Merge pull request #276 from GetStream/vishal/thread-remove-message-fix

Updating removeMessage function to handle threads

src/channel_state.js

@@ -251,23 +251,43 @@ export class ChannelState {
 	 * @return {boolean} Returns if the message was removed
 	 */
 	removeMessage(messageToRemove) {
-		let removed = false;
-		const messages = this.messages.flatMap(message => {
-			const idMatch =
-				message.id && messageToRemove.id && message.id === messageToRemove.id;
+		let isRemoved = false;
+		if (messageToRemove.parent_id && this.threads[messageToRemove.parent_id]) {
+			const { removed, result: threadMessages } = this.removeMessageFromArray(
+				this.threads[messageToRemove.parent_id],
+				messageToRemove,
+			);
+			this.threads = this.threads[messageToRemove.parent_id].set(
+				messageToRemove.parent_id,
+				threadMessages,
+			);
+			isRemoved = removed;
+		} else {
+			const { removed, result: messages } = this.removeMessageFromArray(
+				this.messages,
+				messageToRemove,
+			);
+			this.messages = messages;
+			isRemoved = removed;
+		}
+
+		return isRemoved;
+	}
 
+	removeMessageFromArray = (msgArray, msg) => {
+		let removed = false;
+		const result = msgArray.flatMap(message => {
+			const idMatch = message.id && msg.id && message.id === msg.id;
 			if (idMatch) {
+				removed = true;
 				return [];
 			} else {
-				removed = true;
 				return message;
 			}
 		});
 
-		this.messages = messages;
-		return removed;
-	}
-
+		return { removed, result };
+	};
 	/**
 	 * filterErrorMessages - Removes error messages from the channel state.
 	 *

types/stream-chat/index.d.ts

@@ -365,7 +365,7 @@ export class Channel {
   show(userId?: string): Promise<APIResponse>;
   getMessagesById(messageIds: string[]): Promise<APIResponse>;
 
-  mute(options?: object): Promise<MuteAPIResponse>;
+  mute(options?: object): Promise<MuteChannelAPIResponse>;
   unmute(options?: object): Promise<UnmuteAPIResponse>;
 }
 
@@ -496,11 +496,16 @@ export interface BanUserAPIResponse extends APIResponse {}
 export interface UnbanUserAPIResponse extends APIResponse {}
 
 export interface MuteAPIResponse extends APIResponse {
-  mute: MuteResponse;
-  channel_mute: MuteChannelResponse;
+  mute: MuteUserResponse;
   own_user: OwnUserResponse;
 }
 
+export interface MuteChannelAPIResponse extends APIResponse {
+  mute: MuteUserResponse;
+  own_user: OwnUserResponse;
+  channel_mute: ChannelMute;
+}
+
 export interface UnmuteAPIResponse extends APIResponse {}
 
 export interface FlagAPIResponse extends APIResponse {
@@ -629,6 +634,7 @@ export interface OwnUserResponse extends UserResponse {
   total_unread_count: number;
   unread_channels: number;
   mutes: Mute[];
+  channel_mutes: ChannelMute[];
 }
 
 export interface Mute {
@@ -689,19 +695,24 @@ export interface ReadResponse {
 export interface MuteResponse {
   user: UserResponse;
   target?: UserResponse;
-  channel?: Channel;
   created_at?: string;
   updated_at?: string;
 }
 
-export interface MuteChannelResponse {
+export interface MuteUserResponse extends MuteResponse {}
+export interface ChannelMute {
   user: UserResponse;
   channel?: Channel;
   expires?: string;
   created_at?: string;
   updated_at?: string;
 }
 
+export interface MuteChannelAPIResponse {
+  channel_mute: ChannelMute;
+  own_user: OwnUserResponse;
+}
+
 export interface FlagResponse {
   created_by_automod: boolean;
   user?: UserResponse;