add a getOrThrow to ConversationController when we expect this convo

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<void>;
   get: (id: string) => ConversationModel | undefined;
-    getOrCreateAndWait: (id: string, type: string) => Promise<ConversationModel>; getOrCreate: (id: string, type: string) => Promise<ConversationModel>;
-
-}
+  getOrThrow: (id: string) => ConversationModel;
+  getOrCreateAndWait: (id: string, type: string) => Promise<ConversationModel>;
+  getOrCreate: (id: string, type: string) => Promise<ConversationModel>;
+};

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);

js/models/conversations.d.ts

@@ -41,7 +41,7 @@ export interface ConversationModel
   toggleVerified: () => Promise<void>;
   getProfile: (id: string) => Promise<any>;
   getProfiles: () => Promise<any>;
-  setProfileKey: (key: string) => void;
+  setProfileKey: (key: string) => Promise<void>;
   isMe: () => boolean;
   getRecipients: () => Array<string>;
   getTitle: () => string;
@@ -61,12 +61,18 @@ export interface ConversationModel
   isOnline: () => boolean;
   isModerator: (id?: string) => boolean;
 
-
   lastMessage: string;
   messageCollection: Backbone.Collection<MessageModel>;
 
   // types to make more specific
-  sendMessage: (body: any, attachments: any, quote: any, preview: any, groupInvitation: any, otherOptions: any) => Promise<void>;
+  sendMessage: (
+    body: any,
+    attachments: any,
+    quote: any,
+    preview: any,
+    groupInvitation: any,
+    otherOptions: any
+  ) => Promise<void>;
   updateGroupAdmins: any;
   setLokiProfile: any;
   onSessionResetReceived: any;

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 {

ts/components/SearchResults.tsx

@@ -41,10 +41,7 @@ export class SearchResults extends React.Component<Props> {
     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 (
       <div className="module-search-results">

ts/components/conversation/Message.tsx

@@ -621,6 +621,7 @@ export class Message extends React.PureComponent<Props, State> {
       direction,
       i18n,
       quote,
+      text,
       isPublic,
       convoId,
     } = this.props;

ts/components/session/conversation/SessionCompositionBox.tsx

@@ -331,12 +331,13 @@ export class SessionCompositionBox extends React.Component<Props, State> {
 
     // Send message
     this.props.onMessageSending();
-    const extractedQuotedMessageProps = _.pick(quotedMessageProps,
+    const extractedQuotedMessageProps = _.pick(
+      quotedMessageProps,
       'id',
       'author',
       'text',
-      'attachments');
-
+      'attachments'
+    );
 
     try {
       await this.props.sendMessage(

ts/components/session/conversation/SessionConversation.tsx

@@ -142,12 +142,9 @@ export class SessionConversation extends React.Component<Props, State> {
     // 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<Props, State> {
     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<Props, State> {
     const showSafetyNumber = this.state.infoViewState === 'safetyNumber';
     const showMessageDetails = this.state.infoViewState === 'messageDetails';
 
-
     return (
       <SessionTheme theme={this.props.theme}>
         <div className="conversation-header">{this.renderHeader()}</div>
@@ -414,16 +407,13 @@ export class SessionConversation extends React.Component<Props, State> {
     // 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<Props, State> {
 
   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<Props, State> {
 
   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<Props, State> {
 
     // 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<Props, State> {
     );
 
     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
@@ -1071,24 +1057,26 @@ export class SessionConversation extends React.Component<Props, State> {
   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 });
-
     }
   }
 

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`

ts/receiver/dataMessage.ts

@@ -710,10 +710,7 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
   }
 
   // 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(

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

ts/receiver/mediumGroups.ts

@@ -287,7 +287,6 @@ async function handleMediumGroupChange(
     return;
   }
 
-
   // ***** Updating the group *****
 
   const curAdmins = convo.get('groupAdmins') || [];

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 });
     }

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;

ts/state/ducks/SessionTheme.tsx

@@ -22,6 +22,8 @@ const common = {
   margins: {
     xs: '5px',
     sm: '10px',
+    md: '15px',
+    lg: '20px',
   },
 };
 

ts/styled.d.ts

@@ -11,6 +11,8 @@ declare module 'styled-components' {
       margins: {
         xs: string;
         sm: string;
+        md: string;
+        lg: string;
       };
     };
     colors: {

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,