From be91c5f5771282f2798cb687f915b0df44eaa59e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 20 Mar 2018 11:36:13 +0300
Subject: jdbc: no more notifications from banned users

---
 .../java/com/juick/server/api/Notifications.java   |  3 +-
 .../main/java/com/juick/server/api/Service.java    | 74 ----------------------
 2 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 juick-server/src/main/java/com/juick/server/api/Service.java

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

diff --git a/juick-server/src/main/java/com/juick/server/api/Notifications.java b/juick-server/src/main/java/com/juick/server/api/Notifications.java
index 16601b7f..94b66746 100644
--- a/juick-server/src/main/java/com/juick/server/api/Notifications.java
+++ b/juick-server/src/main/java/com/juick/server/api/Notifications.java
@@ -84,8 +84,9 @@ public class Notifications {
                 if (msg != null) {
                     List<User> users;
                     if (rid > 0) {
+                        Message op = messagesService.getMessage(mid);
                         Message reply = messagesService.getReply(mid, rid);
-                        users = subscriptionService.getUsersSubscribedToComments(mid, reply.getUser().getUid());
+                        users = subscriptionService.getUsersSubscribedToComments(op, reply);
                     } else {
                         users = subscriptionService.getSubscribedUsers(msg.getUser().getUid(), mid);
                     }
diff --git a/juick-server/src/main/java/com/juick/server/api/Service.java b/juick-server/src/main/java/com/juick/server/api/Service.java
deleted file mode 100644
index 12ffee9c..00000000
--- a/juick-server/src/main/java/com/juick/server/api/Service.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.server.api;
-
-import com.juick.Message;
-import com.juick.User;
-import com.juick.server.util.HttpBadRequestException;
-import com.juick.server.util.HttpForbiddenException;
-import com.juick.server.util.UserUtils;
-import com.juick.service.CrosspostService;
-import com.juick.service.MessagesService;
-import com.juick.service.SubscriptionService;
-import com.juick.service.UserService;
-import org.springframework.http.MediaType;
-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.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * TODO: configure spring-security to allow only admin role
- */
-@ApiIgnore
-@RestController
-public class Service {
-    @Inject
-    private SubscriptionService subscriptionService;
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private CrosspostService crosspostService;
-    @Inject
-    private UserService userService;
-
-    @RequestMapping(value = "/subscriptions", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public List<User> doGet(
-            @RequestParam(defaultValue = "0") int mid,
-            @RequestParam(defaultValue = "0") int uid) throws IOException {
-        User visitor = UserUtils.getCurrentUser();
-        if ((visitor.getUid() == 0) && !(visitor.getName().equals("juick"))) {
-            throw new HttpForbiddenException();
-        }
-        if (uid > 0) {
-            return subscriptionService.getSubscribedUsers(uid, mid);
-        } else {
-            // thread
-            Message msg = messagesService.getMessage(mid);
-            if (msg != null) {
-                return subscriptionService.getUsersSubscribedToComments(mid, msg.getUser().getUid());
-            }
-        }
-        throw new HttpBadRequestException();
-    }
-}
-- 
cgit v1.2.3