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

XAnother big refactor to tie conversation UI logic to the friendRequestStatus variable

Browse Source
pull/63/head
Beaudan 6 years ago
parent 5212edcee2
commit 051e4dd22c
4 changed files with 85 additions and 168 deletions
Show Stats Download Patch File Download Diff File

16
app/sql.js
Unescape Escape View File

@ -396,7 +396,7 @@ async function updateToSchemaVersion6(currentVersion, instance) {
await instance.run( await instance.run(
`ALTER TABLE conversations `ALTER TABLE conversations
ADD COLUMN friendStatus INTEGER;` ADD COLUMN friendRequestStatus INTEGER;`
); );
await instance.run( await instance.run(
@ -964,7 +964,7 @@ async function getConversationCount() {
async function saveConversation(data) { async function saveConversation(data) {
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
const { id, active_at, type, members, name, friendStatus, profileName } = data; const { id, active_at, type, members, name, friendRequestStatus, profileName } = data;
await db.run( await db.run(
`INSERT INTO conversations ( `INSERT INTO conversations (
@ -975,7 +975,7 @@ async function saveConversation(data) {
type, type,
members, members,
name, name,
friendStatus, friendRequestStatus,
profileName profileName
) values ( ) values (
$id, $id,
@ -985,7 +985,7 @@ async function saveConversation(data) {
$type, $type,
$members, $members,
$name, $name,
$friendStatus, $friendRequestStatus,
$profileName $profileName
);`, );`,
{ {
@ -996,7 +996,7 @@ async function saveConversation(data) {
$type: type, $type: type,
$members: members ? members.join(' ') : null, $members: members ? members.join(' ') : null,
$name: name, $name: name,
$friendStatus: friendStatus, $friendRequestStatus: friendRequestStatus,
$profileName: profileName, $profileName: profileName,
} }
); );
@ -1020,7 +1020,7 @@ async function saveConversations(arrayOfConversations) {
async function updateConversation(data) { async function updateConversation(data) {
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
const { id, active_at, type, members, name, friendStatus, profileName } = data; const { id, active_at, type, members, name, friendRequestStatus, profileName } = data;
await db.run( await db.run(
`UPDATE conversations SET `UPDATE conversations SET
@ -1030,7 +1030,7 @@ async function updateConversation(data) {
type = $type, type = $type,
members = $members, members = $members,
name = $name, name = $name,
friendStatus = $friendStatus, friendRequestStatus = $friendRequestStatus,
profileName = $profileName profileName = $profileName
WHERE id = $id;`, WHERE id = $id;`,
{ {
@ -1041,7 +1041,7 @@ async function updateConversation(data) {
$type: type, $type: type,
$members: members ? members.join(' ') : null, $members: members ? members.join(' ') : null,
$name: name, $name: name,
$friendStatus: friendStatus, $friendRequestStatus: friendRequestStatus,
$profileName: profileName, $profileName: profileName,
} }
); );

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

@ -40,7 +40,7 @@
} = window.Signal.Migrations; } = window.Signal.Migrations;
// Possible conversation friend states // Possible conversation friend states
const FriendStatusEnum = Object.freeze({ const FriendRequestStatusEnum = Object.freeze({
// New conversation, no messages sent or received // New conversation, no messages sent or received
none: 0, none: 0,
// Friend request not complete yet, input blocked // Friend request not complete yet, input blocked
@ -69,7 +69,7 @@
return { return {
unreadCount: 0, unreadCount: 0,
verified: textsecure.storage.protocol.VerifiedStatus.DEFAULT, verified: textsecure.storage.protocol.VerifiedStatus.DEFAULT,
friendStatus: FriendStatusEnum.none, friendRequestStatus: FriendRequestStatusEnum.none,
unlockTimestamp: null, // Timestamp used for expiring friend requests. unlockTimestamp: null, // Timestamp used for expiring friend requests.
}; };
}, },
@ -105,8 +105,6 @@
conversation: this, conversation: this,
}); });
this.pendingFriendRequest = false;
this.messageCollection.on('change:errors', this.handleMessageError, this); this.messageCollection.on('change:errors', this.handleMessageError, this);
this.messageCollection.on('send-error', this.onMessageError, this); this.messageCollection.on('send-error', this.onMessageError, this);
@ -147,7 +145,6 @@
this.unset('lastMessage'); this.unset('lastMessage');
this.unset('lastMessageStatus'); this.unset('lastMessageStatus');
this.updateTextInputState();
this.setFriendRequestExpiryTimeout(); this.setFriendRequestExpiryTimeout();
}, },
@ -253,35 +250,8 @@
title: this.getTitle(), title: this.getTitle(),
}; };
}, },
// This function sets `pendingFriendRequest` variable in memory
async updatePendingFriendRequests() {
const pendingFriendRequest = await this.hasPendingFriendRequests();
// Only update if we have different values
if (this.pendingFriendRequest !== pendingFriendRequest) {
this.pendingFriendRequest = pendingFriendRequest;
// trigger an update
this.trigger('change');
}
},
// This goes through all our message history and finds a friend request // This goes through all our message history and finds a friend request
// But this is not a concurrent operation and thus updatePendingFriendRequests is used async getPendingFriendRequests(direction = null) {
async hasPendingFriendRequests() {
// Go through the messages and check for any pending friend requests
const messages = await window.Signal.Data.getMessagesByConversation(
this.id,
{
type: 'friend-request',
MessageCollection: Whisper.MessageCollection,
}
);
const pendingFriendRequest =
messages.models.find(message =>
message.isFriendRequest() &&
message.attributes.friendStatus === 'pending'
);
return pendingFriendRequest !== undefined;
},
async getPendingFriendRequests(direction) {
// Theoretically all our messages could be friend requests, // Theoretically all our messages could be friend requests,
// thus we have to unfortunately go through each one :( // thus we have to unfortunately go through each one :(
const messages = await window.Signal.Data.getMessagesByConversation( const messages = await window.Signal.Data.getMessagesByConversation(
@ -291,12 +261,13 @@
MessageCollection: Whisper.MessageCollection, MessageCollection: Whisper.MessageCollection,
} }
); );
// Get the pending friend requests that match the direction
// Get the messages that are matching the direction and the friendStatus // If no direction is supplied then return all pending friend requests
return messages.models.filter(m => return messages.models.filter(m => {
m.attributes.direction === direction && if (m.attributes.friendStatus !== 'pending')
m.attributes.friendStatus === 'pending' return false;
); return direction === null || m.attributes.direction === direction;
});
}, },
getPropsForListItem() { getPropsForListItem() {
const result = { const result = {
@ -306,7 +277,7 @@
lastUpdated: this.get('timestamp'), lastUpdated: this.get('timestamp'),
unreadCount: this.get('unreadCount') || 0, unreadCount: this.get('unreadCount') || 0,
isSelected: this.isSelected, isSelected: this.isSelected,
showFriendRequestIndicator: this.pendingFriendRequest, showFriendRequestIndicator: this.isPending(),
isBlocked: this.isBlocked(), isBlocked: this.isBlocked(),
lastMessage: { lastMessage: {
status: this.lastMessageStatus, status: this.lastMessageStatus,
@ -459,81 +430,83 @@
return contact.isVerified(); return contact.isVerified();
}); });
}, },
async waitingForFriendRequestApproval() { isPending() {
// Check if we have an incoming friend request return this.get('friendRequestStatus') === FriendRequestStatusEnum.pending;
// Or any successful outgoing ones
const incoming = await this.getPendingFriendRequests('incoming');
const outgoing = await this.getPendingFriendRequests('outgoing');
const successfulOutgoing = outgoing.filter(o => !o.hasErrors());
return (incoming.length > 0 || successfulOutgoing.length > 0);
}, },
isFriend() { isFriend() {
return this.get('friendStatus') === FriendStatusEnum.friends; return this.get('friendRequestStatus') === FriendRequestStatusEnum.friends;
},
updateTextInputState() {
switch (this.get('friendRequestStatus')) {
case FriendRequestStatusEnum.none:
this.trigger('disable:input', false);
this.trigger('change:placeholder', 'friend-request');
return;
case FriendRequestStatusEnum.pending:
this.trigger('disable:input', true);
this.trigger('change:placeholder', 'disabled');
return;
case FriendRequestStatusEnum.friends:
this.trigger('disable:input', false);
this.trigger('change:placeholder', 'chat');
return;
default:
throw new Error('Invalid friend request state');
}
}, },
// Update any pending friend requests for the current user async setFriendRequestStatus(newStatus) {
async updateFriendRequestUI() { this.set({ friendRequestStatus: newStatus });
// Enable the text inputs early await window.Signal.Data.updateConversation(this.id, this.attributes, {
Conversation: Whisper.Conversation,
});
this.updateTextInputState(); this.updateTextInputState();
},
// We only update our friend requests if we have the user as a friend async respondToAllPendingFriendRequests(options) {
if (!this.isFriend()) return; const { response, direction = null } = options;
// Ignore if no response supplied
// Update any pending outgoing messages if (!response) return;
const pending = await this.getPendingFriendRequests('outgoing'); const pending = await this.getPendingFriendRequests(direction);
await Promise.all( await Promise.all(
pending.map(async request => { pending.map(async request => {
if (request.hasErrors()) return; if (request.hasErrors()) return;
request.set({ friendStatus: 'accepted' }); request.set({ friendStatus: response });
await window.Signal.Data.saveMessage(request.attributes, { await window.Signal.Data.saveMessage(request.attributes, {
Message: Whisper.Message, Message: Whisper.Message,
}); });
this.trigger('updateMessage', request); this.trigger('updateMessage', request);
}) })
); );
// Update our local state
await this.updatePendingFriendRequests();
// Send the notification if we had an outgoing friend request
if (pending.length > 0)
this.notifyFriendRequest(this.id, 'accepted')
}, },
// We have declined an incoming friend request // We have declined an incoming friend request
async onDeclineFriendRequest() { async onDeclineFriendRequest() {
// Should we change states for other states? (They should never happen) this.setFriendRequestStatus(FriendRequestStatusEnum.none);
if (this.get('friendStatus') === FriendStatusEnum.pending) { await this.respondToAllPendingFriendRequests({
this.set({ friendStatus: FriendStatusEnum.none }); response: 'declined',
await window.Signal.Data.updateConversation(this.id, this.attributes, { direction: 'incoming',
Conversation: Whisper.Conversation, });
}); await window.libloki.removePreKeyBundleForNumber(this.id);
await this.updateFriendRequestUI();
await this.updatePendingFriendRequests();
await window.libloki.removePreKeyBundleForNumber(this.id);
}
}, },
// We have accepted an incoming friend request // We have accepted an incoming friend request
async onAcceptFriendRequest() { async onAcceptFriendRequest() {
// Should we change states for other states? (They should never happen) if (this.isPending()) {
if (this.get('friendStatus') === FriendStatusEnum.pending) { this.setFriendRequestStatus(FriendRequestStatusEnum.friends);
this.set({ friendStatus: FriendStatusEnum.friends }); await this.respondToAllPendingFriendRequests({
await window.Signal.Data.updateConversation(this.id, this.attributes, { response: 'accepted',
Conversation: Whisper.Conversation, direction: 'incoming',
}); });
await this.updateFriendRequestUI();
await this.updatePendingFriendRequests();
window.libloki.sendFriendRequestAccepted(this.id); window.libloki.sendFriendRequestAccepted(this.id);
} }
}, },
// Our outgoing friend request has been accepted // Our outgoing friend request has been accepted
async onFriendRequestAccepted() { async onFriendRequestAccepted() {
if (this.get('friendStatus') === FriendStatusEnum.pending) { if (this.isPending()) {
this.set({ friendStatus: FriendStatusEnum.friends }); this.setFriendRequestStatus(FriendRequestStatusEnum.friends);
await window.Signal.Data.updateConversation(this.id, this.attributes, { await this.respondToAllPendingFriendRequests({
Conversation: Whisper.Conversation, response: 'accepted',
direction: 'outgoing',
}); });
await this.updateFriendRequestUI(); this.notifyFriendRequest(this.id, 'accepted')
} }
}, },
async onFriendRequestTimeout() { async onFriendRequestTimeout() {
@ -552,30 +525,16 @@
} }
// Change any pending outgoing friend requests to expired // Change any pending outgoing friend requests to expired
const outgoing = await this.getPendingFriendRequests('outgoing'); await this.respondToAllPendingFriendRequests({
await Promise.all( response: 'expired',
outgoing.map(async request => { direction: 'outgoing',
if (request.hasErrors()) return; });
await this.setFriendRequestStatus(FriendRequestStatusEnum.none);
request.set({ friendStatus: 'expired' });
await window.Signal.Data.saveMessage(request.attributes, {
Message: Whisper.Message,
});
this.trigger('updateMessage', request);
})
);
// Update the UI
await this.updatePendingFriendRequests();
await this.updateFriendRequestUI();
}, },
async onFriendRequestReceived() { async onFriendRequestReceived() {
if (this.get('friendStatus') === FriendStatusEnum.none) { if (this.get('friendRequestStatus') === FriendRequestStatusEnum.none) {
this.set({ friendStatus: FriendStatusEnum.pending }); this.setFriendRequestStatus(FriendRequestStatusEnum.pending);
await window.Signal.Data.updateConversation(this.id, this.attributes, { this.notifyFriendRequest(this.id, 'requested');
Conversation: Whisper.Conversation,
});
await this.updateFriendRequestUI();
} }
}, },
async onFriendRequestSent() { async onFriendRequestSent() {
@ -587,20 +546,9 @@
const ms = 60 * 60 * 1000 * hourLockDuration; const ms = 60 * 60 * 1000 * hourLockDuration;
this.set({ unlockTimestamp: Date.now() + ms }); this.set({ unlockTimestamp: Date.now() + ms });
await window.Signal.Data.updateConversation(this.id, this.attributes, {
Conversation: Whisper.Conversation,
});
this.setFriendRequestExpiryTimeout(); this.setFriendRequestExpiryTimeout();
} }
await this.setFriendRequestStatus(FriendRequestStatusEnum.pending);
if (this.get('friendStatus') === FriendStatusEnum.none) {
this.set({ friendStatus: FriendStatusEnum.pending });
await window.Signal.Data.updateConversation(this.id, this.attributes, {
Conversation: Whisper.Conversation,
});
}
this.updateFriendRequestUI();
}, },
setFriendRequestExpiryTimeout() { setFriendRequestExpiryTimeout() {
const unlockTimestamp = this.get('unlockTimestamp'); const unlockTimestamp = this.get('unlockTimestamp');
@ -972,6 +920,9 @@
}, },
async sendMessage(body, attachments, quote) { async sendMessage(body, attachments, quote) {
// Input should be blocked if there is a pending friend request
if (this.isPending())
return;
const destination = this.id; const destination = this.id;
const expireTimer = this.get('expireTimer'); const expireTimer = this.get('expireTimer');
const recipients = this.getRecipients(); const recipients = this.getRecipients();
@ -1007,12 +958,7 @@
recipients, recipients,
}); });
} else { } else {
// We also need to make sure we don't send a new friend request // Check if we have sent a friend request
// if we already have an existing one
const incomingRequests = await this.getPendingFriendRequests('incoming');
if (incomingRequests.length > 0) return null;
// Otherwise check if we have sent a friend request
const outgoingRequests = await this.getPendingFriendRequests('outgoing'); const outgoingRequests = await this.getPendingFriendRequests('outgoing');
if (outgoingRequests.length > 0) { if (outgoingRequests.length > 0) {
// Check if the requests have errored, if so then remove them // Check if the requests have errored, if so then remove them
@ -1123,24 +1069,6 @@
return true; return true;
}); });
}, },
async updateTextInputState() {
// Check if we need to disable the text field
if (!this.isFriend()) {
// Disable the input if we're waiting for friend request approval
const waiting = await this.waitingForFriendRequestApproval();
if (waiting) {
this.trigger('disable:input', true);
this.trigger('change:placeholder', 'disabled');
return;
}
// Tell the user to introduce themselves
this.trigger('disable:input', false);
this.trigger('change:placeholder', 'friend-request');
return;
}
this.trigger('disable:input', false);
this.trigger('change:placeholder', 'chat');
},
wrapSend(promise) { wrapSend(promise) {
return promise.then( return promise.then(
async result => { async result => {
@ -1328,12 +1256,6 @@
return; return;
} }
// Update our friend indicator
this.updatePendingFriendRequests();
// Update our text input state
await this.updateTextInputState();
const messages = await window.Signal.Data.getMessagesByConversation( const messages = await window.Signal.Data.getMessagesByConversation(
this.id, this.id,
{ limit: 1, MessageCollection: Whisper.MessageCollection } { limit: 1, MessageCollection: Whisper.MessageCollection }

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

@ -7,10 +7,9 @@
/* global Signal: false */ /* global Signal: false */
/* global storage: false */ /* global storage: false */
/* global Whisper: false */ /* global Whisper: false */
/* global BlockNumberConversation: false */
// eslint-disable-next-line func-names // eslint-disable-next-line func-names
(function() { (function () {
'use strict'; 'use strict';
window.Whisper = window.Whisper || {}; window.Whisper = window.Whisper || {};
@ -202,7 +201,7 @@
onBlockUser: () => { onBlockUser: () => {
this.model.block(); this.model.block();
}, },
onUnblockUser: () => { onUnblockUser: () => {
this.model.unblock(); this.model.unblock();
}, },
onChangeNickname: () => { onChangeNickname: () => {
@ -255,8 +254,7 @@
this.$('.send-message').blur(this.unfocusBottomBar.bind(this)); this.$('.send-message').blur(this.unfocusBottomBar.bind(this));
this.$emojiPanelContainer = this.$('.emoji-panel-container'); this.$emojiPanelContainer = this.$('.emoji-panel-container');
this.model.updateTextInputState();
this.model.updateFriendRequestUI();
}, },
events: { events: {

3
libtextsecure/outgoing_message.js
Unescape Escape View File

@ -460,9 +460,6 @@ OutgoingMessage.prototype = {
}) })
.then(this.reloadDevicesAndSend(number, true)) .then(this.reloadDevicesAndSend(number, true))
.catch(error => { .catch(error => {
if (this.fallBackEncryption && conversation) {
conversation.updateFriendRequestUI();
}
if (error.message === 'Identity key changed') { if (error.message === 'Identity key changed') {
// eslint-disable-next-line no-param-reassign // eslint-disable-next-line no-param-reassign
error = new textsecure.OutgoingIdentityKeyError( error = new textsecure.OutgoingIdentityKeyError(

Write Preview
Loading…
Cancel
Save