From fd18345c5ab11fe3b9dda08a945336760c06d11d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 Jan 2021 16:10:09 +1100 Subject: [PATCH] remove handling of rss related things completely --- js/background.js | 3 +- js/models/conversations.d.ts | 1 - js/models/conversations.js | 31 ++-------- js/models/messages.d.ts | 1 - js/models/messages.js | 1 - js/views/conversation_view.js | 10 ---- js/views/user_details_dialog_view.js | 3 - ts/components/ConversationListItem.tsx | 10 +--- ts/components/UserDetailsDialog.tsx | 17 +++--- .../conversation/ConversationHeader.tsx | 6 +- ts/components/conversation/Linkify.tsx | 10 +--- ts/components/conversation/Message.tsx | 6 +- ts/components/conversation/MessageBody.tsx | 4 -- .../conversation/SessionConversation.tsx | 6 +- .../session/menu/ConversationHeaderMenu.tsx | 7 +-- .../menu/ConversationListItemContextMenu.tsx | 8 +-- ts/components/session/menu/Menu.tsx | 56 +++++-------------- ts/receiver/dataMessage.ts | 7 --- .../conversations/ConversationController.ts | 2 +- ts/session/utils/SyncMessage.ts | 4 +- ts/state/ducks/conversations.ts | 2 - ts/state/selectors/conversations.ts | 1 - .../integration/stubs/stub_app_dot_net_api.ts | 15 ----- 23 files changed, 39 insertions(+), 172 deletions(-) diff --git a/js/background.js b/js/background.js index 742fbea72..33e061fcb 100644 --- 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 index 8b163b5ad..0cddae624 100644 --- 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 index 1530f190e..946e46f0b 100644 --- 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 index d7ae962ae..2a5ef4a98 100644 --- 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 index 11c96a9ae..f3ad2fa42 100644 --- 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 index 7cd2cf7ca..fc73cabed 100644 --- 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 index 77fae59fe..2bbda3c61 100644 --- 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/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index 90f75835c..dc4ae897f 100644 --- 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 { 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 index 34442cecd..b71637f3f 100644 --- 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 { } public render() { - const { i18n, isRss } = this.props; + const { i18n } = this.props; return ( {
- {!isRss && ( - - )} +
); diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 3c172f8d2..b94b00315 100644 --- 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 { profileName, isGroup, isPublic, - isRss, members, subscriberCount, isMe, @@ -138,7 +136,7 @@ class ConversationHeaderInner extends React.Component { } const memberCount: number = (() => { - if (!isGroup || isRss) { + if (!isGroup) { return 0; } @@ -262,7 +260,7 @@ class ConversationHeaderInner extends React.Component { {!isKickedFromGroup && this.renderExpirationLength()} - {!this.props.isRss && !selectionMode && this.renderAvatar()} + {!selectionMode && this.renderAvatar()} diff --git a/ts/components/conversation/Linkify.tsx b/ts/components/conversation/Linkify.tsx index 558bad7ff..df2824f5f 100644 --- 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 . */ renderNonLink?: RenderTextCallbackType; } @@ -24,17 +23,10 @@ export class Linkify extends React.Component { }; public render() { - const { text, renderNonLink, isRss } = this.props; + const { text, renderNonLink } = this.props; const results: Array = []; let count = 1; - if (isRss && text.indexOf('); - // 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 index 1a530dd57..e816bc1c2 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -553,7 +553,6 @@ class MessageInner extends React.PureComponent { bodyPending, direction, status, - isRss, conversationType, convoId, multiSelectMode, @@ -581,7 +580,6 @@ class MessageInner extends React.PureComponent { > { 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 index 403fdd6e3..b10cf6a80 100644 --- 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 { bodyPending, disableJumbomoji, disableLinks, - isRss, i18n, isGroup, convoId, @@ -141,7 +139,6 @@ export class MessageBody extends React.Component { const bodyContents = this.addDownloading( { return renderEmoji({ i18n, @@ -159,7 +156,6 @@ export class MessageBody extends React.Component { return this.addDownloading( { return renderEmoji({ i18n, diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index d99075f56..4a5f3fac5 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -424,7 +424,6 @@ export class SessionConversation extends React.Component { 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 { }, onAvatarClick: (pubkey: any) => { - if (!conversation.isRss()) { - this.toggleRightPanel(); - } + this.toggleRightPanel(); }, }; @@ -548,7 +545,6 @@ export class SessionConversation extends React.Component { isGroup: !conversation.isPrivate(), isPublic: conversation.isPublic(), isAdmin, - isRss: conversation.isRss(), isBlocked: conversation.isBlocked(), timerOptions: window.Whisper.ExpirationTimerOptions.map((item: any) => ({ diff --git a/ts/components/session/menu/ConversationHeaderMenu.tsx b/ts/components/session/menu/ConversationHeaderMenu.tsx index 86da7513e..e8d7f50c3 100644 --- a/ts/components/session/menu/ConversationHeaderMenu.tsx +++ b/ts/components/session/menu/ConversationHeaderMenu.tsx @@ -18,7 +18,6 @@ export type PropsConversationHeaderMenu = { triggerId: string; isMe: boolean; isPublic?: boolean; - isRss?: boolean; isClosable?: boolean; isKickedFromGroup?: boolean; left?: boolean; @@ -47,7 +46,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { isMe, isClosable, isPublic, - isRss, isGroup, isKickedFromGroup, isAdmin, @@ -73,7 +71,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { {getDisappearingMenuItem( isPublic, - isRss, isKickedFromGroup, left, isBlocked, @@ -90,7 +87,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { window.i18n )} - {getCopyMenuItem(isPublic, isRss, isGroup, onCopyPublicKey, window.i18n)} + {getCopyMenuItem(isPublic, isGroup, onCopyPublicKey, window.i18n)} {getDeleteMessagesMenuItem(isPublic, onDeleteMessages, window.i18n)} {getAddModeratorsMenuItem( isAdmin, @@ -116,7 +113,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { left, isGroup, isPublic, - isRss, onLeaveGroup, window.i18n )} @@ -132,7 +128,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { isClosable, isGroup, isPublic, - isRss, onDeleteContact, window.i18n )} diff --git a/ts/components/session/menu/ConversationListItemContextMenu.tsx b/ts/components/session/menu/ConversationListItemContextMenu.tsx index a8e414758..4ab2a75f8 100644 --- a/ts/components/session/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/session/menu/ConversationListItemContextMenu.tsx @@ -16,7 +16,6 @@ export type PropsContextConversationItem = { type: 'group' | 'direct'; isMe: boolean; isPublic?: boolean; - isRss?: boolean; isClosable?: boolean; isBlocked?: boolean; hasNickname?: boolean; @@ -41,7 +40,6 @@ export const ConversationListItemContextMenu = ( isBlocked, isMe, isClosable, - isRss, isPublic, hasNickname, type, @@ -67,14 +65,13 @@ export const ConversationListItemContextMenu = ( onUnblockContact, window.i18n )} - {/* {!isPublic && !isRss && !isMe ? ( + {/* {!isPublic && !isMe ? ( {i18n('changeNickname')} ) : null} */} {getClearNicknameMenuItem( isPublic, - isRss, isMe, hasNickname, onClearNickname, @@ -82,7 +79,6 @@ export const ConversationListItemContextMenu = ( )} {getCopyMenuItem( isPublic, - isRss, type === 'group', onCopyPublicKey, window.i18n @@ -99,7 +95,6 @@ export const ConversationListItemContextMenu = ( isClosable, type === 'group', isPublic, - isRss, onDeleteContact, window.i18n )} @@ -108,7 +103,6 @@ export const ConversationListItemContextMenu = ( left, type === 'group', isPublic, - isRss, onLeaveGroup, window.i18n )} diff --git a/ts/components/session/menu/Menu.tsx b/ts/components/session/menu/Menu.tsx index cb0fa0530..a46bb6b26 100644 --- a/ts/components/session/menu/Menu.tsx +++ b/ts/components/session/menu/Menu.tsx @@ -5,20 +5,15 @@ import { Item, Submenu } from 'react-contexify'; function showTimerOptions( isPublic: boolean, - isRss: boolean, isKickedFromGroup: boolean, left: boolean, isBlocked: boolean ): boolean { - return !isPublic && !isRss && !left && !isKickedFromGroup && !isBlocked; + return !isPublic && !left && !isKickedFromGroup && !isBlocked; } -function showMemberMenu( - isPublic: boolean, - isRss: boolean, - isGroup: boolean -): boolean { - return !isPublic && !isRss && isGroup; +function showMemberMenu(isPublic: boolean, isGroup: boolean): boolean { + return !isPublic && isGroup; } function showBlock(isMe: boolean, isPrivate: boolean): boolean { @@ -27,33 +22,27 @@ function showBlock(isMe: boolean, isPrivate: boolean): boolean { function showClearNickname( isPublic: boolean, - isRss: boolean, isMe: boolean, hasNickname: boolean ): boolean { - return !isPublic && !isRss && !isMe && hasNickname; + return !isPublic && !isMe && hasNickname; } function showDeleteMessages(isPublic: boolean): boolean { return !isPublic; } -function showCopyId( - isPublic: boolean, - isRss: boolean, - isGroup: boolean -): boolean { - return !isGroup && !isRss; +function showCopyId(isPublic: boolean, isGroup: boolean): boolean { + return !isGroup; } function showDeleteContact( isMe: boolean, isClosable: boolean, isGroup: boolean, - isPublic: boolean, - isRss: boolean + isPublic: boolean ): boolean { - return !isMe && isClosable && !!(!isGroup || isPublic || isRss); + return !isMe && isClosable && !!(!isGroup || isPublic); } function showAddModerators( @@ -82,10 +71,9 @@ function showLeaveGroup( isKickedFromGroup: boolean, left: boolean, isGroup: boolean, - isPublic: boolean, - isRss: boolean + isPublic: boolean ): boolean { - return !isKickedFromGroup && !left && isGroup && !isPublic && !isRss; + return !isKickedFromGroup && !left && isGroup && !isPublic; } function showInviteContact(isGroup: boolean, isPublic: boolean): boolean { @@ -111,7 +99,6 @@ export function getDeleteContactMenuItem( isClosable: boolean | undefined, isGroup: boolean | undefined, isPublic: boolean | undefined, - isRss: boolean | undefined, action: any, i18n: LocalizerType ): JSX.Element | null { @@ -120,8 +107,7 @@ export function getDeleteContactMenuItem( Boolean(isMe), Boolean(isClosable), Boolean(isGroup), - Boolean(isPublic), - Boolean(isRss) + Boolean(isPublic) ) ) { if (isPublic) { @@ -137,7 +123,6 @@ export function getLeaveGroupMenuItem( left: boolean | undefined, isGroup: boolean | undefined, isPublic: boolean | undefined, - isRss: boolean | undefined, action: any, i18n: LocalizerType ): JSX.Element | null { @@ -146,8 +131,7 @@ export function getLeaveGroupMenuItem( Boolean(isKickedFromGroup), Boolean(left), Boolean(isGroup), - Boolean(isPublic), - Boolean(isRss) + Boolean(isPublic) ) ) { return {i18n('leaveGroup')}; @@ -200,12 +184,11 @@ export function getAddModeratorsMenuItem( export function getCopyMenuItem( isPublic: boolean | undefined, - isRss: boolean | undefined, isGroup: boolean | undefined, action: any, i18n: LocalizerType ): JSX.Element | null { - if (showCopyId(Boolean(isPublic), Boolean(isRss), Boolean(isGroup))) { + if (showCopyId(Boolean(isPublic), Boolean(isGroup))) { const copyIdLabel = i18n('copySessionID'); return {copyIdLabel}; } @@ -214,7 +197,6 @@ export function getCopyMenuItem( export function getDisappearingMenuItem( isPublic: boolean | undefined, - isRss: boolean | undefined, isKickedFromGroup: boolean | undefined, left: boolean | undefined, isBlocked: boolean | undefined, @@ -225,7 +207,6 @@ export function getDisappearingMenuItem( if ( showTimerOptions( Boolean(isPublic), - Boolean(isRss), Boolean(isKickedFromGroup), Boolean(left), Boolean(isBlocked) @@ -260,12 +241,11 @@ export function isRtlBody(): boolean { export function getShowMemberMenuItem( isPublic: boolean | undefined, - isRss: boolean | undefined, isGroup: boolean | undefined, action: any, i18n: LocalizerType ): JSX.Element | null { - if (showMemberMenu(Boolean(isPublic), Boolean(isRss), Boolean(isGroup))) { + if (showMemberMenu(Boolean(isPublic), Boolean(isGroup))) { return {i18n('groupMembers')}; } return null; @@ -289,19 +269,13 @@ export function getBlockMenuItem( export function getClearNicknameMenuItem( isPublic: boolean | undefined, - isRss: boolean | undefined, isMe: boolean | undefined, hasNickname: boolean | undefined, action: any, i18n: LocalizerType ): JSX.Element | null { if ( - showClearNickname( - Boolean(isPublic), - Boolean(isRss), - Boolean(isMe), - Boolean(hasNickname) - ) + showClearNickname(Boolean(isPublic), Boolean(isMe), Boolean(hasNickname)) ) { return {i18n('clearNickname')}; } diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 31a1635e7..a42afcdcf 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -450,7 +450,6 @@ interface MessageCreationData { receivedAt: number; sourceDevice: number; // always 1 isn't it? unidentifiedDeliveryReceived: any; // ??? - isRss: boolean; source: boolean; serverId: string; message: any; @@ -469,7 +468,6 @@ export function initIncomingMessage(data: MessageCreationData): MessageModel { receivedAt, sourceDevice, unidentifiedDeliveryReceived, - isRss, source, serverId, message, @@ -498,7 +496,6 @@ export function initIncomingMessage(data: MessageCreationData): MessageModel { direction: 'incoming', // + unread: 1, // + isPublic, // + - isRss, // + }; return new window.Whisper.Message(messageData); @@ -624,10 +621,6 @@ export async function handleMessageEvent(event: MessageEvent): Promise { source = source || msg.get('source'); if (await isMessageDuplicate(data)) { - // RSS expects duplicates, so squelch log - if (!source.match(/^rss:/)) { - window.log.warn('Received duplicate message', msg.idForLogging()); - } confirm(); return; } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 6299963a5..ff5683db1 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -127,7 +127,7 @@ export class ConversationController { ) ); } - if (!conversation.isPublic() && !conversation.isRss()) { + if (!conversation.isPublic()) { await Promise.all([ conversation.updateProfileAvatar(), // NOTE: we request snodes updating the cache, but ignore the result diff --git a/ts/session/utils/SyncMessage.ts b/ts/session/utils/SyncMessage.ts index 5f624749c..2af7eb838 100644 --- a/ts/session/utils/SyncMessage.ts +++ b/ts/session/utils/SyncMessage.ts @@ -77,9 +77,7 @@ export async function filterOpenGroupsConvos( } // We only want to sync across open groups that we haven't left - return conversations.filter( - c => c.isPublic() && !c.isRss() && !c.get('left') - ); + return conversations.filter(c => c.isPublic() && !c.get('left')); } // Serialise as ... diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 191753cd6..fa0cad834 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -57,13 +57,11 @@ export type ConversationType = { lastMessage?: { status: 'error' | 'sending' | 'sent' | 'delivered' | 'read'; text: string; - isRss: boolean; }; phoneNumber: string; type: 'direct' | 'group'; isMe: boolean; isPublic?: boolean; - isRss?: boolean; isClosable?: boolean; lastUpdated: number; unreadCount: number; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index bd9e3f63b..e4723bd05 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -151,7 +151,6 @@ export const _getLeftPaneLists = ( conversation.lastMessage = { status: 'sending', text: '', - isRss: false, }; } diff --git a/ts/test/session/integration/stubs/stub_app_dot_net_api.ts b/ts/test/session/integration/stubs/stub_app_dot_net_api.ts index 985843e6d..73a280554 100644 --- a/ts/test/session/integration/stubs/stub_app_dot_net_api.ts +++ b/ts/test/session/integration/stubs/stub_app_dot_net_api.ts @@ -2,9 +2,6 @@ import LokiAppDotNetServerAPI from '../../../../../js/modules/loki_app_dot_net_api'; -const sampleFeed = - ' FeedForAll Sample Feed'; - const samplesGetMessages = { meta: { code: 200 }, data: [ @@ -77,18 +74,6 @@ class StubAppDotNetAPI extends LokiAppDotNetServerAPI { ) { const { method } = options; - if ( - endpoint === 'loki/v1/rss/messenger' || - endpoint === 'loki/v1/rss/loki' - ) { - return { - statusCode: 200, - response: { - data: sampleFeed, - }, - }; - } - if (endpoint === 'channels/1/messages') { if (!method) { return {