Merge pull request #1545 from Bilb/add-copy-url-menu

Add copy url menu and mark all as read option

_locales/en/messages.json

@@ -453,6 +453,10 @@
   "unverify": {
     "message": "Mark As Not Verified"
   },
+  "markAllAsRead": {
+    "message": "Mark All as Read",
+    "description": "Shown on a menu to mark the whole convo as read."
+  },
   "isNotVerified": {
     "message": "You have not verified your safety number with $name$.",
     "description": "Summary state shown at top of the safety number screen if user has not verified contact.",
@@ -1062,6 +1066,10 @@
     "description": "Copy to clipboard session ID",
     "androidKey": "activity_conversation_menu_copy_session_id"
   },
+  "copyOpenGroupURL": {
+    "message": "Copy Group's URL",
+    "description": "Copy to clipboard Open Group URL"
+  },
   "save": {
     "message": "Save",
     "description": "Used as a 'commit changes' button in the Caption Editor for outgoing image attachments",

_locales/fr/messages.json

@@ -363,6 +363,10 @@
             }
         }
     },
+    "markAllAsRead": {
+        "message": "Tout Marquer Comme Lu",
+        "description": "Shown on a menu to mark the whole convo as read."
+    },
     "isNotVerified": {
         "message": "Vous n’avez pas vérifié votre numéro de sécurité avec $name$",
         "description": "Summary state shown at top of the safety number screen if user has not verified contact.",
@@ -1221,6 +1225,14 @@
     "copy": {
         "message": "Copier"
     },
+    "copySessionID": {
+        "message": "Copier le Session ID",
+        "description": "Copy to clipboard session ID"
+    },
+    "copyOpenGroupURL": {
+        "message": "Copier l'URL de Group",
+        "description": "Copy to clipboard Open Group URL"
+    },
     "linkPreviewsTitle": {
         "message": "Envoyer des aperçus de liens"
     },

ts/components/ConversationListItem.tsx

@@ -42,6 +42,7 @@ type PropsHousekeeping = {
   onUnblockContact?: () => void;
   onInviteContacts?: () => void;
   onClearNickname?: () => void;
+  onMarkAllRead: () => void;
   theme: DefaultTheme;
 };
 
@@ -62,7 +63,6 @@ class ConversationListItem extends React.PureComponent<Props> {
   public renderAvatar() {
     const {
       avatarPath,
-      i18n,
       name,
       phoneNumber,
       profileName,

ts/components/conversation/ConversationHeader.tsx

@@ -83,6 +83,8 @@ interface Props {
   onAvatarClick?: (userPubKey: string) => void;
   onUpdateGroupName: () => void;
 
+  onMarkAllRead: () => void;
+
   memberAvatars?: Array<ConversationAvatar>; // this is added by usingClosedConversationDetails
   theme: DefaultTheme;
 }

ts/components/session/conversation/SessionConversation.tsx

@@ -434,6 +434,10 @@ export class SessionConversation extends React.Component<Props, State> {
         window.Whisper.events.trigger('inviteContacts', conversation);
       },
 
+      onMarkAllRead: () => {
+        void conversation.markReadBouncy(Date.now());
+      },
+
       onAddModerators: () => {
         window.Whisper.events.trigger('addModerators', conversation);
       },

ts/components/session/menu/ConversationHeaderMenu.tsx

@@ -9,6 +9,7 @@ import {
   getDisappearingMenuItem,
   getInviteContactMenuItem,
   getLeaveGroupMenuItem,
+  getMarkAllReadMenuItem,
   getRemoveModeratorsMenuItem,
   getUpdateGroupNameMenuItem,
 } from './Menu';
@@ -31,6 +32,7 @@ export type PropsConversationHeaderMenu = {
   onInviteContacts?: () => void;
 
   onLeaveGroup: () => void;
+  onMarkAllRead: () => void;
   onAddModerators: () => void;
   onRemoveModerators: () => void;
   onUpdateGroupName: () => void;
@@ -55,6 +57,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
     onDeleteMessages,
     onDeleteContact,
     onCopyPublicKey,
+    onMarkAllRead,
     onLeaveGroup,
     onAddModerators,
     onRemoveModerators,
@@ -86,6 +89,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
       )}
 
       {getCopyMenuItem(isPublic, isGroup, onCopyPublicKey, window.i18n)}
+      {getMarkAllReadMenuItem(onMarkAllRead, window.i18n)}
       {getDeleteMessagesMenuItem(isPublic, onDeleteMessages, window.i18n)}
       {getAddModeratorsMenuItem(
         isAdmin,

ts/components/session/menu/ConversationListItemContextMenu.tsx

@@ -9,6 +9,7 @@ import {
   getDeleteMessagesMenuItem,
   getInviteContactMenuItem,
   getLeaveGroupMenuItem,
+  getMarkAllReadMenuItem,
 } from './Menu';
 
 export type PropsContextConversationItem = {
@@ -25,6 +26,7 @@ export type PropsContextConversationItem = {
   onDeleteContact?: () => void;
   onLeaveGroup?: () => void;
   onBlockContact?: () => void;
+  onMarkAllRead: () => void;
   onCopyPublicKey?: () => void;
   onUnblockContact?: () => void;
   onInviteContacts?: () => void;
@@ -48,6 +50,7 @@ export const ConversationListItemContextMenu = (
     onBlockContact,
     onClearNickname,
     onCopyPublicKey,
+    onMarkAllRead,
     onUnblockContact,
     onInviteContacts,
     onLeaveGroup,
@@ -81,6 +84,8 @@ export const ConversationListItemContextMenu = (
         onCopyPublicKey,
         window.i18n
       )}
+      {getMarkAllReadMenuItem(onMarkAllRead, window.i18n)}
+
       {getDeleteMessagesMenuItem(isPublic, onDeleteMessages, window.i18n)}
       {getInviteContactMenuItem(
         type === 'group',

ts/components/session/menu/Menu.tsx

@@ -32,8 +32,9 @@ function showDeleteMessages(isPublic: boolean): boolean {
   return !isPublic;
 }
 
+// we want to show the copyId for open groups and private chats only
 function showCopyId(isPublic: boolean, isGroup: boolean): boolean {
-  return !isGroup; // || isPublic;
+  return !isGroup || isPublic;
 }
 
 function showDeleteContact(
@@ -196,12 +197,21 @@ export function getCopyMenuItem(
   i18n: LocalizerType
 ): JSX.Element | null {
   if (showCopyId(Boolean(isPublic), Boolean(isGroup))) {
-    const copyIdLabel = i18n('copySessionID');
+    const copyIdLabel = isPublic
+      ? i18n('copyOpenGroupURL')
+      : i18n('copySessionID');
     return <Item onClick={action}>{copyIdLabel}</Item>;
   }
   return null;
 }
 
+export function getMarkAllReadMenuItem(
+  action: any,
+  i18n: LocalizerType
+): JSX.Element | null {
+  return <Item onClick={action}>{i18n('markAllAsRead')}</Item>;
+}
+
 export function getDisappearingMenuItem(
   isPublic: boolean | undefined,
   isKickedFromGroup: boolean | undefined,

ts/models/conversation.ts

@@ -423,6 +423,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       onInviteContacts: () => {
         window.Whisper.events.trigger('inviteContacts', this);
       },
+      onMarkAllRead: () => {
+        void this.markReadBouncy(Date.now());
+      },
       onClearNickname: () => {
         void this.setLokiProfile({ displayName: null });
       },
@@ -468,7 +471,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async getUnreadCount() {
-    window.log.warn('getUnreadCount is slow');
     const unreadCount = await getUnreadCountByConversation(this.id);
 
     return unreadCount;
@@ -1351,6 +1353,14 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public copyPublicKey() {
+    if (this.isPublic()) {
+      const atIndex = this.id.indexOf('@') as number;
+      const openGroupUrl = this.id.substr(atIndex + 1);
+      window.clipboard.writeText(openGroupUrl);
+
+      ToastUtils.pushCopiedToClipBoard();
+      return;
+    }
     window.clipboard.writeText(this.id);
 
     ToastUtils.pushCopiedToClipBoard();

ts/state/ducks/conversations.ts

@@ -87,15 +87,16 @@ export interface ConversationType {
   groupAdmins?: Array<string>; // admins for closed groups and moderators for open groups
   members?: Array<string>; // members for closed groups only
 
-  onClick?: () => any;
-  onBlockContact?: () => any;
-  onUnblockContact?: () => any;
-  onCopyPublicKey?: () => any;
-  onDeleteContact?: () => any;
-  onLeaveGroup?: () => any;
-  onDeleteMessages?: () => any;
-  onInviteContacts?: () => any;
-  onClearNickname?: () => any;
+  onClick?: () => void;
+  onBlockContact?: () => void;
+  onUnblockContact?: () => void;
+  onCopyPublicKey?: () => void;
+  onDeleteContact?: () => void;
+  onLeaveGroup?: () => void;
+  onDeleteMessages?: () => void;
+  onInviteContacts?: () => void;
+  onMarkAllRead?: () => void;
+  onClearNickname?: () => void;
 }
 
 export type ConversationLookupType = {