From f7d7e5329231552f8fa051be343bcb4d0b47e1b5 Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Thu, 23 Jul 2020 12:54:41 -0700 Subject: [PATCH] fix badge count --- api/helpers.ts | 1 - api/hub.ts | 20 ++++++++++++-------- dist/api/helpers.js | 1 - dist/api/helpers.js.map | 2 +- dist/api/hub.js | 17 ++++++++++++----- dist/api/hub.js.map | 2 +- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/api/helpers.ts b/api/helpers.ts index d0fdf7d..ce60ab4 100644 --- a/api/helpers.ts +++ b/api/helpers.ts @@ -163,7 +163,6 @@ export async function parseReceiveParams(payload) { const owner = await models.Contact.findOne({ where: { isOwner: true } }) if (isConversation) { sender = await findOrCreateContactByPubkey(sender_pub_key) - console.log("CREATED CONTACT AUTOMATICALLY",sender&&sender.id) chat = await findOrCreateChatByUUID( chat_uuid, [parseInt(owner.id), parseInt(sender.id)] ) diff --git a/api/hub.ts b/api/hub.ts index 0451be6..500b663 100644 --- a/api/hub.ts +++ b/api/hub.ts @@ -204,8 +204,6 @@ const sendNotification = async (chat, name, type:NotificationType) => { message += ` on ${chat.name}` } - console.log('[send notification]', { chat_id:chat.id, message }) - const owner = await models.Contact.findOne({ where: { isOwner: true }}) if (!owner.deviceId) { @@ -215,13 +213,10 @@ const sendNotification = async (chat, name, type:NotificationType) => { const device_id = owner.deviceId const isIOS = device_id.length===64 const isAndroid = !isIOS - - let unseenMessages=await models.Message.count({ where: { sender: { [Op.ne]: owner.id }, seen: false } }) const params:{[k:string]:any} = {device_id} const notification:{[k:string]:any} = { chat_id: chat.id, - badge: unseenMessages, sound: '' } if(type!=='badge' && !chat.isMuted) { @@ -236,14 +231,23 @@ const sendNotification = async (chat, name, type:NotificationType) => { debounce(()=>{ const count = tribeCounts[chat.id]?tribeCounts[chat.id]+' ':'' params.notification.message = `You have ${count}new messages in ${chat.name}` - triggerNotification(params) + finalNotification(owner.id, params) }, chat.id, 30000) } else { - triggerNotification(params) + finalNotification(owner.id, params) + } +} + +async function finalNotification(ownerID: number, params:{[k:string]:any}){ + if(params.notification.message) { + console.log('[send notification]', params.notification) } + let unseenMessages = await models.Message.count({ where: { sender: { [Op.ne]: ownerID }, seen: false } }) + params.notification.badge = unseenMessages + triggerNotification(params) } -function triggerNotification(params){ +function triggerNotification(params:{[k:string]:any}){ fetch("https://hub.sphinx.chat/api/v1/nodes/notify", { method: 'POST' , body: JSON.stringify(params), diff --git a/dist/api/helpers.js b/dist/api/helpers.js index 564f981..24771db 100644 --- a/dist/api/helpers.js +++ b/dist/api/helpers.js @@ -175,7 +175,6 @@ function parseReceiveParams(payload) { const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); if (isConversation) { sender = yield findOrCreateContactByPubkey(sender_pub_key); - console.log("CREATED CONTACT AUTOMATICALLY", sender && sender.id); chat = yield findOrCreateChatByUUID(chat_uuid, [parseInt(owner.id), parseInt(sender.id)]); if (sender.fromGroup) { // if a private msg received, update the contact yield sender.update({ fromGroup: false }); diff --git a/dist/api/helpers.js.map b/dist/api/helpers.js.map index 3b1eaaa..952abd1 100644 --- a/dist/api/helpers.js.map +++ b/dist/api/helpers.js.map @@ -1 +1 @@ -{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../api/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../api/helpers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/hub.js b/dist/api/hub.js index 7ee2b7d..9a7f32d 100644 --- a/dist/api/hub.js +++ b/dist/api/hub.js @@ -198,7 +198,6 @@ const sendNotification = (chat, name, type) => __awaiter(void 0, void 0, void 0, if (type === 'message' && chat.type == constants.chat_types.group && chat.name && chat.name.length) { message += ` on ${chat.name}`; } - console.log('[send notification]', { chat_id: chat.id, message }); const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); if (!owner.deviceId) { console.log('[send notification] skipping. owner.deviceId not set.'); @@ -207,11 +206,9 @@ const sendNotification = (chat, name, type) => __awaiter(void 0, void 0, void 0, const device_id = owner.deviceId; const isIOS = device_id.length === 64; const isAndroid = !isIOS; - let unseenMessages = yield models_1.models.Message.count({ where: { sender: { [sequelize_1.Op.ne]: owner.id }, seen: false } }); const params = { device_id }; const notification = { chat_id: chat.id, - badge: unseenMessages, sound: '' }; if (type !== 'badge' && !chat.isMuted) { @@ -227,14 +224,24 @@ const sendNotification = (chat, name, type) => __awaiter(void 0, void 0, void 0, debounce(() => { const count = tribeCounts[chat.id] ? tribeCounts[chat.id] + ' ' : ''; params.notification.message = `You have ${count}new messages in ${chat.name}`; - triggerNotification(params); + finalNotification(owner.id, params); }, chat.id, 30000); } else { - triggerNotification(params); + finalNotification(owner.id, params); } }); exports.sendNotification = sendNotification; +function finalNotification(ownerID, params) { + return __awaiter(this, void 0, void 0, function* () { + if (params.notification.message) { + console.log('[send notification]', params.notification); + } + let unseenMessages = yield models_1.models.Message.count({ where: { sender: { [sequelize_1.Op.ne]: ownerID }, seen: false } }); + params.notification.badge = unseenMessages; + triggerNotification(params); + }); +} function triggerNotification(params) { fetch("https://hub.sphinx.chat/api/v1/nodes/notify", { method: 'POST', diff --git a/dist/api/hub.js.map b/dist/api/hub.js.map index eabcc04..4a89e21 100644 --- a/dist/api/hub.js.map +++ b/dist/api/hub.js.map @@ -1 +1 @@ -{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../api/hub.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../api/hub.ts"],"names":[],"mappings":"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"} \ No newline at end of file