From 4dada56df5f52cfb6f074f58461c9276f25288e5 Mon Sep 17 00:00:00 2001 From: Norwin Roosen Date: Mon, 3 Dec 2018 16:55:02 +0100 Subject: [PATCH 1/2] fix mattermost unread count JS now also considers unreads from channels. unminified code: function checkUnread() { const selectBadges = "#sidebarChannelContainer .unread-title.has-badge > span.badge"; const pmUnread = Array.from(document.querySelectorAll(selectBadges)) .reduce((total, el) => total += parseInt(el.innerText), 0); const channelsUnread = document.querySelectorAll("#sidebarChannelContainer .unread-title:not(.has-badge)").length; const teamsUnread = document.querySelectorAll(".team-sidebar .team-container.unread").length; updateBadge(pmUnread + channelsUnread + teamsUnread); } function updateBadge(count) { if (count && count >= 1) rambox.setUnreadCount(count); else rambox.clearUnreadCount(); } setInterval(checkUnread, 3e3); --- app/store/ServicesList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 834fd786..e6eb00d1 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -330,7 +330,7 @@ Ext.define('Rambox.store.ServicesList', { ,description: locale['services[32]'] ,url: '___' ,type: 'messaging' - ,js_unread: 'function checkUnread(){var a=document.title.match(/\(([^()]+)\)/);a=isNaN(parseInt(a))?"*"===document.title[0]?"\u2022":"0":parseInt(a[1]),updateBadge(a)}function updateBadge(a){1<=a||"\u2022"===a?rambox.setUnreadCount(a):rambox.clearUnreadCount()}setInterval(checkUnread,3e3);' + ,js_unread: 'function checkUnread(){const selectBadges="#sidebarChannelContainer .unread-title.has-badge > span.badge";const pmUnread=Array.from(document.querySelectorAll(selectBadges)).reduce((total, el)=>total+=parseInt(el.innerText),0);const channelsUnread=document.querySelectorAll("#sidebarChannelContainer .unread-title:not(.has-badge)").length;const teamsUnread=document.querySelectorAll(".team-sidebar .team-container.unread").length;updateBadge(pmUnread+channelsUnread+teamsUnread);}function updateBadge(count){if(count&&count>=1)rambox.setUnreadCount(count);else rambox.clearUnreadCount();}setInterval(checkUnread,3e3);' }, { id: 'dingtalk' From a0eb32194d8c96817da29e3b0a8390d771a52ed4 Mon Sep 17 00:00:00 2001 From: Norwin Roosen Date: Mon, 3 Dec 2018 17:09:09 +0100 Subject: [PATCH 2/2] =?UTF-8?q?mattermost:=20show=20"=E2=80=A2"=20instead?= =?UTF-8?q?=20of=20number=20for=20unread=20channels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/store/ServicesList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index e6eb00d1..a0aba640 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -330,7 +330,7 @@ Ext.define('Rambox.store.ServicesList', { ,description: locale['services[32]'] ,url: '___' ,type: 'messaging' - ,js_unread: 'function checkUnread(){const selectBadges="#sidebarChannelContainer .unread-title.has-badge > span.badge";const pmUnread=Array.from(document.querySelectorAll(selectBadges)).reduce((total, el)=>total+=parseInt(el.innerText),0);const channelsUnread=document.querySelectorAll("#sidebarChannelContainer .unread-title:not(.has-badge)").length;const teamsUnread=document.querySelectorAll(".team-sidebar .team-container.unread").length;updateBadge(pmUnread+channelsUnread+teamsUnread);}function updateBadge(count){if(count&&count>=1)rambox.setUnreadCount(count);else rambox.clearUnreadCount();}setInterval(checkUnread,3e3);' + ,js_unread: 'function checkUnread() {const selectBadges = "#sidebarChannelContainer .unread-title.has-badge > span.badge"; const pmUnread = Array.from(document.querySelectorAll(selectBadges)) .reduce((total, el) => total += parseInt(el.innerText), 0); if (pmUnread) return updateBadge(pmUnread); const channelsUnread = document.querySelectorAll("#sidebarChannelContainer .unread-title:not(.has-badge)").length; const teamsUnread = document.querySelectorAll(".team-sidebar .team-container.unread").length; updateBadge((channelsUnread + teamsUnread) > 0); } function updateBadge(count) {if (count === true) rambox.setUnreadCount("•"); else if (count >= 1) rambox.setUnreadCount(count); else rambox.clearUnreadCount(); } setInterval(checkUnread, 3e3);' }, { id: 'dingtalk'