From 36f0bb5b96e2b0200150b41214cd3e49d41a38c2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 13 Jan 2017 14:42:45 +0300
Subject: juick-www: fix rss controller

---
 .../main/java/com/juick/www/controllers/RSS.java   |  7 ++--
 juick-www/src/main/webapp/WEB-INF/layouts/rss.html | 38 ++++++++++++++++++++++
 juick-www/src/main/webapp/WEB-INF/layouts/rss.xml  | 38 ----------------------
 3 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/rss.html
 delete mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/rss.xml

(limited to 'juick-www/src/main')

diff --git a/juick-www/src/main/java/com/juick/www/controllers/RSS.java b/juick-www/src/main/java/com/juick/www/controllers/RSS.java
index 79fd8e67..b48ae2d0 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/RSS.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/RSS.java
@@ -23,12 +23,14 @@ import com.juick.service.MessagesService;
 import com.juick.service.UserService;
 import com.juick.util.DateFormattersHolder;
 import com.juick.util.MessageUtils;
+import org.springframework.http.MediaType;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletResponse;
@@ -45,7 +47,8 @@ public class RSS {
     @Inject
     MessagesService messagesService;
 
-    @RequestMapping(value = "/rss/{uname}", method = RequestMethod.GET)
+    @RequestMapping(value = "/rss/{uname}", method = RequestMethod.GET, produces = MediaType.APPLICATION_ATOM_XML_VALUE)
+    @ResponseBody
     protected String doGet(JdbcTemplate sql, HttpServletResponse response,
                          @PathVariable String uname, ModelMap model) {
         int uid = userService.getUIDbyName(uname);
@@ -61,6 +64,6 @@ public class RSS {
         model.addAttribute("user", msgs.stream().findFirst().get().getUser());
         model.addAttribute("msgs", msgs);
         model.addAttribute("sdfRSS", DateFormattersHolder.getRssFormatterInstance());
-        return "webapp/WEB-INF/layouts/rss";
+        return "layouts/rss";
     }
 }
diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/rss.html b/juick-www/src/main/webapp/WEB-INF/layouts/rss.html
new file mode 100644
index 00000000..23866c8a
--- /dev/null
+++ b/juick-www/src/main/webapp/WEB-INF/layouts/rss.html
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+<rss version='2.0' xmlns:atom='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/'
+     xmlns:juick='http://juick.com/'>
+    <channel>
+        <atom:link href='http://rss.juick.com/{{ user.getName() }}/blog' rel='self' type='application/rss+xml'/>
+        <title>{{ user.getName() }} - Juick</title>
+        <link>http://juick.com/{{ user.getName() }}/</link>
+        <description>The latest messages by @{{ user.getName() }} at Juick</description>
+        <image>
+            <url>http://i.juick.com/a/{{ user.getUid() }}.png</url>
+            <title>{{ user.getName() }} - Juick</title>
+            <link>http://juick.com/{{ user.getName() }}/</link>
+        </image>
+        {% for msg in msgs %}
+        <item>
+            <link>http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }}</link>
+            <guid>http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }}</guid>
+            <title><![CDATA[@{{ msg.getUser().getName() }}: {% for tag in msg.getTags() %} *{{ tag }}{% endfor %}]]></title>
+            <description><![CDATA[{{ msg.getText() | raw }}]]></description>
+            <pubDate>{{ sdfRSS.format(msg.getDate()) }}</pubDate>
+            <comments>http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }}</comments>
+            {% for tag in msg.getTags() %}
+            <category>{{ tag }}</category>
+            {% endfor %}
+            {% if msg.getAttachmentType() is not empty %}
+            {% if msg.getAttachmentType() == "jpg" %}
+            <media:content url='http://i.juick.com/photos-1024/{{ msg.getMid() }}.jpg' type='image/jpeg'/>
+            <media:thumbnail url='http://i.juick.com/ps/{{ msg.getMid() }}.jpg'/>
+            {% elseif msg.getAttachmentType() == "png" %}
+            <media:content url='http://i.juick.com/photos-1024/{{ msg.getMid() }}.png' type='image/png'/>
+            <media:thumbnail url='http://i.juick.com/ps/{{ msg.getMid() }}.png'/>
+            {% endif %}
+            {% endif %}
+            <juick:user uid='{{ msg.getUser().getUid() }}'/>
+        </item>
+        {% endfor %}
+    </channel>
+</rss>
diff --git a/juick-www/src/main/webapp/WEB-INF/layouts/rss.xml b/juick-www/src/main/webapp/WEB-INF/layouts/rss.xml
deleted file mode 100644
index 23866c8a..00000000
--- a/juick-www/src/main/webapp/WEB-INF/layouts/rss.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<rss version='2.0' xmlns:atom='http://www.w3.org/2005/Atom' xmlns:media='http://search.yahoo.com/mrss/'
-     xmlns:juick='http://juick.com/'>
-    <channel>
-        <atom:link href='http://rss.juick.com/{{ user.getName() }}/blog' rel='self' type='application/rss+xml'/>
-        <title>{{ user.getName() }} - Juick</title>
-        <link>http://juick.com/{{ user.getName() }}/</link>
-        <description>The latest messages by @{{ user.getName() }} at Juick</description>
-        <image>
-            <url>http://i.juick.com/a/{{ user.getUid() }}.png</url>
-            <title>{{ user.getName() }} - Juick</title>
-            <link>http://juick.com/{{ user.getName() }}/</link>
-        </image>
-        {% for msg in msgs %}
-        <item>
-            <link>http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }}</link>
-            <guid>http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }}</guid>
-            <title><![CDATA[@{{ msg.getUser().getName() }}: {% for tag in msg.getTags() %} *{{ tag }}{% endfor %}]]></title>
-            <description><![CDATA[{{ msg.getText() | raw }}]]></description>
-            <pubDate>{{ sdfRSS.format(msg.getDate()) }}</pubDate>
-            <comments>http://juick.com/{{ msg.getUser().getName() }}/{{ msg.getMid() }}</comments>
-            {% for tag in msg.getTags() %}
-            <category>{{ tag }}</category>
-            {% endfor %}
-            {% if msg.getAttachmentType() is not empty %}
-            {% if msg.getAttachmentType() == "jpg" %}
-            <media:content url='http://i.juick.com/photos-1024/{{ msg.getMid() }}.jpg' type='image/jpeg'/>
-            <media:thumbnail url='http://i.juick.com/ps/{{ msg.getMid() }}.jpg'/>
-            {% elseif msg.getAttachmentType() == "png" %}
-            <media:content url='http://i.juick.com/photos-1024/{{ msg.getMid() }}.png' type='image/png'/>
-            <media:thumbnail url='http://i.juick.com/ps/{{ msg.getMid() }}.png'/>
-            {% endif %}
-            {% endif %}
-            <juick:user uid='{{ msg.getUser().getUid() }}'/>
-        </item>
-        {% endfor %}
-    </channel>
-</rss>
-- 
cgit v1.2.3