From 98658ebab12286a56a7a018ba6a92026533dde7c Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 13 Jan 2017 15:09:47 +0300
Subject: juick-www: drop rss controller as we can use it from juick-rss with
 nginx

---
 .../main/java/com/juick/www/controllers/RSS.java   | 69 ----------------------
 juick-www/src/main/webapp/WEB-INF/layouts/rss.html | 38 ------------
 2 files changed, 107 deletions(-)
 delete mode 100644 juick-www/src/main/java/com/juick/www/controllers/RSS.java
 delete mode 100644 juick-www/src/main/webapp/WEB-INF/layouts/rss.html

(limited to 'juick-www')

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
deleted file mode 100644
index b48ae2d0..00000000
--- a/juick-www/src/main/java/com/juick/www/controllers/RSS.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2013, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.www.controllers;
-
-import com.juick.Message;
-import com.juick.server.util.HttpNotFoundException;
-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;
-import java.util.List;
-
-/**
- *
- * @author ugnich
- */
-@Controller
-public class RSS {
-    @Inject
-    UserService userService;
-    @Inject
-    MessagesService messagesService;
-
-    @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);
-        List<Integer> mids = messagesService.getUserBlog(uid, 0, 0);
-        if (mids.isEmpty()) {
-            throw new HttpNotFoundException();
-        }
-
-        List<Message> msgs = messagesService.getMessages(mids);
-
-        msgs.forEach(m -> MessageUtils.formatMessage(m.getText()));
-
-        model.addAttribute("user", msgs.stream().findFirst().get().getUser());
-        model.addAttribute("msgs", msgs);
-        model.addAttribute("sdfRSS", DateFormattersHolder.getRssFormatterInstance());
-        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
deleted file mode 100644
index 23866c8a..00000000
--- a/juick-www/src/main/webapp/WEB-INF/layouts/rss.html
+++ /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