fix: small fix (#1279)

* boost feed cache

* Update sdk.js

* Update postline.html

* v

* Update app.js

* v

* v

* Update ForegroundService.java

* Update package.json

chat/matrix-element.js

@@ -22193,6 +22193,20 @@ f.wordComparison = function (s1, s2) {
   });
   return c / m;
 };
+f.format_date = function (value) {
+  var today = moment();
+  if (today.diff(value, 'days') === 0 && moment(value).day() == today.day()) {
+    if (today.diff(value, 'hours') < 12) return moment(moment.utc(value).toDate()).local().fromNow();
+    return new Date(value).toLocaleTimeString([], {
+      hour: '2-digit',
+      minute: "2-digit",
+      hour12: false
+    });
+  }
+  var mvalue = moment(value);
+  if (today.year() === mvalue.year()) return mvalue.local().format('D MMMM, HH:mm');
+  return mvalue.local().format('D MMMM YYYY');
+};
 f.clientsearch = function (value, arr, exe) {
   var txt = value;
   var ctxt = txt.toLowerCase().replace(/[^\p{L}\p{N}\p{Z}]/gu, '');
@@ -55489,7 +55503,7 @@ var addStylesShadow = __webpack_require__("35d6");
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__("2877");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5bc44b30-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./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/App.vue?vue&type=template&id=5e30a43a&shadow
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5bc44b30-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./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/App.vue?vue&type=template&id=16edd642&shadow
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -55692,7 +55706,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=5e30a43a&shadow
+// CONCATENATED MODULE: ./src/App.vue?vue&type=template&id=16edd642&shadow
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__("14d9");
@@ -67636,6 +67650,22 @@ const sdk = __webpack_require__("7afe");
 
 
 
+
+/*
+import { logger as mxLogger } from 'matrix-js-sdk-bastyon/lib/logger';
+
+// rewrite matrix logger
+mxLogger.info = (...msg) =>
+	console.log('matrix: ' + msg.join(' '));
+mxLogger.log = (...msg) =>
+	console.log('matrix: ' + msg.join(' '));
+mxLogger.warn = (...msg) =>
+	console.log('matrix: ' + msg.join(' '));
+mxLogger.error = (...msg) =>
+	console.error('matrix: ' + msg.join(' '));
+mxLogger.trace = (...msg) =>
+	console.log('matrix: ' + msg.join(' '));*/
+
 var mtrx_axios = __webpack_require__("bc3a");
 class mtrx_MTRX {
   constructor(core, p) {
@@ -67820,7 +67850,11 @@ class mtrx_MTRX {
       var userClient = _this3.createMtrxClient(userClientData);
       window.client = userClient;
       window.core = _this3.core;
-      yield store.startup();
+      try {
+        yield store.startup();
+      } catch (e) {
+        console.error('matrix:', e);
+      }
       _this3.client = userClient;
       _this3.initEvents();
       yield userClient.startClient({
@@ -70643,13 +70677,25 @@ var datevue_type_template_id_6f7832dc_scoped_true_staticRenderFns = [];
   computed: Object(vuex_esm["d" /* mapState */])({
     auth: state => state.auth,
     label: function () {
-      moment.locale(this.$i18n.locale);
       if (this.nofuture) {
         if (moment.utc(this.date).unix() >= moment.utc(new Date()).unix()) {
           return moment(moment.utc(new Date()).toDate()).local().fromNow();
         }
       }
-      return moment(moment.utc(this.date).toDate()).local().fromNow();
+      var value = this.date;
+      return this.$f.format_date(value);
+      var today = moment();
+      if (today.diff(value, 'days') === 0 && moment(value).day() == today.day()) {
+        if (today.diff(value, 'hours') < 12) return moment(moment.utc(value).toDate()).local().fromNow();
+        return new Date(value).toLocaleTimeString([], {
+          hour: '2-digit',
+          minute: "2-digit",
+          hour12: false
+        });
+      }
+      var mvalue = moment(value);
+      if (today.year() === mvalue.year()) return mvalue.local().format('D MMMM, hh:mm');
+      return mvalue.local().format('D MMMM YYYY');
     }
   })
 });
@@ -72227,6 +72273,7 @@ var scriptsadded = false;
 
         // Update the teamroom messages
         this.generateTeamroomMessages();
+        moment.locale(Appvue_type_script_lang_js_shadow_i18n.locale);
         if (this.core && this.core.exporter) {
           this.core.exporter.changeLocalization(Appvue_type_script_lang_js_shadow_i18n.locale);
         }
@@ -72677,7 +72724,7 @@ function Appshadow_injectStyles (context) {
 if (style0.__inject__) style0.__inject__(context)
 var style1 = __webpack_require__("6977")
 if (style1.__inject__) style1.__inject__(context)
-var style2 = __webpack_require__("8a03")
+var style2 = __webpack_require__("ef4f")
 if (style2.__inject__) style2.__inject__(context)
 
 }
@@ -102810,18 +102857,6 @@ __webpack_require__.r(__webpack_exports__);
 module.exports = __webpack_require__("0ac3").Transform
 
 
-/***/ }),
-
-/***/ "8a03":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_5e30a43a_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("9709");
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_5e30a43a_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_5e30a43a_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_5e30a43a_prod_lang_css_shadow__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_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_5e30a43a_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-
-
 /***/ }),
 
 /***/ "8b00":
