chipmunkmc/gamja-old
1
0
Fork 0
mirror of https://git.sr.ht/~emersion/gamja synced 2024-11-14 19:25:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

components/app: introduce getReceipt

Browse source
This commit is contained in:
Simon Ser 2022-02-11 20:59:31 +01:00
parent 0636544c40
commit fce0936c20
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/app.js
View file

@ -145,6 +145,13 @@ function receiptFromMessage(msg) {
let lastErrorID = 0; let lastErrorID = 0;
function getReceipt(stored, type) {
if (!stored || !stored.receipts) {
return null;
}
return stored.receipts[ReceiptType.READ];
}
function getLatestReceipt(bufferStore, server, type) { function getLatestReceipt(bufferStore, server, type) {
let buffers = bufferStore.list(server); let buffers = bufferStore.list(server);
let last = null; let last = null;
@ -434,7 +441,7 @@ export default class App extends Component {
let client = this.clients.get(buf.server); let client = this.clients.get(buf.server);
let stored = this.bufferStore.get({ name: buf.name, server: client.params }); let stored = this.bufferStore.get({ name: buf.name, server: client.params });
let prevReadReceipt = stored && stored.receipts ? stored.receipts[ReceiptType.READ] : null; let prevReadReceipt = getReceipt(stored, ReceiptType.READ);
// TODO: only mark as read if user scrolled at the bottom // TODO: only mark as read if user scrolled at the bottom
let update = State.updateBuffer(state, buf.id, { let update = State.updateBuffer(state, buf.id, {
unread: Unread.NONE, unread: Unread.NONE,
@ -493,12 +500,11 @@ export default class App extends Component {
msg.tags.time = irc.formatDate(new Date()); msg.tags.time = irc.formatDate(new Date());
} }
let isDelivered = false, isRead = false;
let stored = this.bufferStore.get({ name: bufName, server: client.params }); let stored = this.bufferStore.get({ name: bufName, server: client.params });
if (stored) { let deliveryReceipt = getReceipt(stored, ReceiptType.DELIVERED);
isDelivered = isMessageBeforeReceipt(msg, stored.receipts[ReceiptType.DELIVERED]); let readReceipt = getReceipt(stored, ReceiptType.READ);
isRead = isMessageBeforeReceipt(msg, stored.receipts[ReceiptType.READ]); let isDelivered = isMessageBeforeReceipt(msg, deliveryReceipt);
} let isRead = isMessageBeforeReceipt(msg, readReceipt);
// TODO: messages coming from infinite scroll shouldn't trigger notifications // TODO: messages coming from infinite scroll shouldn't trigger notifications