From 1f9b171021513cfdef7066e152fdf1a943fbc2d0 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Tue, 12 Nov 2019 13:16:36 +0000 Subject: [PATCH] wip on private messages --- .../controllers/com/muwire/gui/ChatRoomController.groovy | 5 +++-- gui/griffon-app/models/com/muwire/gui/ChatRoomModel.groovy | 1 + gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy | 5 +++-- gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy index 747b7ea4..f6e31c85 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/ChatRoomController.groovy @@ -67,6 +67,7 @@ class ChatRoomController { params['room'] = newRoom params['console'] = false params['host'] = model.host + params['roomTabName'] = newRoom mvcGroup.parentGroup.createMVCGroup("chat-room", newRoom, params) } @@ -76,9 +77,9 @@ class ChatRoomController { view.closeTab.call() } - UUID uuid = UUID.randomUUID() String room = model.console ? ChatServer.CONSOLE : model.room - + + UUID uuid = UUID.randomUUID() byte [] sig = ChatConnection.sign(uuid, now, room, command.source, model.core.me, model.host, model.core.spk) def event = new ChatMessageEvent(uuid : uuid, diff --git a/gui/griffon-app/models/com/muwire/gui/ChatRoomModel.groovy b/gui/griffon-app/models/com/muwire/gui/ChatRoomModel.groovy index a0cfafa0..6e550973 100644 --- a/gui/griffon-app/models/com/muwire/gui/ChatRoomModel.groovy +++ b/gui/griffon-app/models/com/muwire/gui/ChatRoomModel.groovy @@ -15,6 +15,7 @@ class ChatRoomModel { String room boolean console boolean privateChat + String roomTabName def members = [] diff --git a/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy b/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy index 7d10e375..4e7d49ba 100644 --- a/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy +++ b/gui/griffon-app/models/com/muwire/gui/ChatServerModel.groovy @@ -96,14 +96,15 @@ class ChatServerModel { room = chatCommand.payload } if (chatCommand.action == ChatAction.SAY && - room == core.me.getHumanReadableName()) { + room == core.me.toBase64()) { if (!mvcGroup.childrenGroups.containsKey(e.sender.getHumanReadableName()+"-private-chat")) { def params = [:] params['core'] = core params['tabName'] = host.getHumanReadableName() + "-chat-rooms" - params['room'] = e.sender.getHumanReadableName() + params['room'] = e.sender.toBase64() params['privateChat'] = true params['host'] = host + params['roomTabName'] = e.sender.getHumanReadableName() mvcGroup.createMVCGroup("chat-room",e.sender.getHumanReadableName()+"-private-chat", params) } diff --git a/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy index 0bebeb7c..d1ec067e 100644 --- a/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy @@ -86,7 +86,7 @@ class ChatRoomView { void mvcGroupInit(Map args) { parent = mvcGroup.parentGroup.view.builder.getVariable(model.tabName) - parent.addTab(model.room, pane) + parent.addTab(model.roomTabName, pane) int index = parent.indexOfComponent(pane) parent.setSelectedIndex(index) @@ -94,7 +94,7 @@ class ChatRoomView { def tabPanel = builder.panel { borderLayout() panel (constraints : BorderLayout.CENTER) { - label(text : model.room) + label(text : model.roomTabName) } button(icon : imageIcon("/close_tab.png"), preferredSize: [20, 20], constraints : BorderLayout.EAST, actionPerformed : closeTab ) @@ -122,6 +122,7 @@ class ChatRoomView { params['room'] = p.getHumanReadableName() params['privateChat'] = true params['host'] = model.host + params['privateTarget'] = p mvcGroup.parentGroup.createMVCGroup("chat-room", p.getHumanReadableName()+"-private-chat", params) }