idk/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make private chat room ids unique across servers

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-11-13 14:09:09 +00:00
parent 38eb89f2f7
commit edd5a29b10
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy
View File

@@ -101,7 +101,8 @@ class ChatRoomController {
Persona p = view.getSelectedPersona()
if (p == null)
return
if (p != model.core.me && !mvcGroup.parentGroup.childrenGroups.containsKey(p.getHumanReadableName()+"-private-chat")) {
String groupId = model.host.getHumanReadableName() + "-" + p.getHumanReadableName() +"-private-chat"
if (p != model.core.me && !mvcGroup.parentGroup.childrenGroups.containsKey(groupId) {
def params = [:]
params['core'] = model.core
params['tabName'] = model.tabName
@@ -110,7 +111,7 @@ class ChatRoomController {
params['host'] = model.host
params['roomTabName'] = p.getHumanReadableName()
mvcGroup.parentGroup.createMVCGroup("chat-room", p.getHumanReadableName()+"-private-chat", params)
mvcGroup.parentGroup.createMVCGroup("chat-room", groupId, params)
}
}