diff --git a/api/hub.ts b/api/hub.ts index f134c9e..46d9a1b 100644 --- a/api/hub.ts +++ b/api/hub.ts @@ -221,14 +221,14 @@ const sendNotification = async (chat, name, type) => { return } - const unseenMessages = await models.Message.findAll({ where: { sender: { [Op.ne]: owner.id }, seen: false } }) + const unseenMessages = await models.Message.count({ where: { sender: { [Op.ne]: owner.id }, seen: false } }) const params = { device_id: owner.deviceId, - notification: { - chat_id: chat.id, + notification: { + chat_id: chat.id, message, - badge: unseenMessages.length + badge: unseenMessages } } diff --git a/api/utils/nodeinfo.ts b/api/utils/nodeinfo.ts index f58b2d4..edda975 100644 --- a/api/utils/nodeinfo.ts +++ b/api/utils/nodeinfo.ts @@ -83,10 +83,10 @@ export {nodeinfo} async function isClean(){ // has owner but with no auth token const cleanOwner = await models.Contact.findOne({ where: { isOwner: true, authToken: null }}) - const msgs = await models.Message.findAll() - const allContacts = await models.Contact.findAll() - const noMsgs = msgs.length===0 - const onlyOneContact = allContacts.length===1 + const msgs = await models.Message.count() + const allContacts = await models.Contact.count() + const noMsgs = msgs===0 + const onlyOneContact = allContacts===1 if(cleanOwner && noMsgs && onlyOneContact) return true return false } \ No newline at end of file diff --git a/dist/api/hub.js b/dist/api/hub.js index dacf9cb..6885bce 100644 --- a/dist/api/hub.js +++ b/dist/api/hub.js @@ -213,13 +213,13 @@ const sendNotification = (chat, name, type) => __awaiter(void 0, void 0, void 0, console.log('[send notification] skipping. owner.deviceId not set.'); return; } - const unseenMessages = yield models_1.models.Message.findAll({ where: { sender: { [sequelize_1.Op.ne]: owner.id }, seen: false } }); + const unseenMessages = yield models_1.models.Message.count({ where: { sender: { [sequelize_1.Op.ne]: owner.id }, seen: false } }); const params = { device_id: owner.deviceId, notification: { chat_id: chat.id, message, - badge: unseenMessages.length + badge: unseenMessages } }; fetch("https://hub.sphinx.chat/api/v1/nodes/notify", { diff --git a/dist/api/hub.js.map b/dist/api/hub.js.map index 997734c..fefebe3 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 diff --git a/dist/api/utils/nodeinfo.js b/dist/api/utils/nodeinfo.js index de5bbc6..01a04fd 100644 --- a/dist/api/utils/nodeinfo.js +++ b/dist/api/utils/nodeinfo.js @@ -91,10 +91,10 @@ function isClean() { return __awaiter(this, void 0, void 0, function* () { // has owner but with no auth token const cleanOwner = yield models_1.models.Contact.findOne({ where: { isOwner: true, authToken: null } }); - const msgs = yield models_1.models.Message.findAll(); - const allContacts = yield models_1.models.Contact.findAll(); - const noMsgs = msgs.length === 0; - const onlyOneContact = allContacts.length === 1; + const msgs = yield models_1.models.Message.count(); + const allContacts = yield models_1.models.Contact.count(); + const noMsgs = msgs === 0; + const onlyOneContact = allContacts === 1; if (cleanOwner && noMsgs && onlyOneContact) return true; return false; diff --git a/dist/api/utils/nodeinfo.js.map b/dist/api/utils/nodeinfo.js.map index f9eee42..abcbf96 100644 --- a/dist/api/utils/nodeinfo.js.map +++ b/dist/api/utils/nodeinfo.js.map @@ -1 +1 @@ -{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../api/utils/nodeinfo.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"nodeinfo.js","sourceRoot":"","sources":["../../../api/utils/nodeinfo.ts"],"names":[],"mappings":"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"} \ No newline at end of file