From 61d1713a563eaa950b9a026d4eafd80286da79ce Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Thu, 18 Mar 2010 19:53:20 +0100 Subject: [PATCH] Show own invites in selected conversation --- src/org/yaaic/irc/IRCConnection.java | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/org/yaaic/irc/IRCConnection.java b/src/org/yaaic/irc/IRCConnection.java index 0f4cedc..bc6fd5c 100644 --- a/src/org/yaaic/irc/IRCConnection.java +++ b/src/org/yaaic/irc/IRCConnection.java @@ -239,13 +239,25 @@ public class IRCConnection extends PircBot { debug("Invite", target + " " + targetNick + "(" + sourceNick + ")"); - Message message = new Message(sourceNick + " invited " + targetNick); - server.getConversation(target).addMessage(message); - - Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); - intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); - intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); - service.sendBroadcast(intent); + if (targetNick.equals(this.getNick())) { + // We are invited + Message message = new Message(sourceNick + " invites you into " + target); + server.getConversation(server.getSelectedConversation()).addMessage(message); + + Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); + intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); + intent.putExtra(Broadcast.EXTRA_CONVERSATION, server.getSelectedConversation()); + service.sendBroadcast(intent); + } else { + // Someone is invited + Message message = new Message(sourceNick + " invites " + targetNick + " into " + target); + server.getConversation(target).addMessage(message); + + Intent intent = new Intent(Broadcast.CONVERSATION_MESSAGE); + intent.putExtra(Broadcast.EXTRA_SERVER, server.getId()); + intent.putExtra(Broadcast.EXTRA_CONVERSATION, target); + service.sendBroadcast(intent); + } } /**