quickblox-react-ui-kit 0.2.4 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickblox-react-ui-kit",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "main": "dist/index-ui.js",
   "license": "MIT",
   "dependencies": {

package/src/App.tsx

@@ -28,7 +28,7 @@ function App() {
   const { connectionRepository } = useQBConnection();
 
   const initLoginData: LoginData = {
-    login: 'artimed', // vit1
+    login: 'anruaav2', // vit1
     password: 'quickblox',
   };
 

package/src/Data/repository/DialogsRepository.ts

@@ -52,6 +52,10 @@ export default class DialogsRepository implements IDialogsRepository {
     this.dialogLocalDTOMapper = new DialogLocalDTOMapper();
   }
 
+  release() {
+    this.localDataStorage.clearAll();
+  }
+
   subscribeLocalSync(subscriber: FunctionTypeVoidToVoid): void {
     this.localDataStorage.subscribe(subscriber);
   }

package/src/Data/repository/EventMessagesRepository.ts

@@ -47,6 +47,8 @@ export default class EventMessagesRepository
       new SubscriptionPerformer<MessageEntity>();
     this.subscriptionOnSystemMessages[NotificationTypes.DELETE_LEAVE_DIALOG] =
       new SubscriptionPerformer<MessageEntity>();
+    this.subscriptionOnSystemMessages[NotificationTypes.REMOVE_USER] =
+      new SubscriptionPerformer<MessageEntity>();
     this.subscriptionOnSystemMessages[NotificationTypes.NEW_DIALOG] =
       new SubscriptionPerformer<MessageEntity>();
     this.remoteDs.subscribeOnSystemMessaging(
@@ -61,6 +63,10 @@ export default class EventMessagesRepository
       NotificationTypes.DELETE_LEAVE_DIALOG,
       this.DeleteLeaveDialogEventHandler.bind(this),
     );
+    this.remoteDs.subscribeOnSystemMessaging(
+      NotificationTypes.REMOVE_USER,
+      this.RemoteUserDialogEventHandler.bind(this),
+    );
     this.remoteDs.subscribeOnMessaging(this.NewMessageEventHandler.bind(this));
     this.remoteDs.subscribeOnUpdateMessageStatus(
       this.UpdateMessageStatusEventHandler.bind(this),
@@ -158,6 +164,31 @@ export default class EventMessagesRepository
       });
   }
 
