CringeStudios/gamja
5
0
Fork 1
mirror of https://codeberg.org/emersion/gamja synced 2025-03-13 07:48:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add network to buffer state

Browse Source
This commit is contained in:
Simon Ser 2021-01-21 19:27:04 +01:00
parent 5a1e6ba813
commit abc2fbcfb1
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
components/app.js
View File

@ -214,7 +214,7 @@ export default class App extends Component {
}, callback); }, callback);
} }
createBuffer(name) { createBuffer(netID, name) {
this.setState((state) => { this.setState((state) => {
if (state.buffers.get(name)) { if (state.buffers.get(name)) {
return; return;
@ -233,6 +233,7 @@ export default class App extends Component {
bufferList.push({ bufferList.push({
name, name,
type, type,
network: netID,
serverInfo: null, // if server serverInfo: null, // if server
topic: null, // if channel topic: null, // if channel
members: new Map(), // if channel members: new Map(), // if channel
@ -300,7 +301,7 @@ export default class App extends Component {
this.saveReceipts(); this.saveReceipts();
} }
addMessage(bufName, msg) { addMessage(netID, bufName, msg) {
msg.key = messagesCount; msg.key = messagesCount;
messagesCount++; messagesCount++;
@ -350,7 +351,7 @@ export default class App extends Component {
} }
if (msg.prefix.name != this.client.nick && (msg.command != "PART" && msg.comand != "QUIT")) { if (msg.prefix.name != this.client.nick && (msg.command != "PART" && msg.comand != "QUIT")) {
this.createBuffer(bufName); this.createBuffer(netID, bufName);
} }
this.setReceipt(bufName, ReceiptType.DELIVERED, msg); this.setReceipt(bufName, ReceiptType.DELIVERED, msg);
@ -406,7 +407,7 @@ export default class App extends Component {
}); });
}); });
this.createBuffer(SERVER_BUFFER); this.createBuffer(netID, SERVER_BUFFER);
this.switchBuffer(SERVER_BUFFER); this.switchBuffer(SERVER_BUFFER);
} }
@ -525,19 +526,19 @@ export default class App extends Component {
if (target == this.client.nick) { if (target == this.client.nick) {
target = msg.prefix.name; target = msg.prefix.name;
} }
this.addMessage(target, msg); this.addMessage(netID, target, msg);
break; break;
case "JOIN": case "JOIN":
var channel = msg.params[0]; var channel = msg.params[0];
this.createBuffer(channel); this.createBuffer(netID, channel);
this.setBufferState(channel, (buf) => { this.setBufferState(channel, (buf) => {
var members = new Map(buf.members); var members = new Map(buf.members);
members.set(msg.prefix.name, null); members.set(msg.prefix.name, null);
return { members }; return { members };
}); });
if (msg.prefix.name != this.client.nick) { if (msg.prefix.name != this.client.nick) {
this.addMessage(channel, msg); this.addMessage(netID, channel, msg);
} }
if (channel == this.state.connectParams.autojoin[0]) { if (channel == this.state.connectParams.autojoin[0]) {
// TODO: only switch once right after connect // TODO: only switch once right after connect
@ -563,7 +564,7 @@ export default class App extends Component {
members.delete(msg.prefix.name); members.delete(msg.prefix.name);
return { members }; return { members };
}); });
this.addMessage(channel, msg); this.addMessage(netID, channel, msg);
if (msg.prefix.name == this.client.nick) { if (msg.prefix.name == this.client.nick) {
this.receipts.delete(channel); this.receipts.delete(channel);
@ -586,7 +587,7 @@ export default class App extends Component {
}); });
return { buffers }; return { buffers };
}); });
affectedBuffers.forEach((name) => this.addMessage(name, msg)); affectedBuffers.forEach((name) => this.addMessage(netID, name, msg));
break; break;
case "NICK": case "NICK":
var newNick = msg.params[0]; var newNick = msg.params[0];
@ -606,14 +607,14 @@ export default class App extends Component {
}); });
return { buffers }; return { buffers };
}); });
affectedBuffers.forEach((name) => this.addMessage(name, msg)); affectedBuffers.forEach((name) => this.addMessage(netID, name, msg));
break; break;
case "TOPIC": case "TOPIC":
var channel = msg.params[0]; var channel = msg.params[0];
var topic = msg.params[1]; var topic = msg.params[1];
this.setBufferState(channel, { topic }); this.setBufferState(channel, { topic });
this.addMessage(channel, msg); this.addMessage(netID, channel, msg);
break; break;
case "AWAY": case "AWAY":
var awayMessage = msg.params[0]; var awayMessage = msg.params[0];
@ -630,7 +631,7 @@ export default class App extends Component {
// Ignore these // Ignore these
break; break;
default: default:
this.addMessage(SERVER_BUFFER, msg); this.addMessage(netID, SERVER_BUFFER, msg);
} }
} }
@ -663,7 +664,7 @@ export default class App extends Component {
} else { } else {
this.client.send({ command: "WHO", params: [target] }); this.client.send({ command: "WHO", params: [target] });
} }
this.createBuffer(target); this.createBuffer(this.state.activeNetwork, target);
this.switchBuffer(target); this.switchBuffer(target);
} }
@ -721,7 +722,7 @@ export default class App extends Component {
if (!this.client.enabledCaps["echo-message"]) { if (!this.client.enabledCaps["echo-message"]) {
msg.prefix = { name: this.client.nick }; msg.prefix = { name: this.client.nick };
this.addMessage(target, msg); this.addMessage(this.state.activeNetwork, target, msg);
} }
} }