PushQueriesService -> UserService

1 files changed, 6 insertions, 9 deletions

diff --git a/src/main/java/com/juick/www/api/Notifications.java b/src/main/java/com/juick/www/api/Notifications.java
index 1ebe3c61..ac5a635b 100644
--- a/src/main/java/com/juick/www/api/Notifications.java
+++ b/src/main/java/com/juick/www/api/Notifications.java
@@ -39,9 +39,6 @@ import java.util.stream.Stream;
 @RestController
 public class Notifications {
     private static final Logger logger = LoggerFactory.getLogger("www");
-    
-    @Inject
-    private PushQueriesService pushQueriesService;
     @Inject
     private MessagesService messagesService;
     @Inject
@@ -56,7 +53,7 @@ public class Notifications {
     private User collectTokens(Integer uid) {
         User user = userService.getUserByUID(uid).orElse(AnonymousUser.INSTANCE);
         user.setUnreadCount(messagesService.getUnread(user).size());
-        var tokens = pushQueriesService.getTokens(List.of(user.getUid()));
+        var tokens = userService.getTokens(List.of(user.getUid()));
         var xmppJids = userService.getJIDsbyUID(uid).stream()
                 .map(jid -> new ExternalToken(null, "xmpp", jid, null));
         var tgIds = telegramService.getTelegramIdentifiers(Collections.singletonList(user)).stream()
@@ -113,7 +110,7 @@ public class Notifications {
             throw new HttpForbiddenException();
         }
         list.forEach(t -> {
-            pushQueriesService.deleteToken(t.type(), t.token());
+            userService.deleteToken(t.type(), t.token());
         });
 
         return Status.OK;
@@ -127,7 +124,7 @@ public class Notifications {
             throw new HttpForbiddenException();
         }
         list.forEach(t -> {
-            pushQueriesService.deleteToken(t.type(), t.token());
+            userService.deleteToken(t.type(), t.token());
         });
 
         return Status.OK;
@@ -139,7 +136,7 @@ public class Notifications {
             @Parameter(hidden = true) User visitor,
             @RequestBody List<ExternalToken> list) {
         list.forEach(t -> {
-            pushQueriesService.addToken(visitor.getUid(), t.type(), t.token());
+            userService.addToken(visitor.getUid(), t.type(), t.token());
         });
         return Status.OK;
     }
@@ -149,7 +146,7 @@ public class Notifications {
     public Status doAndroidRegister(
             @Parameter(hidden = true) User visitor,
             @RequestParam(name = "regid") String regId) {
-        pushQueriesService.addToken(visitor.getUid(),"fcm", regId);
+        userService.addToken(visitor.getUid(),"fcm", regId);
         return Status.OK;
     }
 
@@ -158,7 +155,7 @@ public class Notifications {
     public Status doWinphoneRegister(
             @Parameter(hidden = true) User visitor,
             @RequestParam(name = "url") String regId) {
-        pushQueriesService.addToken(visitor.getUid(),  "mpns", regId);
+        userService.addToken(visitor.getUid(),  "mpns", regId);
         return Status.OK;
     }
 }