Merge pull request #1449 from oxen-io/clearnet

Session v1.4.7
oxen-io · Jan 22, 2021 · 98296ae · 98296ae
2 parents 29358eb + b4c71c4
commit 98296ae
Show file tree

Hide file tree

Showing 25 changed files with 64 additions and 189 deletions.
diff --git a/js/background.js b/js/background.js
@@ -662,7 +662,7 @@
               window
                 .getConversationController()
                 .getConversations()
-                .filter(convo => convo.isPublic() && !convo.isRss())
+                .filter(convo => convo.isPublic())
                 .forEach(convo =>
                   convo.trigger('ourAvatarChanged', { url, profileKey })
                 );
@@ -892,7 +892,6 @@
           profileName: displayName,
           pubkey: userPubKey,
           avatarPath,
-          isRss: conversation.isRss(),
           onStartConversation: () => {
             window.inboxStore.dispatch(
               window.actionsCreators.openConversationExternal(conversation.id)

diff --git a/js/models/conversations.d.ts b/js/models/conversations.d.ts
@@ -59,7 +59,6 @@ export interface ConversationModel
 
   isPublic: () => boolean;
   isClosedGroup: () => boolean;
-  isRss: () => boolean;
   isBlocked: () => boolean;
   isClosable: () => boolean;
   isAdmin: (id: string) => boolean;

diff --git a/js/models/conversations.js b/js/models/conversations.js
@@ -150,15 +150,10 @@
       return !!(this.id && this.id.match(/^publicChat:/));
     },
     isClosedGroup() {
-      return (
-        this.get('type') === Message.GROUP && !this.isPublic() && !this.isRss()
-      );
+      return this.get('type') === Message.GROUP && !this.isPublic();
     },
     isClosable() {
-      return !this.isRss() || this.get('closable');
-    },
-    isRss() {
-      return !!(this.id && this.id.match(/^rss:/));
+      return this.get('closable');
     },
     isBlocked() {
       if (!this.id || this.isMe()) {
@@ -180,7 +175,7 @@
       return this.get('is_medium_group');
     },
     async block() {
-      if (!this.id || this.isPublic() || this.isRss()) {
+      if (!this.id || this.isPublic()) {
         return;
       }
 
@@ -192,7 +187,7 @@
       await libsession.Utils.SyncMessageUtils.sendBlockedListSyncMessage();
     },
     async unblock() {
-      if (!this.id || this.isPublic() || this.isRss()) {
+      if (!this.id || this.isPublic()) {
         return;
       }
       const promise = this.isPrivate()
@@ -313,7 +308,7 @@
     },
 
     async updateProfileAvatar() {
-      if (this.isRss() || this.isPublic()) {
+      if (this.isPublic()) {
         return;
       }
 
@@ -446,7 +441,6 @@
         type: this.isPrivate() ? 'direct' : 'group',
         isMe: this.isMe(),
         isPublic: this.isPublic(),
-        isRss: this.isRss(),
         isClosable: this.isClosable(),
         isTyping: typingKeys.length > 0,
         lastUpdated: this.get('timestamp'),
@@ -465,7 +459,6 @@
         lastMessage: {
           status: this.get('lastMessageStatus'),
           text: this.get('lastMessage'),
-          isRss: this.isRss(),
         },
         hasNickname: !!this.getNickname(),
         isKickedFromGroup: !!this.get('isKickedFromGroup'),
@@ -940,9 +933,6 @@
       if (!this.isPublic()) {
         return;
       }
-      if (this.isRss()) {
-        return;
-      }
       if (!this.get('profileSharing')) {
         return;
       }
@@ -1304,17 +1294,6 @@
     getNickname() {
       return this.get('nickname');
     },
-    getRssSettings() {
-      if (!this.isRss()) {
-        return null;
-      }
-      return {
-        RSS_FEED: this.get('rssFeed'),
-        CONVO_ID: this.id,
-        title: this.get('name'),
-        closeable: this.get('closable'),
-      };
-    },
     // maybe "Backend" instead of "Source"?
     async setPublicSource(newServer, newChannelId) {
       if (!this.isPublic()) {

diff --git a/js/models/messages.d.ts b/js/models/messages.d.ts
@@ -87,7 +87,6 @@ export interface MessageRegularProps {
   expirationTimestamp?: number;
   convoId: string;
   isPublic?: boolean;
-  isRss?: boolean;
   selected: boolean;
   isKickedFromGroup: boolean;
   // whether or not to show check boxes

diff --git a/js/models/messages.js b/js/models/messages.js
@@ -579,7 +579,6 @@
         expirationLength,
         expirationTimestamp,
         isPublic,
-        isRss: !!this.get('isRss'),
         isKickedFromGroup:
           conversation && conversation.get('isKickedFromGroup'),
         isAdmin, // if the sender is an admin (not us)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
@@ -308,16 +308,6 @@
 
       this.model.updateLastMessage();
 
-      if (this.model.isRss()) {
-        $('.compose').hide();
-        $('.conversation-stack').removeClass('conversation-stack-no-border');
-        $('.conversation-stack').addClass('conversation-stack-border');
-      } else {
-        $('.compose').show();
-        $('.conversation-stack').removeClass('conversation-stack-border');
-        $('.conversation-stack').addClass('conversation-stack-no-border');
-      }
-
       // We schedule our catch-up decrypt right after any in-progress fetch of
       //   messages from the database, then ensure that the loading screen is only
       //   dismissed when that is complete.

diff --git a/js/views/user_details_dialog_view.js b/js/views/user_details_dialog_view.js
@@ -12,7 +12,6 @@
       profileName,
       avatarPath,
       pubkey,
-      isRss,
       onOk,
       onStartConversation,
       theme,
@@ -21,7 +20,6 @@
 
       this.profileName = profileName;
       this.pubkey = pubkey;
-      this.isRss = isRss;
       this.avatarPath = avatarPath;
       this.onOk = onOk;
       this.onStartConversation = onStartConversation;
@@ -40,7 +38,6 @@
           onStartConversation: this.onStartConversation,
           profileName: this.profileName,
           pubkey: this.pubkey,
-          isRss: this.isRss,
           avatarPath: this.avatarPath,
           i18n,
           theme: this.theme,

diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
@@ -23,7 +23,7 @@ function MessageReceiver() {
       // bind events
       lokiPublicChatAPI.on(
         'publicMessage',
-        window.NewReceiver.handleUnencryptedMessage
+        window.NewReceiver.handlePublicMessage
       );
       openGroupBound = true;
     }

diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
@@ -33,7 +33,6 @@ export type ConversationListItemProps = {
   avatarPath?: string;
   isMe: boolean;
   isPublic?: boolean;
-  isRss?: boolean;
   isClosable?: boolean;
   primaryDevice?: string;
 
@@ -46,7 +45,6 @@ export type ConversationListItemProps = {
   lastMessage?: {
     status: 'sending' | 'sent' | 'delivered' | 'read' | 'error';
     text: string;
-    isRss: boolean;
   };
 
   isBlocked?: boolean;
@@ -170,13 +168,7 @@ class ConversationListItem extends React.PureComponent<Props> {
     if (!lastMessage && !isTyping) {
       return null;
     }
-    let text = lastMessage && lastMessage.text ? lastMessage.text : '';
-
-    // if coming from Rss feed
-    if (lastMessage && lastMessage.isRss) {
-      // strip any HTML
-      text = text.replace(/<[^>]*>?/gm, '');
-    }
+    const text = lastMessage && lastMessage.text ? lastMessage.text : '';
 
     if (isEmpty(text)) {
       return null;

diff --git a/ts/components/UserDetailsDialog.tsx b/ts/components/UserDetailsDialog.tsx
@@ -12,7 +12,6 @@ import { DefaultTheme } from 'styled-components';
 
 interface Props {
   i18n: any;
-  isRss: boolean;
   profileName: string;
   avatarPath: string;
   pubkey: string;
@@ -37,7 +36,7 @@ export class UserDetailsDialog extends React.Component<Props, State> {
   }
 
   public render() {
-    const { i18n, isRss } = this.props;
+    const { i18n } = this.props;
 
     return (
       <SessionModal
@@ -52,14 +51,12 @@ export class UserDetailsDialog extends React.Component<Props, State> {
         <SessionIdEditable editable={false} text={this.props.pubkey} />
 
         <div className="session-modal__button-group__center">
-          {!isRss && (
-            <SessionButton
-              text={i18n('startConversation')}
-              buttonType={SessionButtonType.Default}
-              buttonColor={SessionButtonColor.Primary}
-              onClick={this.onClickStartConversation}
-            />
-          )}
+          <SessionButton
+            text={i18n('startConversation')}
+            buttonType={SessionButtonType.Default}
+            buttonColor={SessionButtonColor.Primary}
+            onClick={this.onClickStartConversation}
+          />
         </div>
       </SessionModal>
     );

diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
@@ -42,7 +42,6 @@ interface Props {
   isGroup: boolean;
   isPrivate: boolean;
   isPublic: boolean;
-  isRss: boolean;
   isAdmin: boolean;
 
   // We might not always have the full list of members,
@@ -120,7 +119,6 @@ class ConversationHeaderInner extends React.Component<Props> {
       profileName,
       isGroup,
       isPublic,
-      isRss,
       members,
       subscriberCount,
       isMe,
@@ -138,7 +136,7 @@ class ConversationHeaderInner extends React.Component<Props> {
     }
 
     const memberCount: number = (() => {
-      if (!isGroup || isRss) {
+      if (!isGroup) {
         return 0;
       }
 
@@ -262,7 +260,7 @@ class ConversationHeaderInner extends React.Component<Props> {
           </div>
           {!isKickedFromGroup && this.renderExpirationLength()}
 
-          {!this.props.isRss && !selectionMode && this.renderAvatar()}
+          {!selectionMode && this.renderAvatar()}
 
           <ConversationHeaderMenu {...this.getHeaderMenuProps(triggerId)} />
         </div>

diff --git a/ts/components/conversation/Linkify.tsx b/ts/components/conversation/Linkify.tsx
@@ -10,7 +10,6 @@ const linkify = LinkifyIt();
 
 interface Props {
   text: string;
-  isRss?: boolean;
   /** Allows you to customize now non-links are rendered. Simplest is just a <span>. */
   renderNonLink?: RenderTextCallbackType;
 }
@@ -24,17 +23,10 @@ export class Linkify extends React.Component<Props> {
   };
 
   public render() {
-    const { text, renderNonLink, isRss } = this.props;
+    const { text, renderNonLink } = this.props;
     const results: Array<any> = [];
     let count = 1;
 
-    if (isRss && text.indexOf('</') !== -1) {
-      results.push(<SessionHtmlRenderer key={count++} html={text} tag="div" />);
-      // should already have links
-
-      return results;
-    }
-
     const matchData = linkify.match(text) || [];
     let last = 0;
 

diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
@@ -553,7 +553,6 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
       bodyPending,
       direction,
       status,
-      isRss,
       conversationType,
       convoId,
       multiSelectMode,
@@ -581,7 +580,6 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
       >
         <MessageBody
           text={contents || ''}
-          isRss={isRss}
           i18n={window.i18n}
           bodyPending={bodyPending}
           isGroup={conversationType === 'group'}
@@ -916,8 +914,8 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
   private handleContextMenu(e: any) {
     e.preventDefault();
     e.stopPropagation();
-    const { isRss, multiSelectMode, isKickedFromGroup } = this.props;
-    const enableContextMenu = !isRss && !multiSelectMode && !isKickedFromGroup;
+    const { multiSelectMode, isKickedFromGroup } = this.props;
+    const enableContextMenu = !multiSelectMode && !isKickedFromGroup;
 
     if (enableContextMenu) {
       // Don't forget to pass the id and the event and voila!

diff --git a/ts/components/conversation/MessageBody.tsx b/ts/components/conversation/MessageBody.tsx
@@ -10,7 +10,6 @@ import { LocalizerType, RenderTextCallbackType } from '../../types/Util';
 
 interface Props {
   text: string;
-  isRss?: boolean;
   bodyPending?: boolean;
   /** If set, all emoji will be the same size. Otherwise, just one emoji will be large. */
   disableJumbomoji?: boolean;
@@ -106,7 +105,6 @@ export class MessageBody extends React.Component<Props> {
       bodyPending,
       disableJumbomoji,
       disableLinks,
-      isRss,
       i18n,
       isGroup,
       convoId,
@@ -141,7 +139,6 @@ export class MessageBody extends React.Component<Props> {
     const bodyContents = this.addDownloading(
       <Linkify
         text={textWithPending}
-        isRss={isRss}
         renderNonLink={({ key, text: nonLinkText }) => {
           return renderEmoji({
             i18n,
@@ -159,7 +156,6 @@ export class MessageBody extends React.Component<Props> {
     return this.addDownloading(
       <Linkify
         text={textWithPending}
-        isRss={isRss}
         renderNonLink={({ key, text: nonLinkText }) => {
           return renderEmoji({
             i18n,

diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
@@ -424,7 +424,6 @@ export class SessionConversation extends React.Component<Props, State> {
       isGroup: !conversation.isPrivate(),
       isPrivate: conversation.isPrivate(),
       isPublic: conversation.isPublic(),
-      isRss: conversation.isRss(),
       isAdmin: conversation.isAdmin(ourPrimary),
       members,
       subscriberCount: conversation.get('subscriberCount'),
@@ -483,9 +482,7 @@ export class SessionConversation extends React.Component<Props, State> {
       },
 
       onAvatarClick: (pubkey: any) => {
-        if (!conversation.isRss()) {
-          this.toggleRightPanel();
-        }
+        this.toggleRightPanel();
       },
     };
 
@@ -548,7 +545,6 @@ export class SessionConversation extends React.Component<Props, State> {
       isGroup: !conversation.isPrivate(),
       isPublic: conversation.isPublic(),
       isAdmin,
-      isRss: conversation.isRss(),
       isBlocked: conversation.isBlocked(),
 
       timerOptions: window.Whisper.ExpirationTimerOptions.map((item: any) => ({