TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Fixing the channel tree updates for TeamSpeak server

Browse source
This commit is contained in:
WolverinDEV 2021-01-07 13:58:01 +01:00
parent ceb0ada606
commit 1b604dd048
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
shared/js/ui/tree/Controller.tsx
View file

@ -311,8 +311,8 @@ class ChannelTreeController {
return; return;
} }
this.channelTree.clients.forEach(channel => this.sendClientNameInfo(channel)); /* Faster than just sending each stuff individual */
this.channelTree.clients.forEach(client => this.sendClientIcons(client)); this.sendChannelTreeEntriesFull(undefined);
} }
/* general channel tree event handlers */ /* general channel tree event handlers */
@ -403,7 +403,7 @@ class ChannelTreeController {
/* entry event handlers */ /* entry event handlers */
private initializeTreeEntryEvents<T extends ChannelTreeEntryEvents>(entry: ChannelTreeEntryModel<T>, events: any[]) { private initializeTreeEntryEvents<T extends ChannelTreeEntryEvents>(entry: ChannelTreeEntryModel<T>, events: any[]) {
events.push(entry.events.on("notify_unread_state_change", event => { events.push(entry.events.on("notify_unread_state_change", event => {
this.events.fire("notify_unread_state", { unread: event.unread, treeEntryId: entry.uniqueEntryId }); this.events.fire_react("notify_unread_state", { unread: event.unread, treeEntryId: entry.uniqueEntryId });
})); }));
} }
@ -456,7 +456,7 @@ class ChannelTreeController {
this.initializeTreeEntryEvents(client, events); this.initializeTreeEntryEvents(client, events);
events.push(client.events.on("notify_status_icon_changed", event => { events.push(client.events.on("notify_status_icon_changed", event => {
this.events.fire("notify_client_status", { treeEntryId: client.uniqueEntryId, status: event.newIcon }); this.events.fire_react("notify_client_status", { treeEntryId: client.uniqueEntryId, status: event.newIcon });
})); }));
events.push(client.events.on("notify_properties_updated", event => { events.push(client.events.on("notify_properties_updated", event => {
@ -546,6 +546,7 @@ class ChannelTreeController {
for(const entry of this.buildFlatChannelTree()) { for(const entry of this.buildFlatChannelTree()) {
if(!fullInfoEntries || fullInfoEntries.indexOf(entry.entry.uniqueEntryId) !== -1) { if(!fullInfoEntries || fullInfoEntries.indexOf(entry.entry.uniqueEntryId) !== -1) {
console.error("Sending full info for %o - %o", entry.entry.uniqueEntryId, fullInfoEntries);
if(entry.entry instanceof ServerEntry) { if(entry.entry instanceof ServerEntry) {
entries.push({ entries.push({
type: "server", type: "server",
@ -677,7 +678,7 @@ export function initializeChannelTreeController(events: Registry<ChannelTreeUIEv
events.fire_react("notify_unread_state", { treeEntryId: event.treeEntryId, unread: entry.isUnread() }); events.fire_react("notify_unread_state", { treeEntryId: event.treeEntryId, unread: entry.isUnread() });
}); });
events.on("notify_destroy", channelTree.client.events().on("notify_visibility_changed", event => events.fire("notify_visibility_changed", event))); events.on("notify_destroy", channelTree.client.events().on("notify_visibility_changed", event => events.fire_react("notify_visibility_changed", event)));
events.on("query_tree_entries", event => controller.sendChannelTreeEntriesFull(event.fullInfo ? undefined : [])); events.on("query_tree_entries", event => controller.sendChannelTreeEntriesFull(event.fullInfo ? undefined : []));
events.on("query_selected_entry", () => controller.sendSelectedEntry()); events.on("query_selected_entry", () => controller.sendSelectedEntry());
@ -851,12 +852,12 @@ export function initializeChannelTreeController(events: Registry<ChannelTreeUIEv
return; return;
} }
events.fire("notify_client_name_edit", { treeEntryId: event.treeEntryId, initialValue: undefined }); events.fire_react("notify_client_name_edit", { treeEntryId: event.treeEntryId, initialValue: undefined });
if(!event.name || event.name === entry.clientNickName()) { return; } if(!event.name || event.name === entry.clientNickName()) { return; }
entry.renameSelf(event.name).then(result => { entry.renameSelf(event.name).then(result => {
if(result) { return; } if(result) { return; }
events.fire("notify_client_name_edit", { treeEntryId: event.treeEntryId, initialValue: event.name }); events.fire_react("notify_client_name_edit", { treeEntryId: event.treeEntryId, initialValue: event.name });
}) })
}); });

5
shared/js/ui/tree/RendererDataProvider.tsx
View file

@ -660,6 +660,7 @@ export class RDPChannelTree {
if(entry.fullInfo) { if(entry.fullInfo) {
channel.stateQueried = true; channel.stateQueried = true;
channel.unread = entry.unread;
channel.handleInfoUpdate(entry.info); channel.handleInfoUpdate(entry.info);
channel.handleIconUpdate(entry.icon); channel.handleIconUpdate(entry.icon);
channel.handleIconsUpdate(entry.icons); channel.handleIconsUpdate(entry.icons);
@ -678,6 +679,7 @@ export class RDPChannelTree {
if(entry.fullInfo) { if(entry.fullInfo) {
client.stateQueried = true; client.stateQueried = true;
client.unread = entry.unread;
client.handleNameUpdate(entry.name); client.handleNameUpdate(entry.name);
client.handleStatusUpdate(entry.status); client.handleStatusUpdate(entry.status);
client.handleIconsUpdate(entry.icons); client.handleIconsUpdate(entry.icons);
@ -696,8 +698,9 @@ export class RDPChannelTree {
if(entry.fullInfo) { if(entry.fullInfo) {
server.stateQueried = true; server.stateQueried = true;
server.unread = entry.unread;
server.handleStateUpdate(entry.state); server.handleStateUpdate(entry.state);
} else if(server.stateQueried) { } else if(!server.stateQueried) {
server.queryState(); server.queryState();
} }
result = server; result = server;