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

suffix for group ids

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-11-12 12:33:18 +00:00
parent 621af96bdf
commit 59c03be35e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy
View File

@@ -97,7 +97,7 @@ class ChatServerModel {
} }
if (chatCommand.action == ChatAction.SAY && if (chatCommand.action == ChatAction.SAY &&
room == core.me.getHumanReadableName()) { room == core.me.getHumanReadableName()) {
if (!mvcGroup.childrenGroups.containsKey(e.sender.getHumanReadableName())) { if (!mvcGroup.childrenGroups.containsKey(e.sender.getHumanReadableName()+"-private-chat")) {
def params = [:] def params = [:]
params['core'] = core params['core'] = core
params['tabName'] = host.getHumanReadableName() + "-chat-rooms" params['tabName'] = host.getHumanReadableName() + "-chat-rooms"
@@ -105,7 +105,7 @@ class ChatServerModel {
params['privateChat'] = true params['privateChat'] = true
params['host'] = host params['host'] = host
mvcGroup.createMVCGroup("chat-room",e.sender.getHumanReadableName(), params) mvcGroup.createMVCGroup("chat-room",e.sender.getHumanReadableName()+"-private-chat", params)
} }
room = e.sender.getHumanReadableName() room = e.sender.getHumanReadableName()
} }

4
gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy
View File

@@ -115,7 +115,7 @@ class ChatRoomView {
if (lastMembersTableSortEvent != null) if (lastMembersTableSortEvent != null)
selectedRow = membersTable.rowSorter.convertRowIndexToModel(selectedRow) selectedRow = membersTable.rowSorter.convertRowIndexToModel(selectedRow)
Persona p = model.members[selectedRow] Persona p = model.members[selectedRow]
if (p != model.core.me && !mvcGroup.parentGroup.childrenGroups.containsKey(p.getHumanReadableName())) { if (p != model.core.me && !mvcGroup.parentGroup.childrenGroups.containsKey(p.getHumanReadableName()+"-private-chat")) {
def params = [:] def params = [:]
params['core'] = model.core params['core'] = model.core
params['tabName'] = model.tabName params['tabName'] = model.tabName
@@ -123,7 +123,7 @@ class ChatRoomView {
params['privateChat'] = true params['privateChat'] = true
params['host'] = model.host params['host'] = model.host
mvcGroup.parentGroup.createMVCGroup("chat-room", p.getHumanReadableName(), params) mvcGroup.parentGroup.createMVCGroup("chat-room", p.getHumanReadableName()+"-private-chat", params)
} }
} }
} }