2 files changed, 4 insertions, 26 deletions
diff --git a/src/main/java/com/juick/www/api/webhooks/PatreonWebhook.java b/src/main/java/com/juick/www/api/webhooks/PatreonWebhook.java
index d8467ff0..c05585ac 100644
--- a/src/main/java/com/juick/www/api/webhooks/PatreonWebhook.java
+++ b/src/main/java/com/juick/www/api/webhooks/PatreonWebhook.java
@@ -67,28 +67,6 @@ public class PatreonWebhook {
         var updatedEmails = StreamSupport.stream(json.get("included").spliterator(), false)
                 .filter(node -> node.get("type").textValue().equals("user"))
                 .map(node -> node.get("attributes").get("email").textValue()).toList();
-        var campainsResponse = patreonService.fetchCampaigns();
-        List<String> activeEmails = new ArrayList<>();
-        campainsResponse.forEach(campaign -> {
-            var pledgesResponse = patreonService.fetchPledges(campaign);
-            pledgesResponse.forEach(pledge -> {
-                logger.info("Pledge email: {}", pledge);
-                activeEmails.add(pledge);
-            });
-        });
-        activeEmails.forEach(email -> {
-            var user = userService.getUserByEmail(email);
-            if (!user.isAnonymous()) {
-                userService.setPremium(user.getUid(), true);
-            }
-        });
-        updatedEmails.stream().filter(email -> !activeEmails.contains(email))
-                .forEach(deleted -> {
-                    var user = userService.getUserByEmail(deleted);
-                    if (!user.isAnonymous()) {
-                        logger.info("User is not a patron anymore: {}", deleted);
-                        userService.setPremium(user.getUid(), false);
-                    }
-                });
+        patreonService.updateStatus(updatedEmails);
     }
 }
diff --git a/src/main/java/com/juick/www/api/webhooks/VkWebhook.java b/src/main/java/com/juick/www/api/webhooks/VkWebhook.java
index 45e20d3f..d69d00be 100644
--- a/src/main/java/com/juick/www/api/webhooks/VkWebhook.java
+++ b/src/main/java/com/juick/www/api/webhooks/VkWebhook.java
@@ -62,9 +62,9 @@ public class VkWebhook {
             if (secretKey.equals(secret)) {
                 if (type.startsWith("donut_")) {
                     var vkId = json.get("object").get("user_id").asLong(0);
-                    var userId = userService.getUIDbyVKID(vkId);
-                    if (userId > 0) {
-                        vkService.updatePremiumStatus(userId);
+                    var user = userService.getUserByVKID(vkId);
+                    if (user.isPresent()) {
+                        vkService.updatePremiumStatus(user.get().getUid());
                     }
                 }
                 return "ok";