Merge pull request #5 from Adamant-im/dev-system-chat-type

Adding Signal/Rich chat types
Adamant-im · Jun 9, 2018 · 7abb065 · 7abb065
2 parents 5c5a184 + 419b32a
commit 7abb065
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/config.json b/config.json
@@ -1,8 +1,8 @@
 {
     "port": 36666,
     "address": "0.0.0.0",
-    "version": "0.2.1",
-    "minVersion": ">=0.2.1",
+    "version": "0.3.0",
+    "minVersion": ">=0.3.0",
     "fileLogLevel": "info",
     "logFileName": "logs/adamant.log",
     "consoleLogLevel": "none",

diff --git a/logic/chat.js b/logic/chat.js
@@ -114,7 +114,7 @@ Chat.prototype.verify = function (trs, sender, cb) {
     }
 
 
-    if (trs.asset.chat.type > 1 || trs.asset.chat.type < 0) {
+    if (trs.asset.chat.type > 3 || trs.asset.chat.type < 0) {
         return setImmediate(cb, 'Invalid message type');
     }
 

diff --git a/modules/chats.js b/modules/chats.js
@@ -106,7 +106,7 @@ __private.getByIds = function (ids, cb) {
 };
 
 /**
- * Gets records from `dapps` table based on filter
+ * Gets records from `chats` table based on filter
  * @private
  * @implements {library.db.query}
  * @param {Object} filter - Could contains type, name, category, link, limit,
@@ -118,9 +118,13 @@ __private.list = function (filter, cb) {
     var params = {}, where = [];
 
     if (filter.type >= 0) {
-        where.push('"type" = ${type}');
+        where.push('"c_type" = ${type}');
         params.type = filter.type;
     }
+    else {
+        // message type=3 is reserved for system messages, and shouldn't be retrieved without a filter
+        where.push('NOT ("c_type" = 3)');
+    }
     where.push('"t_type" = '+ transactionTypes.CHAT_MESSAGE);
 
     if (filter.senderId) {

diff --git a/modules/states.js b/modules/states.js
@@ -118,9 +118,13 @@ __private.list = function (filter, cb) {
     var params = {}, where = [];
 
     if (filter.type >= 0) {
-        where.push('"type" = ${type}');
+        where.push('"st_type" = ${type}');
         params.type = filter.type;
     }
+    if (filter.key) {
+        where.push('"st_stored_key" = ${key}');
+        params.key = filter.key;
+    }
     where.push('"t_type" = '+ transactionTypes.STATE);
 
     if (filter.senderId) {