Request, grant and revoke talk power

Core keeps client_is_talker, the request's time and reason, and each
channel's needed talk power; clientedit grants or revokes, and "grant
next" picks whoever in our channel asked first, optionally revoking the
rest. The server refuses a request or a grant ("invalid parameter") from
or for a client that can already talk, so both are offered only to those
short of talk power. Grants dropped without an invoker (leaving the
channel, the channel's need changing) are not announced. Verified on a
local 3.13.7 server.

Desktop: Grant/Revoke Talk Power in the client menu, also for several
selected clients; the tree's badges in TeamSpeak's order (granted or
insufficient ahead of the groups, a request after them); the request's
reason in the info panel; log lines; the three talk power hotkeys. The
Self menu's request item shows only while it is needed.
Android: grant/revoke among the client sheet's admin actions, request or
cancel on our own sheet, the same badges in the tree.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-11 01:15:39 +00:00
co-authored by Claude Opus 5.5
parent 204cbd6048
commit a57700959f
23 changed files with 287 additions and 18 deletions
@@ -66,6 +66,15 @@ final class ClientMenu {
menu.add(me);
}
menu.addSeparator();
if (actions.canGrantTalkPower() && client.talker) {
JMenuItem revoke = new JMenuItem("Revoke Talk Power", Icons.of("TALK_POWER_REVOKE"));
revoke.addActionListener(a -> actions.setTalker(List.of(client), false));
menu.add(revoke);
} else if (actions.canGrantTalkPower() && model.lacksTalkPower(client)) {
JMenuItem grant = new JMenuItem("Grant Talk Power", Icons.of("TALK_POWER_GRANT"));
grant.addActionListener(a -> actions.setTalker(List.of(client), true));
menu.add(grant);
}
menu.add(buildServerGroupMenu(client, model, groupIcons, actions));
menu.add(buildChannelGroupMenu(client, model, groupIcons, actions));
menu.addSeparator();
@@ -118,6 +127,18 @@ final class ClientMenu {
moveHere.setEnabled(others);
moveHere.addActionListener(a -> actions.moveClientsToOwnChannel(clients));
menu.add(moveHere);
if (actions.canGrantTalkPower()) {
menu.addSeparator();
JMenuItem grant = new JMenuItem("Grant Talk Power", Icons.of("TALK_POWER_GRANT"));
List<ClientEntry> silent = clients.stream().filter(model::lacksTalkPower).toList();
grant.setEnabled(!silent.isEmpty());
grant.addActionListener(a -> actions.setTalker(silent, true));
menu.add(grant);
JMenuItem revoke = new JMenuItem("Revoke Talk Power", Icons.of("TALK_POWER_REVOKE"));
revoke.setEnabled(clients.stream().anyMatch(c -> c.talker));
revoke.addActionListener(a -> actions.setTalker(clients.stream().filter(c -> c.talker).toList(), false));
menu.add(revoke);
}
return menu;
}
@@ -22,6 +22,7 @@ import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -316,6 +317,11 @@ final class DropIndicatorTree extends JTree {
}
}
private static void addIcon(List<Icon> icons, String key) {
Icon icon = key == null ? null : Icons.of(key);
if (icon != null) icons.add(icon);
}
/** The icon strip a row shows on its right, empty when it has none (yet). */
private List<Icon> badgesOf(DefaultMutableTreeNode treeNode) {
Object node = treeNode.getUserObject();
@@ -325,8 +331,12 @@ final class DropIndicatorTree extends JTree {
}
if (node instanceof ClientEntry) {
ClientEntry cl = (ClientEntry) node;
List<Icon> icons = groupIcons.iconsOf(
model.serverGroupsOf(cl.serverGroupIds), model.channelGroup(cl.channelGroupId));
List<Icon> icons = new ArrayList<>();
// TeamSpeak's order: talk power ahead of the groups, a talk request after them.
addIcon(icons, cl.talker ? "IS_TALKER" : model.lacksTalkPower(cl) ? "INPUT_MUTED" : null);
icons.addAll(groupIcons.iconsOf(
model.serverGroupsOf(cl.serverGroupIds), model.channelGroup(cl.channelGroupId)));
addIcon(icons, cl.talkRequest ? "TALK_POWER_REQUEST" : null);
// The country's flag comes last, at the row's edge, as in TeamSpeak.
Icon flag = settings.countryFlags ? CountryFlagIcons.of(cl.country) : null;
if (flag != null) icons.add(flag);
@@ -99,6 +99,10 @@ final class HotkeyActions implements HotkeyEngine.Handler {
for (ServerTab tab : targets) tab.session().stopRecording();
}
case TALK_POWER_REQUEST -> toggleTalkRequest(targets);
case TALK_POWER_GRANT_NEXT -> grantNextTalkPower(targets, false);
case TALK_POWER_REVOKE_ALL_GRANT_NEXT -> grantNextTalkPower(targets, true);
case FILEBROWSER -> frame.browseCurrentChannel();
case SKIN_RELOAD -> frame.reloadSkin();
case BRING_TO_FRONT -> frame.bringToFront();
@@ -139,6 +143,19 @@ final class HotkeyActions implements HotkeyEngine.Handler {
frame.refreshAfterHotkey();
}
/** Asks without a reason, as there is nobody to type one. */
private void toggleTalkRequest(List<ServerTab> targets) {
boolean requested = targets.stream().anyMatch(t -> t.session().isTalkRequested());
for (ServerTab tab : targets) {
if (requested) tab.session().cancelTalkRequest();
else tab.session().requestTalkPower("");
}
}
private void grantNextTalkPower(List<ServerTab> targets, boolean revokeOthers) {
for (ServerTab tab : targets) tab.session().grantNextTalkPower(revokeOthers);
}
private static boolean anyMicMuted(List<ServerTab> tabs) {
return tabs.stream().anyMatch(t -> t.session().isMicMuted());
}
@@ -277,6 +277,11 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
return selected != null && selected.session().isTalkRequested();
}
@Override
public boolean canRequestTalkPower() {
return selected != null && selected.session().canRequestTalkPower();
}
@Override
public void onRequestTalkPower() {
requestTalkPower();
@@ -57,6 +57,9 @@ final class MainMenuBar extends JMenuBar {
/** Whether our talk power request is pending; asked as the Self menu opens. */
boolean isTalkPowerRequested();
/** Whether the current server lets us ask for talk power; asked as the Self menu opens. */
boolean canRequestTalkPower();
/** Requests talk power, or withdraws a pending request. */
void onRequestTalkPower();
@@ -246,7 +249,9 @@ final class MainMenuBar extends JMenuBar {
self.addMenuListener(new MenuListener() {
@Override
public void menuSelected(MenuEvent e) {
showTalkPowerRequested(listener.isTalkPowerRequested());
boolean requested = listener.isTalkPowerRequested();
showTalkPowerRequested(requested);
talkPowerItem.setVisible(requested || listener.canRequestTalkPower());
avatarItem.setVisible(!avatarItem.isEnabled() || listener.canSetAvatar());
deleteAvatarItem.setVisible(listener.hasAvatar());
}
@@ -233,6 +233,16 @@ final class ServerTabTreeActions implements ServerTreePanel.Actions {
return tab.session().canDeleteOtherAvatars();
}
@Override
public boolean canGrantTalkPower() {
return tab.session().canGrantTalkPower();
}
@Override
public void setTalker(List<ClientEntry> clients, boolean talker) {
conn.setTalker(ids(clients), talker);
}
@Override
public void deleteClientAvatar(ClientEntry client) {
tab.avatar().deleteOf(client);
@@ -130,6 +130,11 @@ public final class ServerTreePanel extends JPanel {
/** Whether we may delete other clients' avatars. */
boolean canDeleteOtherAvatars();
/** Whether we may grant and revoke talk power. */
boolean canGrantTalkPower();
void setTalker(List<ClientEntry> clients, boolean talker);
void deleteClientAvatar(ClientEntry client);
/** A new nickname for ourselves, typed into the tree row. */