Nextrek
Diff Revisions
1119
vs
1120
for /socketIO/chat.js
|
@@ -53,7 +53,11 @@ |
53 |
53 |
|
} |
54 |
54 |
|
}, |
55 |
55 |
|
|
56 |
|
- |
user: null, |
|
56 |
+ |
usersMap: {}, |
|
57 |
+ |
|
|
58 |
+ |
getUser(sid) { |
|
59 |
+ |
return this.usersMap[sid] |
|
60 |
+ |
}, |
57 |
61 |
|
|
58 |
62 |
|
createUser(id, name, role) { |
59 |
63 |
|
const _this = this; |
|
@@ -78,14 +82,14 @@ |
78 |
82 |
|
}, |
79 |
83 |
|
|
80 |
84 |
|
addUser(user) { |
81 |
|
- |
this.user = user; |
|
85 |
+ |
this.usersMap[user.room] = user; |
82 |
86 |
|
this.users.push(user); |
83 |
87 |
|
this.rooms[user.role][user.room] = []; |
84 |
88 |
|
}, |
85 |
89 |
|
|
86 |
|
- |
deleteUser() { |
87 |
|
- |
this.users.splice(this.users.indexOf(this.user), 1); |
88 |
|
- |
this.user = null; |
|
90 |
+ |
deleteUser(user) { |
|
91 |
+ |
this.users.splice(this.users.indexOf(user), 1); |
|
92 |
+ |
delete this.usersMap[user.room]; |
89 |
93 |
|
}, |
90 |
94 |
|
|
91 |
95 |
|
getUsersByRole(role) { |
|
@@ -110,12 +114,12 @@ |
110 |
114 |
|
} |
111 |
115 |
|
}, |
112 |
116 |
|
|
113 |
|
- |
message(from, message) { |
|
117 |
+ |
message(data, room) { |
114 |
118 |
|
return { |
115 |
|
- |
user: from, |
116 |
|
- |
room: from.room, |
117 |
|
- |
content: message, |
118 |
|
- |
contentType: 'text/plain' |
|
119 |
+ |
from: this.user, |
|
120 |
+ |
room: room, |
|
121 |
+ |
content: data.content, |
|
122 |
+ |
contentType: data.contentType |
119 |
123 |
|
} |
120 |
124 |
|
} |
121 |
125 |
|
} |