Cynosphere/HiddenPhox
Cynosphere/HiddenPhox
1
2
Fork 0
Code Projects Releases Packages Wiki Activity

propigate errors from lookupUser

Browse source
This commit is contained in:
Cynthia Foxwell 2024-08-18 14:16:05 -06:00
parent 83c49eb6ae
commit 5b8a9afbaa
6 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/utility/avatar.js
View file

@ -48,7 +48,7 @@ avatar.callback = async function (msg, line, [user], {server, guild}) {
} }
} else if (user) { } else if (user) {
const lookup = await lookupUser(msg, user); const lookup = await lookupUser(msg, user);
if (lookup == "No results" || lookup == "Canceled" || lookup == "Request timed out") { if (typeof lookup === "string") {
return lookup; return lookup;
} else { } else {
id = lookup.id; id = lookup.id;

2
src/modules/utility/banner.js
View file

@ -44,7 +44,7 @@ banner.callback = async function (msg, line, [user], {server, guild}) {
} }
} else if (user) { } else if (user) {
const lookup = await lookupUser(msg, user); const lookup = await lookupUser(msg, user);
if (lookup == "No results" || lookup == "Canceled" || lookup == "Request timed out") { if (typeof lookup === "string") {
return lookup; return lookup;
} else { } else {
id = lookup.id; id = lookup.id;

2
src/modules/utility/decoration.js
View file

@ -15,7 +15,7 @@ decoration.callback = async function (msg, line, [user]) {
if (user) { if (user) {
const lookup = await lookupUser(msg, user); const lookup = await lookupUser(msg, user);
if (lookup == "No results" || lookup == "Canceled" || lookup == "Request timed out") { if (typeof lookup === "string") {
return lookup; return lookup;
} else { } else {
id = lookup.id; id = lookup.id;

2
src/modules/utility/presence.js
View file

@ -52,7 +52,7 @@ presence.callback = async function (msg, line) {
let target; let target;
if (line) { if (line) {
const user = await lookupUser(msg, line); const user = await lookupUser(msg, line);
if (user == "No results" || user == "Canceled" || user == "Request timed out") { if (typeof user === "string") {
return user; return user;
} else { } else {
let member = user; let member = user;

2
src/modules/utility/userinfo.js
View file

@ -70,7 +70,7 @@ userinfo.callback = async function (msg, line) {
id = msg.author?.id ?? msg.user?.id; id = msg.author?.id ?? msg.user?.id;
} else { } else {
const lookup = await lookupUser(msg, line); const lookup = await lookupUser(msg, line);
if (lookup == "No results" || lookup == "Canceled" || lookup == "Request timed out") { if (typeof lookup === "string") {
return lookup; return lookup;
} else { } else {
id = lookup.id; id = lookup.id;

4
src/util/selection.js
View file

@ -112,7 +112,11 @@ async function selectionMessage(msg, heading, options, timeout = 30000, maxItems
async function lookupUser(msg, str, filter) { async function lookupUser(msg, str, filter) {
if (REGEX_SNOWFLAKE.test(str)) { if (REGEX_SNOWFLAKE.test(str)) {
try {
return await hf.bot.requestHandler.request("GET", APIEndpoints.USER(str.match(REGEX_SNOWFLAKE)[1]), true); return await hf.bot.requestHandler.request("GET", APIEndpoints.USER(str.match(REGEX_SNOWFLAKE)[1]), true);
} catch (err) {
return err.message;
}
} }
let users; let users;