acid: clean up kick handler

diff --git a/acid/src/main/java/net/rizon/acid/messages/Kick.java b/acid/src/main/java/net/rizon/acid/messages/Kick.java
index 66a951a16db593c15cdd61f1d3e1850b0a76ccce..696f338d5415f0c248fb55b24549fd66f63b2eb5 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/Kick.java
+++ b/acid/src/main/java/net/rizon/acid/messages/Kick.java
@@ -18,9 +18,7 @@ public class Kick extends Message
        }
 
        // :99hAAAAAB KICK #geo 99hAAAAAB :Lame and fake
-
-       @Override
-       public void on(String source, String[] params)
+       private void run(String source, String[] params)
        {
                String channel = params[0];
                User kickee = User.findUser(params[1]);
@@ -30,22 +28,28 @@ public class Kick extends Message
                        return;
                }
 
-               String kicker = User.toName(source);;
-               if (kicker == source)
-                       kicker = Server.toName(source);
-               if (kicker == source)
-                       log.warn("KICK from nonexitent source " + source);
-
                Channel chan = Channel.findChannel(channel);
                if (chan == null)
                {
-                       log.warn("KICK from " + kicker + " for " + kickee.getNick() + " on nonexistent channel " + channel);
+                       log.warn("KICK from " + source + " for " + kickee.getNick() + " on nonexistent channel " + channel);
                        return;
                }
 
                chan.removeUser(kickee);
                kickee.remChan(chan);
 
-               Acidictive.onKick(kicker, kickee, chan, params[2]);
+               Acidictive.onKick(source, kickee, chan, params[2]);
+       }
+
+       @Override
+       public void onUser(User source, String[] params)
+       {
+               run(source.getNick(), params);
+       }
+
+       @Override
+       public void onServer(Server source, String[] params)
+       {
+               run(source.getName(), params);
        }
-}
\ No newline at end of file
+}