feat: Room Invited State

app/containers/RoomItem/RoomItem.tsx

@@ -16,6 +16,8 @@ import { type IRoomItemProps } from './interfaces';
 import { formatLastMessage } from '../../lib/methods/formatLastMessage';
 import useStatusAccessibilityLabel from '../../lib/hooks/useStatusAccessibilityLabel';
 import { useResponsiveLayout } from '../../lib/hooks/useResponsiveLayout/useResponsiveLayout';
+import { CustomIcon } from '../CustomIcon';
+import { useTheme } from '../../theme';
 
 const RoomItem = ({
 	rid,
@@ -53,10 +55,12 @@ const RoomItem = ({
 	displayMode,
 	sourceType,
 	hideMentionStatus,
-	accessibilityDate
+	accessibilityDate,
+	isInvited
 }: IRoomItemProps) => {
 	'use memo';
 
+	const { colors } = useTheme();
 	const { isLargeFontScale } = useResponsiveLayout();
 	const memoizedMessage = useMemo(
 		() => formatLastMessage({ lastMessage, username, useRealName, showLastMessage, alert, type }),
@@ -137,6 +141,15 @@ const RoomItem = ({
 								hideMentionStatus={hideMentionStatus}
 								hideUnreadStatus={hideUnreadStatus}
 							/>
+							{isInvited ? (
+								<CustomIcon
+									size={24}
+									name='mail'
+									role='status'
+									accessibilityLabel={I18n.t('Invited')}
+									color={colors.badgeBackgroundLevel2}
+								/>
+							) : null}
 						</View>
 						{isLargeFontScale ? <UpdatedAt date={date} hideUnreadStatus={hideUnreadStatus} alert={alert} /> : null}
 					</>

app/containers/RoomItem/index.tsx

@@ -5,6 +5,7 @@ import { isGroupChat } from '../../lib/methods/helpers';
 import { formatDate, formatDateAccessibility } from '../../lib/methods/helpers/room';
 import { type IRoomItemContainerProps } from './interfaces';
 import RoomItem from './RoomItem';
+import { isInviteSubscription } from '../../lib/methods/isInviteSubscription';
 
 const attrs = ['width', 'isFocused', 'showLastMessage', 'autoJoin', 'showAvatar', 'displayMode'];
 
@@ -61,6 +62,7 @@ const RoomItemContainer = React.memo(
 				name={name}
 				avatar={avatar}
 				isGroupChat={isGroupChat(item)}
+				isInvited={isInviteSubscription(item)}
 				isRead={isRead}
 				onPress={handleOnPress}
 				onLongPress={handleOnLongPress}

app/containers/RoomItem/interfaces.ts

@@ -107,6 +107,7 @@ export interface IRoomItemProps extends IBaseRoomItem {
 	testID: string;
 	status: TUserStatus;
 	isGroupChat: boolean;
+	isInvited?: boolean;
 	isRead: boolean;
 	teamMain: boolean;
 	date: string;

app/definitions/ISubscription.ts

@@ -116,6 +116,12 @@ export interface ISubscription {
 	uploads: RelationModified<TUploadModel>;
 	disableNotifications?: boolean;
 	federated?: boolean;
+	inviter?: Required<Pick<IUser, '_id' | 'username'>> & Pick<IUser, 'name'>;
+}
+
+export interface IInviteSubscription extends ISubscription {
+	status: 'INVITED';
+	inviter: NonNullable<ISubscription['inviter']>;
 }
 
 export type TSubscriptionModel = ISubscription &

app/definitions/rest/v1/rooms.ts

@@ -54,6 +54,9 @@ export type RoomsEndpoints = {
 			success: boolean;
 		};
 	};
+	'rooms.invite': {
+		POST: (params: { roomId: string; action: 'accept' | 'reject' }) => void;
+	};
 };
 
 export type TRoomsMediaResponse = {

app/i18n/locales/en.json

@@ -337,6 +337,7 @@
   "error-invalid-file-type": "Invalid file type",
   "error-invalid-password": "Invalid password",
   "error-invalid-room-name": "{{room_name}} is not a valid room name",
+  "error-invitation-reply-action": "Error while sending invitation reply",
   "error-no-tokens-for-this-user": "There are no tokens for this user",
   "error-not-allowed": "Not allowed",
   "error-not-permission-to-upload-file": "You don't have permission to upload files",
@@ -416,6 +417,11 @@
   "Invite_user_to_join_channel_all_from": "Invite all users from [#channel] to join this channel",
   "Invite_user_to_join_channel_all_to": "Invite all users from this channel to join [#channel]",
   "Invite_users": "Invite users",
+  "Invited": "Invited",
+  "invited_room_description_channel": "You've been invited by",
+  "invited_room_description_dm": "You've been invited to have a conversation with",
+  "invited_room_title_channel": "Invitation to join {{room_name}}",
+  "invited_room_title_dm": "Message request",
   "IP": "IP",
   "is_typing": "is typing",
   "Italic": "Italic",
@@ -684,6 +690,7 @@
   "Recording_audio_in_progress": "Recording audio message",
   "Register": "Register",
   "Registration_Succeeded": "Registration succeeded!",
+  "reject": "Reject",
   "Remove": "Remove",
   "remove": "remove",
   "Remove_from_room": "Remove from room",

app/lib/database/model/Subscription.js

@@ -153,6 +153,10 @@ export default class Subscription extends Model {
 
 	@field('federated') federated;
 
+	@field('status') status;
+
+	@json('inviter', sanitizer) inviter;
+
 	asPlain() {
 		return {
 			_id: this._id,
@@ -219,7 +223,9 @@ export default class Subscription extends Model {
 			usersCount: this.usersCount,
 			source: this.source,
 			disableNotifications: this.disableNotifications,
-			federated: this.federated
+			federated: this.federated,
+			status: this.status,
+			inviter: this.inviter
 		};
 	}
 }

app/lib/database/model/migrations.js

@@ -331,6 +331,18 @@ export default schemaMigrations({
 					columns: [{ name: 'federated', type: 'boolean', isOptional: true }]
 				})
 			]
+		},
+		{
+			toVersion: 28,
+			steps: [
+				addColumns({
+					table: 'subscriptions',
+					columns: [
+						{ name: 'status', type: 'string', isOptional: true },
+						{ name: 'inviter', type: 'string', 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',
@@ -70,7 +70,9 @@ export default appSchema({
 				{ name: 'users_count', type: 'number', isOptional: true },
 				{ name: 'unmuted', type: 'string', isOptional: true },
 				{ name: 'disable_notifications', type: 'boolean', isOptional: true },
-				{ name: 'federated', type: 'boolean', isOptional: true }
+				{ name: 'federated', type: 'boolean', isOptional: true },
+				{ name: 'status', type: 'string', isOptional: true },
+				{ name: 'inviter', type: 'string', isOptional: true }
 			]
 		}),
 		tableSchema({

app/lib/methods/getInvitationData.ts

@@ -0,0 +1,21 @@
+import { type IInviteSubscription } from '../../definitions';
+import I18n from '../../i18n';
+import { getRoomTitle } from './helpers';
+import { replyRoomInvite } from './replyRoomInvite';
+
+export const getInvitationData = (room: IInviteSubscription) => {
+	const title =
+		room.t === 'd'
+			? I18n.t('invited_room_title_dm')
+			: I18n.t('invited_room_title_channel', { room_name: getRoomTitle(room).slice(0, 30) });
+
+	const description = room.t === 'd' ? I18n.t('invited_room_description_dm') : I18n.t('invited_room_description_channel');
+
+	return {
+		title,
+		description,
+		inviter: room.inviter,
+		accept: () => replyRoomInvite(room.id, 'accept'),
+		reject: () => replyRoomInvite(room.id, 'reject')
+	};
+};

app/lib/methods/helpers/mergeSubscriptionsRooms.ts

@@ -14,6 +14,7 @@ import {
 } from '../../../definitions';
 import { compareServerVersion } from './compareServerVersion';
 
+// eslint-disable-next-line complexity
 export const merge = (
 	subscription: ISubscription | IServerSubscription,
 	room?: IRoom | IServerRoom | IOmnichannelRoom
@@ -112,6 +113,8 @@ export const merge = (
 		mergedSubscription.autoTranslate = false;
 	}
 
+	mergedSubscription.status = mergedSubscription.status ?? undefined;
+	mergedSubscription.inviter = mergedSubscription.inviter ?? undefined;
 	mergedSubscription.blocker = !!mergedSubscription.blocker;
 	mergedSubscription.blocked = !!mergedSubscription.blocked;
 	mergedSubscription.hideMentionStatus = !!mergedSubscription.hideMentionStatus;

app/lib/methods/isInviteSubscription.ts

@@ -0,0 +1,4 @@
+import { type IInviteSubscription, type ISubscription } from '../../definitions';
+
+export const isInviteSubscription = (subscription: ISubscription): subscription is IInviteSubscription =>
+	subscription?.status === 'INVITED' && !!subscription.inviter;

app/lib/methods/replyRoomInvite.ts

@@ -0,0 +1,13 @@
+import i18n from '../../i18n';
+import { sendInvitationReply } from '../services/restApi';
+import { showErrorAlert } from './helpers';
+import log from './helpers/log';
+
+export const replyRoomInvite = async (rid: string, action: 'accept' | 'reject') => {
+	try {
+		await sendInvitationReply(rid, action);
+	} catch (e) {
+		showErrorAlert(i18n.t('error-invitation-reply-action'));
+		log(e);
+	}
+};

app/lib/services/restApi.ts

@@ -1100,6 +1100,8 @@ export function getUserInfo(userId: string) {
 
 export const toggleFavorite = (roomId: string, favorite: boolean) => sdk.post('rooms.favorite', { roomId, favorite });
 
+export const sendInvitationReply = (roomId: string, action: 'accept' | 'reject') => sdk.post('rooms.invite', { roomId, action });
+
 export const videoConferenceJoin = (callId: string, cam?: boolean, mic?: boolean) =>
 	sdk.post('video-conference.join', { callId, state: { cam: !!cam, mic: mic === undefined ? true : mic } });
 

app/views/RoomView/RightButtons.tsx

@@ -479,6 +479,10 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 			return null;
 		}
 
+		if (status === 'INVITED') {
+			return null;
+		}
+
 		if (t === 'l') {
 			if (!this.isOmnichannelPreview()) {
 				return (

app/views/RoomView/components/InvitedRoom.tsx

@@ -0,0 +1,100 @@
+import React, { type ReactElement } from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+import { useTheme } from '../../../theme';
+import { CustomIcon } from '../../../containers/CustomIcon';
+import Button from '../../../containers/Button';
+import sharedStyles from '../../Styles';
+import I18n from '../../../i18n';
+import type { IInviteSubscription } from '../../../definitions';
+import Chip from '../../../containers/Chip';
+
+const GAP = 32;
+
+type InvitedRoomProps = {
+	title: string;
+	description: string;
+	inviter: IInviteSubscription['inviter'];
+	loading?: boolean;
+	onAccept: () => Promise<void>;
+	onReject: () => Promise<void>;
+};
+
+export const InvitedRoom = ({ title, description, inviter, loading, onAccept, onReject }: InvitedRoomProps): ReactElement => {
+	const { colors } = useTheme();
+	const styles = useStyle();
+
+	return (
+		<View style={styles.root}>
+			<View style={styles.container}>
+				<View style={styles.textView}>
+					<View style={styles.icon}>
+						<CustomIcon name='mail' size={42} color={colors.fontSecondaryInfo} />
+					</View>
+					<Text style={styles.title}>{title}</Text>
+					<Text style={styles.description}>{description}</Text>
+					<View style={styles.username}>
+						<Chip avatar={inviter.username} text={inviter.name || inviter.username} />
+					</View>
+				</View>
+				<Button title={I18n.t('accept')} loading={loading} onPress={onAccept} />
+				<Button
+					title={I18n.t('reject')}
+					type='secondary'
+					loading={loading}
+					backgroundColor={colors.surfaceTint}
+					onPress={onReject}
+				/>
+			</View>
+		</View>
+	);
+};
+
+const useStyle = () => {
+	const { colors } = useTheme();
+	const styles = StyleSheet.create({
+		root: {
+			flex: 1,
+			backgroundColor: colors.surfaceRoom
+		},
+		container: {
+			flex: 1,
+			marginHorizontal: 24,
+			justifyContent: 'center'
+		},
+		textView: { alignItems: 'center' },
+		icon: {
+			width: 58,
+			height: 58,
+			borderRadius: 30,
+			marginBottom: GAP,
+			backgroundColor: colors.surfaceNeutral,
+			alignItems: 'center',
+			justifyContent: 'center'
+		},
+		title: {
+			...sharedStyles.textBold,
+			fontSize: 24,
+			lineHeight: 32,
+			textAlign: 'center',
+			color: colors.fontTitlesLabels,
+			marginBottom: GAP
+		},
+		description: {
+			...sharedStyles.textRegular,
+			fontSize: 16,
+			lineHeight: 24,
+			textAlign: 'center',
+			color: colors.fontDefault
+		},
+		username: {
+			...sharedStyles.textRegular,
+			fontSize: 16,
+			lineHeight: 24,
+			textAlign: 'center',
+			color: colors.fontDefault,
+			marginBottom: GAP
+		}
+	});
+	return styles;
+};

app/views/RoomView/constants.ts

@@ -44,5 +44,7 @@ export const roomAttrsUpdate = [
 	'autoTranslateLanguage',
 	'unmuted',
 	'E2EKey',
-	'encrypted'
+	'encrypted',
+	'status',
+	'inviter'
 ] as TRoomUpdate[];