Add Request Talk Power and Set Phonetic Nickname to the Self menu

A request asks for a reason, as TS3 does, and turns the item into Cancel
Talk Power Request until it is granted or withdrawn. The phonetic nickname
applies to the current server. client_talk_request carries the request's
timestamp, so any non-zero value now counts as a pending request.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-04 00:04:46 +00:00
co-authored by Claude Opus 5.5
parent 7c2d4c7c42
commit 06180b4273
6 changed files with 116 additions and 1 deletions
@@ -8,10 +8,14 @@ public final class ClientEntry {
public final int id;
public volatile int channelId;
public volatile String nickname;
/** How text-to-speech should say the nickname ({@code client_nickname_phonetic}). */
public volatile String phoneticNickname = "";
public volatile String uniqueId = "";
public volatile int databaseId;
public volatile int type; // 0 = normal voice client, 1 = server-query
public volatile int talkPower;
/** Waiting for a moderator to grant talk power ({@code client_talk_request}). */
public volatile boolean talkRequest;
public volatile int[] serverGroupIds = new int[0];
public volatile int channelGroupId;
@@ -38,6 +38,8 @@ final class ConnectionEventHandler implements TS3Listener {
ClientEntry c = conn.getModel().putClient(e.getClientId(), e.getClientNickname(), e.getClientTargetId());
c.type = safeInt(e, "client_type");
c.talkPower = e.getClientTalkPower();
c.talkRequest = talkRequested(e);
c.phoneticNickname = TeamspeakConnection.orEmpty(e.get("client_nickname_phonetic"));
c.inputMuted = e.isClientInputMuted();
c.outputMuted = e.isClientOutputMuted();
c.inputHardware = e.isClientUsingHardwareInput();
@@ -326,6 +328,10 @@ final class ConnectionEventHandler implements TS3Listener {
c.awayMessage = TeamspeakConnection.orEmpty(e.get("client_away_message"));
}
if (has(e, "client_talk_power")) c.talkPower = e.getInt("client_talk_power");
if (has(e, "client_talk_request")) c.talkRequest = talkRequested(e);
if (reported(e, "client_nickname_phonetic")) {
c.phoneticNickname = TeamspeakConnection.orEmpty(e.get("client_nickname_phonetic"));
}
if (reported(e, "client_description")) {
c.description = TeamspeakConnection.orEmpty(e.get("client_description"));
conn.ui.onInfoUpdated();
@@ -355,7 +361,7 @@ final class ConnectionEventHandler implements TS3Listener {
? SoundEvent.CLIENT_RENAMED_BY_YOU : SoundEvent.CLIENT_RENAMED_BY_OTHER, vars);
conn.log(oldName + " is now known as " + conn.clientLink(c.id));
}
if (safeInt(e, "client_talk_request") > 0 && !self) {
if (has(e, "client_talk_request") && talkRequested(e) && !self) {
conn.sound(SoundEvent.CLIENT_REQUESTED_TALK_POWER, vars);
}
if (self && has(e, "client_is_talker")) {
@@ -676,6 +682,12 @@ final class ConnectionEventHandler implements TS3Listener {
TeamspeakConnection.orEmpty(e.get("invokeruid")), name);
}
/** {@code client_talk_request} holds the request's timestamp, or 0 when there is none. */
private static boolean talkRequested(BaseEvent e) {
String v = e.get("client_talk_request");
return v != null && !v.isBlank() && !v.trim().equals("0");
}
private static int safeInt(BaseEvent e, String key) {
try {
String v = e.get(key);
@@ -854,6 +854,21 @@ public final class TeamspeakConnection implements TS3Listener {
"Channel commander update failed");
}
/** @param message the reason shown to moderators; ignored when withdrawing the request */
public void setTalkRequest(boolean request, String message) {
updateSelf(self -> self.talkRequest = request);
selfUpdate(cmd -> {
cmd.add(new CommandSingleParameter("client_talk_request", request ? "1" : "0"));
if (request) cmd.add(new CommandSingleParameter("client_talk_request_msg", message));
}, "Talk power request failed");
}
public void setPhoneticNickname(String phoneticNickname) {
updateSelf(self -> self.phoneticNickname = phoneticNickname);
selfUpdate(cmd -> cmd.add(new CommandSingleParameter("client_nickname_phonetic", phoneticNickname)),
"Setting phonetic nickname failed");
}
/**
* Applies a change of our own state to the local model. The server sends
* {@code notifyclientupdated} to the <em>other</em> clients only, so without this
@@ -305,6 +305,30 @@ public final class ServerSession {
if (conn.isConnected()) conn.setNickname(nickname);
}
public boolean isTalkRequested() {
ClientEntry self = self();
return conn.isConnected() && self != null && self.talkRequest;
}
/** @param message the reason shown to moderators, may be empty */
public void requestTalkPower(String message) {
if (conn.isConnected()) conn.setTalkRequest(true, message);
}
public void cancelTalkRequest() {
if (conn.isConnected()) conn.setTalkRequest(false, "");
}
public String phoneticNickname() {
ClientEntry self = self();
return self == null ? "" : self.phoneticNickname;
}
/** Applies to this server only; the identity keeps its own phonetic nickname for new connections. */
public void setPhoneticNickname(String phoneticNickname) {
if (conn.isConnected()) conn.setPhoneticNickname(phoneticNickname);
}
/** What the local client looks like on this server. */
public SelfState selfState() {
if (!conn.isConnected()) return SelfState.DISCONNECTED;
@@ -253,6 +253,21 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
changeNickname();
}
@Override
public boolean isTalkPowerRequested() {
return selected != null && selected.session().isTalkRequested();
}
@Override
public void onRequestTalkPower() {
requestTalkPower();
}
@Override
public void onSetPhoneticNickname() {
setPhoneticNickname();
}
@Override
public boolean canSetAvatar() {
return selected != null && selected.session().canSetAvatar();
@@ -925,6 +940,26 @@ public final class MainFrame extends JFrame implements ServerTabPane.Listener {
}
}
/** Asks for a reason and requests talk power, or withdraws the pending request. */
private void requestTalkPower() {
if (selected == null) return;
if (selected.session().isTalkRequested()) {
selected.session().cancelTalkRequest();
return;
}
String message = (String) JOptionPane.showInputDialog(this, "Reason:", "Request Talk Power",
JOptionPane.PLAIN_MESSAGE, Icons.of("TALK_POWER_REQUEST"), null, "");
if (message != null) selected.session().requestTalkPower(message.trim());
}
private void setPhoneticNickname() {
if (selected == null) return;
String phonetic = (String) JOptionPane.showInputDialog(this, "Phonetic nickname:", "Set Phonetic Nickname",
JOptionPane.PLAIN_MESSAGE, Icons.of("PHONETICSNICKNAME"), null,
selected.session().phoneticNickname());
if (phonetic != null) selected.session().setPhoneticNickname(phonetic.trim());
}
private void showAbout() {
JOptionPane.showMessageDialog(this,
"TS3J Swing Client\n\n" +
@@ -54,6 +54,14 @@ final class MainMenuBar extends JMenuBar {
void onChangeNickname();
/** Whether our talk power request is pending; asked as the Self menu opens. */
boolean isTalkPowerRequested();
/** Requests talk power, or withdraws a pending request. */
void onRequestTalkPower();
void onSetPhoneticNickname();
/** Whether the current server lets us upload an avatar; asked as the Self menu opens. */
boolean canSetAvatar();
@@ -103,6 +111,8 @@ final class MainMenuBar extends JMenuBar {
private JCheckBoxMenuItem awayItem;
private JMenuItem awayStatusItem;
private JCheckBoxMenuItem commanderItem;
private JMenuItem talkPowerItem;
private JMenuItem phoneticItem;
private JMenuItem avatarItem;
private JMenuItem deleteAvatarItem;
private JMenuItem banListItem;
@@ -181,6 +191,11 @@ final class MainMenuBar extends JMenuBar {
commanderItem.addActionListener(e -> listener.onCommanderToggle(commanderItem.isSelected()));
JMenuItem nick = new JMenuItem("Change nickname…", Icons.of("CHANGE_NICKNAME"));
nick.addActionListener(e -> listener.onChangeNickname());
talkPowerItem = new JMenuItem();
talkPowerItem.addActionListener(e -> listener.onRequestTalkPower());
showTalkPowerRequested(false);
phoneticItem = new JMenuItem("Set Phonetic Nickname…", Icons.of("PHONETICSNICKNAME"));
phoneticItem.addActionListener(e -> listener.onSetPhoneticNickname());
avatarItem = new JMenuItem("Set avatar…", Icons.of("UPLOAD_AVATAR"));
avatarItem.addActionListener(e -> listener.onSetAvatar());
deleteAvatarItem = new JMenuItem("Delete avatar", Icons.of("DELETE_AVATAR"));
@@ -193,11 +208,14 @@ final class MainMenuBar extends JMenuBar {
self.add(commanderItem);
self.addSeparator();
self.add(nick);
self.add(talkPowerItem);
self.add(phoneticItem);
self.add(avatarItem);
self.add(deleteAvatarItem);
self.addMenuListener(new MenuListener() {
@Override
public void menuSelected(MenuEvent e) {
showTalkPowerRequested(listener.isTalkPowerRequested());
avatarItem.setVisible(!avatarItem.isEnabled() || listener.canSetAvatar());
deleteAvatarItem.setVisible(listener.hasAvatar());
}
@@ -294,6 +312,8 @@ final class MainMenuBar extends JMenuBar {
awayItem.setEnabled(connected);
awayStatusItem.setEnabled(connected);
commanderItem.setEnabled(connected);
talkPowerItem.setEnabled(connected);
phoneticItem.setEnabled(connected);
avatarItem.setEnabled(connected);
deleteAvatarItem.setEnabled(connected);
banListItem.setEnabled(connected);
@@ -303,6 +323,11 @@ final class MainMenuBar extends JMenuBar {
commanderItem.setSelected(commander);
}
private void showTalkPowerRequested(boolean requested) {
talkPowerItem.setText(requested ? "Cancel Talk Power Request" : "Request Talk Power…");
talkPowerItem.setIcon(Icons.of(requested ? "TALK_POWER_CANCEL_REQUEST" : "TALK_POWER_REQUEST"));
}
private void showMuted(boolean micMuted, boolean deafened) {
muteItem.setText(micMuted ? "Unmute Microphone" : "Mute Microphone");
muteItem.setIcon(Icons.of(micMuted ? "CAPTURE" : "INPUT_MUTED"));