Add SU from UID, allow SU filling on User object creation

diff --git a/acid/src/main/java/net/rizon/acid/core/AcidUser.java b/acid/src/main/java/net/rizon/acid/core/AcidUser.java
index 6b66d1a41c54f447f9ca1a627825ff53545509bb..308e55fbdcb21d00c2723b2711182df32f098685 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/AcidUser.java
+++ b/acid/src/main/java/net/rizon/acid/core/AcidUser.java
@@ -11,12 +11,12 @@ public class AcidUser extends User
 
        public AcidUser(final String nick, final String user, final String host, final String vhost, final String name, final String modes)
        {
-               super(nick, user, host, vhost, name, AcidCore.me, AcidCore.getTS(), AcidCore.getTS(), modes, User.generateUID(), "255.255.255.255");
+               super(nick, user, host, vhost, name, AcidCore.me, AcidCore.getTS(), AcidCore.getTS(), modes, User.generateUID(), "255.255.255.255", "0");
        }
 
        public AcidUser(Plugin pkg, Client c)
        {
-               super(c.nick, c.user, c.host, c.vhost, c.name, AcidCore.me, AcidCore.getTS(), AcidCore.getTS(), c.modes, User.generateUID(), "255.255.255.255");
+               super(c.nick, c.user, c.host, c.vhost, c.name, AcidCore.me, AcidCore.getTS(), AcidCore.getTS(), c.modes, User.generateUID(), "255.255.255.255", "0");
                this.pkg = pkg;
                this.client = c;
 

diff --git a/acid/src/main/java/net/rizon/acid/core/Protocol.java b/acid/src/main/java/net/rizon/acid/core/Protocol.java
index 666c516f7c6f0552cbd78f860ac1ab20eac90b1f..d3ea447ced08202ec35ea9c5a6323891fac9fac5 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Protocol.java
+++ b/acid/src/main/java/net/rizon/acid/core/Protocol.java
@@ -149,7 +149,12 @@ public class Protocol
 
        public static void svskill(final String target)
        {
-               encap("*", "SVSKILL", target);
+               svskill(target, "SVSKILLED");
+       }
+
+       public static void svskill(final String target, final String reason)
+       {
+               encap("*", "SVSKILL", target, reason);
        }
 
        public static void noop(Server s)

diff --git a/acid/src/main/java/net/rizon/acid/core/User.java b/acid/src/main/java/net/rizon/acid/core/User.java
index c3accd5a320ca01eb2ff375c20a313cda456ae33..b7e895c09eaebc5ed9158b921e49e14ccf3aa028 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/User.java
+++ b/acid/src/main/java/net/rizon/acid/core/User.java
@@ -33,7 +33,7 @@ public class User implements Comparable<User>
        private String cgihost;
 
        public User(String nick, String user, String host, String vhost, String name,
-                       Server server, int nickTS, int conTS, String modes, String UID, String ip)
+                       Server server, int nickTS, int conTS, String modes, String UID, String ip, String su)
        {
                this.nick = nick;
                this.user = user;
@@ -71,6 +71,10 @@ public class User implements Comparable<User>
                this.certfp = "";
                this.authflags = "";
                this.su = "";
+               if (!su.equals("0"))
+               {
+                       this.su = su;
+               }
 
                /*
                 * i'm not sure if this is just how plexus handles it

diff --git a/acid/src/main/java/net/rizon/acid/messages/UID.java b/acid/src/main/java/net/rizon/acid/messages/UID.java
index 7dd462d02d6a93856fd0a416c60d035abaa12eb3..6dcf8a015109b2ab58816b52be2d9ebfcd646fb3 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/UID.java
+++ b/acid/src/main/java/net/rizon/acid/messages/UID.java
@@ -19,7 +19,7 @@ public class UID extends Message
        @Override
        public void onServer(Server source, String[] params)
        {
-               User user = new User(params[0], params[4], params[9], params[5], params[10], source, Integer.parseInt(params[2]), Integer.parseInt(params[2]), params[3], params[7], params[6]);
+               User user = new User(params[0], params[4], params[9], params[5], params[10], source, Integer.parseInt(params[2]), Integer.parseInt(params[2]), params[3], params[7], params[6], params[8]);
                UserList.increaseHost(params[6]);
 
                Acidictive.onNick(user, source.isBursting());