2 files changed, 4 insertions, 5 deletions
diff --git a/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java b/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java
index 1bfaf429..8a3beb6a 100644
--- a/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java
+++ b/juick-xmpp/src/main/java/com/juick/components/XMPPConnection.java
@@ -287,7 +287,7 @@ public class XMPPConnection implements AutoCloseable {
         }
         com.juick.Message fullMsg = messagesService.getMessage(jmsg.getMid());
         String txt = "@" + jmsg.getUser().getName() + ":" + fullMsg.getTagsString() + "\n";
-        String attachment = fullMsg.getAttachmentURL();
+        String attachment = fullMsg.getAttachment().getMedium().getUrl();
         if (attachment != null) {
             txt += attachment + "\n";
         }
@@ -330,7 +330,7 @@ public class XMPPConnection implements AutoCloseable {
         replyQuote = fullReply.getReplyQuote();
 
         String txt = "Reply by @" + jmsg.getUser().getName() + ":\n" + replyQuote + "\n@" + replyTo + " ";
-        String attachment = jmsg.getAttachmentURL();
+        String attachment = jmsg.getAttachment().getMedium().getUrl();
         if (attachment != null) {
             txt += attachment + "\n";
         }
@@ -357,7 +357,7 @@ public class XMPPConnection implements AutoCloseable {
 
         String txt = "Recommended by @" + recomm.getUser().getName() + ":\n";
         txt += "@" + jmsg.getUser().getName() + ":" + jmsg.getTagsString() + "\n";
-        String attachment = jmsg.getAttachmentURL();
+        String attachment = jmsg.getAttachment().getMedium().getUrl();
         if (attachment != null) {
             txt += attachment + "\n";
         }
diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java
index 5ab4aeb2..34f91a85 100644
--- a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java
+++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java
@@ -17,7 +17,6 @@
 
 package com.juick.components.configuration;
 
-import com.juick.configuration.DataConfiguration;
 import org.apache.commons.codec.CharEncoding;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
@@ -31,7 +30,7 @@ public class XmppInitializer extends AbstractAnnotationConfigDispatcherServletIn
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{DataConfiguration.class};
+        return new Class<?>[]{};
     }
 
     @Override