Add joinRoom to get all messages coming from the room
This commit is contained in:
parent
7a19bfbe69
commit
105cbf18f6
1 changed files with 13 additions and 4 deletions
|
|
@ -30,6 +30,7 @@ export class ChatService {
|
||||||
|
|
||||||
setRoom(room: string){
|
setRoom(room: string){
|
||||||
this.room = room;
|
this.room = room;
|
||||||
|
this.joinRoom(this.room);
|
||||||
}
|
}
|
||||||
|
|
||||||
setSocket(){
|
setSocket(){
|
||||||
|
|
@ -38,8 +39,8 @@ export class ChatService {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
sendMessage(sender: string | null, receiver: string | null, room: string, message: string) {
|
sendMessage(sender: string | null, room: string, message: string) {
|
||||||
if(receiver === null){
|
if(room === 'general' || room === 'General'){
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
this.socket.emit(room, {
|
this.socket.emit(room, {
|
||||||
username: sender,
|
username: sender,
|
||||||
|
|
@ -49,16 +50,24 @@ export class ChatService {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
//console.log('sendMessage private: ',sender,receiver,message);
|
//console.log('sendMessage private: ',sender,room,message);
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
this.socket.emit('privateroom', {
|
this.socket.emit('privateroom', {
|
||||||
sender: sender,
|
sender: sender,
|
||||||
receiver: receiver,
|
room: room,
|
||||||
date: new Date(),
|
date: new Date(),
|
||||||
message: message
|
message: message
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
joinRoom(room: string): void{
|
||||||
|
//@ts-ignore
|
||||||
|
this.socket.emit('joinroom', {
|
||||||
|
room: room
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
leaveRoom(): void {
|
leaveRoom(): void {
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
this.socket?.disconnect();
|
this.socket?.disconnect();
|
||||||
|
|
|
||||||
Reference in a new issue