Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2025-02-16 13:18:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

network event: remove unused array

Browse source 
All the network events only ever emit a single copy
There's no point in wrapping it into an array
This commit is contained in:
Reto Brunner 2024-04-07 14:22:53 +02:00
parent 5ee9c2b338
commit bf7eb0e727
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/js/socket-events/network.ts
View file

@ -3,7 +3,7 @@ import {store} from "../store";
import {switchToChannel} from "../router"; import {switchToChannel} from "../router";
socket.on("network", function (data) { socket.on("network", function (data) {
const network = data.networks[0]; const network = data.network;
network.isJoinChannelShown = false; network.isJoinChannelShown = false;
network.isCollapsed = false; network.isCollapsed = false;

2
server/client.ts
View file

@ -344,7 +344,7 @@ class Client {
client.networks.push(network); client.networks.push(network);
client.emit("network", { client.emit("network", {
networks: [network.getFilteredClone(this.lastActiveChannel, -1)], network: network.getFilteredClone(this.lastActiveChannel, -1),
}); });
if (!network.validate(client)) { if (!network.validate(client)) {

2
shared/types/socket-events.d.ts vendored
View file

@ -53,7 +53,7 @@ interface ServerToClientEvents {
names: EventHandler<{id: number; users: SharedUser[]}>; names: EventHandler<{id: number; users: SharedUser[]}>;
network: EventHandler<{networks: SharedNetwork[]}>; network: EventHandler<{network: SharedNetwork}>;
"network:options": EventHandler<{network: string; serverOptions: {[key: string]: any}}>; "network:options": EventHandler<{network: string; serverOptions: {[key: string]: any}}>;
"network:status": EventHandler<{network: string; connected: boolean; secure: boolean}>; "network:status": EventHandler<{network: string; connected: boolean; secure: boolean}>;
"network:info": EventHandler<{uuid: string}>; "network:info": EventHandler<{uuid: string}>;

15
test/server.ts
View file

@ -110,14 +110,13 @@ describe("Server", function () {
}); });
client.on("network", (data) => { client.on("network", (data) => {
expect(data.networks).to.be.an("array"); expect(data.network).to.exist;
expect(data.networks).to.have.lengthOf(1); expect(data.network.nick).to.equal("test-user");
expect(data.networks[0].nick).to.equal("test-user"); expect(data.network.name).to.equal("Test Network");
expect(data.networks[0].name).to.equal("Test Network"); expect(data.network.channels).to.have.lengthOf(3);
expect(data.networks[0].channels).to.have.lengthOf(3); expect(data.network.channels[0].name).to.equal("Test Network");
expect(data.networks[0].channels[0].name).to.equal("Test Network"); expect(data.network.channels[1].name).to.equal("#thelounge");
expect(data.networks[0].channels[1].name).to.equal("#thelounge"); expect(data.network.channels[2].name).to.equal("#spam");
expect(data.networks[0].channels[2].name).to.equal("#spam");
done(); done();
}); });
}); });