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

Simplify Client.roundtrip callback arg

Browse Source
This commit is contained in:
Simon Ser 2021-05-31 17:13:55 +02:00
parent 619f1db08f
commit 06ca812d06
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/client.js
View File

@ -296,8 +296,7 @@ export default class Client extends EventTarget {
who(mask) { who(mask) {
var msg = { command: "WHO", params: [mask] }; var msg = { command: "WHO", params: [mask] };
var l = []; var l = [];
return this.roundtrip(msg, (event) => { return this.roundtrip(msg, (msg) => {
var msg = event.detail.message;
switch (msg.command) { switch (msg.command) {
case irc.RPL_WHOREPLY: case irc.RPL_WHOREPLY:
// TODO: match with mask // TODO: match with mask
@ -315,8 +314,7 @@ export default class Client extends EventTarget {
whois(target) { whois(target) {
var targetCM = this.cm(target); var targetCM = this.cm(target);
var msg = { command: "WHOIS", params: [target] }; var msg = { command: "WHOIS", params: [target] };
return this.roundtrip(msg, (event) => { return this.roundtrip(msg, (msg) => {
var msg = event.detail.message;
switch (msg.command) { switch (msg.command) {
case irc.RPL_ENDOFWHOIS: case irc.RPL_ENDOFWHOIS:
var nick = msg.params[1]; var nick = msg.params[1];
@ -488,7 +486,7 @@ export default class Client extends EventTarget {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var handleMessage = (event) => { var handleMessage = (event) => {
try { try {
var result = done(event); var result = done(event.detail.message);
if (result) { if (result) {
this.removeEventListener("message", handleMessage); this.removeEventListener("message", handleMessage);
resolve(result); resolve(result);
@ -505,9 +503,7 @@ export default class Client extends EventTarget {
} }
fetchBatch(msg, batchType) { fetchBatch(msg, batchType) {
return this.roundtrip(msg, (event) => { return this.roundtrip(msg, (msg) => {
var msg = event.detail.message;
switch (msg.command) { switch (msg.command) {
case "BATCH": case "BATCH":
var enter = msg.params[0].startsWith("+"); var enter = msg.params[0].startsWith("+");