Skip to content

Commit

Permalink
fix: notifications (#1146)
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxgithubprofile
maxgithubprofile authored Nov 27, 2023
1 parent 3207bed commit 71606d3
Show file tree
Hide file tree
Showing 21 changed files with 18,465 additions and 341 deletions.
117 changes: 63 additions & 54 deletions chat/matrix-element.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6366,18 +6366,6 @@ var ClientWidgetApi = /*#__PURE__*/function (_EventEmitter) {

exports.ClientWidgetApi = ClientWidgetApi;

/***/ }),

/***/ "02e9":
/***/ (function(module, __webpack_exports__, __webpack_require__) {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_650f1dfa_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("a433");
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_650f1dfa_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_650f1dfa_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__);
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_650f1dfa_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_650f1dfa_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));


/***/ }),

/***/ "0366":
Expand Down Expand Up @@ -43356,6 +43344,18 @@ module.exports = {
};
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("4362")))

/***/ }),

/***/ "4734":
/***/ (function(module, __webpack_exports__, __webpack_require__) {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_1cd3a14d_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("5d2a");
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_1cd3a14d_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_1cd3a14d_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__);
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_1cd3a14d_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_bgimage_vue_vue_type_style_index_0_id_1cd3a14d_prod_scoped_true_lang_sass___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));


/***/ }),

/***/ "4754":
Expand Down Expand Up @@ -123813,12 +123813,17 @@ class notifier_Notifier {
if (this.core.vm.$store.state.mobile) {
position = "top-left";
}
var formatIcon = info.icon || null;
if (formatIcon && typeof replaceArchiveInImage != 'undefined') {
formatIcon = replaceArchiveInImage(formatIcon);
}
;
this.core.vm.$message({
event: info.event,
title: info.title,
message: info.message,
roomId: info.roomId,
iconImg: info.icon ? info.icon.replace('bastyon.com:8092', 'pocketnet.app:8092').replace('test.pocketnet', 'pocketnet') : null,
iconImg: formatIcon,
onClick: click,
zIndex: 999,
supportHTML: true,
Expand Down Expand Up @@ -125933,8 +125938,8 @@ var userspic_component = Object(componentNormalizer["a" /* default */])(
)

/* harmony default export */ var userspic = (userspic_component.exports);
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ac3d8d66-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/assets/bgimage.vue?vue&type=template&id=650f1dfa&scoped=true&
var bgimagevue_type_template_id_650f1dfa_scoped_true_render = function render() {
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ac3d8d66-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/assets/bgimage.vue?vue&type=template&id=1cd3a14d&scoped=true&
var bgimagevue_type_template_id_1cd3a14d_scoped_true_render = function render() {
var _vm = this,
_c = _vm._self._c;
return _c('div', {
Expand All @@ -125946,9 +125951,9 @@ var bgimagevue_type_template_id_650f1dfa_scoped_true_render = function render()
style: 'background-image:url(' + _vm.imageSrc + '); background-size: cover; background-position: center center; background-repeat: no-repeat'
}, [_vm._t("cnt")], 2);
};
var bgimagevue_type_template_id_650f1dfa_scoped_true_staticRenderFns = [];
var bgimagevue_type_template_id_1cd3a14d_scoped_true_staticRenderFns = [];

// CONCATENATED MODULE: ./src/components/assets/bgimage.vue?vue&type=template&id=650f1dfa&scoped=true&
// CONCATENATED MODULE: ./src/components/assets/bgimage.vue?vue&type=template&id=1cd3a14d&scoped=true&

// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/assets/bgimage.vue?vue&type=script&lang=js&
var loadedCache = {};
Expand Down Expand Up @@ -125980,7 +125985,11 @@ var loadedCache = {};
methods: {
load: function () {
if (this.src) {
this.imageSrc = this.src.replace("bastyon.com:8092", "pocketnet.app:8092").replace("test.pocketnet", "pocketnet");
this.imageSrc = this.src;
if (this.imageSrc && typeof replaceArchiveInImage != 'undefined') {
this.imageSrc = replaceArchiveInImage(this.imageSrc);
}
;
var image = new Image();
image.src = this.imageSrc;
image.onload = () => {
Expand All @@ -125999,7 +126008,7 @@ var loadedCache = {};

function bgimage_injectStyles (context) {

var style0 = __webpack_require__("02e9")
var style0 = __webpack_require__("4734")
if (style0.__inject__) style0.__inject__(context)

}
Expand All @@ -126008,11 +126017,11 @@ if (style0.__inject__) style0.__inject__(context)

var bgimage_component = Object(componentNormalizer["a" /* default */])(
assets_bgimagevue_type_script_lang_js_,
bgimagevue_type_template_id_650f1dfa_scoped_true_render,
bgimagevue_type_template_id_650f1dfa_scoped_true_staticRenderFns,
bgimagevue_type_template_id_1cd3a14d_scoped_true_render,
bgimagevue_type_template_id_1cd3a14d_scoped_true_staticRenderFns,
false,
bgimage_injectStyles,
"650f1dfa",
"1cd3a14d",
null
,true
)
Expand Down Expand Up @@ -128291,6 +128300,24 @@ module.exports = pipeline;

/***/ }),

/***/ "5d2a":
/***/ (function(module, exports, __webpack_require__) {

// style-loader: Adds some css to the DOM by adding a <style> tag

// load the styles
var content = __webpack_require__("8451");
if(content.__esModule) content = content.default;
if(typeof content === 'string') content = [[module.i, content, '']];
if(content.locals) module.exports = content.locals;
// add CSS to Shadow Root
var add = __webpack_require__("35d6").default
module.exports.__inject__ = function (shadowRoot) {
add("e400c6de", content, shadowRoot)
};

/***/ }),

/***/ "5d7d":
/***/ (function(module, __webpack_exports__, __webpack_require__) {

Expand Down Expand Up @@ -147287,20 +147314,6 @@ asn1.decoders = __webpack_require__("20f6");
asn1.encoders = __webpack_require__("343e");


/***/ }),

/***/ "7fb5":
/***/ (function(module, exports, __webpack_require__) {

// Imports
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.i, ".bgimage[data-v-650f1dfa]{width:100%;height:100%;opacity:0;transition:.3s}.bgimage.loaded[data-v-650f1dfa]{opacity:1}", ""]);
// Exports
module.exports = exports;


/***/ }),

/***/ "7fe8":
Expand Down Expand Up @@ -152448,6 +152461,20 @@ module.exports = function xor (a, b) {
}


/***/ }),

/***/ "8451":
/***/ (function(module, exports, __webpack_require__) {

// Imports
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.i, ".bgimage[data-v-1cd3a14d]{width:100%;height:100%;opacity:0;transition:.3s}.bgimage.loaded[data-v-1cd3a14d]{opacity:1}", ""]);
// Exports
module.exports = exports;


/***/ }),