+  protected RemoteUserDialogEventHandler(messageInfo: RemoteMessageDTO): void {
+    this.messageDTOMapper
+      .toEntity<RemoteMessageDTO, MessageEntity>(messageInfo)
+      // eslint-disable-next-line promise/always-return
+      .then((currentMessage: MessageEntity) => {
+        console.log(
+          'have system message new dialog',
+          JSON.stringify(currentMessage),
+        );
+        this.subscriptionOnSystemMessages[
+          NotificationTypes.REMOVE_USER
+        ].informSubscribers(currentMessage, EventMessageType.SystemMessage);
+      })
+      .catch((reason) => {
+        const errorMessage = stringifyError(reason);
+
+        console.log(
+          'get system message with new dialog with exception:',
+          errorMessage,
+        );
+
+        throw new Error(errorMessage);
+      });
+  }
+
   protected UpdateDialogEventHandler(messageInfo: RemoteMessageDTO): void {
     console.log('call UpdateDialogEventHandler');
     if (this.messageDTOMapper) {
@@ -274,6 +305,9 @@ export default class EventMessagesRepository
       case NotificationTypes.DELETE_LEAVE_DIALOG:
         SystemMessageType = NotificationTypes.DELETE_LEAVE_DIALOG;
         break;
+      case NotificationTypes.REMOVE_USER:
+        SystemMessageType = NotificationTypes.REMOVE_USER;
+        break;
       case NotificationTypes.UPDATE_DIALOG:
         SystemMessageType = NotificationTypes.UPDATE_DIALOG;
         break;

package/src/Data/repository/MessagesRepository.ts

@@ -225,7 +225,7 @@ export default class MessagesRepository implements IMessagesRepository {
     await this.remoteDataSource.typingMessageStop(remoteDialogDTO, senderId);
   }
 
-  async saveMessageToLocal(entity: MessageEntity): Promise<boolean> {
+  async saveMessageToLocal(entity: MessageEntity): Promise<MessageEntity> {
     try {
       const dto: RemoteMessageDTO = await this.messageLocalDTOMapper.fromEntity(
         entity,
@@ -233,26 +233,32 @@ export default class MessagesRepository implements IMessagesRepository {
 
       await this.localDataStorage.saveMessage(dto);
 
-      return Promise.resolve(true);
+      return Promise.resolve(entity);
     } catch (e) {
-      return Promise.resolve(false);
+      // eslint-disable-next-line no-param-reassign
+      entity.delivered_ids = [];
+
+      return Promise.resolve(entity);
     }
   }
 
-  async sendMessageToRemote(entity: MessageEntity): Promise<boolean> {
+  async sendMessageToRemote(entity: MessageEntity): Promise<MessageEntity> {
+    let messageResult: MessageEntity = entity;
+
     try {
-      const dto: RemoteMessageDTO =
+      const dtoParam: RemoteMessageDTO =
         await this.messageRemoteDTOMapper.fromEntity(entity);
 
-      await this.remoteDataSource.sendMessage(dto);
+      const dtoResult: RemoteMessageDTO =
+        await this.remoteDataSource.sendMessage(dtoParam);
 
-      return Promise.resolve(true);
+      messageResult = await this.messageRemoteDTOMapper.toEntity(dtoResult);
+
+      return Promise.resolve(messageResult);
     } catch (e) {
       // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject(false);
+      return Promise.reject(messageResult);
     }
-
-    return Promise.resolve(false);
   }
 
   async updateMessageInLocal(entity: MessageEntity): Promise<boolean> {

package/src/Data/source/exception/MapperDTOException.ts

@@ -15,5 +15,8 @@ export class MapperDTOException extends RepositoryException {
   constructor(message: string, code: number, description = '') {
     super(message, code);
     this._description = description;
+    if (this._description) {
+      this.message += ` ${this._description}`;
+    }
   }
 }

package/src/Data/source/remote/RemoteDataSource.ts

@@ -149,6 +149,8 @@ export class RemoteDataSource implements IRemoteDataSource {
     this.fileDTOMapper = new FileDTOMapper();
     this._needInit = true;
     this._authProcessed = false;
+    this.subscriptionOnSystemMessages[NotificationTypes.REMOVE_USER] =
+      new SubscriptionPerformer<RemoteMessageDTO>();
     this.subscriptionOnSystemMessages[NotificationTypes.UPDATE_DIALOG] =
       new SubscriptionPerformer<RemoteMessageDTO>();
     this.subscriptionOnSystemMessages[NotificationTypes.DELETE_LEAVE_DIALOG] =
@@ -270,6 +272,9 @@ export class RemoteDataSource implements IRemoteDataSource {
     let SystemMessageType: string = NotificationTypes.NEW_DIALOG;
 
     switch (notificationType) {
+      case NotificationTypes.REMOVE_USER:
+        SystemMessageType = NotificationTypes.REMOVE_USER;
+        break;
       case NotificationTypes.DELETE_LEAVE_DIALOG:
         SystemMessageType = NotificationTypes.DELETE_LEAVE_DIALOG;
         break;
@@ -348,26 +353,13 @@ export class RemoteDataSource implements IRemoteDataSource {
         message.extension.notification_type || NotificationTypes.UPDATE_DIALOG;
       resultMessage.dialogId = message?.extension?.dialog_id || '';
 
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      function getEventNameFromNotification(notification_type: string) {
-        let EventName = SubscriptionPerformer.DEFAULT_SUBSCRIPTION_NAME;
-
-        if (
-          notification_type === NotificationTypes.UPDATE_DIALOG ||
-          notification_type === NotificationTypes.NEW_DIALOG
-        ) {
-          EventName = 'UPDATE_DIALOG_LIST_INFO';
-        }
-
-        return EventName;
-      }
-
       this.subscriptionOnSystemMessages[
         resultMessage.notification_type
       ].informSubscribers(resultMessage, EventMessageType.SystemMessage);
     };
 
-    function ToRemoteMessageDTO(message: QBChatXMPPMessage) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    function QBChatXMPPMessageToRemoteMessageDTO(message: QBChatXMPPMessage) {
       const resultMessage = new RemoteMessageDTO();
 
       resultMessage.id = message.id;
@@ -413,28 +405,104 @@ export class RemoteDataSource implements IRemoteDataSource {
       // нужно получить реализовать так как при обработке onDeliveredStatusListener
       const dialogId = message.dialog_id || message.extension.dialog_id || '-1';
 
-      // eslint-disable-next-line promise/catch-or-return,@typescript-eslint/no-unused-vars,promise/always-return
-      QBGetDialogById(dialogId).then((result) => {
-        // const dialogs: QBChatDialog[] | undefined = result?.items.filter(
-        //   (v) => v._id === dialogId,
-        // );
-        // const current = dialogs && dialogs.length > 0 ? dialogs[0] : undefined;
-
+      //
+      qbChatGetMessagesExtended(dialogId, {
+        _id: message.id,
+      })
         // eslint-disable-next-line promise/always-return
-        // if (current && current.type === DialogType.group)
-        // eslint-disable-next-line no-lone-blocks
-        {
-          // const messageId = message.id;
-          const resultMessage = ToRemoteMessageDTO(message);
-
-          this.subscriptionOnChatMessages.informSubscribers(
-            resultMessage,
-            EventMessageType.RegularMessage,
+        .then((qbMessages: GetMessagesResult) => {
+          ///
+          qbMessages.items.map(async (currentItem) => {
+            const dtoMessage: RemoteMessageDTO =
+              await this.messageDTOMapper.toTDO<
+                QBChatMessage,
+                RemoteMessageDTO
+              >(currentItem);
+
+            dtoMessage.dialogId = dialogId;
+
+            this.subscriptionOnChatMessages.informSubscribers(
+              dtoMessage,
+              EventMessageType.RegularMessage,
+            );
+
+            return dtoMessage;
+          });
+
+          ///
+        })
+        .catch();
+      //
+      // // eslint-disable-next-line promise/catch-or-return,@typescript-eslint/no-unused-vars,promise/always-return
+      // QBGetDialogById(dialogId).then((result) => {
+      //   // const dialogs: QBChatDialog[] | undefined = result?.items.filter(
+      //   //   (v) => v._id === dialogId,
+      //   // );
+      //   // const current = dialogs && dialogs.length > 0 ? dialogs[0] : undefined;
+      //
+      //   // eslint-disable-next-line promise/always-return
+      //   // if (current && current.type === DialogType.group)
+      //   // eslint-disable-next-line no-lone-blocks
+      //   {
+      //     // const messageId = message.id;
+      //     const resultMessage = QBChatXMPPMessageToRemoteMessageDTO(message);
+      //
+      //     this.subscriptionOnChatMessages.informSubscribers(
+      //       resultMessage,
+      //       EventMessageType.RegularMessage,
+      //     );
+      //   }
+      //
+      //   //
+      // });
+    };
+    QB.chat.onDeliveredStatusListener = (messageId, dialogId, userId) => {
+      console.log(
+        `EVENT: receive delivered message id: ${messageId}, dialogid: ${dialogId} userid: ${userId}`,
+      );
+
+      QBGetDialogById(dialogId)
+        .then((result) => {
+          //
+          const dialogs: QBChatDialog[] | undefined = result?.items.filter(
+            (v) => v._id === dialogId,
           );
-        }
+          const current =
+            dialogs && dialogs.length > 0 ? dialogs[0] : undefined;
 
-        //
-      });
+          // eslint-disable-next-line promise/always-return
+          if (current && current.type === DialogType.private) {
+            //
+            qbChatGetMessagesExtended(dialogId, {
+              _id: messageId,
+            })
+              // eslint-disable-next-line promise/always-return
+              .then((qbMessages: GetMessagesResult) => {
+                ///
+                qbMessages.items.map(async (currentItem) => {
+                  const dtoMessage: RemoteMessageDTO =
+                    await this.messageDTOMapper.toTDO<
+                      QBChatMessage,
+                      RemoteMessageDTO
+                    >(currentItem);
+
+                  dtoMessage.dialogId = dialogId;
+
+                  this.subscriptionOnChatMessages.informSubscribers(
+                    dtoMessage,
+                    EventMessageType.RegularMessage,
+                  );
+
+                  return dtoMessage;
+                });
+
+                ///
+              })
+              .catch();
+            //
+          }
+        })
+        .catch();
     };
     QB.chat.onMessageTypingListener = (isTyping, userId, dialogId) => {
       console.log(
@@ -492,54 +560,6 @@ export class RemoteDataSource implements IRemoteDataSource {
       );
     };
 
-    QB.chat.onDeliveredStatusListener = (messageId, dialogId, userId) => {
-      console.log(
-        `EVENT: receive delivered message id: ${messageId}, dialogid: ${dialogId} userid: ${userId}`,
-      );
-
-      QBGetDialogById(dialogId)
-        .then((result) => {
-          //
-          const dialogs: QBChatDialog[] | undefined = result?.items.filter(
-            (v) => v._id === dialogId,
-          );
-          const current =
-            dialogs && dialogs.length > 0 ? dialogs[0] : undefined;
-
-          // eslint-disable-next-line promise/always-return
-          if (current && current.type === DialogType.private) {
-            //
-            qbChatGetMessagesExtended(dialogId, {
-              _id: messageId,
-            })
-              // eslint-disable-next-line promise/always-return
-              .then((qbMessages: GetMessagesResult) => {
-                ///
-                qbMessages.items.map(async (currentItem) => {
-                  const dtoMessage: RemoteMessageDTO =
-                    await this.messageDTOMapper.toTDO<
-                      QBChatMessage,
-                      RemoteMessageDTO
-                    >(currentItem);
-
-                  dtoMessage.dialogId = dialogId;
-
-                  this.subscriptionOnChatMessages.informSubscribers(
-                    dtoMessage,
-                    EventMessageType.RegularMessage,
-                  );
-
-                  return dtoMessage;
-                });
-
-                ///
-              })
-              .catch();
-            //
-          }
-        })
-        .catch();
-    };
     QB.chat.onReadStatusListener = (messageId, dialogId, userId) => {
       console.log(
         `EVENT: receive read message id: ${messageId}, dialogid: ${dialogId} userid: ${userId}`,
@@ -1153,32 +1173,32 @@ export class RemoteDataSource implements IRemoteDataSource {
      */
     // notification_type: 3,
     // dialog_updated_at: Date.now() / 1000,
-    let messageText = '';
-
-    switch (dto.notification_type) {
-      case NotificationTypes.DELETE_LEAVE_DIALOG: {
-        messageText = `${
-          this.authInformation?.userName || 'owner'
-        } has left the chat.`;
-        break;
-      }
-      case NotificationTypes.NEW_DIALOG: {
-        messageText = `${
-          this.authInformation?.userName || 'owner'
-        } create the chat`;
-        break;
-      }
-      case NotificationTypes.UPDATE_DIALOG: {
-        messageText = `${
-          this.authInformation?.userName || 'owner'
-        } update the chat`;
-        break;
-      }
-      default: {
-        messageText = dto.message;
-        break;
-      }
-    }
+    const messageText = dto.message;
+
+    // switch (dto.notification_type) {
+    //   case NotificationTypes.DELETE_LEAVE_DIALOG: {
+    //     messageText = `${
+    //       this.authInformation?.userName || 'owner'
+    //     } has left the chat.`;
+    //     break;
+    //   }
+    //   case NotificationTypes.NEW_DIALOG: {
+    //     messageText = `${
+    //       this.authInformation?.userName || 'owner'
+    //     } create the chat`;
+    //     break;
+    //   }
+    //   case NotificationTypes.UPDATE_DIALOG: {
+    //     messageText = `${
+    //       this.authInformation?.userName || 'owner'
+    //     } update the chat`;
+    //     break;
+    //   }
+    //   default: {
+    //     messageText = dto.message;
+    //     break;
+    //   }
+    // }
     const qbEntity: QBChatNewMessage = {
       type: dto.dialog_type === DialogType.private ? 'chat' : 'groupchat',
       body: messageText,
@@ -1207,10 +1227,10 @@ export class RemoteDataSource implements IRemoteDataSource {
         qbEntity.extension.attachments?.push(chatMessageAttachment);
       });
     }
-    let qbMessages: QBChatMessage['_id'];
+    let qbMessageId: QBChatMessage['_id'];
 
     if (dto.dialog_type === DialogType.private) {
-      qbMessages = await QBChatSendMessage(dto.recipient_id, qbEntity);
+      qbMessageId = await QBChatSendMessage(dto.recipient_id, qbEntity);
     } else {
       await QBJoinGroupDialog(dto.dialogId).catch(() => {
         throw new RemoteDataSourceException(
@@ -1220,10 +1240,10 @@ export class RemoteDataSource implements IRemoteDataSource {
       });
       const dialogJid = QB.chat.helpers.getRoomJidFromDialogId(dto.dialogId);
 
-      qbMessages = await QBChatSendMessage(dialogJid, qbEntity);
+      qbMessageId = await QBChatSendMessage(dialogJid, qbEntity);
     }
 
-    if (qbMessages === null || qbMessages === undefined) {
+    if (qbMessageId === null || qbMessageId === undefined) {
       return Promise.reject(
         new RemoteDataSourceException(
           INCORRECT_REMOTE_DATASOURCE_DATA_EXCEPTION_MESSAGE,
@@ -1232,6 +1252,8 @@ export class RemoteDataSource implements IRemoteDataSource {
       );
     }
     console.log('regular message was sent');
+    // eslint-disable-next-line no-param-reassign
+    dto.id = qbMessageId;
 
     return Promise.resolve(dto);
   }

package/src/Domain/entity/NotificationTypes.ts

@@ -4,4 +4,6 @@ export class NotificationTypes {
   public static readonly UPDATE_DIALOG = '2';
 
   public static readonly DELETE_LEAVE_DIALOG = '3';
+
+  public static readonly REMOVE_USER = '4';
 }

package/src/Domain/repository/IDialogsRepository.ts

@@ -37,4 +37,6 @@ export interface IDialogsRepository {
   isLocalSynced(): Promise<boolean>;
 
   setLocalSynced(synced: boolean): void;
+
+  release(): void;
 }

package/src/Domain/repository/IMessagesRepository.ts

@@ -3,9 +3,9 @@ import { PaginatedResult, Pagination } from './Pagination';
 import { DialogEntity } from '../entity/DialogEntity'
 
 export interface IMessagesRepository {
-  saveMessageToLocal(message: MessageEntity): Promise<boolean>;
+  saveMessageToLocal(message: MessageEntity): Promise<MessageEntity>;
 
-  sendMessageToRemote(message: MessageEntity): Promise<boolean>;
+  sendMessageToRemote(message: MessageEntity): Promise<MessageEntity>;
 
   getMessagesFromLocal(dialogId: string): Promise<Array<MessageEntity>>;
 

package/src/Domain/use_cases/CreateDialogUseCase.ts

@@ -15,16 +15,20 @@ export class CreateDialogUseCase implements IUseCase<void, DialogEntity> {
 
   private newDialog: GroupDialogEntity;
 
+  private textInformationMessage: string;
+
   // todo: delete synUseCase: BaseUseCase<boolean>, use only dialogRepository
   constructor(
     eventMessagesRepository: EventMessagesRepository,
     dialogRepository: DialogsRepository,
     newDialog: GroupDialogEntity,
+    textInformationMessage: string,
   ) {
     console.log('CONSTRUCTOR CreateDialogUseCase');
     this.dialogRepository = dialogRepository;
     this.newDialog = newDialog;
     this.eventMessagesRepository = eventMessagesRepository;
+    this.textInformationMessage = textInformationMessage;
   }
 
   async execute(): Promise<DialogEntity> {
@@ -60,7 +64,10 @@ export class CreateDialogUseCase implements IUseCase<void, DialogEntity> {
     remoteMessageDTO.dialogId = result.id;
     remoteMessageDTO.notification_type = NotificationTypes.NEW_DIALOG;
     remoteMessageDTO.date_sent = Date.now() / 1000;
-    remoteMessageDTO.message = `User ${this.newDialog.ownerId} create new dialog ${this.newDialog.name}`;
+    remoteMessageDTO.message =
+      this.textInformationMessage && this.textInformationMessage.length > 0
+        ? this.textInformationMessage
+        : `User ${this.newDialog.ownerId} create new dialog ${this.newDialog.name}`;
 
     this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
       EventMessageType.RegularMessage,

package/src/Domain/use_cases/GetAllDialogsUseCaseWithMock.ts

@@ -21,6 +21,7 @@ export class GetAllDialogsUseCaseWithMock
     const fromRemote: PaginatedResult<DialogEntity> =
       await this.dialogRepository.getDialogsFromRemote(this.pagination);
 
+    this.dialogRepository.release();
     await Promise.all(
       fromRemote.ResultData.map(async (entity) => {
         // eslint-disable-next-line no-return-await

package/src/Domain/use_cases/LeaveDialogUseCase.ts

@@ -27,17 +27,21 @@ export class LeaveDialogUseCase implements IUseCase<void, boolean> {
 
   private leaveType: DialogLeaveTypeArcheType;
 
+  private textInformationMessage: string;
+
   constructor(
     eventMessagesRepository: EventMessagesRepository,
     dialogRepository: DialogsRepository,
     dialog: DialogEntity,
     leaveType: DialogLeaveTypeArcheType,
+    textInformationMessage: string,
   ) {
     console.log('CONSTRUCTOR LeaveDialogUseCase');
     this.eventMessagesRepository = eventMessagesRepository;
     this.dialogRepository = dialogRepository;
     this.dialogToLeave = dialog;
     this.leaveType = leaveType;
+    this.textInformationMessage = textInformationMessage;
   }
 
   async execute(): Promise<boolean> {
@@ -59,7 +63,10 @@ export class LeaveDialogUseCase implements IUseCase<void, boolean> {
     remoteMessageDTO.dialogId = this.dialogToLeave.id;
     remoteMessageDTO.notification_type = NotificationTypes.DELETE_LEAVE_DIALOG;
     remoteMessageDTO.date_sent = Date.now();
-    remoteMessageDTO.message = `User ${this.dialogToLeave.ownerId} has left dialog.`;
+    remoteMessageDTO.message =
+      this.textInformationMessage && this.textInformationMessage.length > 0
+        ? this.textInformationMessage
+        : `User ${this.dialogToLeave.ownerId} has left dialog.`;
 
     this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
       EventMessageType.RegularMessage,

package/src/Domain/use_cases/RemoveUsersFromTheDialogUseCase.ts

@@ -21,17 +21,21 @@ export class RemoveUsersFromTheDialogUseCase
 
   private usersIds: Array<number>;
 
+  private textInformationMessage: string;
+
   constructor(
     eventMessagesRepository: EventMessagesRepository,
     dialogRepository: DialogsRepository,
     dialog: DialogEntity,
     usersIds: Array<number>,
+    textInformationMessage: string,
   ) {
     console.log('CONSTRUCTOR LeaveDialogUseCase');
     this.eventMessagesRepository = eventMessagesRepository;
     this.dialogRepository = dialogRepository;
     this.dialogToLeave = dialog;
     this.usersIds = usersIds;
+    this.textInformationMessage = textInformationMessage;
   }
 
   async execute(): Promise<boolean> {
@@ -53,13 +57,25 @@ export class RemoveUsersFromTheDialogUseCase
     remoteMessageDTO.dialogId = this.dialogToLeave.id;
     remoteMessageDTO.notification_type = NotificationTypes.DELETE_LEAVE_DIALOG;
     remoteMessageDTO.date_sent = Date.now();
-    remoteMessageDTO.message = `User ${this.dialogToLeave.ownerId} has left dialog.`;
-
-    this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
-      EventMessageType.RegularMessage,
-      remoteMessageDTO,
-      receivers,
-    );
+    remoteMessageDTO.message =
+      this.textInformationMessage && this.textInformationMessage.length > 0
+        ? this.textInformationMessage
+        : `User ${this.dialogToLeave.ownerId} delete other users from dialog.`;
+
+    const updatedRecivers: number[] = [];
+
+    receivers.forEach((item) => {
+      if (!this.usersIds.includes(item)) {
+        updatedRecivers.push(item);
+      }
+    });
+
+    // send visual message
+    // this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
+    //   EventMessageType.RegularMessage,
+    //   remoteMessageDTO,
+    //   updatedRecivers,
+    // );
     //
 
     await this.dialogRepository
@@ -81,21 +97,28 @@ export class RemoveUsersFromTheDialogUseCase
       console.log('try to delete dialog in local');
 
       remoteMessageDTO.dialogId = this.dialogToLeave.id;
-      remoteMessageDTO.notification_type =
-        NotificationTypes.DELETE_LEAVE_DIALOG;
-
-      await this.dialogRepository.deleteDialogFromLocal(this.dialogToLeave.id);
-      this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
-        EventMessageType.LocalMessage,
-        remoteMessageDTO,
-        [],
-      );
+      remoteMessageDTO.notification_type = NotificationTypes.REMOVE_USER;
 
       this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
         EventMessageType.SystemMessage,
         remoteMessageDTO,
-        receivers,
+        [...this.usersIds], // receivers,
       );
+
+      //
+      remoteMessageDTO.notification_type = NotificationTypes.UPDATE_DIALOG;
+
+      if (updatedRecivers) {
+        if (updatedRecivers.length > 0) {
+          this.eventMessagesRepository.dispatchEvent<RemoteMessageDTO>(
+            EventMessageType.SystemMessage,
+            remoteMessageDTO,
+            updatedRecivers,
+          );
+        }
+      }
+
+      //
     }
 
     return resultOperation;