Skip to content

Commit 37c122b

Browse files
committed
Add new client and channel properties, clean-up
1 parent 2efd11b commit 37c122b

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

src/main/java/com/github/theholywaffle/teamspeak3/api/ChannelProperty.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
public enum ChannelProperty implements Property {
3232

33+
CHANNEL_BANNER_GFX_URL(true),
34+
CHANNEL_BANNER_MODE(true),
3335
CHANNEL_CODEC(true),
3436
CHANNEL_CODEC_IS_UNENCRYPTED(true),
3537
CHANNEL_CODEC_LATENCY_FACTOR(false),
@@ -55,11 +57,15 @@ public enum ChannelProperty implements Property {
5557
CHANNEL_NEEDED_TALK_POWER(true),
5658
CHANNEL_ORDER(true),
5759
CHANNEL_PASSWORD(true),
60+
CHANNEL_SECURITY_SALT(false),
5861
CHANNEL_TOPIC(true),
59-
SECONDS_EMPTY(false),
62+
CHANNEL_UNIQUE_IDENTIFIER(false),
6063
CID(false),
64+
CPID(true),
6165
PID(false),
62-
CPID(true);
66+
SECONDS_EMPTY(false),
67+
TOTAL_CLIENTS(false),
68+
TOTAL_CLIENTS_FAMILY(false);
6369

6470
private final boolean changeable;
6571

src/main/java/com/github/theholywaffle/teamspeak3/api/ClientProperty.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
public enum ClientProperty implements Property {
3535

3636
CID(false),
37+
CLID(false),
3738
CLIENT_AWAY(false),
3839
CLIENT_AWAY_MESSAGE(false),
3940
/**
@@ -45,7 +46,12 @@ public enum ClientProperty implements Property {
4546
* </p>
4647
*/
4748
CLIENT_BADGES(true),
48-
CLIENT_BASE64HASHCLIENTUID(false),
49+
CLIENT_BASE64HASHCLIENTUID(false) {
50+
@Override
51+
public String getName() {
52+
return "client_base64HashClientUID";
53+
}
54+
},
4955
CLIENT_CHANNEL_GROUP_ID(false),
5056
CLIENT_CHANNEL_GROUP_INHERITED_CHANNEL_ID(false),
5157
CLIENT_COUNTRY(false),
@@ -54,12 +60,14 @@ public enum ClientProperty implements Property {
5460
CLIENT_DEFAULT_CHANNEL(false),
5561
CLIENT_DEFAULT_TOKEN(false),
5662
CLIENT_DESCRIPTION(true),
63+
CLIENT_ESTIMATED_LOCATION(false),
5764
CLIENT_FLAG_AVATAR(false),
5865
CLIENT_FLAG_TALKING(false),
5966
CLIENT_ICON_ID(true),
6067
CLIENT_IDLE_TIME(false),
6168
CLIENT_INPUT_HARDWARE(false),
6269
CLIENT_INPUT_MUTED(false),
70+
CLIENT_INTEGRATIONS(false),
6371
CLIENT_IS_CHANNEL_COMMANDER(true),
6472
CLIENT_IS_PRIORITY_SPEAKER(false),
6573
CLIENT_IS_RECORDING(false),
@@ -69,6 +77,7 @@ public enum ClientProperty implements Property {
6977
CLIENT_META_DATA(false),
7078
CLIENT_MONTH_BYTES_DOWNLOADED(false),
7179
CLIENT_MONTH_BYTES_UPLOADED(false),
80+
CLIENT_MYTEAMSPEAK_AVATAR(false),
7281
CLIENT_MYTEAMSPEAK_ID(false),
7382
CLIENT_NEEDED_SERVERQUERY_VIEW_POWER(false),
7483
CLIENT_NICKNAME(true),
@@ -77,7 +86,9 @@ public enum ClientProperty implements Property {
7786
CLIENT_OUTPUT_MUTED(false),
7887
CLIENT_OUTPUTONLY_MUTED(false),
7988
CLIENT_PLATFORM(false),
89+
CLIENT_SECURITY_HASH(false),
8090
CLIENT_SERVERGROUPS(false),
91+
CLIENT_SIGNED_BADGES(false),
8192
CLIENT_TALK_POWER(false),
8293
CLIENT_TALK_REQUEST(false),
8394
CLIENT_TALK_REQUEST_MSG(false),
@@ -88,6 +99,7 @@ public enum ClientProperty implements Property {
8899
CLIENT_UNIQUE_IDENTIFIER(false),
89100
CLIENT_UNREAD_MESSAGES(false),
90101
CLIENT_VERSION(false),
102+
CLIENT_VERSION_SIGN(false),
91103
CONNECTION_BANDWIDTH_RECEIVED_LAST_MINUTE_TOTAL(false),
92104
CONNECTION_BANDWIDTH_RECEIVED_LAST_SECOND_TOTAL(false),
93105
CONNECTION_BANDWIDTH_SENT_LAST_MINUTE_TOTAL(false),

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Channel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public int getId() {
4242
}
4343

4444
public int getTotalClientsFamily() {
45-
return getInt("total_clients_family");
45+
return getInt(ChannelProperty.TOTAL_CLIENTS_FAMILY);
4646
}
4747

4848
public int getTotalClients() {
49-
return getInt("total_clients");
49+
return getInt(ChannelProperty.TOTAL_CLIENTS);
5050
}
5151

5252
public int getNeededSubscribePower() {

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Client.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public long getIconId() {
103103
}
104104

105105
public int getId() {
106-
return getInt("clid");
106+
return getInt(ClientProperty.CLID);
107107
}
108108

109109
public long getIdleTime() {

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/ClientInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public long getBandwidthSentLastSecond() {
6666
}
6767

6868
public String getBase64ClientUId() {
69-
return get("client_base64HashClientUID");
69+
return get(ClientProperty.CLIENT_BASE64HASHCLIENTUID);
7070
}
7171

7272
public int getDefaultChannel() {

0 commit comments

Comments
 (0)