peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Peter Maquiran
2022-09-30 13:12:16 +01:00
parent 34f9537954
commit 08b9d5e5df
5 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/chat/room.service.ts
+7 -6
View File
@@ -49,6 +49,7 @@ export class RoomService {
userThatIsTyping = ''
messagesLocalReference = []
members = []
membersExcludeMe = []
u
sessionStore = SessionStore
countDownTime = ''
@@ -101,8 +102,8 @@ export class RoomService {
const statusNum = d.fields.args[0][2]
const statusText = this.statusNumberToText(statusNum)
if(this.members?.map) {
const membersIds = this.members.map((user)=> user._id)
if(this.membersExcludeMe?.map) {
const membersIds = this.membersExcludeMe.map((user)=> user._id)
if(membersIds.includes(userId)) {
@@ -187,7 +188,7 @@ export class RoomService {
this.lastMessage = lastMessage
this._updatedAt = _updatedAt
this.u = u
this.members = members
this.membersExcludeMe = members
this.calDateDuration()
this.restoreMessageFromDB()
@@ -307,7 +308,7 @@ export class RoomService {
this.messages.forEach((message, index)=> {
if(message.localReference == ChatMessage.localReference) {
const membersIds = this.members.map((user)=> user._id)
const membersIds = this.membersExcludeMe.map((user)=> user._id)
this.getAllUsers().forEach( async (users) => {
@@ -369,7 +370,7 @@ export class RoomService {
getRoomMembersIds(): string[] {
try {
return this.members.map((user)=> user._id)
return this.membersExcludeMe.map((user)=> user._id)
} catch(error) {
return []
}
@@ -778,7 +779,7 @@ export class RoomService {
async readAllMessage() {
const membersIds = this.members.map((user)=> user._id)
const membersIds = this.membersExcludeMe.map((user)=> user._id)
await this.messages.forEach( async (message, index) => {
src/app/services/chat/ws-chat-methods.service.ts
+8 -4
View File
@@ -202,7 +202,8 @@ export class WsChatMethodsService {
const members = res['members'];
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
rooms.result.update[index]['members'] = users
rooms.result.update[index]['members'] = members
rooms.result.update[index]['membersExcludeMe'] = users
await this.prepareRoom(roomData);
} else {
@@ -224,7 +225,8 @@ export class WsChatMethodsService {
const members = res['members'];
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
rooms.result.update[index]['members'] = users
rooms.result.update[index]['members'] = members
rooms.result.update[index]['membersExcludeMe'] = users
await this.prepareRoom(roomData);
@@ -250,7 +252,8 @@ export class WsChatMethodsService {
const members = res['members'];
const users = members.filter(data => data.username != this.sessionStore.user.UserName);
rooms.result.update[index]['members'] = users
rooms.result.update[index]['members'] = members
rooms.result.update[index]['membersExcludeMe'] = users
await this.prepareRoom(roomData);
}
}
@@ -377,7 +380,8 @@ export class WsChatMethodsService {
lastMessage: this.getRoomLastMessage(roomData),
_updatedAt: new Date( roomData._updatedAt || roomData._updatedAt['$date']),
u : roomData.u || {},
members: roomData.members
members: roomData.members,
membersExcludeMe: roomData.membersExcludeMe
}
let roomId = this.getRoomId(roomData);