improvement: private message

.maestro/tests/assorted/private-message.yaml

@@ -0,0 +1,84 @@
+appId: chat.rocket.reactnative
+name: Private Message
+onFlowStart:
+  - runFlow: '../../helpers/setup.yaml'
+onFlowComplete:
+  - evalScript: ${output.utils.deleteCreatedUsers()}
+tags:
+  - test-13
+
+---
+- evalScript: ${output.user = output.utils.createUser()}
+- evalScript: ${output.channel = output.utils.createRandomRoom(output.user.username, output.user.password)}
+
+- runFlow:
+    file: '../../helpers/login-with-deeplink.yaml'
+    env:
+      USERNAME: ${output.user.username}
+      PASSWORD: ${output.user.password}
+- tapOn:
+    id: rooms-list-view-item-${output.channel.name}
+
+# send a private slash command and dismiss it manually
+- tapOn:
+    id: message-composer-input
+- inputText: '/status'
+- extendedWaitUntil:
+    visible:
+      id: autocomplete-item-status
+    timeout: 15000
+- tapOn:
+    id: autocomplete-item-status
+- extendedWaitUntil:
+    notVisible:
+      id: autocomplete-item-status
+    timeout: 15000
+- tapOn:
+    id: message-composer-send
+- extendedWaitUntil:
+    visible:
+      text: 'Status message changed successfully.'
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      text: 'Dismiss message'
+    timeout: 15000
+- tapOn:
+    id: dismiss-private-message
+- extendedWaitUntil:
+    notVisible:
+      text: 'Status message changed successfully.'
+    timeout: 15000
+
+# send a private slash command, go back to room list and return to same channel
+- tapOn:
+    id: message-composer-input
+- inputText: '/status'
+- extendedWaitUntil:
+    visible:
+      id: autocomplete-item-status
+    timeout: 15000
+- tapOn:
+    id: autocomplete-item-status
+- extendedWaitUntil:
+    notVisible:
+      id: autocomplete-item-status
+    timeout: 15000
+- tapOn:
+    id: message-composer-send
+- extendedWaitUntil:
+    visible:
+      text: 'Status message changed successfully.'
+    timeout: 60000
+- extendedWaitUntil:
+    visible:
+      text: 'Dismiss message'
+    timeout: 15000
+- tapOn:
+    id: header-back
+- tapOn:
+    id: rooms-list-view-item-${output.channel.name}
+- extendedWaitUntil:
+    notVisible:
+      text: 'Status message changed successfully.'
+    timeout: 15000

app/containers/message/Message.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { View, type ViewStyle } from 'react-native';
+import { View, Text, type ViewStyle, Pressable } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 import { A11y } from 'react-native-a11y-order';
 
@@ -26,6 +26,7 @@ import { getInfoMessage } from './utils';
 import MessageTime from './Time';
 import { useResponsiveLayout } from '../../lib/hooks/useResponsiveLayout/useResponsiveLayout';
 import Quote from './Components/Attachments/Quote';
