catch poll timeout
This commit is contained in:
parent
bb7dc2bef6
commit
50142bd6f2
|
@ -41,38 +41,44 @@ export default class tg extends EventEmitter {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
async poll() {
|
async poll() {
|
||||||
let res = await (await fetch(`${this.api}/getUpdates?offset=${this.lastUpdate}&allowed_updates=message`)).json();
|
try {
|
||||||
setTimeout(async () => { await this.poll(); }, this.options.pollrate);
|
let res = await (await fetch(`${this.api}/getUpdates?offset=${this.lastUpdate}&allowed_updates=message`)).json();
|
||||||
if (!res.ok)
|
if (!res.ok)
|
||||||
return this.emit("data", ["error", res.description]);
|
return this.emit("data", ["error", res.description]);
|
||||||
if (res.result.length === 0)
|
if (res.result.length === 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
res = res.result[res.result.length - 1];
|
res = res.result[res.result.length - 1];
|
||||||
this.lastUpdate = res.update_id + 1;
|
this.lastUpdate = res.update_id + 1;
|
||||||
if (res.message.date >= ~~(Date.now() / 1000) - 10 && res.message.message_id !== this.lastMessage) {
|
if (res.message.date >= ~~(Date.now() / 1000) - 10 && res.message.message_id !== this.lastMessage) {
|
||||||
this.lastMessage = res.message.message_id;
|
this.lastMessage = res.message.message_id;
|
||||||
if (!this.server.user.has(res.message.from.username || res.message.from.first_name)) {
|
if (!this.server.user.has(res.message.from.username || res.message.from.first_name)) {
|
||||||
this.server.user.set(res.message.from.username || res.message.from.first_name, {
|
this.server.user.set(res.message.from.username || res.message.from.first_name, {
|
||||||
nick: res.message.from.first_name,
|
nick: res.message.from.first_name,
|
||||||
username: res.message.from.username,
|
username: res.message.from.username,
|
||||||
account: res.message.from.id.toString(),
|
account: res.message.from.id.toString(),
|
||||||
prefix: `${res.message.from.username}!${res.message.from.id.toString()}`,
|
prefix: `${res.message.from.username}!${res.message.from.id.toString()}`,
|
||||||
id: res.message.from.id
|
id: res.message.from.id
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
return this.emit("data", ["message", this.reply(res.message)]);
|
||||||
}
|
}
|
||||||
return this.emit("data", ["message", this.reply(res.message)]);
|
}
|
||||||
|
catch {
|
||||||
|
return this.emit("data", ["error", "tg timed out lol"]);
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
setTimeout(async () => { await this.poll(); }, this.options.pollrate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
async send(chatid, msg, reply = null) {
|
async send(chatid, msg, reply = null) {
|
||||||
msg = Array.isArray(msg) ? msg.join("\n") : msg;
|
|
||||||
if (msg.length === 0 || msg.length > 2048)
|
if (msg.length === 0 || msg.length > 2048)
|
||||||
return this.emit("data", ["error", "msg to short or to long lol"]);
|
return this.emit("data", ["error", "msg to short or to long lol"]);
|
||||||
const opts = {
|
const opts = {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: {
|
body: {
|
||||||
chat_id: chatid,
|
chat_id: chatid,
|
||||||
text: this.format(msg),//msg.split("\n").length > 1 ? `<code>${this.format(msg)}</code>` : this.format(msg),
|
text: msg.split("\n").length > 1 ? `<code>${msg}</code>` : msg,
|
||||||
parse_mode: "HTML"
|
parse_mode: "HTML"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -99,9 +105,9 @@ export default class tg extends EventEmitter {
|
||||||
message: tmp.text,
|
message: tmp.text,
|
||||||
time: tmp.date,
|
time: tmp.date,
|
||||||
raw: tmp,
|
raw: tmp,
|
||||||
reply: msg => this.send(tmp.chat.id, msg, tmp.message_id),
|
reply: msg => this.send(tmp.chat.id, this.format(msg), tmp.message_id),
|
||||||
replyAction: msg => this.send(tmp.chat.id, `Uwe ${msg}`, tmp.message_id),
|
replyAction: msg => this.send(tmp.chat.id, this.format(`Uwe ${msg}`), tmp.message_id),
|
||||||
replyNotice: msg => this.send(tmp.chat.id, msg, tmp.message_id),
|
replyNotice: msg => this.send(tmp.chat.id, this.format(msg), tmp.message_id),
|
||||||
_user: this.server.user
|
_user: this.server.user
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -109,7 +115,6 @@ export default class tg extends EventEmitter {
|
||||||
return msg.toString()
|
return msg.toString()
|
||||||
.split("<").join("<")
|
.split("<").join("<")
|
||||||
.split(">").join(">")
|
.split(">").join(">")
|
||||||
.split("&").join("&")
|
|
||||||
.replace(/\[b\](.*?)\[\/b\]/g, "<b>$1</b>") // bold
|
.replace(/\[b\](.*?)\[\/b\]/g, "<b>$1</b>") // bold
|
||||||
.replace(/\[i\](.*?)\[\/i\]/g, "<i>$1</i>") // italic
|
.replace(/\[i\](.*?)\[\/i\]/g, "<i>$1</i>") // italic
|
||||||
.replace(/\[color=(.*?)](.*?)\[\/color\]/g, "$2")
|
.replace(/\[color=(.*?)](.*?)\[\/color\]/g, "$2")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user