tomasz
/
irc-style-chat-over-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed source information for channels.

master
Tomasz Półgrabia 2017-09-23 10:33:03 +02:00
parent 43297fa76e
commit dfae4f7638
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/pl/polgrabiat/websockets/chat/websocketschat/handlers/JoinCommandHandler.java
View File

@ -34,7 +34,7 @@ public class JoinCommandHandler implements SessionCommandHandler {
sendMessage(user.getSession(), globalCtx, sendMessage(user.getSession(), globalCtx,
destination, destination,
"PRIVMSG " + channelCtx.getName() + " " "PRIVMSG " + channelCtx.getName() + " "
+ user.getNick() + " has " + userCtx.getNick() + " has "
+ " joined the channel"); + " joined the channel");
} catch (RuntimeException e) { } catch (RuntimeException e) {
lg.error("Error while sending a message", e); lg.error("Error while sending a message", e);

16
src/main/java/pl/polgrabiat/websockets/chat/websocketschat/handlers/PrivMessageHandler.java
View File

@ -13,27 +13,27 @@ public class PrivMessageHandler implements SessionCommandHandler {
public boolean handleCommand(GlobalCtx globalCtx, WebSocketSession session, String payload, String command, String data) throws IOException { public boolean handleCommand(GlobalCtx globalCtx, WebSocketSession session, String payload, String command, String data) throws IOException {
StringTokenizer tokenizer = new StringTokenizer(data); StringTokenizer tokenizer = new StringTokenizer(data);
String destination = tokenizer.nextToken(); String destination = tokenizer.nextToken();
UserCtx userCtx = globalCtx.getUserSessions().get(session);
if (destination.startsWith("#")) { if (destination.startsWith("#")) {
// channel // channel
ChannelCtx channel = globalCtx.getChannels().get(destination); ChannelCtx channel = globalCtx.getChannels().get(destination);
if (channel == null) { if (channel == null) {
sendMessage(session, sendMessage(session,
globalCtx, destination,"MSG invalid destination"); globalCtx, userCtx.getNick(),"MSG invalid destination");
return true; return true;
} }
UserCtx userCtx = globalCtx.getUserSessions().get(session);
if (!channel.getUsers().contains(userCtx)) { if (!channel.getUsers().contains(userCtx)) {
sendMessage(session, globalCtx, destination, "MSG You are not the member of this channel"); sendMessage(session, globalCtx, userCtx.getNick(), "MSG You are not the member of this channel");
return true; return true;
} }
// sending to other users // sending to other users
for (UserCtx user : channel.getUsers()) { for (UserCtx user : channel.getUsers()) {
sendMessage(user.getSession(), globalCtx, destination, payload); sendMessage(user.getSession(), globalCtx, userCtx.getNick(), payload);
} }
return true; return true;
@ -42,15 +42,15 @@ public class PrivMessageHandler implements SessionCommandHandler {
// user // user
UserCtx userCtx = globalCtx.getUserSessions().get(globalCtx.getUserNameSessions().get(destination)); UserCtx destUserCtx = globalCtx.getUserSessions().get(globalCtx.getUserNameSessions().get(destination));
UserCtx sourceUserCtx = globalCtx.getUserSessions().get(session); UserCtx sourceUserCtx = globalCtx.getUserSessions().get(session);
if (userCtx == null) { if (destUserCtx == null) {
sendMessage(session, sendMessage(session,
globalCtx, destination,"MSG invalid destination"); globalCtx, destination,"MSG invalid destination");
return true; return true;
} }
sendMessage(userCtx.getSession(), sendMessage(destUserCtx.getSession(),
globalCtx, sourceUserCtx.getNick(), payload); // destination and source globalCtx, sourceUserCtx.getNick(), payload); // destination and source
sendMessage(session, sendMessage(session,
globalCtx, sourceUserCtx.getNick(), payload); // destination and source globalCtx, sourceUserCtx.getNick(), payload); // destination and source