From e9773c05be0f1be31021003ceb63d1d029fb0131 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 2 Dec 2019 22:16:17 -0800 Subject: [PATCH 01/17] mark all public servers as active (move out of friends tab into convos where you'd expect it) --- js/views/connecting_to_server_dialog_view.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/views/connecting_to_server_dialog_view.js b/js/views/connecting_to_server_dialog_view.js index 65b427aee..84deb2a4a 100644 --- a/js/views/connecting_to_server_dialog_view.js +++ b/js/views/connecting_to_server_dialog_view.js @@ -50,6 +50,7 @@ ); await serverAPI.findOrCreateChannel(channelId, conversationId); await conversation.setPublicSource(sslServerUrl, channelId); + await conversation.set({ active_at: Date.now() }); await conversation.setFriendRequestStatus( friends.friendRequestStatusEnum.friends ); From 29090ad80a1f4852ca17021a0df404730f11a167 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:34:26 -0800 Subject: [PATCH 02/17] add updatePublicGroupDialogTitle and strip trailing whitespace --- _locales/en/messages.json | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 91f32bdd7..012b77605 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1992,54 +1992,44 @@ "message": "Note: Your display name will be visible to your contacts", "description": "Shown to the user as a warning about setting display name" }, - "copyPublicKey": { "message": "Copy public key", "description": "Button action that the user can click to copy their public keys" }, - "banUser": { "message": "Ban user", "description": "Ban user from public chat by public key." }, - "banUserConfirm": { "message": "Are you sure you want to ban user?", "description": "Message shown when confirming user ban." }, - "userBanned": { "message": "User successfully banned", "description": "Toast on succesful user ban." }, - "userBanFailed": { "message": "User ban failed!", "description": "Toast on unsuccesful user ban." }, - "copyChatId": { "message": "Copy Chat ID" }, - "updateGroup": { "message": "Update Group", "description": "Button action that the user can click to rename the group or add a new member" }, - "leaveGroup": { "message": "Leave Group", "description": "Button action that the user can click to leave the group" }, - "leaveGroupDialogTitle": { "message": "Are you sure you want to leave this group?", "description": "Title shown to the user to confirm they want to leave the group" }, - "copiedPublicKey": { "message": "Copied public key", "description": "A toast message telling the user that the key was copied" @@ -2062,18 +2052,20 @@ "message": "Edit profile", "description": "Button action that the user can click to edit their profile" }, - "createGroupDialogTitle": { "message": "Creating a Private Group Chat", "description": "Title for the dialog box used to create a new private group" }, - "updateGroupDialogTitle": { "message": "Updating a Private Group Chat", "description": "Title for the dialog box used to update an existing private group" }, - + "updatePublicGroupDialogTitle": { + "message": "Updating a Public Chat Channel", + "description": + "Title for the dialog box used to update an existing public chat channel" + }, "showSeed": { "message": "Show seed", "description": @@ -2093,25 +2085,21 @@ "description": "Title for the dialog box used to connect to a new public server" }, - "createPrivateGroup": { "message": "Create Private Group", "description": "Button action that the user can click to show a dialog for creating a new private group chat" }, - "seedViewTitle": { "message": "Please save the seed below in a safe location. They can be used to restore your account if you lose access or migrate to a new device.", "description": "The title shown when the user views their seeds" }, - "copiedMnemonic": { "message": "Copied seed to clipboard", "description": "A toast message telling the user that the mnemonic seed was copied" }, - "passwordViewTitle": { "message": "Type in your password", "description": @@ -2125,7 +2113,6 @@ "description": "A button action that the user can click to reset the database" }, - "setPassword": { "message": "Set Password", "description": "Button action that the user can click to set a password" @@ -2210,7 +2197,6 @@ "message": "Invalid Pubkey Format", "description": "Error string shown when user types an invalid pubkey format" }, - "conversationsTab": { "message": "Conversations", "description": "conversation tab title" From ca0e1f995cb52c46392e29bf4193c6d750160157 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:34:45 -0800 Subject: [PATCH 03/17] handle public group updates differently --- js/background.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/js/background.js b/js/background.js index 13ef99a9b..6f2404d3b 100644 --- a/js/background.js +++ b/js/background.js @@ -741,6 +741,20 @@ 'group' ); + if (convo.isPublic()) { + const API = await convo.getPublicSendData(); + if (await API.setChannelName(groupName)) { + // queue update from server + // and let that set the conversation + API.pollForChannelOnce(); + // or we could just directly call + // convo.setGroupName(groupName); + // but gut is saying let the server be the definitive storage of the state + // and trickle down from there + } + return; + } + const avatar = ''; const options = {}; From 027bb76989ac3b808bd98910417e35ab1e9b82b5 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:36:03 -0800 Subject: [PATCH 04/17] setPublicSource now marks convo active, make getPublicSendData use the lokiPublicChatAPI findOrCreateChannel, add some warnings --- js/models/conversations.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index af7c85828..7572682b3 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -1,5 +1,6 @@ /* global _, + log, i18n, Backbone, ConversationController, @@ -2346,14 +2347,21 @@ // maybe "Backend" instead of "Source"? async setPublicSource(newServer, newChannelId) { if (!this.isPublic()) { + log.warn( + `trying to setPublicSource on non public chat conversation ${this.id}` + ); return; } if ( this.get('server') !== newServer || this.get('channelId') !== newChannelId ) { - this.set({ server: newServer }); - this.set({ channelId: newChannelId }); + // mark active so it's not in the friends list but the conversation list + this.set({ + server: newServer, + channelId: newChannelId, + active_at: Date.now(), + }); await window.Signal.Data.updateConversation(this.id, this.attributes, { Conversation: Whisper.Conversation, }); @@ -2361,6 +2369,9 @@ }, getPublicSource() { if (!this.isPublic()) { + log.warn( + `trying to getPublicSource on non public chat conversation ${this.id}` + ); return null; } return { @@ -2370,18 +2381,8 @@ }; }, async getPublicSendData() { - const serverAPI = await lokiPublicChatAPI.findOrCreateServer( - this.get('server') - ); - if (!serverAPI) { - window.log.warn( - `Failed to get serverAPI (${this.get('server')}) for conversation (${ - this.id - })` - ); - return null; - } - const channelAPI = await serverAPI.findOrCreateChannel( + const channelAPI = await lokiPublicChatAPI.findOrCreateChannel( + this.get('server'), this.get('channelId'), this.id ); From 3678b49787da6065d474f1999f72f010a604e0f7 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:36:42 -0800 Subject: [PATCH 05/17] abort trying response if failed --- js/modules/loki_rss_api.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/js/modules/loki_rss_api.js b/js/modules/loki_rss_api.js index 6a7c3f23a..dacf1f33f 100644 --- a/js/modules/loki_rss_api.js +++ b/js/modules/loki_rss_api.js @@ -55,12 +55,14 @@ class LokiRssAPI extends EventEmitter { async getFeed() { let response; - let success = true; try { response = await nodeFetch(this.feedUrl); } catch (e) { log.error('fetcherror', e); - success = false; + return; + } + if (!response) { + return; } const responseXML = await response.text(); let feedDOM = {}; @@ -71,9 +73,6 @@ class LokiRssAPI extends EventEmitter { ); } catch (e) { log.error('xmlerror', e); - success = false; - } - if (!success) { return; } const feedObj = xml2json(feedDOM); From 22979e9d6b4cf0f454430fdd149212100daf8f93 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:37:14 -0800 Subject: [PATCH 06/17] add amMod property --- js/views/conversation_view.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 60af7147c..7d2068d85 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -223,6 +223,9 @@ isOnline: this.model.isOnline(), isArchived: this.model.get('isArchived'), isPublic: this.model.isPublic(), + amMod: this.model.isModerator( + window.storage.get('primaryDevicePubKey') + ), members, expirationSettingName, showBackButton: Boolean(this.panels && this.panels.length), From 24f7c33ab66d784573c0d5b49c90fd6a42fa9825 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:37:43 -0800 Subject: [PATCH 07/17] add isPublic property, support public chat settings --- js/views/create_group_dialog_view.js | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/js/views/create_group_dialog_view.js b/js/views/create_group_dialog_view.js index 0ff6e3205..ebbcd1ecb 100644 --- a/js/views/create_group_dialog_view.js +++ b/js/views/create_group_dialog_view.js @@ -99,6 +99,7 @@ this.cancelText = i18n('cancel'); this.close = this.close.bind(this); this.onSubmit = this.onSubmit.bind(this); + this.isPublic = groupConvo.isPublic(); const ourPK = textsecure.storage.user.getNumber(); @@ -115,10 +116,31 @@ this.friendList = allMembers; // only give members that are not already in the group - const existingMembers = groupConvo.get('members'); + let existingMembers = groupConvo.get('members'); + + // at least make sure it's an array + if (!Array.isArray(existingMembers)) { + existingMembers = []; + } this.existingMembers = existingMembers; + // public chat settings overrides + if (this.isPublic) { + // fix the title + this.titleText = `${i18n('updatePublicGroupDialogTitle')}: ${ + this.groupName + }`; + // I'd much prefer to integrate mods with groupAdmins + // but lets discuss first... + this.isAdmin = groupConvo.isModerator( + window.storage.get('primaryDevicePubKey') + ); + // zero out friendList for now + this.friendList = []; + this.existingMembers = []; + } + this.$el.focus(); this.render(); }, @@ -130,6 +152,7 @@ titleText: this.titleText, groupName: this.groupName, okText: this.okText, + isPublic: this.isPublic, cancelText: this.cancelText, existingMembers: this.existingMembers, friendList: this.friendList, From b152d186d5e8e90de51f4bc35bb12a74ec2f8689 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:38:10 -0800 Subject: [PATCH 08/17] handle public chat group update --- ts/components/conversation/UpdateGroupDialog.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ts/components/conversation/UpdateGroupDialog.tsx b/ts/components/conversation/UpdateGroupDialog.tsx index 0e0d2710b..722950ea1 100644 --- a/ts/components/conversation/UpdateGroupDialog.tsx +++ b/ts/components/conversation/UpdateGroupDialog.tsx @@ -13,6 +13,7 @@ interface Props { titleText: string; groupName: string; okText: string; + isPublic: boolean; cancelText: string; // friends not in the group friendList: Array; @@ -88,16 +89,25 @@ export class UpdateGroupDialog extends React.Component { public render() { const checkMarkedCount = this.getMemberCount(this.state.friendList); - const titleText = `${this.props.titleText} (Members: ${checkMarkedCount})`; + let titleText = `${this.props.titleText} (Members: ${checkMarkedCount})`; const okText = this.props.okText; const cancelText = this.props.cancelText; - const noFriendsClasses = + let noFriendsClasses = this.state.friendList.length === 0 ? 'no-friends' : classNames('no-friends', 'hidden'); + // alternatively, we can go back to const and use more trinary operators + // but this looks cleaner/more organized to me + if (this.props.isPublic) { + // remove member count from title + titleText = `${this.props.titleText}`; + // hide the no-friend message + noFriendsClasses = classNames('no-friends', 'hidden'); + } + const errorMsg = this.state.errorMessage; const errorMessageClasses = classNames( 'error-message', From d58a835af4c5d1a520376518fe2ad1748fa0dad2 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:38:35 -0800 Subject: [PATCH 09/17] enable updateGroup if a public chat channel mod --- ts/components/conversation/ConversationHeader.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index cbad995cc..5c79eadf3 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -30,6 +30,7 @@ interface Props { isGroup: boolean; isArchived: boolean; isPublic: boolean; + amMod: boolean; members: Array; @@ -233,6 +234,7 @@ export class ConversationHeader extends React.Component { isClosable, isPublic, isGroup, + amMod, onDeleteMessages, onDeleteContact, onCopyPublicKey, @@ -250,7 +252,7 @@ export class ConversationHeader extends React.Component { {this.renderPublicMenuItems()} {copyIdLabel} {i18n('deleteMessages')} - {isPrivateGroup ? ( + {isPrivateGroup || amMod ? ( {i18n('updateGroup')} ) : null} {isPrivateGroup ? ( From eb888874e1111bc251bc60d543baca3f97b0b7f2 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:40:04 -0800 Subject: [PATCH 10/17] remove the need for lokiPublicChatAPI and reorganize the process/notes --- js/views/connecting_to_server_dialog_view.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/js/views/connecting_to_server_dialog_view.js b/js/views/connecting_to_server_dialog_view.js index 84deb2a4a..2a491ff29 100644 --- a/js/views/connecting_to_server_dialog_view.js +++ b/js/views/connecting_to_server_dialog_view.js @@ -1,4 +1,4 @@ -/* global Whisper, i18n, lokiPublicChatAPI, ConversationController, friends */ +/* global Whisper, i18n, ConversationController, friends */ // eslint-disable-next-line func-names (function() { @@ -36,24 +36,19 @@ return this.resolveWith({ errorCode: i18n('publicChatExists') }); } - const serverAPI = await lokiPublicChatAPI.findOrCreateServer( - sslServerUrl - ); - if (!serverAPI) { - // Url incorrect or server not compatible - return this.resolveWith({ errorCode: i18n('connectToServerFail') }); - } - + // create conversation const conversation = await ConversationController.getOrCreateAndWait( conversationId, 'group' ); - await serverAPI.findOrCreateChannel(channelId, conversationId); + // convert conversation to a public one await conversation.setPublicSource(sslServerUrl, channelId); - await conversation.set({ active_at: Date.now() }); + // set friend and appropriate SYNC messages for multidevice await conversation.setFriendRequestStatus( friends.friendRequestStatusEnum.friends ); + // and finally activate it + conversation.getPublicSendData(); // may want "await" if you want to use the API return this.resolveWith({ conversation }); }, resolveWith(result) { From a7bb17b9770ef2711ce76991d81249a6f2fb212d Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:41:28 -0800 Subject: [PATCH 11/17] remove _adnApi and expect LokiAppDotNetAPI to be like the serverAPI --- js/modules/loki_file_server_api.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/js/modules/loki_file_server_api.js b/js/modules/loki_file_server_api.js index 97c72fcb4..8cd1107f4 100644 --- a/js/modules/loki_file_server_api.js +++ b/js/modules/loki_file_server_api.js @@ -13,20 +13,19 @@ const DEVICE_MAPPING_USER_ANNOTATION_TYPE = class LokiFileServerInstance { constructor(ourKey) { this.ourKey = ourKey; - // why don't we extend this? - this._adnApi = new LokiAppDotNetAPI(ourKey); - this.avatarMap = {}; } // FIXME: this is not file-server specific // and is currently called by LokiAppDotNetAPI. // LokiAppDotNetAPI (base) should not know about LokiFileServer. async establishConnection(serverUrl) { - // FIXME: we don't always need a token... - this._server = await this._adnApi.findOrCreateServer(serverUrl); + // why don't we extend this? + this._server = new LokiAppDotNetAPI(this.ourKey, serverUrl); + // get a token for multidevice + const gotToken = await this._server.getOrRefreshServerToken(); // TODO: Handle this failure gracefully - if (!this._server) { - log.error('Failed to establish connection to file server'); + if (!gotToken) { + log.error('You are blacklisted form this home server'); } } async getUserDeviceMapping(pubKey) { @@ -45,10 +44,6 @@ class LokiFileServerInstance { await Promise.all( users.map(async user => { let found = false; - // if this user has an avatar set, copy it into the map - this.avatarMap[user.username] = user.avatar_image - ? user.avatar_image.url - : false; if (!user.annotations || !user.annotations.length) { log.info( `verifyUserObjectDeviceMap no annotation for ${user.username}` From facae157fe2de7c81f5fd8259bd710ae86c6523c Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:43:38 -0800 Subject: [PATCH 12/17] actually move public chat specific functions into this class (isolating the file server classes) --- js/modules/loki_public_chat_api.js | 122 ++++++++++++++++++++++++++++- 1 file changed, 120 insertions(+), 2 deletions(-) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index e90d89744..d0c35c89a 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -1,5 +1,123 @@ +/* global log */ +const EventEmitter = require('events'); const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); -class LokiPublicChatAPI extends LokiAppDotNetAPI {} +class LokiPublicChatFactoryAPI extends EventEmitter { + constructor(ourKey) { + super(); + this.ourKey = ourKey; + this.servers = []; + this.allMembers = []; + // Multidevice states + this.primaryUserProfileName = {}; + } -module.exports = LokiPublicChatAPI; + async close() { + await Promise.all(this.servers.map(server => server.close())); + } + + // server getter/factory + async findOrCreateServer(serverUrl) { + let thisServer = this.servers.find( + server => server.baseServerUrl === serverUrl + ); + if (!thisServer) { + log.info(`LokiAppDotNetAPI creating ${serverUrl}`); + thisServer = new LokiAppDotNetAPI(this.ourKey, serverUrl); + const gotToken = await thisServer.getOrRefreshServerToken(); + if (!gotToken) { + log.warn(`Invalid server ${serverUrl}`); + return null; + } + log.info(`set token ${thisServer.token}`); + + this.servers.push(thisServer); + } + return thisServer; + } + + // channel getter/factory + async findOrCreateChannel(serverUrl, channelId, conversationId) { + const server = await this.findOrCreateServer(serverUrl); + if (!server) { + log.error(`Failed to create server for: ${serverUrl}`); + return null; + } + return server.findOrCreateChannel(this, channelId, conversationId); + } + + // deallocate resources server uses + unregisterChannel(serverUrl, channelId) { + let thisServer; + let i = 0; + for (; i < this.servers.length; i += 1) { + if (this.servers[i].baseServerUrl === serverUrl) { + thisServer = this.servers[i]; + break; + } + } + + if (!thisServer) { + log.warn(`Tried to unregister from nonexistent server ${serverUrl}`); + return; + } + thisServer.unregisterChannel(channelId); + this.servers.splice(i, 1); + } + + // shouldn't this be scoped per conversation? + async getListOfMembers() { + // enable in the next release + /* + let members = []; + await Promise.all(this.servers.map(async server => { + await Promise.all(server.channels.map(async channel => { + const newMembers = await channel.getSubscribers(); + members = [...members, ...newMembers]; + })); + })); + const results = members.map(member => { + return { authorPhoneNumber: member.username }; + }); + */ + return this.allMembers; + } + + // TODO: make this private (or remove altogether) when + // we switch to polling the server for group members + setListOfMembers(members) { + this.allMembers = members; + } + + async setProfileName(profileName) { + await Promise.all( + this.servers.map(async server => { + await server.setProfileName(profileName); + }) + ); + } + + async setHomeServer(homeServer) { + await Promise.all( + this.servers.map(async server => { + // this may fail + // but we can't create a sql table to remember to retry forever + // I think we just silently fail for now + await server.setHomeServer(homeServer); + }) + ); + } + + async setAvatar(url, profileKey) { + await Promise.all( + this.servers.map(async server => { + // this may fail + // but we can't create a sql table to remember to retry forever + // I think we just silently fail for now + await server.setAvatar(url, profileKey); + }) + ); + } +} + +module.exports = LokiPublicChatFactoryAPI; From bb66515cce861a68d982d2a5ec9af755aac83396 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 02:46:57 -0800 Subject: [PATCH 13/17] we now expose LokiAppDotNetServerAPI, move getPrivateKey into chatAPI, deleteMessage clean up forEach with filter, add channel setting functions, update moderators endpoint/use primary device --- js/modules/loki_app_dot_net_api.js | 290 +++++++++++++---------------- 1 file changed, 129 insertions(+), 161 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 5a3710d65..82a685c99 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -1,7 +1,6 @@ /* global log, textsecure, libloki, Signal, Whisper, Headers, ConversationController, clearTimeout, MessageController, libsignal, StringView, window, _, dcodeIO, Buffer */ -const EventEmitter = require('events'); const nodeFetch = require('node-fetch'); const { URL, URLSearchParams } = require('url'); const FormData = require('form-data'); @@ -15,144 +14,19 @@ const PUBLICCHAT_MIN_TIME_BETWEEN_DUPLICATE_MESSAGES = 10 * 1000; // 10s const HOMESERVER_USER_ANNOTATION_TYPE = 'network.loki.messenger.homeserver'; const AVATAR_USER_ANNOTATION_TYPE = 'network.loki.messenger.avatar'; +const SETTINGS_CHANNEL_ANNOTATION_TYPE = 'net.patter-app.settings'; const MESSAGE_ATTACHMENT_TYPE = 'net.app.core.oembed'; const LOKI_ATTACHMENT_TYPE = 'attachment'; const LOKI_PREVIEW_TYPE = 'preview'; -// not quite a singleton yet (one for chat and one per file server) -class LokiAppDotNetAPI extends EventEmitter { - constructor(ourKey) { - super(); - this.ourKey = ourKey; - this.servers = []; - this.myPrivateKey = false; - this.allMembers = []; - // Multidevice states - this.primaryUserProfileName = {}; - } - - async close() { - await Promise.all(this.servers.map(server => server.close())); - } - - async getPrivateKey() { - if (!this.myPrivateKey) { - const myKeyPair = await textsecure.storage.protocol.getIdentityKeyPair(); - this.myPrivateKey = myKeyPair.privKey; - } - return this.myPrivateKey; - } - - // server getter/factory - async findOrCreateServer(serverUrl) { - let thisServer = this.servers.find( - server => server.baseServerUrl === serverUrl - ); - if (!thisServer) { - log.info(`LokiAppDotNetAPI creating ${serverUrl}`); - thisServer = new LokiAppDotNetServerAPI(this, serverUrl); - const gotToken = await thisServer.getOrRefreshServerToken(); - if (!gotToken) { - log.warn(`Invalid server ${serverUrl}`); - return null; - } - log.info(`set token ${thisServer.token}`); - - this.servers.push(thisServer); - } - return thisServer; - } - - // channel getter/factory - async findOrCreateChannel(serverUrl, channelId, conversationId) { - const server = await this.findOrCreateServer(serverUrl); - if (!server) { - log.error(`Failed to create server for: ${serverUrl}`); - return null; - } - return server.findOrCreateChannel(channelId, conversationId); - } - - // deallocate resources server uses - unregisterChannel(serverUrl, channelId) { - let thisServer; - let i = 0; - for (; i < this.servers.length; i += 1) { - if (this.servers[i].baseServerUrl === serverUrl) { - thisServer = this.servers[i]; - break; - } - } - - if (!thisServer) { - log.warn(`Tried to unregister from nonexistent server ${serverUrl}`); - return; - } - thisServer.unregisterChannel(channelId); - this.servers.splice(i, 1); - } - - // shouldn't this be scoped per conversation? - async getListOfMembers() { - // enable in the next release - /* - let members = []; - await Promise.all(this.servers.map(async server => { - await Promise.all(server.channels.map(async channel => { - const newMembers = await channel.getSubscribers(); - members = [...members, ...newMembers]; - })); - })); - const results = members.map(member => { - return { authorPhoneNumber: member.username }; - }); - */ - return this.allMembers; - } - - // TODO: make this private (or remove altogether) when - // we switch to polling the server for group members - setListOfMembers(members) { - this.allMembers = members; - } - - async setProfileName(profileName) { - await Promise.all( - this.servers.map(async server => { - await server.setProfileName(profileName); - }) - ); - } - - async setHomeServer(homeServer) { - await Promise.all( - this.servers.map(async server => { - // this may fail - // but we can't create a sql table to remember to retry forever - // I think we just silently fail for now - await server.setHomeServer(homeServer); - }) - ); - } - - async setAvatar(url, profileKey) { - await Promise.all( - this.servers.map(async server => { - // this may fail - // but we can't create a sql table to remember to retry forever - // I think we just silently fail for now - await server.setAvatar(url, profileKey); - }) - ); - } -} - +// the core ADN class that handles all communication with a specific server class LokiAppDotNetServerAPI { - constructor(chatAPI, url) { - this.chatAPI = chatAPI; + constructor(ourKey, url) { + this.ourKey = ourKey; this.channels = []; this.tokenPromise = null; this.baseServerUrl = url; + log.info(`LokiAppDotNetAPI registered server ${url}`); } async close() { @@ -163,18 +37,22 @@ class LokiAppDotNetServerAPI { } // channel getter/factory - async findOrCreateChannel(channelId, conversationId) { + async findOrCreateChannel(chatAPI, channelId, conversationId) { let thisChannel = this.channels.find( channel => channel.channelId === channelId ); if (!thisChannel) { - log.info(`LokiAppDotNetAPI registering channel ${conversationId}`); // make sure we're subscribed // eventually we'll need to move to account registration/add server await this.serverRequest(`channels/${channelId}/subscribe`, { method: 'POST', }); - thisChannel = new LokiPublicChannelAPI(this, channelId, conversationId); + thisChannel = new LokiPublicChannelAPI( + chatAPI, + this, + channelId, + conversationId + ); this.channels.push(thisChannel); } return thisChannel; @@ -207,7 +85,7 @@ class LokiAppDotNetServerAPI { async setProfileName(profileName) { // when we add an annotation, may need this /* - const privKey = await this.serverAPI.chatAPI.getPrivateKey(); + const privKey = await this.getPrivateKey(); // we might need an annotation that sets the homeserver for media // better to include this with each attachment... const objToSign = { @@ -306,6 +184,7 @@ class LokiAppDotNetServerAPI { tokenRes.response.data.user ) { // get our profile name + // FIXME: should this be window.storage.get('primaryDevicePubKey')? const ourNumber = textsecure.storage.user.getNumber(); const profileConvo = ConversationController.get(ourNumber); const profileName = profileConvo.getProfileName(); @@ -354,7 +233,7 @@ class LokiAppDotNetServerAPI { try { const url = new URL(`${this.baseServerUrl}/loki/v1/get_challenge`); const params = { - pubKey: this.chatAPI.ourKey, + pubKey: this.ourKey, }; url.search = new URLSearchParams(params); @@ -378,7 +257,7 @@ class LokiAppDotNetServerAPI { 'Content-Type': 'application/json', }, body: JSON.stringify({ - pubKey: this.chatAPI.ourKey, + pubKey: this.ourKey, token, }), }; @@ -441,7 +320,7 @@ class LokiAppDotNetServerAPI { try { response = await result.json(); } catch (e) { - log.warn(`serverRequest json arpse ${e}`); + log.warn(`serverRequest json parse ${e}`); return { err: e, statusCode: result.status, @@ -678,9 +557,11 @@ class LokiAppDotNetServerAPI { } } +// functions to a specific ADN channel on an ADN server class LokiPublicChannelAPI { - constructor(serverAPI, channelId, conversationId) { + constructor(chatAPI, serverAPI, channelId, conversationId) { // properties + this.chatAPI = chatAPI; this.serverAPI = serverAPI; this.channelId = channelId; this.baseChannelUrl = `channels/${this.channelId}`; @@ -691,6 +572,7 @@ class LokiPublicChannelAPI { this.deleteLastId = 1; this.timers = {}; this.running = true; + this.myPrivateKey = false; // can escalated to SQL if it start uses too much memory this.logMop = {}; @@ -699,7 +581,11 @@ class LokiPublicChannelAPI { // end properties - log.info(`registered LokiPublicChannel ${channelId}`); + log.info( + `registered LokiPublicChannel ${channelId} on ${ + this.serverAPI.baseServerUrl + }` + ); // start polling this.pollForMessages(); this.pollForDeletions(); @@ -709,6 +595,14 @@ class LokiPublicChannelAPI { // TODO: poll for group members here? } + async getPrivateKey() { + if (!this.myPrivateKey) { + const myKeyPair = await textsecure.storage.protocol.getIdentityKeyPair(); + this.myPrivateKey = myKeyPair.privKey; + } + return this.myPrivateKey; + } + async banUser(pubkey) { const res = await this.serverRequest( `loki/v1/moderation/blacklist/@${pubkey}`, @@ -769,9 +663,10 @@ class LokiPublicChannelAPI { async pollOnceForModerators() { // get moderator status const res = await this.serverRequest( - `loki/v1/channel/${this.channelId}/get_moderators` + `loki/v1/channels/${this.channelId}/moderators` ); - const ourNumber = textsecure.storage.user.getNumber(); + // FIXME: should this be window.storage.get('primaryDevicePubKey')? + const ourNumber = textsecure.storage.user.getNumber();; // Get the list of moderators if no errors occurred const moderators = !res.err && res.response && res.response.moderators; @@ -784,6 +679,70 @@ class LokiPublicChannelAPI { await this.conversation.setModerators(moderators || []); } + async setChannelSettings(settings) { + if (!this.modStatus) { + // need moderator access to set this + log.warn('Need moderator access to setChannelName'); + return false; + } + // racy! + const res = await this.serverRequest(this.baseChannelUrl, { + params: { include_annotations: 1 }, + }); + if (res.err) { + // state unknown + log.warn(`public chat channel state unknown, skipping set: ${res.err}`); + return false; + } + let notes = + res.response && res.response.data && res.response.data.annotations; + if (!notes) { + // ok if nothing is set yet + notes = []; + } + let settingNotes = notes.filter( + note => note.type === SETTINGS_CHANNEL_ANNOTATION_TYPE + ); + if (!settingNotes) { + // default name, description, avatar + settingNotes = [ + { + type: SETTINGS_CHANNEL_ANNOTATION_TYPE, + value: { + name: 'Your Public Chat', + description: 'Your public chat room', + avatar: 'images/group_default.png', + }, + }, + ]; + } + // update settings + settingNotes[0].value = Object.assign(settingNotes[0].value, settings); + // commit settings + const updateRes = await this.serverRequest( + `loki/v1/${this.baseChannelUrl}`, + { method: 'PUT', objBody: { annotations: settingNotes } } + ); + if (updateRes.err || !updateRes.response || !updateRes.response.data) { + if (updateRes.err) { + log.error(`Error ${updateRes.err}`); + } + return false; + } + return true; + } + + // Do we need this? They definitely make it more clear... + setChannelName(name) { + return this.setChannelSettings({ name }); + } + setChannelDescription(description) { + return this.setChannelSettings({ description }); + } + setChannelAvatar(avatar) { + return this.setChannelSettings({ avatar }); + } + // delete messages on the server async deleteMessages(serverIds, canThrow = false) { const res = await this.serverRequest( @@ -863,18 +822,21 @@ class LokiPublicChannelAPI { res.response.data.annotations && res.response.data.annotations.length ) { - res.response.data.annotations.forEach(note => { - if (note.type === 'net.patter-app.settings') { - // note.value.description only needed for directory - if (note.value && note.value.name) { - this.conversation.setGroupName(note.value.name); - } - if (note.value && note.value.avatar) { - this.conversation.setProfileAvatar(note.value.avatar); - } - // else could set a default in case of server problems... - } - }); + // get our setting note + const settingNotes = res.response.data.annotations.filter( + note => note.type === SETTINGS_CHANNEL_ANNOTATION_TYPE + ); + const note = settingNotes && settingNotes.length ? settingNotes[0] : {}; + // setting_note.value.description only needed for directory + if (note.value && note.value.name) { + this.conversation.setGroupName(note.value.name); + } + if (note.value && note.value.avatar) { + this.conversation.setProfileAvatar(note.value.avatar); + } + // is it mutable? + // who are the moderators? + // else could set a default in case of server problems... } } @@ -1096,6 +1058,7 @@ class LokiPublicChannelAPI { let pendingMessages = []; // get our profile name + // FIXME: should this be window.storage.get('primaryDevicePubKey')? const ourNumber = textsecure.storage.user.getNumber(); let lastProfileName = false; @@ -1272,11 +1235,16 @@ class LokiPublicChannelAPI { // filter out invalid messages pendingMessages = pendingMessages.filter(messageData => !!messageData); // separate messages coming from primary and secondary devices - const [primaryMessages, slaveMessages] = _.partition(pendingMessages, message => !(message.source in slavePrimaryMap)); + const [primaryMessages, slaveMessages] = _.partition( + pendingMessages, + message => !(message.source in slavePrimaryMap) + ); // process primary devices' message directly - primaryMessages.forEach(message => this.serverAPI.chatAPI.emit('publicMessage', { - message, - })); + primaryMessages.forEach(message => + this.chatAPI.emit('publicMessage', { + message, + }) + ); pendingMessages = []; // allow memory to be freed @@ -1332,7 +1300,7 @@ class LokiPublicChannelAPI { messageData.message.profile.avatar = avatar; messageData.message.profileKey = profileKey; } - this.serverAPI.chatAPI.emit('publicMessage', { + this.chatAPI.emit('publicMessage', { message: messageData, }); }); @@ -1477,7 +1445,7 @@ class LokiPublicChannelAPI { } } } - const privKey = await this.serverAPI.chatAPI.getPrivateKey(); + const privKey = await this.getPrivateKey(); const sigVer = 1; const mockAdnMessage = { text }; if (payload.reply_to) { @@ -1511,4 +1479,4 @@ class LokiPublicChannelAPI { } } -module.exports = LokiAppDotNetAPI; +module.exports = LokiAppDotNetServerAPI; From 91a814b20a8089c8ddea639e41c956f6d380bf2b Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Dec 2019 15:21:41 -0800 Subject: [PATCH 14/17] remove avatar annotation if not needed, lint --- js/modules/loki_app_dot_net_api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 82a685c99..2328c7cb9 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -145,7 +145,7 @@ class LokiAppDotNetServerAPI { } async setAvatar(url, profileKey) { - let value = null; + let value; // undefined will save bandwidth on the annotation if we don't need it (no avatar) if (url && profileKey) { value = { url, profileKey }; } @@ -666,7 +666,7 @@ class LokiPublicChannelAPI { `loki/v1/channels/${this.channelId}/moderators` ); // FIXME: should this be window.storage.get('primaryDevicePubKey')? - const ourNumber = textsecure.storage.user.getNumber();; + const ourNumber = textsecure.storage.user.getNumber(); // Get the list of moderators if no errors occurred const moderators = !res.err && res.response && res.response.moderators; From 03efa0634b3cb8463b11792941342a3e0c4575f2 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 6 Dec 2019 13:57:29 -0800 Subject: [PATCH 15/17] add back in time functions --- js/modules/loki_public_chat_api.js | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index d0c35c89a..c91d5dd61 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -36,6 +36,42 @@ class LokiPublicChatFactoryAPI extends EventEmitter { return thisServer; } + static async getServerTime() { + const url = `${window.getDefaultFileServer()}/loki/v1/time`; + let timestamp = NaN; + + try { + const res = await nodeFetch(url); + if (res.ok) { + timestamp = await res.text(); + } + } catch (e) { + return timestamp; + } + + return Number(timestamp); + } + + static async getTimeDifferential() { + // Get time differential between server and client in seconds + const serverTime = await this.getServerTime(); + const clientTime = Math.ceil(Date.now() / 1000); + + if (Number.isNaN(serverTime)) { + return 0; + } + return serverTime - clientTime; + } + + static async setClockParams() { + // Set server-client time difference + const maxTimeDifferential = 30; + const timeDifferential = await this.getTimeDifferential(); + + window.clientClockSynced = Math.abs(timeDifferential) < maxTimeDifferential; + return window.clientClockSynced; + } + // channel getter/factory async findOrCreateChannel(serverUrl, channelId, conversationId) { const server = await this.findOrCreateServer(serverUrl); From b1002057305e9491b7d3a993b5200cdc82fb0546 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 6 Dec 2019 14:11:56 -0800 Subject: [PATCH 16/17] fix time includes, unregisterChannel use findIndex --- js/modules/loki_public_chat_api.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/js/modules/loki_public_chat_api.js b/js/modules/loki_public_chat_api.js index c91d5dd61..f65cbe5fc 100644 --- a/js/modules/loki_public_chat_api.js +++ b/js/modules/loki_public_chat_api.js @@ -1,5 +1,6 @@ -/* global log */ +/* global log, window */ const EventEmitter = require('events'); +const nodeFetch = require('node-fetch'); const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); class LokiPublicChatFactoryAPI extends EventEmitter { @@ -84,17 +85,16 @@ class LokiPublicChatFactoryAPI extends EventEmitter { // deallocate resources server uses unregisterChannel(serverUrl, channelId) { - let thisServer; - let i = 0; - for (; i < this.servers.length; i += 1) { - if (this.servers[i].baseServerUrl === serverUrl) { - thisServer = this.servers[i]; - break; - } + const i = this.servers.findIndex( + server => server.baseServerUrl === serverUrl + ); + if (i === -1) { + log.warn(`Tried to unregister from nonexistent server ${serverUrl}`); + return; } - + const thisServer = this.servers[i]; if (!thisServer) { - log.warn(`Tried to unregister from nonexistent server ${serverUrl}`); + log.warn(`Tried to unregister from nonexistent server ${i}`); return; } thisServer.unregisterChannel(channelId); From 37f4b8e8ed170f0ffccf73b6733dbe880ba80fd2 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Fri, 6 Dec 2019 14:12:10 -0800 Subject: [PATCH 17/17] use else --- .../conversation/UpdateGroupDialog.tsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ts/components/conversation/UpdateGroupDialog.tsx b/ts/components/conversation/UpdateGroupDialog.tsx index 722950ea1..e89f0c479 100644 --- a/ts/components/conversation/UpdateGroupDialog.tsx +++ b/ts/components/conversation/UpdateGroupDialog.tsx @@ -89,23 +89,24 @@ export class UpdateGroupDialog extends React.Component { public render() { const checkMarkedCount = this.getMemberCount(this.state.friendList); - let titleText = `${this.props.titleText} (Members: ${checkMarkedCount})`; - const okText = this.props.okText; const cancelText = this.props.cancelText; - let noFriendsClasses = - this.state.friendList.length === 0 - ? 'no-friends' - : classNames('no-friends', 'hidden'); + let titleText; + let noFriendsClasses; - // alternatively, we can go back to const and use more trinary operators - // but this looks cleaner/more organized to me if (this.props.isPublic) { - // remove member count from title + // no member count in title titleText = `${this.props.titleText}`; // hide the no-friend message noFriendsClasses = classNames('no-friends', 'hidden'); + } else { + // private group + titleText = `${this.props.titleText} (Members: ${checkMarkedCount})`; + noFriendsClasses = + this.state.friendList.length === 0 + ? 'no-friends' + : classNames('no-friends', 'hidden'); } const errorMsg = this.state.errorMessage;