diff --git a/src/app/module/chat/data/repository/room-repository.service.ts b/src/app/module/chat/data/repository/room-repository.service.ts index 5826fff2e..5db98d9ac 100644 --- a/src/app/module/chat/data/repository/room-repository.service.ts +++ b/src/app/module/chat/data/repository/room-repository.service.ts @@ -227,11 +227,11 @@ export class RoomRepositoryService { @captureAndReraiseAsync('RoomRepositoryService/addMemberToRoom') async addMemberToRoom(data: AddMemberToRoomInputDTO) { - return this.roomLiveSignalRDataSourceService.addMemberToRoom(data) + // return this.roomLiveSignalRDataSourceService.addMemberToRoom(data) - // const result = await this.roomRemoteDataSourceService.addMemberToRoom(data) + const result = await this.roomRemoteDataSourceService.addMemberToRoom(data) - // return result + return result } async updateMemberStatus(data: MemberListUPdateStatusInputDTO) { diff --git a/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts b/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts index a8f34df37..a9e9569ae 100644 --- a/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts +++ b/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts @@ -14,8 +14,6 @@ export class ListenMessageDeleteByRoomIdService { execute({roomId}) { return this.messageLiveSignalRDataSourceService.getMessageDelete().pipe( filter((message) => { - - console.log({message}, 'delete') return roomId == message?.roomId } ) ) diff --git a/src/app/module/chat/domain/use-case/message-attachment-by-message-id.service.ts b/src/app/module/chat/domain/use-case/message-attachment-by-message-id.service.ts index e4867cdd2..a56b8d8a7 100644 --- a/src/app/module/chat/domain/use-case/message-attachment-by-message-id.service.ts +++ b/src/app/module/chat/domain/use-case/message-attachment-by-message-id.service.ts @@ -30,7 +30,6 @@ export class MessageAttachmentByMessageIdUseCase { if(getLocalAttachment.isOk() && getLocalAttachment.value) { if(getLocalAttachment.value) { - console.log('found local', getLocalAttachment.value) return getLocalAttachment.map(e => e.file) } } else { diff --git a/src/app/module/chat/domain/use-case/sync-all-room-messages.service.ts b/src/app/module/chat/domain/use-case/sync-all-room-messages.service.ts index 12d542c3a..ea8d7c414 100644 --- a/src/app/module/chat/domain/use-case/sync-all-room-messages.service.ts +++ b/src/app/module/chat/domain/use-case/sync-all-room-messages.service.ts @@ -19,7 +19,9 @@ export class SyncAllRoomMessagesService { const allRooms: RoomTable[] = await this.RoomRepositoryService.getRoomList() if(allRooms) { - console.log('allRooms', allRooms) + if(allRooms.length == 0) { + console.log('no room to sync') + } for(const room of allRooms) { this.MessageRepositoryService.listAllMessagesByRoomId(room.id) } diff --git a/src/app/module/chat/infra/socket/signal-r.service.ts b/src/app/module/chat/infra/socket/signal-r.service.ts index 6d41761b6..0d39e9350 100644 --- a/src/app/module/chat/infra/socket/signal-r.service.ts +++ b/src/app/module/chat/infra/socket/signal-r.service.ts @@ -6,7 +6,7 @@ import { Plugins } from '@capacitor/core'; import { UserTypingDTO } from '../../data/dto/typing/typingInputDTO'; import { MessageOutPutDataDTO } from '../../data/dto/message/messageOutputDTO'; import { MessageDeleteInputDTO } from '../../data/dto/message/messageDeleteInputDTO'; -import { object, z } from 'zod'; +import { z } from 'zod'; import { switchMap } from 'rxjs/operators'; import { Result } from 'neverthrow'; @@ -84,7 +84,6 @@ export class SignalRService { }) this.connection.getMessages().subscribe((data) => { - console.log("receive message 55") this.messageSubject.next(data) }) this.connection.getTyping().subscribe((data) => { @@ -92,7 +91,6 @@ export class SignalRService { }) this.connection.getMessageDelete().subscribe((data) => { - console.log('delete middleware', data) this.messageDelete.next(data) }) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index a2ad0c323..22462981b 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -5,19 +5,16 @@ import { ViewChild, ViewContainerRef, Output, - NgZone, } from '@angular/core'; -import { ModalController, Platform } from '@ionic/angular'; -import { AuthService } from 'src/app/services/auth.service'; +import { ModalController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; -// import { ChatSystemService } from 'src/app/services/chat/chat-system.service' import { GroupMessagesPage } from './group-messages/group-messages.page'; import { ContactsPage } from './messages/contacts/contacts.page'; import { MessagesPage } from './messages/messages.page'; import { NewGroupPage } from './new-group/new-group.page'; import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page'; import { Observable, Subject } from "rxjs/Rx"; -import { Router, NavigationEnd, ActivatedRoute } from '@angular/router'; +import { Router, NavigationEnd } from '@angular/router'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { environment } from 'src/environments/environment'; @@ -25,10 +22,8 @@ import { TimeService } from 'src/app/services/functions/time.service'; import { ThemeService } from 'src/app/services/theme.service' import { DataService } from 'src/app/services/data.service'; import { RouteService } from 'src/app/services/route.service'; -import { MessageLiveDataSourceService } from 'src/app/module/chat/data/data-source/message/message-live-data-source.service'; import { RoomRemoteDataSourceState } from 'src/app/module/chat/data/data-source/room/room-memory-data-source'; import { RoomListOutPutDTO } from 'src/app/module/chat/data/dto/room/roomListOutputDTO'; -import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service' import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service' import { Observable as DexieObservable } from 'Dexie'; @@ -117,24 +112,10 @@ export class ChatPage implements OnInit { public ThemeService: ThemeService, private dataService: DataService, private router: Router, - // public ChatSystemService: ChatSystemService, public RouteService: RouteService, private RoomRepositoryService: RoomRepositoryService, - private messageLiveDataSourceService: MessageLiveDataSourceService, ) { - - // this.messageLiveDataSourceService.socket.messages$.subscribe(({payload, requestId, type}) => { - // if(payload.sender == null) { - // delete payload.sender - // } - - // if(type == 'createRoom') { - // this.RoomRepositoryService.list(); - // } - - // }) - this.headers = new HttpHeaders(); window.onresize = (event) => { if (window.innerWidth > 701) { @@ -319,8 +300,6 @@ export class ChatPage implements OnInit { openMessagesPage(rid) { - console.log('rid', rid); - // this.chatService.refreshtoken(); this.roomId = rid; @@ -446,20 +425,6 @@ export class ChatPage implements OnInit { async closeNewEventComponentAndOpenChat({ roomId }) { this.closeAllDesktopComponents(); - // this.ChatSystemService._group.forEach((room) => { - // if (room.id == roomId) { - - - // this.openGroupMessagesPage(roomId) - // } - // }) - - // this.ChatSystemService._dm.forEach((room) => { - // if (room.id == roomId) { - // this.openMessagesPage(roomId) - // } - // }) - } doRefresh(event) { diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 67624565b..bcbb86b06 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -58,24 +58,45 @@ {{ message.message }} -
-
+
+
- {{ attachment.fileName }} + {{ attachment.fileName}}
+
+ +
-
- +
+ +
+ +
+ + + + + + + + + + + {{ attachment.fileName}}
+
+
@@ -110,9 +131,6 @@
- - -