fix bool case

api/controllers/contacts.ts

@@ -217,21 +217,16 @@ const receiveContactKey = async (payload) => {
 	const sender_pub_key = dat.sender.pub_key
 	const sender_contact_key = dat.sender.contact_key
 	const sender_alias = dat.sender.alias || 'Unknown'
-	const sender_photo_url = dat.sender.photoUrl
-
-	if(sender_photo_url){
-		// download and store photo locally
-	}
+	const sender_photo_url = dat.sender.photo_url
 
 	const owner = await models.Contact.findOne({ where: { isOwner: true }})
 	const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key, status: constants.contact_statuses.confirmed }})
 
 	if (sender_contact_key && sender) {
-		if(!sender.alias || sender.alias==='Unknown') {
-			sender.update({ contactKey: sender_contact_key, alias: sender_alias })
-		} else {
-			sender.update({ contactKey: sender_contact_key })
-		}
+		const objToUpdate:{[k:string]:any} = {contactKey: sender_contact_key}
+		if(sender_alias) objToUpdate.alias = sender_alias
+		if(sender_photo_url) objToUpdate.photoUrl = sender_photo_url
+		await sender.update(objToUpdate)
 
 		socket.sendJson({
 			type: 'contact',

api/utils/case.ts

@@ -1,6 +1,7 @@
 import * as changeCase from "change-case";
 
 const dateKeys = ['date','createdAt','updatedAt','created_at','updated_at']
+const boolKeys = ['from_group','is_owner','deleted']
 
 function toSnake(obj) {
     const ret: {[k: string]: any} = {}
@@ -9,6 +10,8 @@ function toSnake(obj) {
             const v: any = value
             const d = new Date(v)
             ret[changeCase.snakeCase(key)] = d.toISOString()
+        } else if(boolKeys.includes(key)) {
+            ret[changeCase.snakeCase(key)] = (!value||value==='0')?0:1
         } else {
             ret[changeCase.snakeCase(key)] = value
         }   

dist/api/controllers/contacts.js

@@ -200,19 +200,16 @@ const receiveContactKey = (payload) => __awaiter(void 0, void 0, void 0, functio
     const sender_pub_key = dat.sender.pub_key;
     const sender_contact_key = dat.sender.contact_key;
     const sender_alias = dat.sender.alias || 'Unknown';
-    const sender_photo_url = dat.sender.photoUrl;
-    if (sender_photo_url) {
-        // download and store photo locally
-    }
+    const sender_photo_url = dat.sender.photo_url;
     const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
     const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key, status: constants.contact_statuses.confirmed } });
     if (sender_contact_key && sender) {
-        if (!sender.alias || sender.alias === 'Unknown') {
-            sender.update({ contactKey: sender_contact_key, alias: sender_alias });
-        }
-        else {
-            sender.update({ contactKey: sender_contact_key });
-        }
+        const objToUpdate = { contactKey: sender_contact_key };
+        if (sender_alias)
+            objToUpdate.alias = sender_alias;
+        if (sender_photo_url)
+            objToUpdate.photoUrl = sender_photo_url;
+        yield sender.update(objToUpdate);
         socket.sendJson({
             type: 'contact',
             response: jsonUtils.contactToJson(sender)

dist/api/utils/case.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const changeCase = require("change-case");
 const dateKeys = ['date', 'createdAt', 'updatedAt', 'created_at', 'updated_at'];
+const boolKeys = ['from_group', 'is_owner', 'deleted'];
 function toSnake(obj) {
     const ret = {};
     for (let [key, value] of Object.entries(obj)) {
@@ -10,6 +11,9 @@ function toSnake(obj) {
             const d = new Date(v);
             ret[changeCase.snakeCase(key)] = d.toISOString();
         }
+        else if (boolKeys.includes(key)) {
+            ret[changeCase.snakeCase(key)] = (!value || value === '0') ? 0 : 1;
+        }
         else {
             ret[changeCase.snakeCase(key)] = value;
         }

dist/api/utils/case.js.map

@@ -1 +1 @@
-{"version":3,"file":"case.js","sourceRoot":"","sources":["../../../api/utils/case.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAE1C,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAC,WAAW,EAAC,WAAW,EAAC,YAAY,EAAC,YAAY,CAAC,CAAA;AAE3E,SAAS,OAAO,CAAC,GAAG;IAChB,MAAM,GAAG,GAAuB,EAAE,CAAA;IAClC,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,EAAC;YAC/B,MAAM,CAAC,GAAQ,KAAK,CAAA;YACpB,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;YACrB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;SACnD;aAAM;YACH,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;SACzC;KACJ;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAUO,0BAAO;AARf,SAAS,OAAO,CAAC,GAAG;IAChB,MAAM,GAAG,GAAuB,EAAE,CAAA;IAClC,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;KACzC;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAEgB,0BAAO"}
+{"version":3,"file":"case.js","sourceRoot":"","sources":["../../../api/utils/case.ts"],"names":[],"mappings":";;AAAA,0CAA0C;AAE1C,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAC,WAAW,EAAC,WAAW,EAAC,YAAY,EAAC,YAAY,CAAC,CAAA;AAC3E,MAAM,QAAQ,GAAG,CAAC,YAAY,EAAC,UAAU,EAAC,SAAS,CAAC,CAAA;AAEpD,SAAS,OAAO,CAAC,GAAG;IAChB,MAAM,GAAG,GAAuB,EAAE,CAAA;IAClC,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,IAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,EAAC;YAC/B,MAAM,CAAC,GAAQ,KAAK,CAAA;YACpB,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAA;YACrB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAA;SACnD;aAAM,IAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC9B,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,IAAE,KAAK,KAAG,GAAG,CAAC,CAAA,CAAC,CAAA,CAAC,CAAA,CAAC,CAAA,CAAC,CAAA;SAC7D;aAAM;YACH,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;SACzC;KACJ;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAUO,0BAAO;AARf,SAAS,OAAO,CAAC,GAAG;IAChB,MAAM,GAAG,GAAuB,EAAE,CAAA;IAClC,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;KACzC;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAEgB,0BAAO"}