修复构建错误

PBH-BTN · Feb 1, 2025 · 9413de2 · 9413de2
1 parent 5da7910
commit 9413de2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/src/main/java/com/ghostchu/peerbanhelper/btn/ability/BtnAbilitySubmitBans.java b/src/main/java/com/ghostchu/peerbanhelper/btn/ability/BtnAbilitySubmitBans.java
@@ -10,6 +10,7 @@
 import com.ghostchu.peerbanhelper.text.TranslationComponent;
 import com.ghostchu.peerbanhelper.util.HTTPUtil;
 import com.ghostchu.peerbanhelper.util.json.JsonUtil;
+import com.ghostchu.peerbanhelper.wrapper.BanBehavior;
 import com.ghostchu.peerbanhelper.wrapper.BanMetadata;
 import com.github.mizosoft.methanol.MutableRequest;
 import com.google.gson.JsonObject;
@@ -116,7 +117,7 @@ private List<BtnBan> generateBans() {
             if (e.getValue().getBanAt() <= lastReport) {
                 continue;
             }
-            if (e.getValue().isBanForDisconnect()) {
+            if (e.getValue().getBanBehavior() == BanBehavior.DISCONNECT) {
                 continue;
             }
             BtnBan btnBan = new BtnBan();

diff --git a/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/deluge/DelugePeer.java b/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/deluge/DelugePeer.java
@@ -28,6 +28,11 @@ public String getRawIp() {
         return peerAddress.getIp();
     }
 
+    @Override
+    public boolean isPBHThrottled() {
+        return false;
+    }
+
     @Override
     public boolean isHandshaking() {
         return downloadSpeed <= 0 && uploadSpeed <= 0;

diff --git a/...ain/java/com/ghostchu/peerbanhelper/downloader/impl/qbittorrent/impl/QBittorrentPeer.java b/...ain/java/com/ghostchu/peerbanhelper/downloader/impl/qbittorrent/impl/QBittorrentPeer.java
@@ -119,6 +119,11 @@ public String getRawIp() {
         return rawIp == null ? ip : rawIp;
     }
 
+    @Override
+    public boolean isPBHThrottled() {
+        return false;
+    }
+
     public String getConnection() {
         return connection;
     }

diff --git a/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/transmission/TRPeer.java b/src/main/java/com/ghostchu/peerbanhelper/downloader/impl/transmission/TRPeer.java
@@ -81,4 +81,9 @@ public String getRawIp() {
         return backend.getAddress();
     }
 
+    @Override
+    public boolean isPBHThrottled() {
+        return false;
+    }
+
 }
diff --git a/src/main/java/com/ghostchu/peerbanhelper/metric/impl/inmemory/InMemoryMetrics.java b/src/main/java/com/ghostchu/peerbanhelper/metric/impl/inmemory/InMemoryMetrics.java
@@ -1,6 +1,7 @@
 package com.ghostchu.peerbanhelper.metric.impl.inmemory;
 
 import com.ghostchu.peerbanhelper.metric.BasicMetrics;
+import com.ghostchu.peerbanhelper.wrapper.BanBehavior;
 import com.ghostchu.peerbanhelper.wrapper.BanMetadata;
 import com.ghostchu.peerbanhelper.wrapper.PeerAddress;
 import org.springframework.stereotype.Component;
@@ -34,15 +35,15 @@ public void recordCheck() {
 
     @Override
     public void recordPeerBan(PeerAddress address, BanMetadata metadata) {
-        if(metadata.isBanForDisconnect()){
+        if (metadata.getBanBehavior() == BanBehavior.DISCONNECT) {
             return;
         }
         bans++;
     }
 
     @Override
     public void recordPeerUnban(PeerAddress address, BanMetadata metadata) {
-        if(metadata.isBanForDisconnect()){
+        if (metadata.getBanBehavior() == BanBehavior.DISCONNECT) {
             return;
         }
         unbans++;

diff --git a/src/main/java/com/ghostchu/peerbanhelper/metric/impl/persist/PersistMetrics.java b/src/main/java/com/ghostchu/peerbanhelper/metric/impl/persist/PersistMetrics.java
@@ -14,6 +14,7 @@
 import com.ghostchu.peerbanhelper.text.Lang;
 import com.ghostchu.peerbanhelper.util.CommonUtil;
 import com.ghostchu.peerbanhelper.util.MiscUtil;
+import com.ghostchu.peerbanhelper.wrapper.BanBehavior;
 import com.ghostchu.peerbanhelper.wrapper.BanMetadata;
 import com.ghostchu.peerbanhelper.wrapper.PeerAddress;
 import lombok.extern.slf4j.Slf4j;
@@ -88,7 +89,7 @@ public void recordCheck() {
 
     @Override
     public void recordPeerBan(PeerAddress address, BanMetadata metadata) {
-        if (metadata.isBanForDisconnect()) {
+        if (metadata.getBanBehavior() == BanBehavior.DISCONNECT) {
             return;
         }
         inMemory.recordPeerBan(address, metadata);
@@ -133,7 +134,7 @@ public void recordPeerBan(PeerAddress address, BanMetadata metadata) {
 
     @Override
     public void recordPeerUnban(PeerAddress address, BanMetadata metadata) {
-        if (metadata.isBanForDisconnect()) {
+        if (metadata.getBanBehavior() == BanBehavior.DISCONNECT) {
             return;
         }
         inMemory.recordPeerUnban(address, metadata);

diff --git a/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHBanController.java b/src/main/java/com/ghostchu/peerbanhelper/module/impl/webapi/PBHBanController.java
@@ -12,6 +12,7 @@
 import com.ghostchu.peerbanhelper.web.Role;
 import com.ghostchu.peerbanhelper.web.wrapper.StdResp;
 import com.ghostchu.peerbanhelper.wrapper.BakedBanMetadata;
+import com.ghostchu.peerbanhelper.wrapper.BanBehavior;
 import com.ghostchu.peerbanhelper.wrapper.PeerAddress;
 import com.ghostchu.peerbanhelper.wrapper.PeerWrapper;
 import io.javalin.http.Context;
@@ -123,7 +124,7 @@ public void onDisable() {
                 .stream()
                 .filter(b -> {
                     if (!ignoreBanForDisconnect) return true;
-                    return !b.getValue().isBanForDisconnect();
+                    return b.getValue().getBanBehavior() != BanBehavior.DISCONNECT;
                 })
                 .filter(b -> search == null || b.getKey().toString().toLowerCase(Locale.ROOT).contains(search.toLowerCase(Locale.ROOT))
                         || b.getValue().toString().toLowerCase(Locale.ROOT).contains(search.toLowerCase(Locale.ROOT)))