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

Implement case-mapping for buffers and message handler

Browse Source
This commit is contained in:
Simon Ser 2021-05-27 23:40:08 +02:00
parent e000832483
commit fc9dfa2dca
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/app.js
View File

@ -133,12 +133,20 @@ function getBuffer(state, id) {
return state.buffers.get(id.id); return state.buffers.get(id.id);
} }
var network = id.network, name = id.name; var netID = id.network, name = id.name;
if (!network) { if (!netID) {
network = getActiveNetworkID(state); netID = getActiveNetworkID(state);
} }
var cm = irc.CaseMapping.RFC1459;
var network = state.networks.get(netID);
if (network) {
cm = irc.CaseMapping.byName(network.isupport.get("CASEMAPPING")) || cm;
}
var nameCM = cm(name);
for (var buf of state.buffers.values()) { for (var buf of state.buffers.values()) {
if (buf.network === network && buf.name === name) { if (buf.network === netID && cm(buf.name) === nameCM) {
return buf; return buf;
} }
} }
@ -480,7 +488,7 @@ export default class App extends Component {
} }
} }
if (msg.prefix.name != client.nick && (msg.command != "PART" && msg.comand != "QUIT")) { if (!client.isMyNick(msg.prefix.name) && (msg.command != "PART" && msg.comand != "QUIT")) {
this.createBuffer(netID, bufName); this.createBuffer(netID, bufName);
} }
@ -682,7 +690,7 @@ export default class App extends Component {
case "PRIVMSG": case "PRIVMSG":
var target = msg.params[0]; var target = msg.params[0];
if (target == client.nick) { if (target == client.nick) {
if (msg.prefix.name == client.serverPrefix.name) { if (client.cm(msg.prefix.name) == client.cm(client.serverPrefix.name)) {
target = SERVER_BUFFER; target = SERVER_BUFFER;
} else { } else {
target = msg.prefix.name; target = msg.prefix.name;
@ -699,7 +707,7 @@ export default class App extends Component {
members.set(msg.prefix.name, null); members.set(msg.prefix.name, null);
return { members }; return { members };
}); });
if (msg.prefix.name != client.nick) { if (!client.isMyNick(msg.prefix.name)) {
this.addMessage(netID, channel, msg); this.addMessage(netID, channel, msg);
} }
if (channel == this.switchToChannel) { if (channel == this.switchToChannel) {
@ -708,7 +716,7 @@ export default class App extends Component {
} }
var receipt = this.getReceipt(channel, ReceiptType.READ); var receipt = this.getReceipt(channel, ReceiptType.READ);
if (msg.prefix.name == client.nick && receipt && client.enabledCaps["draft/chathistory"] && client.enabledCaps["server-time"]) { if (client.isMyNick(msg.prefix.name) && receipt && client.enabledCaps["draft/chathistory"] && client.enabledCaps["server-time"]) {
var after = receipt; var after = receipt;
var before = { time: msg.tags.time || irc.formatDate(new Date()) }; var before = { time: msg.tags.time || irc.formatDate(new Date()) };
client.fetchHistoryBetween(channel, after, before, CHATHISTORY_MAX_SIZE).catch((err) => { client.fetchHistoryBetween(channel, after, before, CHATHISTORY_MAX_SIZE).catch((err) => {
@ -728,7 +736,7 @@ export default class App extends Component {
}); });
this.addMessage(netID, channel, msg); this.addMessage(netID, channel, msg);
if (msg.prefix.name == client.nick) { if (client.isMyNick(msg.prefix.name)) {
this.receipts.delete(channel); this.receipts.delete(channel);
this.saveReceipts(); this.saveReceipts();
} }
@ -744,7 +752,7 @@ export default class App extends Component {
}); });
this.addMessage(netID, channel, msg); this.addMessage(netID, channel, msg);
if (msg.prefix.name == client.nick) { if (client.isMyNick(msg.prefix.name)) {
this.receipts.delete(channel); this.receipts.delete(channel);
this.saveReceipts(); this.saveReceipts();
} }
@ -757,12 +765,12 @@ export default class App extends Component {
if (buf.network != netID) { if (buf.network != netID) {
return; return;
} }
if (!buf.members.has(msg.prefix.name) && buf.name != msg.prefix.name) { if (!buf.members.has(msg.prefix.name) && client.cm(buf.name) !== client.cm(msg.prefix.name)) {
return; return;
} }
var members = new irc.CaseMapMap(buf.members); var members = new irc.CaseMapMap(buf.members);
members.delete(msg.prefix.name); members.delete(msg.prefix.name);
var offline = buf.name == msg.prefix.name; var offline = client.cm(buf.name) === client.cm(msg.prefix.name);
buffers.set(buf.id, { ...buf, members, offline }); buffers.set(buf.id, { ...buf, members, offline });
affectedBuffers.push(buf.name); affectedBuffers.push(buf.name);
}); });

4
lib/client.js
View File

@ -434,6 +434,10 @@ export default class Client extends EventTarget {
} }
} }
isMyNick(nick) {
return this.cm(nick) == this.cm(this.nick);
}
/* Execute a command that expects a response. `done` is called with message /* Execute a command that expects a response. `done` is called with message
* events until it returns a truthy value. */ * events until it returns a truthy value. */
roundtrip(msg, done) { roundtrip(msg, done) {