This commit is contained in:
Dragory 2019-05-02 18:17:09 +03:00
parent ac7f6e728b
commit d776eb1710

View file

@ -565,14 +565,11 @@ export async function resolveUser(bot: Client, value: string): Promise<User | Un
const cachedUser = bot.users.find(u => u.id === userId); const cachedUser = bot.users.find(u => u.id === userId);
if (cachedUser) return cachedUser; if (cachedUser) return cachedUser;
try { // try {
logger.info(`Resolving unknown user: ${value} / ${userId}`); // const freshUser = await bot.getRESTUser(userId);
console.trace(); // bot.users.add(freshUser, bot);
// return freshUser;
const freshUser = await bot.getRESTUser(userId); // } catch (e) {} // tslint:disable-line
bot.users.add(freshUser, bot);
return freshUser;
} catch (e) {} // tslint:disable-line
return new UnknownUser({ id: userId }); return new UnknownUser({ id: userId });
} }
@ -586,16 +583,13 @@ export async function resolveMember(bot: Client, guild: Guild, value: string): P
let member = guild.members.get(user.id); let member = guild.members.get(user.id);
// If not, fetch it from the API // If not, fetch it from the API
if (!member) { // if (!member) {
try { // try {
logger.info(`Resolving unknown member: ${value}`); // member = await bot.getRESTGuildMember(guild.id, user.id);
console.trace(); // member.id = user.id;
// member.guild = guild;
member = await bot.getRESTGuildMember(guild.id, user.id); // } catch (e) {} // tslint:disable-line
member.id = user.id; // }
member.guild = guild;
} catch (e) {} // tslint:disable-line
}
return member; return member;
} }