From 2b4b08c7954f5ae03681401b613318cfbfde1c76 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 31 Jul 2016 02:02:32 +0300
Subject: www: do not throw on xmpp errors

---
 juick-www/src/main/java/com/juick/www/PM.java | 55 +++++++++++++++------------
 1 file changed, 31 insertions(+), 24 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/PM.java')

diff --git a/juick-www/src/main/java/com/juick/www/PM.java b/juick-www/src/main/java/com/juick/www/PM.java
index 15d69808..ee1d7140 100644
--- a/juick-www/src/main/java/com/juick/www/PM.java
+++ b/juick-www/src/main/java/com/juick/www/PM.java
@@ -31,12 +31,15 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
  * @author Ugnich Anton
  */
 public class PM {
+    private static final Logger logger = Logger.getLogger(PM.class.getName());
 
     protected void doGetInbox(JdbcTemplate sql, HttpServletRequest request, HttpServletResponse response, com.juick.User visitor) throws ServletException, IOException {
         /*
@@ -188,31 +191,35 @@ public class PM {
         }
 
         if (PMQueries.createPM(sql, visitor.getUID(), uid, body)) {
-            Message msg = new Message();
-            msg.from = new JID("juick", "juick.com", null);
-            msg.to = new JID(Integer.toString(uid), "push.juick.com", null);
-            JuickMessage jmsg = new JuickMessage();
-            jmsg.setUser(visitor);
-            jmsg.setText(body);
-            msg.childs.add(jmsg);
-            xmpp.send(msg);
-
-            msg.to.Host = "ws.juick.com";
-            xmpp.send(msg);
-
-            List<String> jids = UserQueries.getJIDsbyUID(sql, uid);
-            for (String jid : jids) {
-                Message mm = new Message();
-                mm.to = new JID(jid);
-                mm.type = Message.Type.chat;
-                if (PMQueries.havePMinRoster(sql, visitor.getUID(), jid)) {
-                    mm.from = new JID(jmsg.getUser().getUName(), "juick.com", "Juick");
-                    mm.body = body;
-                } else {
-                    mm.from = new JID("juick", "juick.com", "Juick");
-                    mm.body = "Private message from @" + jmsg.getUser().getUName() + ":\n" + body;
+            if (xmpp.isLoggedIn()) {
+                Message msg = new Message();
+                msg.from = new JID("juick", "juick.com", null);
+                msg.to = new JID(Integer.toString(uid), "push.juick.com", null);
+                JuickMessage jmsg = new JuickMessage();
+                jmsg.setUser(visitor);
+                jmsg.setText(body);
+                msg.childs.add(jmsg);
+                xmpp.send(msg);
+
+                msg.to.Host = "ws.juick.com";
+                xmpp.send(msg);
+
+                List<String> jids = UserQueries.getJIDsbyUID(sql, uid);
+                for (String jid : jids) {
+                    Message mm = new Message();
+                    mm.to = new JID(jid);
+                    mm.type = Message.Type.chat;
+                    if (PMQueries.havePMinRoster(sql, visitor.getUID(), jid)) {
+                        mm.from = new JID(jmsg.getUser().getUName(), "juick.com", "Juick");
+                        mm.body = body;
+                    } else {
+                        mm.from = new JID("juick", "juick.com", "Juick");
+                        mm.body = "Private message from @" + jmsg.getUser().getUName() + ":\n" + body;
+                    }
+                    xmpp.send(mm);
                 }
-                xmpp.send(mm);
+            } else {
+                logger.log(Level.WARNING, "XMPP unavailable");
             }
 
             Utils.sendTemporaryRedirect(response, "/pm/sent");
-- 
cgit v1.2.3