keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Merge pull request #679 from neuroscr/multidevice-publicchat

Browse Source 
Public Server Moderator QoL improvements
pull/693/head
Ryan Tharp 5 years ago committed by GitHub
parent 5123fa0409 37f4b8e8ed
commit 8916657bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 382 additions and 266 deletions
Show Stats Download Patch File Download Diff File

24
_locales/en/messages.json
Unescape Escape View File

@ -1998,54 +1998,44 @@
"message": "Note: Your display name will be visible to your contacts", "message": "Note: Your display name will be visible to your contacts",
"description": "Shown to the user as a warning about setting display name" "description": "Shown to the user as a warning about setting display name"
}, },
"copyPublicKey": { "copyPublicKey": {
"message": "Copy public key", "message": "Copy public key",
"description": "description":
"Button action that the user can click to copy their public keys" "Button action that the user can click to copy their public keys"
}, },
"banUser": { "banUser": {
"message": "Ban user", "message": "Ban user",
"description": "Ban user from public chat by public key." "description": "Ban user from public chat by public key."
}, },
"banUserConfirm": { "banUserConfirm": {
"message": "Are you sure you want to ban user?", "message": "Are you sure you want to ban user?",
"description": "Message shown when confirming user ban." "description": "Message shown when confirming user ban."
}, },
"userBanned": { "userBanned": {
"message": "User successfully banned", "message": "User successfully banned",
"description": "Toast on succesful user ban." "description": "Toast on succesful user ban."
}, },
"userBanFailed": { "userBanFailed": {
"message": "User ban failed!", "message": "User ban failed!",
"description": "Toast on unsuccesful user ban." "description": "Toast on unsuccesful user ban."
}, },
"copyChatId": { "copyChatId": {
"message": "Copy Chat ID" "message": "Copy Chat ID"
}, },
"updateGroup": { "updateGroup": {
"message": "Update Group", "message": "Update Group",
"description": "description":
"Button action that the user can click to rename the group or add a new member" "Button action that the user can click to rename the group or add a new member"
}, },
"leaveGroup": { "leaveGroup": {
"message": "Leave Group", "message": "Leave Group",
"description": "Button action that the user can click to leave the group" "description": "Button action that the user can click to leave the group"
}, },
"leaveGroupDialogTitle": { "leaveGroupDialogTitle": {
"message": "Are you sure you want to leave this group?", "message": "Are you sure you want to leave this group?",
"description": "description":
"Title shown to the user to confirm they want to leave the group" "Title shown to the user to confirm they want to leave the group"
}, },
"copiedPublicKey": { "copiedPublicKey": {
"message": "Copied public key", "message": "Copied public key",
"description": "A toast message telling the user that the key was copied" "description": "A toast message telling the user that the key was copied"
@ -2068,18 +2058,20 @@
"message": "Edit profile", "message": "Edit profile",
"description": "Button action that the user can click to edit their profile" "description": "Button action that the user can click to edit their profile"
}, },
"createGroupDialogTitle": { "createGroupDialogTitle": {
"message": "Creating a Private Group Chat", "message": "Creating a Private Group Chat",
"description": "Title for the dialog box used to create a new private group" "description": "Title for the dialog box used to create a new private group"
}, },
"updateGroupDialogTitle": { "updateGroupDialogTitle": {
"message": "Updating a Private Group Chat", "message": "Updating a Private Group Chat",
"description": "description":
"Title for the dialog box used to update an existing private group" "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": { "showSeed": {
"message": "Show seed", "message": "Show seed",
"description": "description":
@ -2099,25 +2091,21 @@
"description": "description":
"Title for the dialog box used to connect to a new public server" "Title for the dialog box used to connect to a new public server"
}, },
"createPrivateGroup": { "createPrivateGroup": {
"message": "Create Private Group", "message": "Create Private Group",
"description": "description":
"Button action that the user can click to show a dialog for creating a new private group chat" "Button action that the user can click to show a dialog for creating a new private group chat"
}, },
"seedViewTitle": { "seedViewTitle": {
"message": "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.", "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" "description": "The title shown when the user views their seeds"
}, },
"copiedMnemonic": { "copiedMnemonic": {
"message": "Copied seed to clipboard", "message": "Copied seed to clipboard",
"description": "description":
"A toast message telling the user that the mnemonic seed was copied" "A toast message telling the user that the mnemonic seed was copied"
}, },
"passwordViewTitle": { "passwordViewTitle": {
"message": "Type in your password", "message": "Type in your password",
"description": "description":
@ -2131,7 +2119,6 @@
"description": "description":
"A button action that the user can click to reset the database" "A button action that the user can click to reset the database"
}, },
"setPassword": { "setPassword": {
"message": "Set Password", "message": "Set Password",
"description": "Button action that the user can click to set a password" "description": "Button action that the user can click to set a password"
@ -2216,7 +2203,6 @@
"message": "Invalid Pubkey Format", "message": "Invalid Pubkey Format",
"description": "Error string shown when user types an invalid pubkey format" "description": "Error string shown when user types an invalid pubkey format"
}, },
"conversationsTab": { "conversationsTab": {
"message": "Conversations", "message": "Conversations",
"description": "conversation tab title" "description": "conversation tab title"

14
js/background.js
Unescape Escape View File

@ -744,6 +744,20 @@
'group' '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 avatar = '';
const options = {}; const options = {};

29
js/models/conversations.js
Unescape Escape View File

@ -1,5 +1,6 @@
/* global /* global
_, _,
log,
i18n, i18n,
Backbone, Backbone,
ConversationController, ConversationController,
@ -2352,14 +2353,21 @@
// maybe "Backend" instead of "Source"? // maybe "Backend" instead of "Source"?
async setPublicSource(newServer, newChannelId) { async setPublicSource(newServer, newChannelId) {
if (!this.isPublic()) { if (!this.isPublic()) {
log.warn(
`trying to setPublicSource on non public chat conversation ${this.id}`
);
return; return;
} }
if ( if (
this.get('server') !== newServer || this.get('server') !== newServer ||
this.get('channelId') !== newChannelId this.get('channelId') !== newChannelId
) { ) {
this.set({ server: newServer }); // mark active so it's not in the friends list but the conversation list
this.set({ channelId: newChannelId }); this.set({
server: newServer,
channelId: newChannelId,
active_at: Date.now(),
});
await window.Signal.Data.updateConversation(this.id, this.attributes, { await window.Signal.Data.updateConversation(this.id, this.attributes, {
Conversation: Whisper.Conversation, Conversation: Whisper.Conversation,
}); });
@ -2367,6 +2375,9 @@
}, },
getPublicSource() { getPublicSource() {
if (!this.isPublic()) { if (!this.isPublic()) {
log.warn(
`trying to getPublicSource on non public chat conversation ${this.id}`
);
return null; return null;
} }
return { return {
@ -2376,18 +2387,8 @@
}; };
}, },
async getPublicSendData() { async getPublicSendData() {
const serverAPI = await lokiPublicChatAPI.findOrCreateServer( const channelAPI = await lokiPublicChatAPI.findOrCreateChannel(
this.get('server') 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(
this.get('channelId'), this.get('channelId'),
this.id this.id
); );

326
js/modules/loki_app_dot_net_api.js
Unescape Escape View File

@ -1,7 +1,6 @@
/* global log, textsecure, libloki, Signal, Whisper, Headers, ConversationController, /* global log, textsecure, libloki, Signal, Whisper, Headers, ConversationController,
clearTimeout, MessageController, libsignal, StringView, window, _, clearTimeout, MessageController, libsignal, StringView, window, _,
dcodeIO, Buffer */ dcodeIO, Buffer */
const EventEmitter = require('events');
const nodeFetch = require('node-fetch'); const nodeFetch = require('node-fetch');
const { URL, URLSearchParams } = require('url'); const { URL, URLSearchParams } = require('url');
const FormData = require('form-data'); const FormData = require('form-data');
@ -15,180 +14,19 @@ const PUBLICCHAT_MIN_TIME_BETWEEN_DUPLICATE_MESSAGES = 10 * 1000; // 10s
const HOMESERVER_USER_ANNOTATION_TYPE = 'network.loki.messenger.homeserver'; const HOMESERVER_USER_ANNOTATION_TYPE = 'network.loki.messenger.homeserver';
const AVATAR_USER_ANNOTATION_TYPE = 'network.loki.messenger.avatar'; 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 MESSAGE_ATTACHMENT_TYPE = 'net.app.core.oembed';
const LOKI_ATTACHMENT_TYPE = 'attachment'; const LOKI_ATTACHMENT_TYPE = 'attachment';
const LOKI_PREVIEW_TYPE = 'preview'; const LOKI_PREVIEW_TYPE = 'preview';
// not quite a singleton yet (one for chat and one per file server) // the core ADN class that handles all communication with a specific 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;
}
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);
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);
})
);
}
}
class LokiAppDotNetServerAPI { class LokiAppDotNetServerAPI {
constructor(chatAPI, url) { constructor(ourKey, url) {
this.chatAPI = chatAPI; this.ourKey = ourKey;
this.channels = []; this.channels = [];
this.tokenPromise = null; this.tokenPromise = null;
this.baseServerUrl = url; this.baseServerUrl = url;
log.info(`LokiAppDotNetAPI registered server ${url}`);
} }
async close() { async close() {
@ -199,18 +37,22 @@ class LokiAppDotNetServerAPI {
} }
// channel getter/factory // channel getter/factory
async findOrCreateChannel(channelId, conversationId) { async findOrCreateChannel(chatAPI, channelId, conversationId) {
let thisChannel = this.channels.find( let thisChannel = this.channels.find(
channel => channel.channelId === channelId channel => channel.channelId === channelId
); );
if (!thisChannel) { if (!thisChannel) {
log.info(`LokiAppDotNetAPI registering channel ${conversationId}`);
// make sure we're subscribed // make sure we're subscribed
// eventually we'll need to move to account registration/add server // eventually we'll need to move to account registration/add server
await this.serverRequest(`channels/${channelId}/subscribe`, { await this.serverRequest(`channels/${channelId}/subscribe`, {
method: 'POST', method: 'POST',
}); });
thisChannel = new LokiPublicChannelAPI(this, channelId, conversationId); thisChannel = new LokiPublicChannelAPI(
chatAPI,
this,
channelId,
conversationId
);
this.channels.push(thisChannel); this.channels.push(thisChannel);
} }
return thisChannel; return thisChannel;
@ -243,7 +85,7 @@ class LokiAppDotNetServerAPI {
async setProfileName(profileName) { async setProfileName(profileName) {
// when we add an annotation, may need this // 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 // we might need an annotation that sets the homeserver for media
// better to include this with each attachment... // better to include this with each attachment...
const objToSign = { const objToSign = {
@ -303,7 +145,7 @@ class LokiAppDotNetServerAPI {
} }
async setAvatar(url, profileKey) { 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) { if (url && profileKey) {
value = { url, profileKey }; value = { url, profileKey };
} }
@ -342,6 +184,7 @@ class LokiAppDotNetServerAPI {
tokenRes.response.data.user tokenRes.response.data.user
) { ) {
// get our profile name // get our profile name
// FIXME: should this be window.storage.get('primaryDevicePubKey')?
const ourNumber = textsecure.storage.user.getNumber(); const ourNumber = textsecure.storage.user.getNumber();
const profileConvo = ConversationController.get(ourNumber); const profileConvo = ConversationController.get(ourNumber);
const profileName = profileConvo.getProfileName(); const profileName = profileConvo.getProfileName();
@ -390,7 +233,7 @@ class LokiAppDotNetServerAPI {
try { try {
const url = new URL(`${this.baseServerUrl}/loki/v1/get_challenge`); const url = new URL(`${this.baseServerUrl}/loki/v1/get_challenge`);
const params = { const params = {
pubKey: this.chatAPI.ourKey, pubKey: this.ourKey,
}; };
url.search = new URLSearchParams(params); url.search = new URLSearchParams(params);
@ -414,7 +257,7 @@ class LokiAppDotNetServerAPI {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
}, },
body: JSON.stringify({ body: JSON.stringify({
pubKey: this.chatAPI.ourKey, pubKey: this.ourKey,
token, token,
}), }),
}; };
@ -477,7 +320,7 @@ class LokiAppDotNetServerAPI {
try { try {
response = await result.json(); response = await result.json();
} catch (e) { } catch (e) {
log.warn(`serverRequest json arpse ${e}`); log.warn(`serverRequest json parse ${e}`);
return { return {
err: e, err: e,
statusCode: result.status, statusCode: result.status,
@ -714,9 +557,11 @@ class LokiAppDotNetServerAPI {
} }
} }
// functions to a specific ADN channel on an ADN server
class LokiPublicChannelAPI { class LokiPublicChannelAPI {
constructor(serverAPI, channelId, conversationId) { constructor(chatAPI, serverAPI, channelId, conversationId) {
// properties // properties
this.chatAPI = chatAPI;
this.serverAPI = serverAPI; this.serverAPI = serverAPI;
this.channelId = channelId; this.channelId = channelId;
this.baseChannelUrl = `channels/${this.channelId}`; this.baseChannelUrl = `channels/${this.channelId}`;
@ -727,6 +572,7 @@ class LokiPublicChannelAPI {
this.deleteLastId = 1; this.deleteLastId = 1;
this.timers = {}; this.timers = {};
this.running = true; this.running = true;
this.myPrivateKey = false;
// can escalated to SQL if it start uses too much memory // can escalated to SQL if it start uses too much memory
this.logMop = {}; this.logMop = {};
@ -735,7 +581,11 @@ class LokiPublicChannelAPI {
// end properties // end properties
log.info(`registered LokiPublicChannel ${channelId}`); log.info(
`registered LokiPublicChannel ${channelId} on ${
this.serverAPI.baseServerUrl
}`
);
// start polling // start polling
this.pollForMessages(); this.pollForMessages();
this.pollForDeletions(); this.pollForDeletions();
@ -745,6 +595,14 @@ class LokiPublicChannelAPI {
// TODO: poll for group members here? // 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) { async banUser(pubkey) {
const res = await this.serverRequest( const res = await this.serverRequest(
`loki/v1/moderation/blacklist/@${pubkey}`, `loki/v1/moderation/blacklist/@${pubkey}`,
@ -805,8 +663,9 @@ class LokiPublicChannelAPI {
async pollOnceForModerators() { async pollOnceForModerators() {
// get moderator status // get moderator status
const res = await this.serverRequest( const res = await this.serverRequest(
`loki/v1/channel/${this.channelId}/get_moderators` `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 // Get the list of moderators if no errors occurred
@ -820,6 +679,70 @@ class LokiPublicChannelAPI {
await this.conversation.setModerators(moderators || []); 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 // delete messages on the server
async deleteMessages(serverIds, canThrow = false) { async deleteMessages(serverIds, canThrow = false) {
const res = await this.serverRequest( const res = await this.serverRequest(
@ -899,18 +822,21 @@ class LokiPublicChannelAPI {
res.response.data.annotations && res.response.data.annotations &&
res.response.data.annotations.length res.response.data.annotations.length
) { ) {
res.response.data.annotations.forEach(note => { // get our setting note
if (note.type === 'net.patter-app.settings') { const settingNotes = res.response.data.annotations.filter(
// note.value.description only needed for directory note => note.type === SETTINGS_CHANNEL_ANNOTATION_TYPE
if (note.value && note.value.name) { );
this.conversation.setGroupName(note.value.name); const note = settingNotes && settingNotes.length ? settingNotes[0] : {};
} // setting_note.value.description only needed for directory
if (note.value && note.value.avatar) { if (note.value && note.value.name) {
this.conversation.setProfileAvatar(note.value.avatar); this.conversation.setGroupName(note.value.name);
} }
// else could set a default in case of server problems... 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...
} }
} }
@ -1132,6 +1058,7 @@ class LokiPublicChannelAPI {
let pendingMessages = []; let pendingMessages = [];
// get our profile name // get our profile name
// FIXME: should this be window.storage.get('primaryDevicePubKey')?
const ourNumber = textsecure.storage.user.getNumber(); const ourNumber = textsecure.storage.user.getNumber();
let lastProfileName = false; let lastProfileName = false;
@ -1308,11 +1235,16 @@ class LokiPublicChannelAPI {
// filter out invalid messages // filter out invalid messages
pendingMessages = pendingMessages.filter(messageData => !!messageData); pendingMessages = pendingMessages.filter(messageData => !!messageData);
// separate messages coming from primary and secondary devices // 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 // process primary devices' message directly
primaryMessages.forEach(message => this.serverAPI.chatAPI.emit('publicMessage', { primaryMessages.forEach(message =>
message, this.chatAPI.emit('publicMessage', {
})); message,
})
);
pendingMessages = []; // allow memory to be freed pendingMessages = []; // allow memory to be freed
@ -1368,7 +1300,7 @@ class LokiPublicChannelAPI {
messageData.message.profile.avatar = avatar; messageData.message.profile.avatar = avatar;
messageData.message.profileKey = profileKey; messageData.message.profileKey = profileKey;
} }
this.serverAPI.chatAPI.emit('publicMessage', { this.chatAPI.emit('publicMessage', {
message: messageData, message: messageData,
}); });
}); });
@ -1513,7 +1445,7 @@ class LokiPublicChannelAPI {
} }
} }
} }
const privKey = await this.serverAPI.chatAPI.getPrivateKey(); const privKey = await this.getPrivateKey();
const sigVer = 1; const sigVer = 1;
const mockAdnMessage = { text }; const mockAdnMessage = { text };
if (payload.reply_to) { if (payload.reply_to) {
@ -1547,4 +1479,4 @@ class LokiPublicChannelAPI {
} }
} }
module.exports = LokiAppDotNetAPI; module.exports = LokiAppDotNetServerAPI;

17
js/modules/loki_file_server_api.js
Unescape Escape View File

@ -13,20 +13,19 @@ const DEVICE_MAPPING_USER_ANNOTATION_TYPE =
class LokiFileServerInstance { class LokiFileServerInstance {
constructor(ourKey) { constructor(ourKey) {
this.ourKey = ourKey; this.ourKey = ourKey;
// why don't we extend this?
this._adnApi = new LokiAppDotNetAPI(ourKey);
this.avatarMap = {};
} }
// FIXME: this is not file-server specific // FIXME: this is not file-server specific
// and is currently called by LokiAppDotNetAPI. // and is currently called by LokiAppDotNetAPI.
// LokiAppDotNetAPI (base) should not know about LokiFileServer. // LokiAppDotNetAPI (base) should not know about LokiFileServer.
async establishConnection(serverUrl) { async establishConnection(serverUrl) {
// FIXME: we don't always need a token... // why don't we extend this?
this._server = await this._adnApi.findOrCreateServer(serverUrl); this._server = new LokiAppDotNetAPI(this.ourKey, serverUrl);
// get a token for multidevice
const gotToken = await this._server.getOrRefreshServerToken();
// TODO: Handle this failure gracefully // TODO: Handle this failure gracefully
if (!this._server) { if (!gotToken) {
log.error('Failed to establish connection to file server'); log.error('You are blacklisted form this home server');
} }
} }
async getUserDeviceMapping(pubKey) { async getUserDeviceMapping(pubKey) {
@ -45,10 +44,6 @@ class LokiFileServerInstance {
await Promise.all( await Promise.all(
users.map(async user => { users.map(async user => {
let found = false; 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) { if (!user.annotations || !user.annotations.length) {
log.info( log.info(
`verifyUserObjectDeviceMap no annotation for ${user.username}` `verifyUserObjectDeviceMap no annotation for ${user.username}`

158
js/modules/loki_public_chat_api.js
Unescape Escape View File

@ -1,5 +1,159 @@
/* global log, window */
const EventEmitter = require('events');
const nodeFetch = require('node-fetch');
const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); 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;
}
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);
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) {
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 ${i}`);
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;

9
js/modules/loki_rss_api.js
Unescape Escape View File

@ -55,12 +55,14 @@ class LokiRssAPI extends EventEmitter {
async getFeed() { async getFeed() {
let response; let response;
let success = true;
try { try {
response = await nodeFetch(this.feedUrl); response = await nodeFetch(this.feedUrl);
} catch (e) { } catch (e) {
log.error('fetcherror', e); log.error('fetcherror', e);
success = false; return;
}
if (!response) {
return;
} }
const responseXML = await response.text(); const responseXML = await response.text();
let feedDOM = {}; let feedDOM = {};
@ -71,9 +73,6 @@ class LokiRssAPI extends EventEmitter {
); );
} catch (e) { } catch (e) {
log.error('xmlerror', e); log.error('xmlerror', e);
success = false;
}
if (!success) {
return; return;
} }
const feedObj = xml2json(feedDOM); const feedObj = xml2json(feedDOM);

16
js/views/connecting_to_server_dialog_view.js
Unescape Escape View File

@ -1,4 +1,4 @@
/* global Whisper, i18n, lokiPublicChatAPI, ConversationController, friends */ /* global Whisper, i18n, ConversationController, friends */
// eslint-disable-next-line func-names // eslint-disable-next-line func-names
(function() { (function() {
@ -36,23 +36,19 @@
return this.resolveWith({ errorCode: i18n('publicChatExists') }); return this.resolveWith({ errorCode: i18n('publicChatExists') });
} }
const serverAPI = await lokiPublicChatAPI.findOrCreateServer( // create conversation
sslServerUrl
);
if (!serverAPI) {
// Url incorrect or server not compatible
return this.resolveWith({ errorCode: i18n('connectToServerFail') });
}
const conversation = await ConversationController.getOrCreateAndWait( const conversation = await ConversationController.getOrCreateAndWait(
conversationId, conversationId,
'group' 'group'
); );
await serverAPI.findOrCreateChannel(channelId, conversationId); // convert conversation to a public one
await conversation.setPublicSource(sslServerUrl, channelId); await conversation.setPublicSource(sslServerUrl, channelId);
// set friend and appropriate SYNC messages for multidevice
await conversation.setFriendRequestStatus( await conversation.setFriendRequestStatus(
friends.friendRequestStatusEnum.friends friends.friendRequestStatusEnum.friends
); );
// and finally activate it
conversation.getPublicSendData(); // may want "await" if you want to use the API
return this.resolveWith({ conversation }); return this.resolveWith({ conversation });
}, },
resolveWith(result) { resolveWith(result) {

3
js/views/conversation_view.js
Unescape Escape View File

@ -228,6 +228,9 @@
isOnline: this.model.isOnline(), isOnline: this.model.isOnline(),
isArchived: this.model.get('isArchived'), isArchived: this.model.get('isArchived'),
isPublic: this.model.isPublic(), isPublic: this.model.isPublic(),
amMod: this.model.isModerator(
window.storage.get('primaryDevicePubKey')
),
members, members,
expirationSettingName, expirationSettingName,
showBackButton: Boolean(this.panels && this.panels.length), showBackButton: Boolean(this.panels && this.panels.length),

25
js/views/create_group_dialog_view.js
Unescape Escape View File

@ -99,6 +99,7 @@
this.cancelText = i18n('cancel'); this.cancelText = i18n('cancel');
this.close = this.close.bind(this); this.close = this.close.bind(this);
this.onSubmit = this.onSubmit.bind(this); this.onSubmit = this.onSubmit.bind(this);
this.isPublic = groupConvo.isPublic();
const ourPK = textsecure.storage.user.getNumber(); const ourPK = textsecure.storage.user.getNumber();
@ -115,10 +116,31 @@
this.friendList = allMembers; this.friendList = allMembers;
// only give members that are not already in the group // 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; 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.$el.focus();
this.render(); this.render();
}, },
@ -130,6 +152,7 @@
titleText: this.titleText, titleText: this.titleText,
groupName: this.groupName, groupName: this.groupName,
okText: this.okText, okText: this.okText,
isPublic: this.isPublic,
cancelText: this.cancelText, cancelText: this.cancelText,
existingMembers: this.existingMembers, existingMembers: this.existingMembers,
friendList: this.friendList, friendList: this.friendList,

4
ts/components/conversation/ConversationHeader.tsx
Unescape Escape View File

@ -30,6 +30,7 @@ interface Props {
isGroup: boolean; isGroup: boolean;
isArchived: boolean; isArchived: boolean;
isPublic: boolean; isPublic: boolean;
amMod: boolean;
members: Array<any>; members: Array<any>;
@ -233,6 +234,7 @@ export class ConversationHeader extends React.Component<Props> {
isClosable, isClosable,
isPublic, isPublic,
isGroup, isGroup,
amMod,
onDeleteMessages, onDeleteMessages,
onDeleteContact, onDeleteContact,
onCopyPublicKey, onCopyPublicKey,
@ -250,7 +252,7 @@ export class ConversationHeader extends React.Component<Props> {
{this.renderPublicMenuItems()} {this.renderPublicMenuItems()}
<MenuItem onClick={onCopyPublicKey}>{copyIdLabel}</MenuItem> <MenuItem onClick={onCopyPublicKey}>{copyIdLabel}</MenuItem>
<MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem> <MenuItem onClick={onDeleteMessages}>{i18n('deleteMessages')}</MenuItem>
{isPrivateGroup ? ( {isPrivateGroup || amMod ? (
<MenuItem onClick={onUpdateGroup}>{i18n('updateGroup')}</MenuItem> <MenuItem onClick={onUpdateGroup}>{i18n('updateGroup')}</MenuItem>
) : null} ) : null}
{isPrivateGroup ? ( {isPrivateGroup ? (

23
ts/components/conversation/UpdateGroupDialog.tsx
Unescape Escape View File

@ -13,6 +13,7 @@ interface Props {
titleText: string; titleText: string;
groupName: string; groupName: string;
okText: string; okText: string;
isPublic: boolean;
cancelText: string; cancelText: string;
// friends not in the group // friends not in the group
friendList: Array<any>; friendList: Array<any>;
@ -88,15 +89,25 @@ export class UpdateGroupDialog extends React.Component<Props, State> {
public render() { public render() {
const checkMarkedCount = this.getMemberCount(this.state.friendList); const checkMarkedCount = this.getMemberCount(this.state.friendList);
const titleText = `${this.props.titleText} (Members: ${checkMarkedCount})`;
const okText = this.props.okText; const okText = this.props.okText;
const cancelText = this.props.cancelText; const cancelText = this.props.cancelText;
const noFriendsClasses = let titleText;
this.state.friendList.length === 0 let noFriendsClasses;
? 'no-friends'
: classNames('no-friends', 'hidden'); if (this.props.isPublic) {
// 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; const errorMsg = this.state.errorMessage;
const errorMessageClasses = classNames( const errorMessageClasses = classNames(

Write Preview
Loading…
Cancel
Save