@@ -107071,24 +107106,6 @@ module.exports = JSON.parse("{\"caption\":{\"create\":\"Create\",\"addPublicChat
 
 /***/ }),
 
-/***/ "9709":
-/***/ (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__("f736");
-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("a6d51be8", content, shadowRoot)
-};
-
-/***/ }),
-
 /***/ "970b":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -204976,6 +204993,24 @@ module.exports = JSON.parse("{\"0\":\"O\",\"1\":\"l\",\"֭\":\"֖\",\"֮\":\"֘\
 
 /***/ }),
 
+/***/ "b77f":
+/***/ (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__("ef59");
+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("3c563434", content, shadowRoot)
+};
+
+/***/ }),
+
 /***/ "b7d1":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -235063,6 +235098,38 @@ module.exports.__inject__ = function (shadowRoot) {
   add("6e48efe9", content, shadowRoot)
 };
 
+/***/ }),
+
+/***/ "ef4f":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_16edd642_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("b77f");
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_16edd642_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_16edd642_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_16edd642_prod_lang_css_shadow__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_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_App_vue_vue_type_style_index_2_id_16edd642_prod_lang_css_shadow__WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+
+
+/***/ }),
+
+/***/ "ef59":
+/***/ (function(module, exports, __webpack_require__) {
+
+// Imports
+var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
+var ___CSS_LOADER_AT_RULE_IMPORT_0___ = __webpack_require__("8db5");
+var ___CSS_LOADER_AT_RULE_IMPORT_1___ = __webpack_require__("78db");
+var ___CSS_LOADER_AT_RULE_IMPORT_2___ = __webpack_require__("c275");
+exports = ___CSS_LOADER_API_IMPORT___(false);
+exports.i(___CSS_LOADER_AT_RULE_IMPORT_0___);
+exports.i(___CSS_LOADER_AT_RULE_IMPORT_1___);
+exports.i(___CSS_LOADER_AT_RULE_IMPORT_2___);
+// Module
+exports.push([module.i, "", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "efdb":
@@ -238013,26 +238080,6 @@ InterceptorManager.prototype.forEach = function forEach(fn) {
 module.exports = InterceptorManager;
 
 
-/***/ }),
-
-/***/ "f736":
-/***/ (function(module, exports, __webpack_require__) {
-
-// Imports
-var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
-var ___CSS_LOADER_AT_RULE_IMPORT_0___ = __webpack_require__("8db5");
-var ___CSS_LOADER_AT_RULE_IMPORT_1___ = __webpack_require__("78db");
-var ___CSS_LOADER_AT_RULE_IMPORT_2___ = __webpack_require__("c275");
-exports = ___CSS_LOADER_API_IMPORT___(false);
-exports.i(___CSS_LOADER_AT_RULE_IMPORT_0___);
-exports.i(___CSS_LOADER_AT_RULE_IMPORT_1___);
-exports.i(___CSS_LOADER_AT_RULE_IMPORT_2___);
-// Module
-exports.push([module.i, "", ""]);
-// Exports
-module.exports = exports;
-
-
 /***/ }),
 
 /***/ "f754":

components/earnings/index.css

@@ -410,6 +410,9 @@
   #earnings {
     min-height: none;
   }
+  #earnings .monetization .disableMonetization {
+    margin-right: 0.5em;
+  }
   #earnings .monetization .monetizationTable .table .period {
     width: 40%;
   }

components/earnings/index.less

