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

Add case-mapping support for channel members

Browse Source 
Make a buffer's members an irc.CaseMapMap.
This commit is contained in:
Simon Ser 2021-05-27 15:17:18 +02:00
parent 615e746ec5
commit b2cdab86aa
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/app.js
View File

@ -333,6 +333,9 @@ export default class App extends Component {
type = BufferType.NICK; type = BufferType.NICK;
} }
var client = this.clients.get(netID);
var cm = client ? client.cm : irc.CaseMapping.RFC1459;
var bufferList = Array.from(state.buffers.values()); var bufferList = Array.from(state.buffers.values());
bufferList.push({ bufferList.push({
id, id,
@ -341,7 +344,7 @@ export default class App extends Component {
network: netID, 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 irc.CaseMapMap(null, cm), // if channel
who: null, // if nick who: null, // if nick
offline: false, // if nick offline: false, // if nick
messages: [], messages: [],
@ -585,6 +588,17 @@ export default class App extends Component {
this.setNetworkState(netID, (network) => { this.setNetworkState(netID, (network) => {
return { isupport: new Map(client.isupport) }; return { isupport: new Map(client.isupport) };
}); });
this.setState((state) => {
var buffers = new Map(state.buffers);
state.buffers.forEach((buf) => {
if (buf.network != netID) {
return;
}
var members = new irc.CaseMapMap(buf.members, client.cm);
buffers.set(buf.id, { ...buf, members });
});
return { buffers };
});
break; break;
case irc.RPL_NOTOPIC: case irc.RPL_NOTOPIC:
var channel = msg.params[1]; var channel = msg.params[1];
@ -605,7 +619,7 @@ export default class App extends Component {
var membersList = msg.params[3].split(" "); var membersList = msg.params[3].split(" ");
this.setBufferState({ network: netID, name: channel }, (buf) => { this.setBufferState({ network: netID, name: channel }, (buf) => {
var members = new Map(buf.members); var members = new irc.CaseMapMap(buf.members);
membersList.forEach((s) => { membersList.forEach((s) => {
var member = irc.parseMembership(s); var member = irc.parseMembership(s);
members.set(member.nick, member.prefix); members.set(member.nick, member.prefix);
@ -660,7 +674,7 @@ export default class App extends Component {
this.createBuffer(netID, channel); this.createBuffer(netID, channel);
this.setBufferState({ network: netID, name: channel }, (buf) => { this.setBufferState({ network: netID, name: channel }, (buf) => {
var members = new Map(buf.members); var members = new irc.CaseMapMap(buf.members);
members.set(msg.prefix.name, null); members.set(msg.prefix.name, null);
return { members }; return { members };
}); });
@ -687,7 +701,7 @@ export default class App extends Component {
var channel = msg.params[0]; var channel = msg.params[0];
this.setBufferState({ network: netID, name: channel }, (buf) => { this.setBufferState({ network: netID, name: channel }, (buf) => {
var members = new Map(buf.members); var members = new irc.CaseMapMap(buf.members);
members.delete(msg.prefix.name); members.delete(msg.prefix.name);
return { members }; return { members };
}); });
@ -703,7 +717,7 @@ export default class App extends Component {
var user = msg.params[1]; var user = msg.params[1];
this.setBufferState({ network: netID, name: channel }, (buf) => { this.setBufferState({ network: netID, name: channel }, (buf) => {
var members = new Map(buf.members); var members = new irc.CaseMapMap(buf.members);
members.delete(user); members.delete(user);
return { members }; return { members };
}); });
@ -722,7 +736,7 @@ export default class App extends Component {
if (!buf.members.has(msg.prefix.name) && buf.name != msg.prefix.name) { if (!buf.members.has(msg.prefix.name) && buf.name != msg.prefix.name) {
return; return;
} }
var members = new Map(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 = buf.name == msg.prefix.name;
buffers.set(buf.id, { ...buf, members, offline }); buffers.set(buf.id, { ...buf, members, offline });
@ -742,7 +756,7 @@ export default class App extends Component {
if (!buf.members.has(msg.prefix.name)) { if (!buf.members.has(msg.prefix.name)) {
return; return;
} }
var members = new Map(buf.members); var members = new irc.CaseMapMap(buf.members);
members.set(newNick, members.get(msg.prefix.name)); members.set(newNick, members.get(msg.prefix.name));
members.delete(msg.prefix.name); members.delete(msg.prefix.name);
buffers.set(buf.id, { ...buf, members }); buffers.set(buf.id, { ...buf, members });

2
components/member-list.js
View File

@ -34,7 +34,7 @@ export default class MemberList extends Component {
render() { render() {
return html` return html`
<ul> <ul>
${Array.from(this.props.members.entries()).sort().map(([nick, membership]) => html` ${Array.from(this.props.members).sort().map(([nick, membership]) => html`
<${MemberItem} key=${nick} nick=${nick} membership=${membership} onClick=${() => this.props.onNickClick(nick)}/> <${MemberItem} key=${nick} nick=${nick} membership=${membership} onClick=${() => this.props.onNickClick(nick)}/>
`)} `)}
</ul> </ul>