fix-message-formatting
Danny van Heumen 11 years ago
parent 57563aca45
commit 10bc3a49fb

@ -1505,15 +1505,16 @@ public void onChannelPart(final ChanPartMessage msg)
return; return;
} }
IRCUser user = msg.getSource(); final IRCUser user = msg.getSource();
if (isMe(user)) if (isMe(user))
{ {
leaveChatRoom(); leaveChatRoom();
return; return;
} }
String userNick = msg.getSource().getNick(); final String userNick = msg.getSource().getNick();
ChatRoomMember member = this.chatroom.getChatRoomMember(userNick); final ChatRoomMember member =
this.chatroom.getChatRoomMember(userNick);
if (member != null) if (member != null)
{ {
// When the account has been disabled, the chat room may return // When the account has been disabled, the chat room may return
@ -1541,15 +1542,15 @@ public void onChannelPart(final ChanPartMessage msg)
*/ */
public void onServerNumericMessage(final ServerNumericMessage msg) public void onServerNumericMessage(final ServerNumericMessage msg)
{ {
Integer code = msg.getNumericCode(); final Integer code = msg.getNumericCode();
if (code == null) if (code == null)
{ {
return; return;
} }
String raw = msg.getText(); final String raw = msg.getText();
if (code.intValue() == IRC_ERR_NOTONCHANNEL) if (code.intValue() == IRC_ERR_NOTONCHANNEL)
{ {
String channel = raw.substring(0, raw.indexOf(" ")); final String channel = raw.substring(0, raw.indexOf(" "));
if (isThisChatRoom(channel)) if (isThisChatRoom(channel))
{ {
LOGGER LOGGER
@ -1629,7 +1630,7 @@ public void onUserQuit(final QuitMessage msg)
this.irc.deleteListener(this); this.irc.deleteListener(this);
return; return;
} }
ChatRoomMember member = this.chatroom.getChatRoomMember(user); final ChatRoomMember member = this.chatroom.getChatRoomMember(user);
if (member != null) if (member != null)
{ {
this.chatroom.fireMemberPresenceEvent(member, null, this.chatroom.fireMemberPresenceEvent(member, null,
@ -1651,10 +1652,10 @@ public void onNickChange(final NickMessage msg)
return; return;
} }
String oldNick = msg.getSource().getNick(); final String oldNick = msg.getSource().getNick();
String newNick = msg.getNewNick(); final String newNick = msg.getNewNick();
ChatRoomMemberIrcImpl member = final ChatRoomMemberIrcImpl member =
(ChatRoomMemberIrcImpl) this.chatroom (ChatRoomMemberIrcImpl) this.chatroom
.getChatRoomMember(oldNick); .getChatRoomMember(oldNick);
if (member != null) if (member != null)

@ -34,8 +34,7 @@ private Utils()
/** /**
* Parse IRC text message and process possible control codes. * Parse IRC text message and process possible control codes.
* *
* TODO Support for color 99 (Transparent) TODO Support for wrapping around * TODO Support for color 99 (Transparent)
* after color 15?
* *
* @param text the message * @param text the message
* @return returns the processed message or null if text message was null, * @return returns the processed message or null if text message was null,

Loading…
Cancel
Save