fix includePhotoUrl if custom photo but no main photo

4 years ago · d7a9b90da2
3 changed files with 5 additions and 5 deletions
--- a/dist/src/network/send.js
+++ b/dist/src/network/send.js
@ -171,8 +171,8 @@ function newmsg(type, chat, sender, message, isForwarded) {
    if (!isForwarded && includeAlias && chat.myAlias) {
        aliasToInclude = chat.myAlias;
    }
-    const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto && chat && chat.type === constants_1.default.chat_types.tribe;
-    let photoUrlToInclude = sender.photoUrl;
+    const includePhotoUrl = sender && !sender.privatePhoto && chat && chat.type === constants_1.default.chat_types.tribe;
+    let photoUrlToInclude = sender.photoUrl || '';
    if (!isForwarded && includePhotoUrl && chat.myPhotoUrl) {
        photoUrlToInclude = chat.myPhotoUrl;
    }
--- a/dist/src/network/send.js.map
+++ b/dist/src/network/send.js.map
--- a/src/network/send.ts
+++ b/src/network/send.ts
@ -163,8 +163,8 @@ export function newmsg(type, chat, sender, message, isForwarded:boolean){
 	if(!isForwarded && includeAlias && chat.myAlias) {
 		aliasToInclude = chat.myAlias
 	}
-	const includePhotoUrl = sender && sender.photoUrl && !sender.privatePhoto && chat && chat.type===constants.chat_types.tribe
-	let photoUrlToInclude = sender.photoUrl
+	const includePhotoUrl = sender && !sender.privatePhoto && chat && chat.type===constants.chat_types.tribe
+	let photoUrlToInclude = sender.photoUrl || ''
 	if(!isForwarded && includePhotoUrl && chat.myPhotoUrl) {
 		photoUrlToInclude = chat.myPhotoUrl
 	}