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

Add State.addMessage

Browse Source
This commit is contained in:
Simon Ser 2021-06-04 19:07:14 +02:00
parent 04362644bf
commit 87588abf27
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
components/app.js
View File

@ -77,29 +77,6 @@ function fillConnectParams(params) {
return params; return params;
} }
/* Insert a message in an immutable list of sorted messages. */
function insertMessage(list, msg) {
if (list.length == 0) {
return [msg];
} else if (list[list.length - 1].tags.time <= msg.tags.time) {
return list.concat(msg);
}
var insertBefore = -1;
for (var i = 0; i < list.length; i++) {
var other = list[i];
if (msg.tags.time < other.tags.time) {
insertBefore = i;
break;
}
}
console.assert(insertBefore >= 0, "");
list = [ ...list ];
list.splice(insertBefore, 0, msg);
return list;
}
function debounce(f, delay) { function debounce(f, delay) {
var timeout = null; var timeout = null;
return (...args) => { return (...args) => {
@ -417,7 +394,9 @@ export default class App extends Component {
this.setReceipt(bufName, ReceiptType.DELIVERED, msg); this.setReceipt(bufName, ReceiptType.DELIVERED, msg);
this.setBufferState({ server: serverID, name: bufName }, (buf) => { var bufID = { server: serverID, name: bufName };
this.setState((state) => State.addMessage(state, msg, bufID));
this.setBufferState(bufID, (buf) => {
// TODO: set unread if scrolled up // TODO: set unread if scrolled up
var unread = buf.unread; var unread = buf.unread;
var lastReadReceipt = buf.lastReadReceipt; var lastReadReceipt = buf.lastReadReceipt;
@ -427,8 +406,7 @@ export default class App extends Component {
this.setReceipt(bufName, ReceiptType.READ, msg); this.setReceipt(bufName, ReceiptType.READ, msg);
lastReadReceipt = this.getReceipt(bufName, ReceiptType.READ); lastReadReceipt = this.getReceipt(bufName, ReceiptType.READ);
} }
var messages = insertMessage(buf.messages, msg); return { unread, lastReadReceipt };
return { messages, unread, lastReadReceipt };
}); });
} }

29
state.js
View File

@ -111,6 +111,29 @@ function compareBuffers(a, b) {
return 0; return 0;
} }
/* Insert a message in an immutable list of sorted messages. */
function insertMessage(list, msg) {
if (list.length == 0) {
return [msg];
} else if (list[list.length - 1].tags.time <= msg.tags.time) {
return list.concat(msg);
}
var insertBefore = -1;
for (var i = 0; i < list.length; i++) {
var other = list[i];
if (msg.tags.time < other.tags.time) {
insertBefore = i;
break;
}
}
console.assert(insertBefore >= 0, "");
list = [ ...list ];
list.splice(insertBefore, 0, msg);
return list;
}
var lastBufferID = 0; var lastBufferID = 0;
export const State = { export const State = {
@ -345,4 +368,10 @@ export const State = {
return updateBuffer(channel, { topic }); return updateBuffer(channel, { topic });
} }
}, },
addMessage(state, msg, bufID) {
return State.updateBuffer(state, bufID, (buf) => {
var messages = insertMessage(buf.messages, msg);
return { messages };
});
},
}; };