@@ -554,6 +554,10 @@
 		min-height: none;
 
 		.monetization{
+
+			.disableMonetization{
+				margin-right: @rhythm;
+			}
 
 			.monetizationTable{
 

components/lenta/templates/share.html

@@ -88,7 +88,7 @@
 						</div>	
 						<div class="sys unselectablemobile">
 							<%if(typeof authorsettings != 'undefined' && authorsettings.pin == share.txid){%><span class="pinnedLabel"><i class="fas fa-thumbtack"></i> <%=e((authorsettings.temp || authorsettings.relay) ? 'pinning' :'pinned').toLowerCase()%>,</span><%} else { %><% if(share.repost) { %><span><i class="fas fa-share"></i> <%=e('reposted')%>, </span><% } }%><% if(share.downloadedDate) {%> <span class="fas fa-download"></span> <span class="realtime editedLabel" time="<%-share.downloadedDate%>"><%- app.reltime(share.downloadedDate) %></span><% } else { %> 
-							<% if(share.time) {%><span  class="realtime " time="<%-share.time%>"><%- app.reltime(share.time) %></span><% } else { %><span><%=e('e13019')%></span><% } %><% if(typeof boosted != 'undefined' && boosted) {%> <i class="fas fa-bolt boostedlabel"></i> <span class="boostedlabel"> Boosted</span><% } %><% if(typeof fromrecommendations != 'undefined' && fromrecommendations) {%> <i class="fas fa-star fromrecommendationslabel"></i> <span class="fromrecommendationslabel"> <%=e('recommended')%></span><% } %><% if(share.edit || share.editing) {%><span class="editedLabel">, <%=e('e13130').toLowerCase()%></span><% } %><% } %><% if(share.visibility()) {%><span class="visibilityLabel">, <%=e('sharevisibility_' + share.visibility()).toLowerCase()%></span><% } %>
+							<% if(share.time) {%><span  class="realtime " time="<%-share.time%>"><%- app.reltime(share.time) %></span><% } else { %><span><%=e('e13019')%></span><% } %><% if(typeof boosted != 'undefined' && boosted) {%> <i class="fas fa-bolt boostedlabel"></i> <span class="boostedlabel"> <%-e('boosted')%></span><% } %><% if(typeof fromrecommendations != 'undefined' && fromrecommendations) {%> <i class="fas fa-star fromrecommendationslabel"></i> <span class="fromrecommendationslabel"> <%=e('recommended')%></span><% } %><% if(share.edit || share.editing) {%><span class="editedLabel">, <%=e('e13130').toLowerCase()%></span><% } %><% } %><% if(share.visibility()) {%><span class="visibilityLabel">, <%=e('sharevisibility_' + share.visibility()).toLowerCase()%></span><% } %>
 						</div>
 
 

components/lenta/templates/sharearticle.html

@@ -124,7 +124,7 @@
         <div class="sys unselectablemobile">
             <%if(typeof authorsettings != 'undefined' && authorsettings.pin == share.txid){%>
             <span class="pinnedLabel"><i class="fas fa-thumbtack"></i> <%=e((authorsettings.temp || authorsettings.relay) ? 'pinning' :'pinned').toLowerCase()%>,</span><%}%><% if(share.downloadedDate) {%> <span class="fas fa-cloud-download-alt"></span> <span class="realtime editedLabel" time="<%-share.downloadedDate%>"><%- app.reltime(share.downloadedDate) %></span><% } else { %> 
-            <% if(share.time) {%><span  class="realtime" time="<%-share.time%>"><%- app.reltime(share.time) %></span><% } else { %><span><%=e('e13019')%></span><% } %><% if(typeof boosted != 'undefined' && boosted) {%> <i class="fas fa-bolt boostedlabel"></i> <span class="boostedlabel"> Boosted</span><% } %> <% if(typeof fromrecommendations != 'undefined' && fromrecommendations) {%> <i class="fas fa-star fromrecommendationslabel"></i> <span class="fromrecommendationslabel"> <%=e('recommended')%></span><% } %><% if(share.edit == 'true') {%><span class="editedLabel">, <%=e('e13130').toLowerCase()%></span><% } %><% } %><% if(share.visibility()) {%><span class="visibilityLabel">, <%=e('sharevisibility_' + share.visibility()).toLowerCase()%></span><% } %>
+            <% if(share.time) {%><span  class="realtime" time="<%-share.time%>"><%- app.reltime(share.time) %></span><% } else { %><span><%=e('e13019')%></span><% } %><% if(typeof boosted != 'undefined' && boosted) {%> <i class="fas fa-bolt boostedlabel"></i> <span class="boostedlabel"> <%-e('boosted')%></span><% } %> <% if(typeof fromrecommendations != 'undefined' && fromrecommendations) {%> <i class="fas fa-star fromrecommendationslabel"></i> <span class="fromrecommendationslabel"> <%=e('recommended')%></span><% } %><% if(share.edit == 'true') {%><span class="editedLabel">, <%=e('e13130').toLowerCase()%></span><% } %><% } %><% if(share.visibility()) {%><span class="visibilityLabel">, <%=e('sharevisibility_' + share.visibility()).toLowerCase()%></span><% } %>
         </div>
     <% } else { %> 
         <div class="sys unselectablemobile">

components/lenta/templates/sharevideolight.html

@@ -78,7 +78,7 @@
 					</div>		
 
 					<div class="datetime">
-						<% if(share.time) {%> <span  class="realtime" time="<%-share.time%>"><%- app.reltime(share.time) %></span><% } else { %> <span><%=e('e13019')%></span><% } %><% if(typeof boosted != 'undefined' && boosted) {%> <i class="fas fa-bolt boostedlabel"></i> <span class="boostedlabel"> Boosted</span> <% } %>
+						<% if(share.time) {%> <span  class="realtime" time="<%-share.time%>"><%- app.reltime(share.time) %></span><% } else { %> <span><%=e('e13019')%></span><% } %><% if(typeof boosted != 'undefined' && boosted) {%> <i class="fas fa-bolt boostedlabel"></i> <span class="boostedlabel"> <%-e('boosted')%></span> <% } %>
 					</div>
 				<% } %>