From 936f9a3efcc45ddc4af12aa5ce09ff33cc545459 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 8 Jul 2021 15:03:27 +1000 Subject: [PATCH 01/23] don't mark message as read if app isn't focused --- js/focus_listener.js | 3 +++ js/read_syncs.js | 2 +- ts/components/conversation/Message.tsx | 2 +- ts/components/session/conversation/SessionMessagesList.tsx | 3 ++- ts/window.d.ts | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/js/focus_listener.js b/js/focus_listener.js index c9a728233..29b027598 100644 --- a/js/focus_listener.js +++ b/js/focus_listener.js @@ -3,12 +3,15 @@ 'use strict'; let windowFocused = false; + let windowFocusedListener = function() {} window.addEventListener('blur', () => { windowFocused = false; }); window.addEventListener('focus', () => { windowFocused = true; + windowFocusedListener(); }); window.isFocused = () => windowFocused; + window.setFocusListener = (listener) => windowFocusedListener = listener; })(); diff --git a/js/read_syncs.js b/js/read_syncs.js index 70aebf1c4..c7337ec07 100644 --- a/js/read_syncs.js +++ b/js/read_syncs.js @@ -59,7 +59,7 @@ // If message is unread, we mark it read. Otherwise, we update the expiration // timer to the time specified by the read sync if it's earlier than // the previous read time. - if (message.isUnread()) { + if (message.isUnread() && window.isFocused()) { await message.markRead(readAt); // onReadMessage may result in messages older than this one being diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 2fd928ccf..6a4ba4c98 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -713,7 +713,7 @@ class MessageInner extends React.PureComponent { const isShowingImage = this.isShowingImage(); const isIncoming = direction === 'incoming'; - const shouldMarkReadWhenVisible = isIncoming && isUnread; + const shouldMarkReadWhenVisible = isIncoming && isUnread && window.isFocused(); const divClasses = ['session-message-wrapper']; if (selected) { diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx index e3af18792..20c7dc350 100644 --- a/ts/components/session/conversation/SessionMessagesList.tsx +++ b/ts/components/session/conversation/SessionMessagesList.tsx @@ -75,6 +75,7 @@ export class SessionMessagesList extends React.Component { this.messageContainerRef = this.props.messageContainerRef; this.ignoreScrollEvents = true; + window.setFocusListener(() => this.updateReadMessages()); } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -378,7 +379,7 @@ export class SessionMessagesList extends React.Component { return; } - if (this.getScrollOffsetBottomPx() === 0) { + if (this.getScrollOffsetBottomPx() === 0 && window.isFocused()) { void conversation.markRead(messages[0].attributes.received_at); } } diff --git a/ts/window.d.ts b/ts/window.d.ts index 5f43a4e83..70c74c782 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -40,6 +40,8 @@ declare global { getFriendsFromContacts: any; getSettingValue: any; i18n: LocalizerType; + isFocused: any; + setFocusListener: (listener: any) => any; libloki: Libloki; libsignal: LibsignalProtocol; log: any; From 2af9d9e15d1538fd87db970f4152747024e4bc52 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 12 Jul 2021 14:35:43 +1000 Subject: [PATCH 02/23] use of a custom hook to detect focus --- js/focus_listener.js | 3 --- ts/components/conversation/Message.tsx | 21 ++++++++----------- .../conversation/SessionMessagesList.tsx | 1 - ts/window.d.ts | 3 +-- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/js/focus_listener.js b/js/focus_listener.js index 29b027598..c9a728233 100644 --- a/js/focus_listener.js +++ b/js/focus_listener.js @@ -3,15 +3,12 @@ 'use strict'; let windowFocused = false; - let windowFocusedListener = function() {} window.addEventListener('blur', () => { windowFocused = false; }); window.addEventListener('focus', () => { windowFocused = true; - windowFocusedListener(); }); window.isFocused = () => windowFocused; - window.setFocusListener = (listener) => windowFocusedListener = listener; })(); diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 6a4ba4c98..c3010a3d9 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -42,6 +42,7 @@ import { MessageInteraction } from '../../interactions'; import autoBind from 'auto-bind'; import { AudioPlayerWithEncryptedFile } from './H5AudioPlayer'; import { ClickToTrustSender } from './message/ClickToTrustSender'; +import { ReadableMessage } from './ReadableMessage'; // Same as MIN_WIDTH in ImageGrid.tsx const MINIMUM_LINK_PREVIEW_IMAGE_WIDTH = 200; @@ -713,7 +714,7 @@ class MessageInner extends React.PureComponent { const isShowingImage = this.isShowingImage(); const isIncoming = direction === 'incoming'; - const shouldMarkReadWhenVisible = isIncoming && isUnread && window.isFocused(); + const shouldMarkReadWhenVisible = isIncoming && isUnread; const divClasses = ['session-message-wrapper']; if (selected) { @@ -729,7 +730,7 @@ class MessageInner extends React.PureComponent { } const onVisible = (inView: boolean) => { - if (inView && shouldMarkReadWhenVisible) { + if (inView && shouldMarkReadWhenVisible && window.isFocused()) { // mark the message as read. // this will trigger the expire timer. void markRead(Date.now()); @@ -737,15 +738,11 @@ class MessageInner extends React.PureComponent { }; return ( - {this.renderAvatar()}
{ {this.renderError(!isIncoming)} {this.renderContextMenu()}
- + ); } diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx index 20c7dc350..922a40d31 100644 --- a/ts/components/session/conversation/SessionMessagesList.tsx +++ b/ts/components/session/conversation/SessionMessagesList.tsx @@ -75,7 +75,6 @@ export class SessionMessagesList extends React.Component { this.messageContainerRef = this.props.messageContainerRef; this.ignoreScrollEvents = true; - window.setFocusListener(() => this.updateReadMessages()); } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/ts/window.d.ts b/ts/window.d.ts index 70c74c782..5a7b1e7d5 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -40,8 +40,7 @@ declare global { getFriendsFromContacts: any; getSettingValue: any; i18n: LocalizerType; - isFocused: any; - setFocusListener: (listener: any) => any; + isFocused: () => boolean; libloki: Libloki; libsignal: LibsignalProtocol; log: any; From c98fdec10eda3a31525effde41705d7816a01403 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 12 Jul 2021 15:03:30 +1000 Subject: [PATCH 03/23] adding new files --- .../conversation/ReadableMessage.tsx | 28 +++++++++++++++++++ ts/hooks/useFocus.ts | 11 ++++++++ 2 files changed, 39 insertions(+) create mode 100644 ts/components/conversation/ReadableMessage.tsx create mode 100644 ts/hooks/useFocus.ts diff --git a/ts/components/conversation/ReadableMessage.tsx b/ts/components/conversation/ReadableMessage.tsx new file mode 100644 index 000000000..d5288e221 --- /dev/null +++ b/ts/components/conversation/ReadableMessage.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { useFocus } from "../../hooks/useFocus" +import { InView } from 'react-intersection-observer'; + +type ReadableMessageProps = { + children: React.ReactNode; + id: string; + className: string; + onChange: (inView: boolean) => void; + onContextMenu: (e: any) => void +} + +export const ReadableMessage = (props: ReadableMessageProps) => { + + const { onChange } = props; + useFocus(onChange); + + return ( + + {props.children} + ); +} diff --git a/ts/hooks/useFocus.ts b/ts/hooks/useFocus.ts new file mode 100644 index 000000000..e3d3d510c --- /dev/null +++ b/ts/hooks/useFocus.ts @@ -0,0 +1,11 @@ +import { useEffect } from "react"; + +export const useFocus = (action: (param: any) => void) => { + + useEffect(() => { + window.addEventListener("focus", action); + return () => { + window.removeEventListener("focus", action); + }; + }); +} \ No newline at end of file From 151fc758c05d69fef7eb70d7fb1641536f434632 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 12 Jul 2021 16:44:31 +1000 Subject: [PATCH 04/23] format --- ts/components/conversation/Message.tsx | 8 ++--- .../conversation/ReadableMessage.tsx | 36 ++++++++----------- ts/hooks/useFocus.ts | 9 +++-- ts/models/message.ts | 2 ++ 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index c3010a3d9..c33845f76 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -739,10 +739,10 @@ class MessageInner extends React.PureComponent { return ( {this.renderAvatar()}
void; - onContextMenu: (e: any) => void -} + children: React.ReactNode; + id: string; + className: string; + onChange: (inView: boolean) => void; + onContextMenu: (e: any) => void; +}; export const ReadableMessage = (props: ReadableMessageProps) => { + const { onChange } = props; + useFocus(onChange); - const { onChange } = props; - useFocus(onChange); - - return ( - - {props.children} - ); -} + return ( + + {props.children} + + ); +}; diff --git a/ts/hooks/useFocus.ts b/ts/hooks/useFocus.ts index e3d3d510c..8f62de92e 100644 --- a/ts/hooks/useFocus.ts +++ b/ts/hooks/useFocus.ts @@ -1,11 +1,10 @@ -import { useEffect } from "react"; +import { useEffect } from 'react'; export const useFocus = (action: (param: any) => void) => { - useEffect(() => { - window.addEventListener("focus", action); + window.addEventListener('focus', action); return () => { - window.removeEventListener("focus", action); + window.removeEventListener('focus', action); }; }); -} \ No newline at end of file +}; diff --git a/ts/models/message.ts b/ts/models/message.ts index 339058372..380c2ec50 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -1047,6 +1047,8 @@ export class MessageModel extends Backbone.Model { public async markRead(readAt: number) { this.markReadNoCommit(readAt); + this.getConversation()?.markRead(readAt); + await this.commit(); } From 14ef4cd39a0b356b767d998ff06eb8ccd64bee02 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 13 Jul 2021 13:08:46 +1000 Subject: [PATCH 05/23] adding lastReadTimestamp property --- ts/models/conversation.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 5dae6d3c5..c17c94566 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -92,6 +92,7 @@ export interface ConversationAttributes { triggerNotificationsFor: ConversationNotificationSettingType; isTrustedForAttachmentDownload: boolean; isPinned: boolean; + lastReadTimestamp: number; } export interface ConversationAttributesOptionals { @@ -160,6 +161,7 @@ export const fillConvoAttributesWithDefaults = ( triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default isTrustedForAttachmentDownload: false, // we don't trust a contact until we say so isPinned: false, + lastReadTimestamp: 0, }); }; @@ -188,7 +190,13 @@ export class ConversationModel extends Backbone.Model { this.updateLastMessage = _.throttle(this.bouncyUpdateLastMessage.bind(this), 1000); this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); //start right away the function is called, and wait 1sec before calling it again - this.markRead = _.debounce(this.markReadBouncy, 1000, { leading: true }); + this.markRead = (readAt: number) => { + const lastReadTimestamp = this.get('lastReadTimestamp'); + if (readAt > lastReadTimestamp) { + this.set('lastReadTimestamp', readAt); + } + _.debounce(this.markReadBouncy, 1000, { leading: true }); + } // Listening for out-of-band data updates this.typingRefreshTimer = null; @@ -902,6 +910,10 @@ export class ConversationModel extends Backbone.Model { } public async markReadBouncy(newestUnreadDate: number, providedOptions: any = {}) { + if (this.get('lastReadTimestamp') >= 0) { + return; + } + const options = providedOptions || {}; _.defaults(options, { sendReadReceipts: true }); From adab2b4506c713df3ed53668532d92af9d4ced76 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 13 Jul 2021 15:14:43 +1000 Subject: [PATCH 06/23] add Notifications in conversations context menu --- ts/components/ConversationListItem.tsx | 11 +++++++- .../menu/ConversationListItemContextMenu.tsx | 19 +++++++++++++- ts/models/conversation.ts | 7 +++++ ts/state/ducks/conversations.ts | 8 +++++- .../unit/selectors/conversations_test.ts | 26 +++++++++++++++++-- 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index ebdd01aee..b17f00bbd 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -66,6 +66,8 @@ const ConversationListItem = (props: Props) => { type, lastMessage, memberAvatars, + notificationForConvo, + currentNotificationSetting, } = props; const triggerId: string = `conversation-item-${phoneNumber}-ctxmenu`; const key: string = `conversation-item-${phoneNumber}`; @@ -119,7 +121,14 @@ const ConversationListItem = (props: Props) => {
- + ); diff --git a/ts/components/session/menu/ConversationListItemContextMenu.tsx b/ts/components/session/menu/ConversationListItemContextMenu.tsx index 740eacfa1..61d39a371 100644 --- a/ts/components/session/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/session/menu/ConversationListItemContextMenu.tsx @@ -1,6 +1,9 @@ import React from 'react'; import { animation, Menu } from 'react-contexify'; -import { ConversationTypeEnum } from '../../../models/conversation'; +import { + ConversationNotificationSettingType, + ConversationTypeEnum, +} from '../../../models/conversation'; import { getBlockMenuItem, @@ -12,8 +15,10 @@ import { getInviteContactMenuItem, getLeaveGroupMenuItem, getMarkAllReadMenuItem, + getNotificationForConvoMenuItem, getPinConversationMenuItem, } from './Menu'; +import { NotificationForConvoOption } from '../../conversation/ConversationHeader'; export type PropsContextConversationItem = { id: string; @@ -26,6 +31,8 @@ export type PropsContextConversationItem = { isKickedFromGroup?: boolean; left?: boolean; theme?: any; + notificationForConvo: Array; + currentNotificationSetting: ConversationNotificationSettingType; }; export const ConversationListItemContextMenu = (props: PropsContextConversationItem) => { @@ -39,6 +46,8 @@ export const ConversationListItemContextMenu = (props: PropsContextConversationI type, left, isKickedFromGroup, + notificationForConvo, + currentNotificationSetting, } = props; const isGroup = type === 'group'; @@ -46,6 +55,14 @@ export const ConversationListItemContextMenu = (props: PropsContextConversationI return ( <> + {getNotificationForConvoMenuItem( + isKickedFromGroup, + left, + isBlocked, + notificationForConvo, + currentNotificationSetting, + conversationId + )} {getPinConversationMenuItem(conversationId)} {getBlockMenuItem(isMe, type === ConversationTypeEnum.PRIVATE, isBlocked, conversationId)} {getCopyMenuItem(isPublic, isGroup, conversationId)} diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 5dae6d3c5..79caa9440 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -408,6 +408,13 @@ export class ConversationModel extends Backbone.Model { groupAdmins, members, isPinned: this.isPinned(), + notificationForConvo: ConversationNotificationSetting.filter(n => + this.isPrivate() ? n !== 'mentions_only' : true + ).map((n: ConversationNotificationSettingType) => { + // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ... + return { value: n, name: window.i18n(`notificationForConvo_${n}`) }; + }), + currentNotificationSetting: this.get('triggerNotificationsFor'), }; } diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index eb20669f9..2fea3d79f 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -5,8 +5,12 @@ import { createAsyncThunk } from '@reduxjs/toolkit'; import { getConversationController } from '../../session/conversations'; import { MessageModel } from '../../models/message'; import { getMessagesByConversation } from '../../data/data'; -import { ConversationTypeEnum } from '../../models/conversation'; +import { + ConversationNotificationSettingType, + ConversationTypeEnum, +} from '../../models/conversation'; import { MessageDeliveryStatus } from '../../models/messageType'; +import { NotificationForConvoOption } from '../../components/conversation/ConversationHeader'; // State @@ -83,6 +87,8 @@ export interface ConversationType { groupAdmins?: Array; // admins for closed groups and moderators for open groups members?: Array; // members for closed groups only isPinned: boolean; + notificationForConvo: Array; + currentNotificationSetting: ConversationNotificationSettingType; } export type ConversationLookupType = { diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts index 06b494aa5..ea673cdf3 100644 --- a/ts/test/session/unit/selectors/conversations_test.ts +++ b/ts/test/session/unit/selectors/conversations_test.ts @@ -1,5 +1,8 @@ import { assert } from 'chai'; -import { ConversationTypeEnum } from '../../../../models/conversation'; +import { + ConversationNotificationSetting, + ConversationTypeEnum, +} from '../../../../models/conversation'; import { ConversationLookupType } from '../../../../state/ducks/conversations'; import { @@ -28,6 +31,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id2: { id: 'id2', @@ -45,13 +50,14 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id3: { id: 'id3', activeAt: 20, name: 'C', phoneNumber: 'notused', - type: ConversationTypeEnum.PRIVATE, isMe: false, unreadCount: 1, @@ -62,6 +68,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id4: { id: 'id4', @@ -78,6 +86,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id5: { id: 'id5', @@ -94,6 +104,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, }; const comparator = _getConversationComparator(i18n); @@ -126,6 +138,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id2: { id: 'id2', @@ -143,6 +157,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id3: { id: 'id3', @@ -160,6 +176,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: true, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id4: { id: 'id4', @@ -176,6 +194,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: true, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, id5: { id: 'id5', @@ -192,6 +212,8 @@ describe('state/selectors/conversations', () => { isKickedFromGroup: false, left: false, isPinned: false, + notificationForConvo: [], + currentNotificationSetting: ConversationNotificationSetting[0], }, }; const comparator = _getConversationComparator(i18n); From 5d7d58fe05b59d1c564fbc284f73d8544b620c9f Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 13 Jul 2021 15:34:56 +1000 Subject: [PATCH 07/23] move NotificationForConvoOption declaration + getConversationNotificationSettingType created as used twice --- .../conversation/ConversationHeader.tsx | 6 +----- .../conversation/SessionConversation.tsx | 8 +------- .../session/menu/ConversationHeaderMenu.tsx | 4 +++- .../menu/ConversationListItemContextMenu.tsx | 2 +- ts/components/session/menu/Menu.tsx | 3 ++- ts/models/conversation.ts | 19 ++++++++++++------- ts/state/ducks/conversations.ts | 6 +++++- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index f18548455..45af09034 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -16,17 +16,13 @@ import { import { contextMenu } from 'react-contexify'; import { DefaultTheme, withTheme } from 'styled-components'; import { ConversationNotificationSettingType } from '../../models/conversation'; +import { NotificationForConvoOption } from '../../state/ducks/conversations'; export interface TimerOption { name: string; value: number; } -export interface NotificationForConvoOption { - name: string; - value: ConversationNotificationSettingType; -} - interface Props { id: string; name?: string; diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index dddb87f62..82bdb317e 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -352,13 +352,7 @@ export class SessionConversation extends React.Component { const members = conversation.get('members') || []; - // exclude mentions_only settings for private chats as this does not make much sense - const notificationForConvo = ConversationNotificationSetting.filter(n => - conversation.isPrivate() ? n !== 'mentions_only' : true - ).map((n: ConversationNotificationSettingType) => { - // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ... - return { value: n, name: window.i18n(`notificationForConvo_${n}`) }; - }); + const notificationForConvo = conversation.getConversationNotificationSettingType(); const headerProps = { id: conversation.id, diff --git a/ts/components/session/menu/ConversationHeaderMenu.tsx b/ts/components/session/menu/ConversationHeaderMenu.tsx index 40b9f97c8..c6cb377bf 100644 --- a/ts/components/session/menu/ConversationHeaderMenu.tsx +++ b/ts/components/session/menu/ConversationHeaderMenu.tsx @@ -13,11 +13,13 @@ import { getLeaveGroupMenuItem, getMarkAllReadMenuItem, getNotificationForConvoMenuItem, + getPinConversationMenuItem, getRemoveModeratorsMenuItem, getUpdateGroupNameMenuItem, } from './Menu'; -import { NotificationForConvoOption, TimerOption } from '../../conversation/ConversationHeader'; +import { TimerOption } from '../../conversation/ConversationHeader'; import { ConversationNotificationSettingType } from '../../../models/conversation'; +import { NotificationForConvoOption } from '../../../state/ducks/conversations'; export type PropsConversationHeaderMenu = { conversationId: string; diff --git a/ts/components/session/menu/ConversationListItemContextMenu.tsx b/ts/components/session/menu/ConversationListItemContextMenu.tsx index 61d39a371..17f5821cb 100644 --- a/ts/components/session/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/session/menu/ConversationListItemContextMenu.tsx @@ -4,6 +4,7 @@ import { ConversationNotificationSettingType, ConversationTypeEnum, } from '../../../models/conversation'; +import { NotificationForConvoOption } from '../../../state/ducks/conversations'; import { getBlockMenuItem, @@ -18,7 +19,6 @@ import { getNotificationForConvoMenuItem, getPinConversationMenuItem, } from './Menu'; -import { NotificationForConvoOption } from '../../conversation/ConversationHeader'; export type PropsContextConversationItem = { id: string; diff --git a/ts/components/session/menu/Menu.tsx b/ts/components/session/menu/Menu.tsx index 9c4886aab..bdfb16a62 100644 --- a/ts/components/session/menu/Menu.tsx +++ b/ts/components/session/menu/Menu.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { getNumberOfPinnedConversations } from '../../../state/selectors/conversations'; import { getFocusedSection } from '../../../state/selectors/section'; -import { NotificationForConvoOption, TimerOption } from '../../conversation/ConversationHeader'; +import { TimerOption } from '../../conversation/ConversationHeader'; import { Item, Submenu } from 'react-contexify'; import { ConversationNotificationSettingType } from '../../../models/conversation'; import { useDispatch, useSelector } from 'react-redux'; @@ -26,6 +26,7 @@ import { } from '../../../interactions/conversationInteractions'; import { SessionButtonColor } from '../SessionButton'; import { ToastUtils } from '../../../session/utils'; +import { NotificationForConvoOption } from '../../../state/ducks/conversations'; const maxNumberOfPinnedConversations = 5; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 79caa9440..5110bad0f 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -25,6 +25,7 @@ import { actions as conversationActions, ConversationType as ReduxConversationType, LastMessageStatusType, + NotificationForConvoOption, } from '../state/ducks/conversations'; import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage'; @@ -35,7 +36,6 @@ import { import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage'; import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage'; import { OpenGroupUtils } from '../opengroup/utils'; -import { ConversationInteraction } from '../interactions'; import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { OpenGroupRequestCommonType } from '../opengroup/opengroupV2/ApiUtil'; import { getOpenGroupV2FromConversationId } from '../opengroup/utils/OpenGroupUtils'; @@ -408,16 +408,21 @@ export class ConversationModel extends Backbone.Model { groupAdmins, members, isPinned: this.isPinned(), - notificationForConvo: ConversationNotificationSetting.filter(n => - this.isPrivate() ? n !== 'mentions_only' : true - ).map((n: ConversationNotificationSettingType) => { - // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ... - return { value: n, name: window.i18n(`notificationForConvo_${n}`) }; - }), + notificationForConvo: this.getConversationNotificationSettingType(), currentNotificationSetting: this.get('triggerNotificationsFor'), }; } + public getConversationNotificationSettingType(): Array { + // exclude mentions_only settings for private chats as this does not make much sense + return ConversationNotificationSetting.filter(n => + this.isPrivate() ? n !== 'mentions_only' : true + ).map((n: ConversationNotificationSettingType) => { + // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ... + return { value: n, name: window.i18n(`notificationForConvo_${n}`) }; + }); + } + public async updateGroupAdmins(groupAdmins: Array) { const existingAdmins = _.uniq(_.sortBy(this.getGroupAdmins())); const newAdmins = _.uniq(_.sortBy(groupAdmins)); diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 2fea3d79f..7ea92c9d9 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -10,7 +10,6 @@ import { ConversationTypeEnum, } from '../../models/conversation'; import { MessageDeliveryStatus } from '../../models/messageType'; -import { NotificationForConvoOption } from '../../components/conversation/ConversationHeader'; // State @@ -91,6 +90,11 @@ export interface ConversationType { currentNotificationSetting: ConversationNotificationSettingType; } +export interface NotificationForConvoOption { + name: string; + value: ConversationNotificationSettingType; +} + export type ConversationLookupType = { [key: string]: ConversationType; }; From 46dc6c6275bc62fe74de0e8d52d5e28dcac55ca6 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 13 Jul 2021 15:38:59 +1000 Subject: [PATCH 08/23] pin conversations added to header menu --- ts/components/session/menu/ConversationHeaderMenu.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/ts/components/session/menu/ConversationHeaderMenu.tsx b/ts/components/session/menu/ConversationHeaderMenu.tsx index c6cb377bf..662379c36 100644 --- a/ts/components/session/menu/ConversationHeaderMenu.tsx +++ b/ts/components/session/menu/ConversationHeaderMenu.tsx @@ -76,6 +76,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => { currentNotificationSetting, conversationId )} + {getPinConversationMenuItem(conversationId)} {getBlockMenuItem(isMe, isPrivate, isBlocked, conversationId)} {getCopyMenuItem(isPublic, isGroup, conversationId)} From c38d2a5ea7d357668fab54b4c3689495e4c89da6 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 15 Jul 2021 16:48:54 +1000 Subject: [PATCH 09/23] revert prev changes + marking read now based on received_at --- ts/components/conversation/Message.tsx | 4 ++-- ts/components/conversation/ReadableMessage.tsx | 18 +++++++++++++++++- ts/models/conversation.ts | 13 +------------ ts/models/message.ts | 2 +- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index c33845f76..7bcf81e95 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -729,8 +729,8 @@ class MessageInner extends React.PureComponent { divClasses.push('flash-green-once'); } - const onVisible = (inView: boolean) => { - if (inView && shouldMarkReadWhenVisible && window.isFocused()) { + const onVisible = (inView: boolean | Object) => { + if (inView === true && shouldMarkReadWhenVisible && window.isFocused()) { // mark the message as read. // this will trigger the expire timer. void markRead(Date.now()); diff --git a/ts/components/conversation/ReadableMessage.tsx b/ts/components/conversation/ReadableMessage.tsx index d6cc6be4b..f907ca1b8 100644 --- a/ts/components/conversation/ReadableMessage.tsx +++ b/ts/components/conversation/ReadableMessage.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useFocus } from '../../hooks/useFocus'; -import { InView } from 'react-intersection-observer'; +import { InView, useInView } from 'react-intersection-observer'; type ReadableMessageProps = { children: React.ReactNode; @@ -11,6 +11,22 @@ type ReadableMessageProps = { }; export const ReadableMessage = (props: ReadableMessageProps) => { + /*const { ref, inView, entry } = useInView({ + threshold: 1, + delay: 200, + triggerOnce: true, + trackVisibility: true, + }); + + const { onChange } = props; + useFocus(() => onChange(inView)); + + return ( +
+ {props.children} +
+ )*/ + const { onChange } = props; useFocus(onChange); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index c17c94566..dd3dcf64e 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -92,7 +92,6 @@ export interface ConversationAttributes { triggerNotificationsFor: ConversationNotificationSettingType; isTrustedForAttachmentDownload: boolean; isPinned: boolean; - lastReadTimestamp: number; } export interface ConversationAttributesOptionals { @@ -161,7 +160,6 @@ export const fillConvoAttributesWithDefaults = ( triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default isTrustedForAttachmentDownload: false, // we don't trust a contact until we say so isPinned: false, - lastReadTimestamp: 0, }); }; @@ -190,13 +188,7 @@ export class ConversationModel extends Backbone.Model { this.updateLastMessage = _.throttle(this.bouncyUpdateLastMessage.bind(this), 1000); this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); //start right away the function is called, and wait 1sec before calling it again - this.markRead = (readAt: number) => { - const lastReadTimestamp = this.get('lastReadTimestamp'); - if (readAt > lastReadTimestamp) { - this.set('lastReadTimestamp', readAt); - } - _.debounce(this.markReadBouncy, 1000, { leading: true }); - } + this.markRead = _.debounce(this.markReadBouncy, 1000, { leading: true }); // Listening for out-of-band data updates this.typingRefreshTimer = null; @@ -910,9 +902,6 @@ export class ConversationModel extends Backbone.Model { } public async markReadBouncy(newestUnreadDate: number, providedOptions: any = {}) { - if (this.get('lastReadTimestamp') >= 0) { - return; - } const options = providedOptions || {}; _.defaults(options, { sendReadReceipts: true }); diff --git a/ts/models/message.ts b/ts/models/message.ts index 380c2ec50..ec58ecf97 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -1047,7 +1047,7 @@ export class MessageModel extends Backbone.Model { public async markRead(readAt: number) { this.markReadNoCommit(readAt); - this.getConversation()?.markRead(readAt); + this.getConversation()?.markRead(this.attributes.received_at); await this.commit(); } From 41c2ce67a7f11a1a06c29cf894645a4b96b4d3d7 Mon Sep 17 00:00:00 2001 From: audric Date: Fri, 16 Jul 2021 10:33:06 +1000 Subject: [PATCH 10/23] fix link device. start polling for our pubkey --- js/expire.js | 2 +- ts/components/session/registration/RegistrationTabs.tsx | 5 ++++- ts/util/accountManager.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/expire.js b/js/expire.js index e4bb6f48b..0f4ecdb8b 100644 --- a/js/expire.js +++ b/js/expire.js @@ -23,7 +23,7 @@ try { latestVersionWithV = await window.Fsv2.getLatestDesktopReleaseFileToFsV2(); if (!latestVersionWithV) { - throw new Error('Invalid latest version. Shceduling retry...'); + throw new Error('Invalid latest version. Scheduling retry...'); } const latestVer = semver.clean(latestVersionWithV); if (semver.valid(latestVer)) { diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationTabs.tsx index 0676ad37e..6b26fea35 100644 --- a/ts/components/session/registration/RegistrationTabs.tsx +++ b/ts/components/session/registration/RegistrationTabs.tsx @@ -17,6 +17,7 @@ import { import { fromHex } from '../../../session/utils/String'; import { TaskTimedOutError } from '../../../session/utils/Promise'; import { mn_decode } from '../../../session/crypto/mnemonic'; +import { SwarmPolling } from '../../../session/snode_api/swarmPolling'; export const MAX_USERNAME_LENGTH = 20; // tslint:disable: use-simple-attributes @@ -190,9 +191,11 @@ export async function signInWithLinking(signInDetails: { try { await resetRegistration(); await window.setPassword(password); - await signInByLinkingDevice(userRecoveryPhrase, 'english'); + const pubkeyStr = await signInByLinkingDevice(userRecoveryPhrase, 'english'); let displayNameFromNetwork = ''; + SwarmPolling.getInstance().addPubkey(pubkeyStr); + SwarmPolling.getInstance().start(); await PromiseUtils.waitForTask(done => { window.Whisper.events.on('configurationMessageReceived', (displayName: string) => { diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts index 2138a161c..dc98d767c 100644 --- a/ts/util/accountManager.ts +++ b/ts/util/accountManager.ts @@ -83,6 +83,7 @@ export async function signInByLinkingDevice(mnemonic: string, mnemonicLanguage: // await for the first configuration message to come in. await registrationDone(pubKeyString, ''); + return pubKeyString; } /** * This is a signup. User has no recovery and does not try to link a device From db46c2960be5a549ed59bc0e4cee3a005b7fcfb1 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 16 Jul 2021 13:32:58 +1000 Subject: [PATCH 11/23] update in marking read message --- .../conversation/ReadableMessage.tsx | 2 +- ts/models/conversation.ts | 20 +++++++++++++++++-- ts/test/test-utils/utils/message.ts | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ts/components/conversation/ReadableMessage.tsx b/ts/components/conversation/ReadableMessage.tsx index f907ca1b8..2dc6ed992 100644 --- a/ts/components/conversation/ReadableMessage.tsx +++ b/ts/components/conversation/ReadableMessage.tsx @@ -31,7 +31,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => { useFocus(onChange); return ( - + {props.children} ); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index dd3dcf64e..0d035be28 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -92,6 +92,7 @@ export interface ConversationAttributes { triggerNotificationsFor: ConversationNotificationSettingType; isTrustedForAttachmentDownload: boolean; isPinned: boolean; + lastReadTimestamp: number; } export interface ConversationAttributesOptionals { @@ -160,6 +161,7 @@ export const fillConvoAttributesWithDefaults = ( triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default isTrustedForAttachmentDownload: false, // we don't trust a contact until we say so isPinned: false, + lastReadTimestamp: 0, }); }; @@ -188,7 +190,16 @@ export class ConversationModel extends Backbone.Model { this.updateLastMessage = _.throttle(this.bouncyUpdateLastMessage.bind(this), 1000); this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); //start right away the function is called, and wait 1sec before calling it again - this.markRead = _.debounce(this.markReadBouncy, 1000, { leading: true }); + //this.markRead = _.debounce(this.markReadBouncy, 1000, { leading: true }); + const markReadBouncy = _.debounce(this.markReadBouncy, 1000, { leading: true }) + this.markRead = (newestUnreadDate: number) => { + const lastReadTimestamp = this.get('lastReadTimestamp'); + if (newestUnreadDate > lastReadTimestamp) + this.set({ + lastReadTimestamp: newestUnreadDate, + }); + markReadBouncy(newestUnreadDate); + } // Listening for out-of-band data updates this.typingRefreshTimer = null; @@ -903,6 +914,11 @@ export class ConversationModel extends Backbone.Model { public async markReadBouncy(newestUnreadDate: number, providedOptions: any = {}) { + const lastReadTimestamp = this.get('lastReadTimestamp'); + if (newestUnreadDate < lastReadTimestamp) { + return; + } + const options = providedOptions || {}; _.defaults(options, { sendReadReceipts: true }); @@ -948,7 +964,7 @@ export class ConversationModel extends Backbone.Model { const cachedUnreadCountOnConvo = this.get('unreadCount'); if (cachedUnreadCountOnConvo !== read.length) { // reset the unreadCount on the convo to the real one coming from markRead messages on the db - this.set({ unreadCount: 0 }); + this.set({ unreadCount: realUnreadCount }); await this.commit(); } else { // window?.log?.info('markRead(): nothing newly read.'); diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 4d0cdf6f2..809a0a96e 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -89,6 +89,7 @@ export class MockConversation { triggerNotificationsFor: 'all', isTrustedForAttachmentDownload: false, isPinned: false, + lastReadTimestamp: 0, }; } From 1397107dff0c86883b1f95f241eff554a3afe9ba Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 16 Jul 2021 13:48:08 +1000 Subject: [PATCH 12/23] fix issues --- ts/models/conversation.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 0d035be28..1df311e82 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -191,15 +191,16 @@ export class ConversationModel extends Backbone.Model { this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); //start right away the function is called, and wait 1sec before calling it again //this.markRead = _.debounce(this.markReadBouncy, 1000, { leading: true }); - const markReadBouncy = _.debounce(this.markReadBouncy, 1000, { leading: true }) + const markReadBouncy = _.debounce(this.markReadBouncy, 1000, { leading: true }); this.markRead = (newestUnreadDate: number) => { const lastReadTimestamp = this.get('lastReadTimestamp'); - if (newestUnreadDate > lastReadTimestamp) - this.set({ - lastReadTimestamp: newestUnreadDate, - }); - markReadBouncy(newestUnreadDate); - } + if (newestUnreadDate > lastReadTimestamp) { + this.set({ + lastReadTimestamp: newestUnreadDate, + }); + } + void markReadBouncy(newestUnreadDate); + }; // Listening for out-of-band data updates this.typingRefreshTimer = null; @@ -913,7 +914,6 @@ export class ConversationModel extends Backbone.Model { } public async markReadBouncy(newestUnreadDate: number, providedOptions: any = {}) { - const lastReadTimestamp = this.get('lastReadTimestamp'); if (newestUnreadDate < lastReadTimestamp) { return; From 4f98917eaf33f71b3c3a002fdfdbe8f6eee24a26 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 16 Jul 2021 13:49:32 +1000 Subject: [PATCH 13/23] clean --- ts/models/conversation.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 1df311e82..dacdc2327 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -190,7 +190,6 @@ export class ConversationModel extends Backbone.Model { this.updateLastMessage = _.throttle(this.bouncyUpdateLastMessage.bind(this), 1000); this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); //start right away the function is called, and wait 1sec before calling it again - //this.markRead = _.debounce(this.markReadBouncy, 1000, { leading: true }); const markReadBouncy = _.debounce(this.markReadBouncy, 1000, { leading: true }); this.markRead = (newestUnreadDate: number) => { const lastReadTimestamp = this.get('lastReadTimestamp'); From 9a420f85cebebaa62ece63ecba3030a5fc4030b5 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 16 Jul 2021 16:20:34 +1000 Subject: [PATCH 14/23] fixes --- ts/components/conversation/ReadableMessage.tsx | 16 ---------------- ts/models/conversation.ts | 16 +++++++--------- ts/test/test-utils/utils/message.ts | 1 - 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/ts/components/conversation/ReadableMessage.tsx b/ts/components/conversation/ReadableMessage.tsx index 2dc6ed992..d56fa2c4e 100644 --- a/ts/components/conversation/ReadableMessage.tsx +++ b/ts/components/conversation/ReadableMessage.tsx @@ -11,22 +11,6 @@ type ReadableMessageProps = { }; export const ReadableMessage = (props: ReadableMessageProps) => { - /*const { ref, inView, entry } = useInView({ - threshold: 1, - delay: 200, - triggerOnce: true, - trackVisibility: true, - }); - - const { onChange } = props; - useFocus(() => onChange(inView)); - - return ( -
- {props.children} -
- )*/ - const { onChange } = props; useFocus(onChange); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index b9867bd86..7b879d0a4 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -92,7 +92,6 @@ export interface ConversationAttributes { triggerNotificationsFor: ConversationNotificationSettingType; isTrustedForAttachmentDownload: boolean; isPinned: boolean; - lastReadTimestamp: number; } export interface ConversationAttributesOptionals { @@ -161,7 +160,6 @@ export const fillConvoAttributesWithDefaults = ( triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default isTrustedForAttachmentDownload: false, // we don't trust a contact until we say so isPinned: false, - lastReadTimestamp: 0, }); }; @@ -175,6 +173,7 @@ export class ConversationModel extends Backbone.Model { private typingRefreshTimer?: NodeJS.Timeout | null; private typingPauseTimer?: NodeJS.Timeout | null; private typingTimer?: NodeJS.Timeout | null; + private lastReadTimestamp: number; private pending: any; @@ -190,20 +189,19 @@ export class ConversationModel extends Backbone.Model { this.updateLastMessage = _.throttle(this.bouncyUpdateLastMessage.bind(this), 1000); this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000 }); //start right away the function is called, and wait 1sec before calling it again - const markReadBouncy = _.debounce(this.markReadBouncy, 1000, { leading: true }); + const markReadDebounced = _.debounce(this.markReadBouncy, 1000, { leading: true }); this.markRead = (newestUnreadDate: number) => { - const lastReadTimestamp = this.get('lastReadTimestamp'); + const lastReadTimestamp = this.lastReadTimestamp; if (newestUnreadDate > lastReadTimestamp) { - this.set({ - lastReadTimestamp: newestUnreadDate, - }); + this.lastReadTimestamp = newestUnreadDate; } - void markReadBouncy(newestUnreadDate); + void markReadDebounced(newestUnreadDate); }; // Listening for out-of-band data updates this.typingRefreshTimer = null; this.typingPauseTimer = null; + this.lastReadTimestamp = 0; window.inboxStore?.dispatch(conversationActions.conversationChanged(this.id, this.getProps())); } @@ -925,7 +923,7 @@ export class ConversationModel extends Backbone.Model { } public async markReadBouncy(newestUnreadDate: number, providedOptions: any = {}) { - const lastReadTimestamp = this.get('lastReadTimestamp'); + const lastReadTimestamp = this.lastReadTimestamp; if (newestUnreadDate < lastReadTimestamp) { return; } diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 809a0a96e..4d0cdf6f2 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -89,7 +89,6 @@ export class MockConversation { triggerNotificationsFor: 'all', isTrustedForAttachmentDownload: false, isPinned: false, - lastReadTimestamp: 0, }; } From e9f70d8c828b590f210d63c259213a6668353455 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 19 Jul 2021 09:31:24 +1000 Subject: [PATCH 15/23] fix issue --- ts/components/session/registration/RegistrationTabs.tsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationTabs.tsx index d3128df43..9c94ec543 100644 --- a/ts/components/session/registration/RegistrationTabs.tsx +++ b/ts/components/session/registration/RegistrationTabs.tsx @@ -17,7 +17,7 @@ import { import { fromHex } from '../../../session/utils/String'; import { TaskTimedOutError } from '../../../session/utils/Promise'; import { mn_decode } from '../../../session/crypto/mnemonic'; -import { SwarmPolling } from '../../../session/snode_api/swarmPolling'; +import { getSwarmPollingInstance } from '../../../session/snode_api/swarmPolling'; export const MAX_USERNAME_LENGTH = 20; // tslint:disable: use-simple-attributes @@ -191,11 +191,9 @@ export async function signInWithLinking(signInDetails: { try { await resetRegistration(); await window.setPassword(password); - const pubkeyStr = await signInByLinkingDevice(userRecoveryPhrase, 'english'); - + await signInByLinkingDevice(userRecoveryPhrase, 'english'); let displayNameFromNetwork = ''; - SwarmPolling.getInstance().addPubkey(pubkeyStr); - SwarmPolling.getInstance().start(); + await getSwarmPollingInstance().start(); await PromiseUtils.waitForTask(done => { window.Whisper.events.on('configurationMessageReceived', (displayName: string) => { From 829fd1c19974a0964e1e839a3cd4c9566d7a267c Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 19 Jul 2021 10:23:20 +1000 Subject: [PATCH 16/23] menu fixes --- ts/components/ConversationListItem.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx index b17f00bbd..c23db163a 100644 --- a/ts/components/ConversationListItem.tsx +++ b/ts/components/ConversationListItem.tsx @@ -63,6 +63,8 @@ const ConversationListItem = (props: Props) => { isMe, isPinned, isTyping, + isPublic, + left, type, lastMessage, memberAvatars, @@ -126,6 +128,8 @@ const ConversationListItem = (props: Props) => { triggerId={triggerId} type={type} isMe={isMe} + isPublic={isPublic} + left={left} notificationForConvo={notificationForConvo} currentNotificationSetting={currentNotificationSetting} /> From c944fac426a9678f4bc2c4121c2c6a94c9e66036 Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Tue, 20 Jul 2021 10:08:09 +1000 Subject: [PATCH 17/23] Transparent background for images. --- stylesheets/_modules.scss | 6 ++---- stylesheets/_session_theme.scss | 21 +++++++++++++++++---- stylesheets/_theme_dark.scss | 2 +- ts/components/conversation/Message.tsx | 9 ++++++--- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index 8d9c4933c..c7dbe3eae 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -130,9 +130,6 @@ border-radius: $session_message-container-border-radius; overflow: hidden; // no background by default for the attachment container - @include themify($themes) { - background: themed('inboxBackground'); - } } .module-message--outgoing { @@ -1284,7 +1281,8 @@ .module-image { overflow: hidden; - background-color: $color-white; + // background-color: $color-white; + background-color: rgba(0, 0, 0, 0); position: relative; display: inline-block; margin: 1px; diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index cb3597fed..40356df68 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -25,8 +25,14 @@ } &__container--incoming { - @include themify($themes) { - background: themed('receivedMessageBackground'); + &--opaque { + @include themify($themes) { + background: themed('receivedMessageBackground'); + } + } + + &--transparent { + background: none; } .module-message__text { @@ -49,8 +55,15 @@ } &__container--outgoing { - @include themify($themes) { - background: themed('sentMessageBackground'); + &--opaque { + @include themify($themes) { + background: themed('sentMessageBackground'); + } + } + + + &--transparent { + background: none; } .module-message__text { diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss index 54639d58e..e0e93674c 100644 --- a/stylesheets/_theme_dark.scss +++ b/stylesheets/_theme_dark.scss @@ -401,7 +401,7 @@ // Module: Image .module-image { - background-color: $color-black; + background: none; } .module-image__border-overlay { diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 2fd928ccf..630f6fac7 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -671,8 +671,8 @@ class MessageInner extends React.PureComponent { return Boolean( displayImage && - ((isImage(attachments) && hasImage(attachments)) || - (isVideo(attachments) && hasVideoScreenshot(attachments))) + ((isImage(attachments) && hasImage(attachments)) || + (isVideo(attachments) && hasVideoScreenshot(attachments))) ); } @@ -781,7 +781,10 @@ class MessageInner extends React.PureComponent {
Date: Tue, 20 Jul 2021 10:12:10 +1000 Subject: [PATCH 18/23] formatting and linting. --- stylesheets/_session_theme.scss | 1 - ts/components/conversation/Message.tsx | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index 40356df68..3e66d9c02 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -61,7 +61,6 @@ } } - &--transparent { background: none; } diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 630f6fac7..407574d58 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -671,8 +671,8 @@ class MessageInner extends React.PureComponent { return Boolean( displayImage && - ((isImage(attachments) && hasImage(attachments)) || - (isVideo(attachments) && hasVideoScreenshot(attachments))) + ((isImage(attachments) && hasImage(attachments)) || + (isVideo(attachments) && hasVideoScreenshot(attachments))) ); } @@ -782,9 +782,9 @@ class MessageInner extends React.PureComponent { className={classNames( 'module-message__container', `module-message__container--${direction}`, - isShowingImage ? - `module-message__container--${direction}--transparent` : - `module-message__container--${direction}--opaque` + isShowingImage + ? `module-message__container--${direction}--transparent` + : `module-message__container--${direction}--opaque` )} style={{ width: isShowingImage ? width : undefined, From ee7e6e47feee3aa8ba5a33fe304a42d6413cea2c Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Tue, 20 Jul 2021 10:50:06 +1000 Subject: [PATCH 19/23] applying to outgoing messages --- stylesheets/_modules.scss | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index c7dbe3eae..577e93568 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -135,18 +135,14 @@ .module-message--outgoing { .module-message__attachment-container--with-content-below, .module-message__attachment-container--with-content-above { - @include themify($themes) { - background: themed('sentMessageBackground'); - } + background: none; } } .module-message--incoming { .module-message__attachment-container--with-content-below, .module-message__attachment-container--with-content-above { - @include themify($themes) { - background: themed('receivedMessageBackground'); - } + background: none; } } From 0aaf40637c0c1211f8c1576c16875e83ae970826 Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Tue, 20 Jul 2021 10:50:06 +1000 Subject: [PATCH 20/23] applying to outgoing messages --- stylesheets/_modules.scss | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index 8d9c4933c..d7edcd82a 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -138,18 +138,14 @@ .module-message--outgoing { .module-message__attachment-container--with-content-below, .module-message__attachment-container--with-content-above { - @include themify($themes) { - background: themed('sentMessageBackground'); - } + background: none; } } .module-message--incoming { .module-message__attachment-container--with-content-below, .module-message__attachment-container--with-content-above { - @include themify($themes) { - background: themed('receivedMessageBackground'); - } + background: none; } } From 4cdc852ea3366ece00c7dca5705b01d8e759ce9c Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Tue, 20 Jul 2021 10:12:10 +1000 Subject: [PATCH 21/23] cherry-pick conflicts. --- stylesheets/_session_theme.scss | 10 ++++++++-- ts/components/conversation/Message.tsx | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index cb3597fed..b45449ccf 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -49,8 +49,14 @@ } &__container--outgoing { - @include themify($themes) { - background: themed('sentMessageBackground'); + &--opaque { + @include themify($themes) { + background: themed('sentMessageBackground'); + } + } + + &--transparent { + background: none; } .module-message__text { diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index 2fd928ccf..407574d58 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -781,7 +781,10 @@ class MessageInner extends React.PureComponent {
Date: Tue, 20 Jul 2021 11:09:27 +1000 Subject: [PATCH 22/23] minor style tweak. --- stylesheets/_modules.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index 577e93568..36472975d 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -1277,8 +1277,7 @@ .module-image { overflow: hidden; - // background-color: $color-white; - background-color: rgba(0, 0, 0, 0); + background: none; position: relative; display: inline-block; margin: 1px; From 8256451ec684f8c28fc73f67bbd104eb0cb906ad Mon Sep 17 00:00:00 2001 From: Brice-W Date: Tue, 20 Jul 2021 15:06:58 +1000 Subject: [PATCH 23/23] enable pinning conversations --- preload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preload.js b/preload.js index 87b3d051b..b9f6206c9 100644 --- a/preload.js +++ b/preload.js @@ -56,7 +56,7 @@ window.lokiFeatureFlags = { useFileOnionRequests: true, useFileOnionRequestsV2: true, // more compact encoding of files in response padOutgoingAttachments: true, - enablePinConversations: false, + enablePinConversations: true, }; if (typeof process.env.NODE_ENV === 'string' && process.env.NODE_ENV.includes('test-integration')) {