From 51d9de02265d6cc9d6045d79497d2a987ae2f7f7 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 15 Nov 2016 14:21:27 +0300
Subject: core classes are now serializeable with JAXB (to use as babbler
 extension)

---
 juick-api/src/main/java/com/juick/api/Main.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'juick-api/src/main/java/com/juick/api/Main.java')

diff --git a/juick-api/src/main/java/com/juick/api/Main.java b/juick-api/src/main/java/com/juick/api/Main.java
index 80cbecd4..c102bf18 100644
--- a/juick-api/src/main/java/com/juick/api/Main.java
+++ b/juick-api/src/main/java/com/juick/api/Main.java
@@ -308,7 +308,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
             xmsg.addChild(jmsg);
 
             Nickname nick = new Nickname();
-            nick.Nickname = "@" + jmsg.getUser().getUName();
+            nick.Nickname = "@" + jmsg.getUser().getName();
             xmsg.addChild(nick);
 
             if (attachmentFName != null) {
@@ -334,7 +334,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
             for (String tag : tagsArr) {
                 tagsStr2 += " *" + tag;
             }
-            xmsg.body = "@" + jmsg.getUser().getUName() + ":" + tagsStr2 + "\n" + body + "\n\n#" + mid + " http://juick.com/" + mid;
+            xmsg.body = "@" + jmsg.getUser().getName() + ":" + tagsStr2 + "\n" + body + "\n\n#" + mid + " http://juick.com/" + mid;
 
             xmsg.to = new JID("juick", "s2s.juick.com", null);
             xmpp.send(xmsg);
@@ -391,8 +391,8 @@ public class Main extends HttpServlet implements Stream.StreamListener {
         }
         body = body.replace("\r", "");
 
-        if ((msg.ReadOnly && msg.getUser().getUID() != vuid) || UserQueries.isInBLAny(sql, msg.getUser().getUID(), vuid)
-                || (reply != null && UserQueries.isInBLAny(sql, reply.getUser().getUID(), vuid))) {
+        if ((msg.ReadOnly && msg.getUser().getUid() != vuid) || UserQueries.isInBLAny(sql, msg.getUser().getUid(), vuid)
+                || (reply != null && UserQueries.isInBLAny(sql, reply.getUser().getUid(), vuid))) {
             response.sendError(403);
             return;
         }
@@ -436,7 +436,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
             }
 
             Nickname nick = new Nickname();
-            nick.Nickname = "@" + jmsg.getUser().getUName();
+            nick.Nickname = "@" + jmsg.getUser().getName();
             xmsg.addChild(nick);
 
             if (attachmentFName != null) {
@@ -458,7 +458,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
                 xmsg.addChild(xoob);
             }
 
-            xmsg.body = "Reply by @" + jmsg.getUser().getUName() + ":\n>" + quote + "\n" + body + "\n\n#" + mid + "/" + ridnew + " http://juick.com/" + mid + "#" + ridnew;
+            xmsg.body = "Reply by @" + jmsg.getUser().getName() + ":\n>" + quote + "\n" + body + "\n\n#" + mid + "/" + ridnew + " http://juick.com/" + mid + "#" + ridnew;
 
             xmsg.to = new JID("juick", "s2s.juick.com", null);
             xmpp.send(xmsg);
-- 
cgit v1.2.3