@subiz/widget-v4 4.0.53 → 4.0.58

package/cloudflare_worker.js

@@ -16,7 +16,7 @@ document.body.appendChild(tag)`
 
 	return new Response(body, {
 		headers: {
-			'Cache-Control': 'public, max-age=3600, must-revalidate, s-maxage=300, no-transform',
+			'Cache-Control': 'public, max-age=300, must-revalidate, s-maxage=300, no-transform',
 			'Content-Type': 'text/javascript',
 		},
 		status: 200,

package/compiled_src/chatbox/Header.js

@@ -219,6 +219,8 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
   }
 
   renderCloseButton() {
+    let accSetting = this.props.plugin.chatbox || {};
+    if (accSetting.hide_close_button) return null;
     return (0, _preact.h)("div", {
       class: "widget-header--button widget-header--button-close",
       "data-tooltip": this.props.t('close'),

package/compiled_src/lib.js

@@ -57,8 +57,13 @@ class Widget {
     xhttp.send();
   }
 
-  async setAccount(id, $container) {
-    await this.store.init(id);
+  async waitReady(cb) {
+    await this.store.readyGate.entry();
+    cb();
+  }
+
+  async setAccount(id, $container, mask, cb) {
+    let outmask = await this.store.init(id, mask);
     if (!$container) $container = document.body;
     this.pluginMgr = new _plugin.default(this, $container);
     let clean = setInterval(() => {
@@ -67,6 +72,8 @@ class Widget {
       clearInterval(clean);
     }, 1000);
     this.domGate.open();
+    cb && cb(outmask);
+    return outmask;
   }
 
   _setAccount(id, $con) {

package/compiled_src/notif/notif.js

@@ -132,7 +132,7 @@ class Notif extends _common.Com {
 
       let profiles = _index.default.get(this.props, 'plugin.notification.profiles', []);
 
-      let user = profiles[Math.floor(Math.random() * _index.default.size(profiles))];
+      let user = profiles[Math.floor(Math.random() * _index.default.size(profiles))] || {};
 
       if (user.avatar_url && user.avatar_url.startsWith('http')) {
         await _index.default.preloadImg(user.avatar_url);
@@ -154,6 +154,10 @@ class Notif extends _common.Com {
 
       let i18n_message = i18n_messages[Math.floor(Math.random() * _index.default.size(i18n_messages))];
 
+      let fallbackmsgs = _index.default.get(this.props, 'plugin.notification.message_quill_deltas', []);
+
+      let fallbackmessage = fallbackmsgs[Math.floor(Math.random() * _index.default.size(fallbackmsgs))];
+
       let i18n_title = _index.default.get(this.props, 'plugin.notification.i18n_title_quill_delta');
 
       return this.setState({
@@ -161,8 +165,8 @@ class Notif extends _common.Com {
         last_show: _index.default.Date.now(),
         timestamp: timestamp,
         user: user,
-        title: this.props.t.i18n(i18n_title),
-        message: this.props.t.i18n(i18n_message)
+        title: this.props.t.i18n(i18n_title) || _index.default.get(this.props, 'plugin.notification.title_quill_delta'),
+        message: this.props.t.i18n(i18n_message) || fallbackmessage
       });
     }
 

package/compiled_src/store/store.js

@@ -331,18 +331,19 @@ class Store {
     if (!this.isInsync('account')) this.reconnect();
   }
 
-  async init(accid) {
+  async init(accid, mask) {
     this.readyGate.close();
     accid = (accid || '').trim();
     this.api.setAuth({
       accid: accid
     });
     this.g_sync = {};
-    let mask = '';
 
-    try {
-      mask = this.cookie.get('__sbmask', '');
-    } catch (e) {}
+    if (!mask) {
+      try {
+        mask = this.cookie.get('__sbmask', '');
+      } catch (e) {}
+    }
 
     let localstorageMask = this.kv.match('mask');
     if (!mask && localstorageMask) mask = localstorageMask;
@@ -385,6 +386,7 @@ class Store {
     await this.reconnect();
     this.readyGate.open();
     this.reconnectWs(accid, userId);
+    return mask;
   }
 
   seenLoop() {

package/compiled_src/util/campaign.js

@@ -26,7 +26,7 @@ function trackScrollingPercentage(percent, cb) {
     let scrollTop = e.srcElement.scrollingElement ? e.srcElement.scrollingElement.scrollTop : e.srcElement.scrollTop;
     let scrollHeight = e.srcElement.scrollingElement ? e.srcElement.scrollingElement.scrollHeight : e.srcElement.scrollHeight;
 
-    if (scrollTop > 0 && scrollHeight > 0 && scrollTop / scrollHeight >= percent) {
+    if (scrollTop > 0 && scrollHeight > 0 && (scrollTop + window.innerHeight) / scrollHeight >= percent) {
       if (cb) cb();
       window.removeEventListener('scroll', handleScroll, false);
     }
@@ -41,7 +41,12 @@ function trackAreaClicked(selector, cb) {
   common.map(selector.split('\n'), selector => {
     selector = common.trim(selector);
     if (!selector) return;
-    let doms = document.querySelectorAll(selector);
+    let doms = [];
+
+    try {
+      doms = document.querySelectorAll(selector);
+    } catch (e) {}
+
     common.map(doms, dom => {
       if (!dom) return;
       dom.addEventListener('click', cb, false);