+import { deletePrivateMessages } from '../../lib/methods/deletePrivateMessages';
 import translationLanguages from '../../lib/constants/translationLanguages';
 
 const MessageInner = React.memo((props: IMessageInner) => {
@@ -193,6 +194,14 @@ const Message = React.memo((props: IMessageTouchable & IMessage) => {
 					<MessageAvatar {...props} />
 					<View style={styles.messageContent}>
 						<MessageInner {...props} />
+						{props.private && (
+							<View style={styles.privateIndicator}>
+								<Text style={styles.privateIndicatorText}>{i18n.t('Only_you_can_see_this_message')} • </Text>
+								<Pressable testID='dismiss-private-message' onPress={() => deletePrivateMessages(props.id)}>
+									<Text style={styles.privateMessageDismiss}>{i18n.t('Dismiss_message')}</Text>
+								</Pressable>
+							</View>
+						)}
 					</View>
 					{!props.isHeader ? (
 						<RightIcons

app/containers/message/index.tsx

@@ -410,7 +410,8 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 			replies,
 			md,
 			comment,
-			pinned
+			pinned,
+			private: isPrivate
 		} = item;
 
 		let message = msg;
@@ -505,6 +506,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 					isBeingEdited={isBeingEdited}
 					isPreview={isPreview}
 					pinned={pinned}
+					private={isPrivate}
 					autoTranslateLanguage={autoTranslateLanguage}
 				/>
 				<MessageSeparator ts={dateSeparator} unread={showUnreadSeparator} />

app/containers/message/interfaces.ts

@@ -117,6 +117,7 @@ export interface IMessageInner
 	blocks: [];
 	urls?: IUrl[];
 	isPreview?: boolean;
+	private?: boolean;
 }
 
 export interface IMessage extends IMessageRepliedThread, IMessageInner, IMessageAvatar {

app/containers/message/styles.ts

@@ -162,5 +162,17 @@ export default StyleSheet.create({
 		right: 8,
 		flexDirection: 'row',
 		gap: 8
+	},
+	privateIndicator: {
+		flexDirection: 'row',
+		marginTop: 5
+	},
+	privateIndicatorText: {
+		fontSize: 12,
+		...sharedStyles.textRegular
+	},
+	privateMessageDismiss: {
+		fontSize: 12,
+		...sharedStyles.textRegular
 	}
 });

app/definitions/IMessage.ts

@@ -174,6 +174,7 @@ export interface IMessage extends IMessageFromServer {
 	subscription?: { id: string };
 	user?: string;
 	editedAt?: string | Date;
+	private?: boolean;
 	e2eMentions?: any;
 }
 

app/i18n/locales/en.json

@@ -254,6 +254,7 @@
   "Discussion_name": "Discussion name",
   "Discussion_name_required": "Discussion name required",
   "Discussions": "Discussions",
+  "Dismiss_message": "Dismiss message",
   "Display": "Display",
   "Displays_action_text": "Displays action text",
   "Do_it_later": "Do it later",
@@ -612,6 +613,7 @@
   "One_result_found": "One result found.",
   "Online": "Online",
   "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
+  "Only_you_can_see_this_message": "Only you can see this message",
   "Oops": "Oops!",
   "Open_Livechats": "Omnichannel chats in progress",
   "Open_servers_history": "Open servers history",

app/lib/database/model/Message.js

@@ -88,6 +88,8 @@ export default class Message extends Model {
 
 	@field('comment') comment;
 
+	@field('private') private;
+
 	asPlain() {
 		return {
 			id: this.id,
@@ -128,7 +130,8 @@ export default class Message extends Model {
 			tshow: this.tshow,
 			md: this.md,
 			content: this.content,
-			comment: this.comment
+			comment: this.comment,
+			private: this.private
 		};
 	}
 }

app/lib/database/model/migrations.js

@@ -331,6 +331,15 @@ export default schemaMigrations({
 					columns: [{ name: 'federated', type: 'boolean', isOptional: true }]
 				})
 			]
+		},
+		{
+			toVersion: 28,
+			steps: [
+				addColumns({
+					table: 'messages',
+					columns: [{ name: 'private', type: 'boolean', isOptional: true }]
+				})
+			]
 		}
 	]
 });

app/lib/database/schema/app.js

@@ -1,7 +1,7 @@
 import { appSchema, tableSchema } from '@nozbe/watermelondb';
 
 export default appSchema({
-	version: 27,
+	version: 28,
 	tables: [
 		tableSchema({
 			name: 'subscriptions',
@@ -129,7 +129,8 @@ export default appSchema({
 				{ name: 'tshow', type: 'boolean', isOptional: true },
 				{ name: 'md', type: 'string', isOptional: true },
 				{ name: 'content', type: 'string', isOptional: true },
-				{ name: 'comment', type: 'string', isOptional: true }
+				{ name: 'comment', type: 'string', isOptional: true },
+				{ name: 'private', type: 'boolean', isOptional: true }
 			]
 		}),
 		tableSchema({

app/lib/methods/deletePrivateMessages.ts

@@ -0,0 +1,26 @@
+import { Q } from '@nozbe/watermelondb';
+
+import database from '../database';
+import log from './helpers/log';
+
+export async function deletePrivateMessages(id?: string): Promise<void> {
+	try {
+		const db = database.active;
+
+		const messages = id
+			? await db.get('messages').query(Q.where('id', id)).fetch()
+			: await db.get('messages').query(Q.where('private', true)).fetch();
+		const messagesToBeDeleted = messages.map(message => message.prepareDestroyPermanently());
+
+		await db.write(async () => {
+			try {
+				await db.batch(...messagesToBeDeleted);
+			} catch (e) {
+				console.log('e', e);
+				// Do nothing
+			}
+		});
+	} catch (e) {
+		log(e);
+	}
+}

app/views/RoomView/index.tsx

@@ -102,6 +102,7 @@ import UserPreferences from '../../lib/methods/userPreferences';
 import { type IRoomViewProps, type IRoomViewState } from './definitions';
 import { roomAttrsUpdate, stateAttrsUpdate } from './constants';
 import { EncryptedRoom, MissingRoomE2EEKey } from './components';
+import { deletePrivateMessages } from '../../lib/methods/deletePrivateMessages';
 
 class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	private rid?: string;
@@ -370,6 +371,8 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 		}
 		EventEmitter.removeListener('connected', this.handleConnected);
 		EventEmitter.removeListener('ROOM_REMOVED', this.handleRoomRemoved);
+
+		deletePrivateMessages();
 		if (!this.tmid) {
 			await AudioManager.unloadRoomAudios(this.rid);
 		}
@@ -860,6 +863,11 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 		if (action && action !== 'quote') {
 			return;
 		}
+
+		if (message.private) {
+			return;
+		}
+
 		// if it's a thread message on main room, we disable the long press
 		if (message.tmid && !this.tmid) {
 			return;