core classes are now serializeable with JAXB (to use as babbler extension)

1 files changed, 14 insertions, 14 deletions

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
index 7458d892..7bb1b230 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
@@ -177,8 +177,8 @@ public class JuickBot {
         }
 
         boolean success = false;
-        if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUID())) {
-            success = PMQueries.createPM(xmpp.jdbc, user_from.getUID(), uid_to, msg.body);
+        if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUid())) {
+            success = PMQueries.createPM(xmpp.jdbc, user_from.getUid(), uid_to, msg.body);
         }
 
         if (success) {
@@ -201,13 +201,13 @@ public class JuickBot {
                 Message mm = new Message();
                 mm.to = new JID(jid);
                 mm.type = Message.Type.chat;
-                inroster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUID(), jid);
+                inroster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUid(), jid);
                 if (inroster) {
-                    mm.from = new JID(jmsg.getUser().getUName(), "juick.com", "Juick");
+                    mm.from = new JID(jmsg.getUser().getName(), "juick.com", "Juick");
                     mm.body = msg.body;
                 } else {
                     mm.from = new JID("juick", "juick.com", "Juick");
-                    mm.body = "Private message from @" + jmsg.getUser().getUName() + ":\n" + msg.body;
+                    mm.body = "Private message from @" + jmsg.getUser().getName() + ":\n" + msg.body;
                 }
                 xmpp.sendOut(mm);
             }
@@ -277,7 +277,7 @@ public class JuickBot {
 
     private void commandLogin(Message m, User user_from) throws Exception {
         Message reply = new Message(jid, m.from, Message.Type.chat);
-        reply.body = "http://juick.com/login?" + UserQueries.getHashByUID(xmpp.jdbc, user_from.getUID());
+        reply.body = "http://juick.com/login?" + UserQueries.getHashByUID(xmpp.jdbc, user_from.getUid());
         xmpp.sendOut(reply);
     }
 
@@ -295,8 +295,8 @@ public class JuickBot {
         }
 
         if (uid_to > 0) {
-            if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUID())) {
-                if (PMQueries.createPM(xmpp.jdbc, user_from.getUID(), uid_to, body)) {
+            if (!UserQueries.isInBLAny(xmpp.jdbc, uid_to, user_from.getUid())) {
+                if (PMQueries.createPM(xmpp.jdbc, user_from.getUid(), uid_to, body)) {
                     jids_to = UserQueries.getJIDsbyUID(xmpp.jdbc, uid_to);
                     ret = 200;
                 } else {
@@ -326,13 +326,13 @@ public class JuickBot {
                 Message mm = new Message();
                 mm.to = new JID(jid);
                 mm.type = Message.Type.chat;
-                haveInRoster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUID(), jid);
+                haveInRoster = PMQueries.havePMinRoster(xmpp.jdbc, user_from.getUid(), jid);
                 if (haveInRoster) {
-                    mm.from = new JID(user_from.getUName(), "juick.com", "Juick");
+                    mm.from = new JID(user_from.getName(), "juick.com", "Juick");
                     mm.body = body;
                 } else {
                     mm.from = new JID("juick", "juick.com", "Juick");
-                    mm.body = "Private message from @" + user_from.getUName() + ":\n" + body;
+                    mm.body = "Private message from @" + user_from.getName() + ":\n" + body;
                 }
                 xmpp.sendOut(mm);
             }
@@ -350,8 +350,8 @@ public class JuickBot {
     }
 
     private void commandBLShow(Message m, User user_from) throws Exception {
-        List<User> blusers = UserQueries.getUserBLUsers(xmpp.jdbc, user_from.getUID());
-        List<String> bltags = TagQueries.getUserBLTags(xmpp.jdbc, user_from.getUID());
+        List<User> blusers = UserQueries.getUserBLUsers(xmpp.jdbc, user_from.getUid());
+        List<String> bltags = TagQueries.getUserBLTags(xmpp.jdbc, user_from.getUid());
 
         String txt = "";
         if (bltags.size() > 0) {
@@ -365,7 +365,7 @@ public class JuickBot {
         }
         if (blusers.size() > 0) {
             for (User bluser : blusers) {
-                txt += "@" + bluser.getUName() + "\n";
+                txt += "@" + bluser.getName() + "\n";
             }
         }
         if (txt.isEmpty()) {