From 026a1930ed78da9501a642bb36ac03af1552e215 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 15 Oct 2020 17:19:49 +1100 Subject: [PATCH] add a getOrThrow to ConversationController when we expect this convo --- js/ConversationController.d.ts | 15 ++--- js/conversation_controller.js | 16 +++++ js/models/conversations.d.ts | 12 +++- stylesheets/_modules.scss | 4 -- ts/components/DevicePairingDialog.tsx | 2 +- ts/components/SearchResults.tsx | 5 +- ts/components/conversation/Message.tsx | 1 + .../conversation/SessionCompositionBox.tsx | 7 ++- .../conversation/SessionConversation.tsx | 62 ++++++++----------- .../SessionQuotedMessageComposition.tsx | 2 + ts/receiver/dataMessage.ts | 5 +- ts/receiver/groups.ts | 4 +- ts/receiver/mediumGroups.ts | 1 - ts/receiver/multidevice.ts | 1 - ts/session/medium_group/index.ts | 3 +- ts/state/ducks/SessionTheme.tsx | 2 + ts/styled.d.ts | 2 + ts/window.d.ts | 2 +- tslint.json | 1 + 19 files changed, 79 insertions(+), 68 deletions(-) diff --git a/js/ConversationController.d.ts b/js/ConversationController.d.ts index 64703285c..cae0e0179 100644 --- a/js/ConversationController.d.ts +++ b/js/ConversationController.d.ts @@ -1,9 +1,10 @@ -import { ConversationModel } from "./models/conversations"; +import { ConversationModel } from './models/conversations'; export type ConversationControllerType = { - reset: () => void; - load: () => Promise; - get: (id: string) => ConversationModel | undefined; - getOrCreateAndWait: (id: string, type: string) => Promise; getOrCreate: (id: string, type: string) => Promise; - -} \ No newline at end of file + reset: () => void; + load: () => Promise; + get: (id: string) => ConversationModel | undefined; + getOrThrow: (id: string) => ConversationModel; + getOrCreateAndWait: (id: string, type: string) => Promise; + getOrCreate: (id: string, type: string) => Promise; +}; diff --git a/js/conversation_controller.js b/js/conversation_controller.js index 58f6beae2..68cd2be16 100644 --- a/js/conversation_controller.js +++ b/js/conversation_controller.js @@ -64,6 +64,22 @@ return conversations.get(id); }, + getOrThrow(id) { + if (!this._initialFetchComplete) { + throw new Error( + 'ConversationController.get() needs complete initial fetch' + ); + } + + const convo = conversations.get(id); + + if (convo) { + return convo; + } + throw new Error( + `Conversation ${id} does not exist on ConversationController.get()` + ); + }, // Needed for some model setup which happens during the initial fetch() call below getUnsafe(id) { return conversations.get(id); diff --git a/js/models/conversations.d.ts b/js/models/conversations.d.ts index 9dd16fa33..bfcb7e1e6 100644 --- a/js/models/conversations.d.ts +++ b/js/models/conversations.d.ts @@ -41,7 +41,7 @@ export interface ConversationModel toggleVerified: () => Promise; getProfile: (id: string) => Promise; getProfiles: () => Promise; - setProfileKey: (key: string) => void; + setProfileKey: (key: string) => Promise; isMe: () => boolean; getRecipients: () => Array; getTitle: () => string; @@ -61,12 +61,18 @@ export interface ConversationModel isOnline: () => boolean; isModerator: (id?: string) => boolean; - lastMessage: string; messageCollection: Backbone.Collection; // types to make more specific - sendMessage: (body: any, attachments: any, quote: any, preview: any, groupInvitation: any, otherOptions: any) => Promise; + sendMessage: ( + body: any, + attachments: any, + quote: any, + preview: any, + groupInvitation: any, + otherOptions: any + ) => Promise; updateGroupAdmins: any; setLokiProfile: any; onSessionResetReceived: any; diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index e04229d54..2357e99e6 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -2607,8 +2607,6 @@ flex-grow: 0; } - - .module-left-pane__list { flex-grow: 1; flex-shrink: 1; @@ -2620,8 +2618,6 @@ outline: none; } - - // Third-party module: react-contextmenu .react-contextmenu { diff --git a/ts/components/DevicePairingDialog.tsx b/ts/components/DevicePairingDialog.tsx index b5c24680e..7ef3eccf9 100644 --- a/ts/components/DevicePairingDialog.tsx +++ b/ts/components/DevicePairingDialog.tsx @@ -290,7 +290,7 @@ export class DevicePairingDialog extends React.Component { type: 'success', }); const { currentPubKey } = this.state; - if(currentPubKey) { + if (currentPubKey) { const conv = window.ConversationController.get(currentPubKey); if (conv) { void conv.setNickname(this.state.deviceAlias); diff --git a/ts/components/SearchResults.tsx b/ts/components/SearchResults.tsx index ac72109aa..99c52b42e 100644 --- a/ts/components/SearchResults.tsx +++ b/ts/components/SearchResults.tsx @@ -41,10 +41,7 @@ export class SearchResults extends React.Component { const haveConversations = conversations && conversations.length; const haveContacts = contacts && contacts.length; const haveMessages = messages && messages.length; - const noResults = - !haveConversations && - !haveContacts && - !haveMessages; + const noResults = !haveConversations && !haveContacts && !haveMessages; return (
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index c42bbfb6e..55b881a7f 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -621,6 +621,7 @@ export class Message extends React.PureComponent { direction, i18n, quote, + text, isPublic, convoId, } = this.props; diff --git a/ts/components/session/conversation/SessionCompositionBox.tsx b/ts/components/session/conversation/SessionCompositionBox.tsx index c00528b33..059e9e858 100644 --- a/ts/components/session/conversation/SessionCompositionBox.tsx +++ b/ts/components/session/conversation/SessionCompositionBox.tsx @@ -331,12 +331,13 @@ export class SessionCompositionBox extends React.Component { // Send message this.props.onMessageSending(); - const extractedQuotedMessageProps = _.pick(quotedMessageProps, + const extractedQuotedMessageProps = _.pick( + quotedMessageProps, 'id', 'author', 'text', - 'attachments'); - + 'attachments' + ); try { await this.props.sendMessage( diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index ddcaf3364..d488d3d6f 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -142,12 +142,9 @@ export class SessionConversation extends React.Component { // Keyboard navigation this.onKeyDown = this.onKeyDown.bind(this); - const conversationModel = window.ConversationController.get( + const conversationModel = window.ConversationController.getOrThrow( this.state.conversationKey ); - if (!conversationModel) { - throw new Error('conversation null on ConversationController.get()'); - } conversationModel.on('change', () => { this.setState( { @@ -214,12 +211,9 @@ export class SessionConversation extends React.Component { const conversation = this.props.conversations.conversationLookup[ conversationKey ]; - const conversationModel = window.ConversationController.get( + const conversationModel = window.ConversationController.getOrThrow( conversationKey ); - if (!conversationModel) { - throw new Error('conversation null on ConversationController.get()'); - } const isRss = conversation.isRss; // TODO VINCE: OPTIMISE FOR NEW SENDING??? @@ -232,7 +226,6 @@ export class SessionConversation extends React.Component { const showSafetyNumber = this.state.infoViewState === 'safetyNumber'; const showMessageDetails = this.state.infoViewState === 'messageDetails'; - return (
{this.renderHeader()}
@@ -414,16 +407,13 @@ export class SessionConversation extends React.Component { // in the conversation model. // The only time we need to call getMessages() is to grab more messages on scroll. const { conversationKey, initialFetchComplete } = this.state; - const conversationModel = window.ConversationController.get( + const conversationModel = window.ConversationController.getOrThrow( conversationKey ); if (initialFetchComplete) { return; } - if (!conversationModel) { - throw new Error('conversation null on ConversationController.get()'); - } const messageSet = await window.Signal.Data.getMessagesByConversation( conversationKey, @@ -506,10 +496,9 @@ export class SessionConversation extends React.Component { public getHeaderProps() { const { conversationKey } = this.state; - const conversation = window.ConversationController.get(conversationKey); - if (!conversation) { - throw new Error('conversation null on ConversationController.get()'); - } + const conversation = window.ConversationController.getOrThrow( + conversationKey + ); const expireTimer = conversation.get('expireTimer'); const expirationSettingName = expireTimer ? window.Whisper.ExpirationTimerOptions.getName(expireTimer || 0) @@ -615,10 +604,9 @@ export class SessionConversation extends React.Component { public getGroupSettingsProps() { const { conversationKey } = this.state; - const conversation = window.ConversationController.get(conversationKey); - if (!conversation) { - throw new Error('conversation null on ConversationController.get()'); - } + const conversation = window.ConversationController.getOrThrow( + conversationKey + ); const ourPK = window.textsecure.storage.user.getNumber(); const members = conversation.get('members') || []; @@ -730,10 +718,10 @@ export class SessionConversation extends React.Component { // If you're not friends, don't mark anything as read. Otherwise // this will automatically accept friend request. - const conversation = window.ConversationController.get(conversationKey); - if (!conversation) { - throw new Error('conversation null on ConversationController.get()'); - } + const conversation = window.ConversationController.getOrThrow( + conversationKey + ); + if (conversation.isBlocked()) { return; } @@ -826,14 +814,12 @@ export class SessionConversation extends React.Component { ); const { conversationKey } = this.state; - const conversationModel = window.ConversationController.get( + const conversationModel = window.ConversationController.getOrThrow( conversationKey ); const multiple = selectedMessages.length > 1; - if (!conversationModel) { - throw new Error('conversation null on ConversationController.get()'); - } + const isPublic = conversationModel.isPublic(); // In future, we may be able to unsend private messages also @@ -1068,27 +1054,29 @@ export class SessionConversation extends React.Component { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~ MESSAGE QUOTE ~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - private async replyToMessage(quotedMessageTimestamp ?: number) { + private async replyToMessage(quotedMessageTimestamp?: number) { if (!_.isEqual(this.state.quotedMessageTimestamp, quotedMessageTimestamp)) { const { conversationKey } = this.state; - const conversationModel = window.ConversationController.get( + const conversationModel = window.ConversationController.getOrThrow( conversationKey ); - if (!conversationModel) { - throw new Error('conversation null on ConversationController.get()'); - } + const conversation = this.props.conversations.conversationLookup[ conversationKey ]; let quotedMessageProps = null; if (quotedMessageTimestamp) { - const quotedMessageModel = conversationModel.getMessagesWithTimestamp(conversation.id, quotedMessageTimestamp); + const quotedMessageModel = conversationModel.getMessagesWithTimestamp( + conversation.id, + quotedMessageTimestamp + ); if (quotedMessageModel && quotedMessageModel.length === 1) { - quotedMessageProps = await conversationModel.makeQuote(quotedMessageModel[0]); + quotedMessageProps = await conversationModel.makeQuote( + quotedMessageModel[0] + ); } } this.setState({ quotedMessageTimestamp, quotedMessageProps }); - } } diff --git a/ts/components/session/conversation/SessionQuotedMessageComposition.tsx b/ts/components/session/conversation/SessionQuotedMessageComposition.tsx index c6b7d1557..795d81c62 100644 --- a/ts/components/session/conversation/SessionQuotedMessageComposition.tsx +++ b/ts/components/session/conversation/SessionQuotedMessageComposition.tsx @@ -12,6 +12,8 @@ interface Props { const QuotedMessageComposition = styled.div` width: 100%; + padding-inline-end: ${props => props.theme.common.margins.md}; + padding-inline-start: ${props => props.theme.common.margins.md}; `; const QuotedMessageCompositionReply = styled.div` diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index ec82b40b0..9d393d79c 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -710,10 +710,7 @@ export async function handleMessageEvent(event: MessageEvent): Promise { } // the conversation with the primary device of that source (can be the same as conversationOrigin) - const conversation = window.ConversationController.get(conversationId); - if (!conversation) { - throw new Error('conversation null on ConversationController.get()'); - } + const conversation = window.ConversationController.getOrThrow(conversationId); conversation.queueJob(() => { handleMessageJob( diff --git a/ts/receiver/groups.ts b/ts/receiver/groups.ts index b5874dedf..88ec65fa5 100644 --- a/ts/receiver/groups.ts +++ b/ts/receiver/groups.ts @@ -87,7 +87,9 @@ export async function preprocessGroupMessage( } else { // be sure to drop a message from a non admin if it tries to change group members // or change the group name - const fromAdmin = conversation.get('groupAdmins')?.includes(primarySource); + const fromAdmin = conversation + .get('groupAdmins') + ?.includes(primarySource); if (!fromAdmin) { // Make sure the message is not removing members / renaming the group diff --git a/ts/receiver/mediumGroups.ts b/ts/receiver/mediumGroups.ts index 22f856114..32b61cafd 100644 --- a/ts/receiver/mediumGroups.ts +++ b/ts/receiver/mediumGroups.ts @@ -287,7 +287,6 @@ async function handleMediumGroupChange( return; } - // ***** Updating the group ***** const curAdmins = convo.get('groupAdmins') || []; diff --git a/ts/receiver/multidevice.ts b/ts/receiver/multidevice.ts index 1d1f01fe5..91588de7f 100644 --- a/ts/receiver/multidevice.ts +++ b/ts/receiver/multidevice.ts @@ -381,7 +381,6 @@ async function onContactReceived(details: any) { conversation.setProfileKey(profileKey); } - if (details.name && details.name.length) { await conversation.setLokiProfile({ displayName: details.name }); } diff --git a/ts/session/medium_group/index.ts b/ts/session/medium_group/index.ts index f1065f063..4f8543206 100644 --- a/ts/session/medium_group/index.ts +++ b/ts/session/medium_group/index.ts @@ -830,7 +830,8 @@ async function updateOrCreateGroup(details: GroupInfo) { await conversation.commit(); const { expireTimer } = details; - const isValidExpireTimer = expireTimer !== undefined && typeof expireTimer === 'number'; + const isValidExpireTimer = + expireTimer !== undefined && typeof expireTimer === 'number'; if (expireTimer === undefined || typeof expireTimer !== 'number') { return; diff --git a/ts/state/ducks/SessionTheme.tsx b/ts/state/ducks/SessionTheme.tsx index 36a9a4ef1..3c4f587d3 100644 --- a/ts/state/ducks/SessionTheme.tsx +++ b/ts/state/ducks/SessionTheme.tsx @@ -22,6 +22,8 @@ const common = { margins: { xs: '5px', sm: '10px', + md: '15px', + lg: '20px', }, }; diff --git a/ts/styled.d.ts b/ts/styled.d.ts index e29059160..f758774de 100644 --- a/ts/styled.d.ts +++ b/ts/styled.d.ts @@ -11,6 +11,8 @@ declare module 'styled-components' { margins: { xs: string; sm: string; + md: string; + lg: string; }; }; colors: { diff --git a/ts/window.d.ts b/ts/window.d.ts index a654a8871..c4bc5dda7 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -12,7 +12,7 @@ import { LibTextsecure } from '../libtextsecure'; import { ConversationType } from '../js/modules/data'; import { RecoveryPhraseUtil } from '../libloki/modules/mnemonic'; import { ConfirmationDialogParams } from '../background'; -import { } from 'styled-components/cssprop'; +import {} from 'styled-components/cssprop'; import { ConversationControllerType } from '../js/ConversationController'; /* diff --git a/tslint.json b/tslint.json index eb2b937d2..70bd8cdd7 100644 --- a/tslint.json +++ b/tslint.json @@ -146,6 +146,7 @@ // We use || and && shortcutting because we're javascript programmers "strict-boolean-expressions": false, "no-promise-as-boolean": true, + "await-promise": true, "no-suspicious-comment": false, "no-backbone-get-set-outside-model": false, "underscore-consistent-invocation": false,