CringeStudios/IRC_Client
5
0
Fork 0
forked from CringeStudios/gamja
Code Pull Requests Activity

components/app: split switchBuffer() and markBufferAsRead()

Browse Source 
We'll want to mark as read independently in response to focus events.
This commit is contained in:
sitting33 2024-04-25 15:59:47 +02:00 committed by Simon Ser
parent 269e034581
commit f79b6bfaa1
1 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
components/app.js
View File

@ -537,17 +537,7 @@ export default class App extends Component {
if (!buf) {
return;
}
let client = this.clients.get(buf.server);
let stored = this.bufferStore.get({ name: buf.name, server: client.params });
let prevReadReceipt = getReceipt(stored, ReceiptType.READ);
// TODO: only mark as read if user scrolled at the bottom
let update = State.updateBuffer(state, buf.id, {
unread: Unread.NONE,
prevReadReceipt,
});
return { ...update, activeBuffer: buf.id };
return { activeBuffer: buf.id };
}, () => {
if (!buf) {
return;
@ -557,6 +547,46 @@ export default class App extends Component {
this.buffer.current.focus();
}
let server = this.state.servers.get(buf.server);
if (buf.type === BufferType.NICK && !server.users.has(buf.name)) {
this.whoUserBuffer(buf.name, buf.server);
}
if (buf.type === BufferType.CHANNEL && !buf.hasInitialWho) {
this.whoChannelBuffer(buf.name, buf.server);
}
if (buf.type !== BufferType.SERVER) {
document.title = buf.name + ' · ' + this.baseTitle;
} else {
document.title = this.baseTitle;
}
});
// TODO: only mark as read if user scrolled at the bottom
this.markBufferAsRead(id);
}
markBufferAsRead(id) {
let buf;
this.setState((state) => {
buf = State.getBuffer(state, id);
if (!buf) {
return;
}
let client = this.clients.get(buf.server);
let stored = this.bufferStore.get({ name: buf.name, server: client.params });
let prevReadReceipt = getReceipt(stored, ReceiptType.READ);
return State.updateBuffer(state, buf.id, {
unread: Unread.NONE,
prevReadReceipt,
});
}, () => {
if (!buf) {
return;
}
let client = this.clients.get(buf.server);
for (let notif of this.messageNotifications) {
@ -577,21 +607,6 @@ export default class App extends Component {
this.sendReadReceipt(client, stored);
}
}
let server = this.state.servers.get(buf.server);
if (buf.type === BufferType.NICK && !server.users.has(buf.name)) {
this.whoUserBuffer(buf.name, buf.server);
}
if (buf.type === BufferType.CHANNEL && !buf.hasInitialWho) {
this.whoChannelBuffer(buf.name, buf.server);
}
if (buf.type !== BufferType.SERVER) {
document.title = buf.name + ' · ' + this.baseTitle;
} else {
document.title = this.baseTitle;
}
});
}