Optimize ServerMemberBanEventImpl#requestBan() to use ServerImpl#requ…

…estBan()
vyfor · Mar 11, 2022 · f858856 · f858856
1 parent 34f9063
commit f858856
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/javacord-api/src/main/java/org/javacord/api/event/server/member/ServerMemberBanEvent.java b/javacord-api/src/main/java/org/javacord/api/event/server/member/ServerMemberBanEvent.java
@@ -15,15 +15,15 @@ public interface ServerMemberBanEvent extends ServerMemberEvent {
      *
      * @return The ban object.
      */
-    CompletableFuture<Optional<Ban>> requestBan();
+    CompletableFuture<Ban> requestBan();
 
     /**
      * Requests the reason of the ban.
      *
      * @return The reason of the ban.
      */
     default CompletableFuture<Optional<String>> requestReason() {
-        return requestBan().thenApply(ban -> ban.flatMap(Ban::getReason));
+        return requestBan().thenApply(Ban::getReason);
     }
 
 }
diff --git a/...rd-core/src/main/java/org/javacord/core/event/server/member/ServerMemberBanEventImpl.java b/...rd-core/src/main/java/org/javacord/core/event/server/member/ServerMemberBanEventImpl.java
@@ -6,7 +6,6 @@
 import org.javacord.api.event.server.member.ServerMemberBanEvent;
 import org.javacord.core.event.server.ServerEventImpl;
 
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -28,11 +27,8 @@ public ServerMemberBanEventImpl(Server server, User user) {
     }
 
     @Override
-    public CompletableFuture<Optional<Ban>> requestBan() {
-        return getServer().getBans()
-                .thenApply(bans -> bans.stream()
-                        .filter(ban -> ban.getUser().equals(getUser()))
-                        .findAny());
+    public CompletableFuture<Ban> requestBan() {
+        return getServer().requestBan(getUser());
     }
 
     @Override