diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 7b4e79ba8..cd7a7ee3b 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -75,6 +75,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe scrollToBottomBtn = false; roomCountDownDate: string; roomCountDownTime: string; + isAdmin = false; @Input() roomId: string; @Output() closeAllDesktopComponents: EventEmitter = new EventEmitter(); @@ -101,7 +102,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe audioPermissionStatus: 'granted'| 'denied' | 'prompt' | null = null sessionStore = SessionStore - groupAdminId = ""; constructor( public wsChatMethodsService: WsChatMethodsService, @@ -404,10 +404,16 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe let room = await this.chatService.getRoomInfo(this.roomId).toPromise(); console.log('ROOM',room) this.room = room['room']; - this.groupAdminId = this.room.u._id; if (this.room.name) { this.roomName = this.room.name.split('-').join(' '); } + + + if(SessionStore.user.ChatData.data.userId == this.room.u._id){ + this.isAdmin = true + } else { + this.isAdmin = false + } if (this.room.customFields.countDownDate) { this.roomCountDownDate = this.room.customFields.countDownDate; @@ -506,8 +512,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } async openGroupMessagesOptions() { - alert(this.groupAdminId) - if(SessionStore.user.ChatData.data.userId == this.groupAdminId) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -554,6 +558,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe componentProps: { roomId: this.roomId, members: this.members, + isAdmin: this.isAdmin } }); await modal.present(); @@ -583,7 +588,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }; }); - } } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index d85351acb..099781440 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -7,9 +7,9 @@
- +
- - + +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 3e81f382d..8d6cfc5a8 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -6,6 +6,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page'; import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'; import { HttpErrorResponse } from '@angular/common/http'; +import { SessionStore } from 'src/app/store/session.service'; @Component({ @@ -17,6 +18,7 @@ export class ChatPopoverPage implements OnInit { roomId:string; room: any; members:any; + isAdmin = false; constructor( private popoverController: PopoverController, @@ -29,6 +31,7 @@ export class ChatPopoverPage implements OnInit { ) { this.roomId = this.navParams.get('roomId'); this.members = this.navParams.get('members'); + this.isAdmin = this.navParams.get('isAdmin'); } ngOnInit() { @@ -63,6 +66,7 @@ export class ChatPopoverPage implements OnInit { componentProps: { roomId: this.roomId, members: this.members, + isAdmin: this.isAdmin } }); await modal.present();