Release 1.13.16 (#528)

rainbowdashlabs · May 30, 2023 · cfa9660 · cfa9660
2 parents a7af708 + c8cfb4e
commit cfa9660
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "de.chojo"
-version = "1.13.15"
+version = "1.13.16"
 
 repositories {
     maven("https://eldonexus.de/repository/maven-public")

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -12,7 +12,7 @@ services:
   database:
     networks:
       - repbot
-    image: postgres:15.2
+    image: postgres:15.3
     expose:
       - 5432
     volumes:

diff --git a/src/main/java/de/chojo/repbot/commands/gdpr/handler/Delete.java b/src/main/java/de/chojo/repbot/commands/gdpr/handler/Delete.java
@@ -4,9 +4,13 @@
 import de.chojo.jdautil.wrapper.EventContext;
 import de.chojo.repbot.dao.access.Gdpr;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
 
 public class Delete implements SlashHandler {
     private final Gdpr gdpr;
+    private static final Logger log = getLogger(Delete.class);
 
     public Delete(Gdpr gdpr) {
         this.gdpr = gdpr;

diff --git a/src/main/java/de/chojo/repbot/commands/prune/handler/Guild.java b/src/main/java/de/chojo/repbot/commands/prune/handler/Guild.java
@@ -5,8 +5,12 @@
 import de.chojo.jdautil.wrapper.EventContext;
 import de.chojo.repbot.service.GdprService;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
 
 public class Guild implements SlashHandler {
+    private static final Logger log = getLogger(Guild.class);
     private final GdprService service;
 
     public Guild(GdprService service) {

diff --git a/src/main/java/de/chojo/repbot/dao/access/gdpr/GdprUser.java b/src/main/java/de/chojo/repbot/dao/access/gdpr/GdprUser.java
@@ -45,6 +45,7 @@ public static GdprUser build(Gdpr gdpr, Row rs, ShardManager shardManager) throw
     }
 
     public boolean queueDeletion() {
+        log.info("User {} requested deletion of their data", userId());
         return builder()
                 .query("""
                        INSERT INTO

diff --git a/src/main/java/de/chojo/repbot/dao/access/guild/reputation/sub/user/Gdpr.java b/src/main/java/de/chojo/repbot/dao/access/guild/reputation/sub/user/Gdpr.java
@@ -7,9 +7,13 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
+import org.slf4j.Logger;
+
+import static org.slf4j.LoggerFactory.getLogger;
 
 public class Gdpr extends QueryFactory implements MemberHolder {
     private final RepUser repUser;
+    private static final Logger log = getLogger(Gdpr.class);
 
     public Gdpr(RepUser repUser) {
         super(repUser);
@@ -22,6 +26,7 @@ public Member member() {
     }
 
     public void queueDeletion() {
+        log.info("User {} is scheduled for deletion on guild {}", userId(), guildId());
         builder()
                 .query("""
                        INSERT INTO
@@ -38,6 +43,7 @@ ON CONFLICT(guild_id, user_id)
     }
 
     public void dequeueDeletion() {
+        log.info("User {} deletion on guild {} canceled", userId(), guildId());
         builder()
                 .query("""
                        DELETE FROM

diff --git a/src/main/java/de/chojo/repbot/service/GdprService.java b/src/main/java/de/chojo/repbot/service/GdprService.java
@@ -2,13 +2,13 @@
 
 import de.chojo.repbot.dao.access.Gdpr;
 import de.chojo.repbot.dao.access.gdpr.RemovalTask;
-import de.chojo.repbot.dao.access.guild.RepGuild;
 import de.chojo.repbot.dao.provider.Guilds;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.ISnowflake;
 import net.dv8tion.jda.api.sharding.ShardManager;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
@@ -60,17 +60,26 @@ public void run() {
 
     public CompletableFuture<Integer> cleanupGuildUsers(Guild guild) {
         return CompletableFuture.supplyAsync(() -> {
-            var savedIds = guilds.guild(guild).userIds();
-            var memberIds = guild.loadMembers().get()
-                                 .stream()
-                                 .map(ISnowflake::getIdLong).toList();
-            var collect = savedIds.stream().filter(id -> !memberIds.contains(id)).toList();
-            for (var id : collect) RemovalTask.anonymExecute(gdpr, guild.getIdLong(), id);
-            return collect.size();
+            log.info("Guild prune was started on {}", guild.getId());
+            var pruned = 0;
+            var users = guilds.guild(guild).userIds();
+            log.info("Checking {} users", users.size());
+            for (var user : users) {
+                try {
+                    guild.retrieveMemberById(user).complete();
+                } catch (RuntimeException e) {
+                    log.info("Removing user {} data during guild prune", user);
+                    RemovalTask.anonymExecute(gdpr, guild.getIdLong(), user);
+                    pruned++;
+                }
+            }
+            log.info("Prune on guild {} finished. Removed {} users", guild.getId(), pruned);
+            return pruned;
         }, executorService);
     }
 
     public void cleanupGuildUser(Guild guild, Long user) {
+        log.info("User data of {} was pruned on guild {}.", user, guild.getIdLong());
         CompletableFuture.runAsync(() -> RemovalTask.anonymExecute(gdpr, guild.getIdLong(), user), executorService);
     }