server: merge rss

1 files changed, 0 insertions, 74 deletions

diff --git a/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java b/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java
deleted file mode 100644
index 7555f128..00000000
--- a/juick-rss/src/main/java/com/juick/rss/controllers/FeedsController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * 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.rss.controllers;
-
-import com.juick.User;
-import com.juick.server.util.HttpBadRequestException;
-import com.juick.service.MessagesService;
-import com.juick.service.UserService;
-import org.springframework.stereotype.Controller;
-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.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by vitalyster on 13.12.2016.
- */
-@Controller
-public class FeedsController {
-
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private UserService userService;
-
-    @RequestMapping(value = "/{userName}/blog", method = RequestMethod.GET)
-    public ModelAndView getBlog(@PathVariable String userName) {
-        User user = userService.getUserByName(userName);
-        if (user.getUid() > 0) {
-            List<Integer> mids = messagesService.getUserBlog(user.getUid(), 0, 0);
-            ModelAndView modelAndView = new ModelAndView();
-            modelAndView.setViewName("messages");
-            modelAndView.addObject("user", user);
-            modelAndView.addObject("messages", messagesService.getMessages(mids));
-            return modelAndView;
-        }
-        throw new HttpBadRequestException();
-    }
-
-    @RequestMapping(value = "/", method = RequestMethod.GET)
-    public ModelAndView getLast(@RequestParam(value = "hours", required = false, defaultValue = "0") Integer hours) {
-        List<Integer> mids = messagesService.getLastMessages(hours);
-        ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("messages");
-        modelAndView.addObject("messages", messagesService.getMessages(mids));
-        return modelAndView;
-    }
-    @RequestMapping(value = "/comments", method = RequestMethod.GET)
-    public ModelAndView getLastReplies(@RequestParam(value = "hours", required = false, defaultValue = "0") Integer hours) {
-        ModelAndView modelAndView = new ModelAndView();
-        modelAndView.setViewName("replies");
-        modelAndView.addObject("messages", messagesService.getLastReplies(hours));
-        return modelAndView;
-    }
-}