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

lib/client: extract fetchBatch function from roundtripChatHistory

Browse Source
This commit is contained in:
Simon Ser 2021-03-03 14:13:05 +01:00
parent 3ece5f1ca5
commit aa79067179
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/client.js
View File

@ -370,14 +370,7 @@ export default class Client extends EventTarget {
}); });
} }
roundtripChatHistory(params) { fetchBatch(msg, batchType) {
// Don't send multiple CHATHISTORY commands in parallel, we can't
// properly handle batches and errors.
this.pendingHistory = this.pendingHistory.catch(() => {}).then(() => {
var msg = {
command: "CHATHISTORY",
params,
};
return this.roundtrip(msg, (event) => { return this.roundtrip(msg, (event) => {
var msg = event.detail.message; var msg = event.detail.message;
@ -389,17 +382,28 @@ export default class Client extends EventTarget {
break; break;
} }
var batch = this.batches.get(name); var batch = this.batches.get(name);
if (batch.type == "chathistory") { if (batch.type === batchType) {
return batch; return batch;
} }
break; break;
case "FAIL": case "FAIL":
if (msg.params[0] == "CHATHISTORY") { if (msg.params[0] === msg.command) {
throw msg; throw msg;
} }
break; break;
} }
}); });
}
roundtripChatHistory(params) {
// Don't send multiple CHATHISTORY commands in parallel, we can't
// properly handle batches and errors.
this.pendingHistory = this.pendingHistory.catch(() => {}).then(() => {
var msg = {
command: "CHATHISTORY",
params,
};
return this.fetchBatch(msg, "chathistory");
}); });
return this.pendingHistory; return this.pendingHistory;
} }