Remove channel's user mode functions and just use membership's instead

diff --git a/acid/src/main/java/net/rizon/acid/core/Acidictive.java b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
index 0e5a7d61a16b16bed2d2f0aa6155b6dd2d382fd2..8c96eb1f64464c60b03f3ba755f7f3e553aaec00 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Acidictive.java
+++ b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
@@ -505,12 +505,21 @@ public class Acidictive extends AcidCore
                                }
                                else if (m.matches("(v|h|o|a|q)"))
                                {
+                                       String targStr = x[whatnick];
+                                       ++whatnick;
+
+                                       User target = User.findUser(targStr);
+                                       if (target == null)
+                                               continue;
+
+                                       Membership mem = chan.findUser(target);
+                                       if (mem == null)
+                                               continue;
+
                                        if (give)
-                                               chan.setMode(User.toName(x[whatnick]), m);
+                                               mem.addMode(m);
                                        else
-                                               chan.remMode(User.toName(x[whatnick]), m);
-                                       
-                                       whatnick++;
+                                               mem.remMode(m);
                                }
                                else
                                {

diff --git a/acid/src/main/java/net/rizon/acid/core/Channel.java b/acid/src/main/java/net/rizon/acid/core/Channel.java
index ac58a7b1d72d9f096cb48c6ddb005adc8108d0ef..feeb4d50fea38770e0744a16048189b8cb70c1af 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Channel.java
+++ b/acid/src/main/java/net/rizon/acid/core/Channel.java
@@ -48,22 +48,9 @@ public class Channel
                        this.destroy();
        }
 
-       public void setMode(String nick, String mode)
+       public Membership findUser(User user)
        {
-               Membership user = list.get(nick.toLowerCase());
-               if (user != null)
-               {
-                       user.addMode(mode);
-               }
-       }
-
-       public void remMode(String nick, String mode)
-       {
-               Membership user = list.get(nick.toLowerCase());
-               if (user != null)
-               {
-                       user.remMode(mode);
-               }
+               return list.get(user.getNick().toLowerCase());
        }
 
        public String getName()
@@ -151,16 +138,6 @@ public class Channel
                }
        }
 
-       public String getModes(String nick)
-       {
-               Membership user = list.get(nick.toLowerCase());
-               if (user != null)
-               {
-                       return user.getModes();
-               }
-               return "";
-       }
-
        public void onNick(String oldnick, String newnick)
        {
                Membership user = list.get(oldnick.toLowerCase());