From 1b4105a3d0c1ac7cef4d643ac4bd4eaca1a86e6a Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Fri, 30 Aug 2019 14:58:40 +1000
Subject: [PATCH] Fix db stuff and remove unneeded message function
---
app/sql.js | 9 ++++++---
js/models/messages.js | 6 +++---
js/modules/data.js | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/sql.js b/app/sql.js
index 77bde9694..bd1e4f1e6 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -790,7 +790,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
await instance.run(
`ALTER TABLE messages
- ADD COLUMN serverId STRING;`
+ ADD COLUMN serverId INTEGER;`
);
await instance.run(
@@ -2060,11 +2060,14 @@ async function removeMessage(id) {
);
}
-async function getMessageByServerId(serverId) {
+async function getMessageByServerId(serverId, conversationId) {
const row = await db.get(
- 'SELECT * FROM messages WHERE serverId = $serverId;',
+ `SELECT * FROM messages WHERE
+ serverId = $serverId AND
+ conversationId = $conversationId;`,
{
$serverId: serverId,
+ $conversationId: conversationId,
}
);
diff --git a/js/models/messages.js b/js/models/messages.js
index b79307473..1c79f2858 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -357,9 +357,6 @@
onDestroy() {
this.cleanup();
},
- deleteMessage() {
- this.trigger('delete', this);
- },
async cleanup() {
MessageController.unregister(this.id);
this.unload();
@@ -1243,6 +1240,9 @@
Message: Whisper.Message,
});
},
+ getServerId() {
+ return this.get('serverId');
+ },
async setServerId(serverId) {
if (_.isEqual(this.get('serverId'), serverId)) return;
diff --git a/js/modules/data.js b/js/modules/data.js
index 80c21bdee..c410f9464 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -908,8 +908,8 @@ async function _removeMessages(ids) {
await channels.removeMessage(ids);
}
-async function getMessageByServerId(id, { Message }) {
- const message = await channels.getMessageByServerId(id);
+async function getMessageByServerId(serverId, conversationId, { Message }) {
+ const message = await channels.getMessageByServerId(serverId, conversationId);
if (!message) {
return null;
}