From f764bb226f0db20a4e4c2258f2304e93f1a47557 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 15 Feb 2018 10:50:40 +0300
Subject: server: handle messages from service ws user

---
 .../src/main/java/com/juick/server/ServerManager.java         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'juick-server/src/main/java/com/juick/server/ServerManager.java')

diff --git a/juick-server/src/main/java/com/juick/server/ServerManager.java b/juick-server/src/main/java/com/juick/server/ServerManager.java
index 79ccb1e4..1db31e23 100644
--- a/juick-server/src/main/java/com/juick/server/ServerManager.java
+++ b/juick-server/src/main/java/com/juick/server/ServerManager.java
@@ -164,13 +164,18 @@ public class ServerManager implements AutoCloseable {
         xmsg.setBody(body);
         try {
             if (StringUtils.isNotEmpty(attachmentName)) {
-                String attachmentUrl = String.format("juick://%s", attachmentName);
-                xmsg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
+                URI httpUri = URI.create(attachmentName);
+                if (httpUri.isAbsolute()) {
+                    xmsg.addExtension(new OobX(httpUri));
+                } else {
+                    String attachmentUrl = String.format("juick://%s", attachmentName);
+                    xmsg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
+                }
             }
-            sendMessage(xmsg);
         } catch (URISyntaxException e1) {
             logger.warn("attachment error", e1);
         }
+        sendMessage(xmsg);
     }
 
     private void onJuickPM(final int uid_to, final com.juick.Message jmsg) throws JsonProcessingException {
-- 
cgit v1.2.3