/***/ "848b":
Expand Down Expand Up @@ -175645,24 +175672,6 @@ __webpack_require__.r(__webpack_exports__);
/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_index_sass_vue_type_style_index_0_prod_lang_sass___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_sass_loader_dist_cjs_js_ref_10_oneOf_1_4_index_sass_vue_type_style_index_0_prod_lang_sass___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));


/***/ }),

/***/ "a433":
/***/ (function(module, exports, __webpack_require__) {

// style-loader: Adds some css to the DOM by adding a <style> tag

// load the styles
var content = __webpack_require__("7fb5");
if(content.__esModule) content = content.default;
if(typeof content === 'string') content = [[module.i, content, '']];
if(content.locals) module.exports = content.locals;
// add CSS to Shadow Root
var add = __webpack_require__("35d6").default
module.exports.__inject__ = function (shadowRoot) {
add("19b58f5a", content, shadowRoot)
};

/***/ }),

/***/ "a45a":
Expand Down
2 changes: 1 addition & 1 deletion chat/matrix-element.js.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions chat/matrix-element.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion chat/matrix-element.min.js.map
View file

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions components/author/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ var author = (function(){
})
},

userslist : function(_el, users, empty, caption, clbk){
userslist : function(_el, users, empty, caption, clbk, count){
self.nav.api.load({

open : true,
Expand All @@ -639,6 +639,7 @@ var author = (function(){
empty : empty,
caption : caption,
sort : 'commonuserrelation',
count : count
},

clbk : function(e, p){
Expand Down Expand Up @@ -762,6 +763,8 @@ var author = (function(){
var u = _.map(deep(author, 'data.subscribers') || [], function(a){
return a
})

var c = u.length

var blocked = deep(author, 'data.blocking') || []

Expand All @@ -774,10 +777,12 @@ var author = (function(){
if(self.user.isItMe(author.address)){
e = self.app.localization.e('aynofollowers')
}

console.log("COUNT 2" , c)

renders.userslist(_el, u, e, self.app.localization.e('followers'), function(e, p){
report.module = p;
})
}, c)

})

Expand All @@ -792,6 +797,8 @@ var author = (function(){
return a.adddress
})

var c = u.length

var blocked = deep(author, 'data.blocking') || []

u = _.filter(u, function(a){
Expand All @@ -804,9 +811,10 @@ var author = (function(){
e = self.app.localization.e('aynofollowing')
}

console.log("COUNT 1" , c)
renders.userslist(_el, u, e, self.app.localization.e('following'), function(e, p){
report.module = p;
})
}, c)

})
},
Expand Down
Loading

0 comments on commit 71606d3

Please sign in to comment.