diff --git a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/ServerModel.java b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/ServerModel.java index 7914168..e0228d7 100644 --- a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/ServerModel.java +++ b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/ServerModel.java @@ -37,6 +37,8 @@ public final class ServerModel { private final Map selfPermissionValues = new LinkedHashMap<>(); /** The local client's {@link #UNREPORTED_PERMISSIONS}, which the needed permissions leave out; absent until known. */ private final Map unreportedValues = new HashMap<>(); + /** Whether the server answered for the {@link #UNREPORTED_PERMISSIONS} at all. */ + private boolean unreportedKnown; private String serverName = "TeamSpeak Server"; /** The {@code virtualserver_*} properties from {@code initserver}, kept up to date by server edits. */ private final Map serverProperties = new HashMap<>(); @@ -55,6 +57,7 @@ public final class ServerModel { nextPermissionId = FIRST_PERMISSION_ID; selfPermissionValues.clear(); unreportedValues.clear(); + unreportedKnown = false; serverProperties.clear(); defaultChannelGroupId = 0; defaultChannelId = 0; @@ -180,6 +183,24 @@ public final class ServerModel { public synchronized void setUnreportedPermissions(Map values) { unreportedValues.clear(); unreportedValues.putAll(values); + unreportedKnown = true; + } + + /** + * The server would not say: asking needs {@code b_client_permissionoverview_own}, which + * moderator groups often lack although they hold the powers. + */ + public synchronized void unreportedPermissionsRefused() { + unreportedValues.clear(); + unreportedKnown = false; + } + + /** + * Whether we may hold one of {@link #UNREPORTED_PERMISSIONS}: unless the server said we + * do not, the action is offered, as the official client always does, and the server judges. + */ + public synchronized boolean mayHavePower(String name) { + return !unreportedKnown || unreportedValues.getOrDefault(name, 0) != 0; } /** One of {@link #UNREPORTED_PERMISSIONS}; 0 until known, or when the server would not tell. */ diff --git a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/TeamspeakConnection.java b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/TeamspeakConnection.java index 16d4e5e..aaa9dee 100644 --- a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/TeamspeakConnection.java +++ b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/net/TeamspeakConnection.java @@ -890,7 +890,7 @@ public final class TeamspeakConnection implements TS3Listener { if (name != null && value != null) powers.put(name, Integer.parseInt(value)); } model.setUnreportedPermissions(powers); - }, e -> model.setUnreportedPermissions(Map.of())); + }, e -> model.unreportedPermissionsRefused()); } /** Assigns or removes a server group for a client (by database id, as {@code servergroupaddclient} needs). */ diff --git a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java index a2e4627..8f3f222 100644 --- a/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java +++ b/ts3-client/core/src/main/java/eu/lixko/ts3j/client/session/ServerSession.java @@ -710,7 +710,7 @@ public final class ServerSession { * server knows, so it is left to refuse. */ private boolean hasPower(String power) { - return conn.isConnected() && conn.getModel().selfPower(power) != 0; + return conn.isConnected() && conn.getModel().mayHavePower(power); } // ---- connection events ---- diff --git a/ts3-client/core/src/test/java/eu/lixko/ts3j/client/net/ServerModelRulesTest.java b/ts3-client/core/src/test/java/eu/lixko/ts3j/client/net/ServerModelRulesTest.java index 996bbe1..1986944 100644 --- a/ts3-client/core/src/test/java/eu/lixko/ts3j/client/net/ServerModelRulesTest.java +++ b/ts3-client/core/src/test/java/eu/lixko/ts3j/client/net/ServerModelRulesTest.java @@ -56,4 +56,16 @@ class ServerModelRulesTest { assertFalse(model.canJoinChannel(1), "full"); assertFalse(model.canJoinChannel(2), "unknown"); } + + @Test + void unreportedPowerCountsOnlyWhenTheServerSaidNo() { + assertTrue(model.mayHavePower("i_client_move_power"), "not answered yet"); + + model.setUnreportedPermissions(java.util.Map.of("i_client_move_power", 50)); + assertTrue(model.mayHavePower("i_client_move_power")); + assertFalse(model.mayHavePower("i_client_kick_from_server_power"), "answered without it"); + + model.unreportedPermissionsRefused(); + assertTrue(model.mayHavePower("i_client_kick_from_server_power"), "refused: left to the server"); + } } diff --git a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java index 9eb4904..9fc86e1 100644 --- a/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java +++ b/ts3-client/swing/src/main/java/eu/lixko/ts3j/client/ui/ComplaintsDialog.java @@ -366,7 +366,7 @@ final class ComplaintsDialog extends JDialog { int[] rows = table.getSelectedRows(); if (rows.length != 1) return null; ServerModel model = conn.getModel(); - if (model.selfPower("i_client_ban_power") == 0) return null; + if (!model.mayHavePower("i_client_ban_power")) return null; Row row = tableModel.get(rows[0]); ClientEntry client = model.findClientByDatabaseId(row.isTarget() ? row.target().dbId() : row.complaint().fromDbId()); return client == null || client.id == conn.getSelfClientId() ? null : client;