| |
@@ -62,17 +62,17 @@ |
| 62 |
62 |
|
|
| 63 |
63 |
|
|
| 64 |
64 |
|
// create user and send updates |
| 65 |
|
- |
socket.on(EVENTS.CONNECTION.OPEN, (event) => { |
| |
65 |
+ |
socket.on(EVENTS.CONNECTION.OPEN, (data) => { |
| 66 |
66 |
|
// create new user |
| 67 |
|
- |
Chat.createUser(connect_sid, event.data.name, event.data.role); |
| |
67 |
+ |
Chat.createUser(connect_sid, data.name, data.role); |
| 68 |
68 |
|
|
| 69 |
|
- |
console.log('user', Chat.user); |
| |
69 |
+ |
console.log('user', Chat.getUser(connect_sid)); |
| 70 |
70 |
|
|
| 71 |
71 |
|
// join user own room |
| 72 |
|
- |
socket.join(Chat.user.room); |
| |
72 |
+ |
socket.join(Chat.getUser(connect_sid).room); |
| 73 |
73 |
|
|
| 74 |
74 |
|
// join operators room if role is operator |
| 75 |
|
- |
if (Chat.user.role === ROLES.OPERATOR) { |
| |
75 |
+ |
if (Chat.getUser(connect_sid).role === ROLES.OPERATOR) { |
| 76 |
76 |
|
socket.join(DEFAULT_ROOMS.OPERATORS); |
| 77 |
77 |
|
} |
| 78 |
78 |
|
|
| |
@@ -91,32 +91,36 @@ |
| 91 |
91 |
|
|
| 92 |
92 |
|
|
| 93 |
93 |
|
// join room |
| 94 |
|
- |
socket.on(EVENTS.ROOM.JOIN, (event) => { |
| 95 |
|
- |
const ownerRoom = Chat.user.joinOwnerRoom(event.data.user); |
| |
94 |
+ |
socket.on(EVENTS.ROOM.JOIN, (data) => { |
| |
95 |
+ |
const ownerRoom = Chat.getUser(connect_sid).joinOwnerRoom(data.user); |
| 96 |
96 |
|
socket.join(ownerRoom); |
| 97 |
97 |
|
|
| 98 |
|
- |
event = Chat.event(EVENTS.JOIN, Chat.rooms); |
| |
98 |
+ |
event = Chat.event(EVENTS.ROOM.JOIN, ownerRoom); |
| 99 |
99 |
|
io.to(ownerRoom).emit(event.type, event.data); |
| 100 |
100 |
|
|
| 101 |
|
- |
console.log('join room', Chat.user.name, event.data); |
| |
101 |
+ |
console.log('join room', Chat.getUser(connect_sid).name, event.data); |
| 102 |
102 |
|
}); |
| 103 |
103 |
|
|
| 104 |
104 |
|
|
| 105 |
105 |
|
// send text message |
| 106 |
|
- |
socket.on(EVENTS.SEND.MESSAGE, (event) => { |
| 107 |
|
- |
io.to(event.data.room).emit(EVENTS.SEND.MESSAGE, event); |
| |
106 |
+ |
socket.on(EVENTS.SEND.MESSAGE, (data) => { |
| |
107 |
+ |
const room = Chat.getUser(connect_sid).role === ROLES.CUSTOMER ? Chat.getUser(connect_sid).room : data.room; |
| |
108 |
+ |
|
| |
109 |
+ |
const message = Chat.message(data, room); |
| |
110 |
+ |
event = Chat.event(EVENTS.SEND.MESSAGE, message); |
| |
111 |
+ |
io.to(room).emit(event.type, event.data); |
| 108 |
112 |
|
|
| 109 |
113 |
|
console.log('sendMessage', event); |
| 110 |
114 |
|
}); |
| 111 |
115 |
|
|
| 112 |
116 |
|
|
| 113 |
117 |
|
socket.on('disconnect', () => { |
| 114 |
|
- |
if (!Chat.user) { |
| |
118 |
+ |
if (!Chat.getUser(connect_sid)) { |
| 115 |
119 |
|
return |
| 116 |
120 |
|
} |
| 117 |
121 |
|
|
| 118 |
|
- |
const userRole = Chat.user.role; |
| 119 |
|
- |
Chat.deleteUser(); |
| |
122 |
+ |
const userRole = Chat.getUser(connect_sid).role; |
| |
123 |
+ |
Chat.deleteUser(Chat.getUser(connect_sid)); |
| 120 |
124 |
|
|
| 121 |
125 |
|
// send operators updated list to operators |
| 122 |
126 |
|
if (userRole === ROLES.OPERATOR) { |
View this file contents
View the full history
Commits for