This commit is contained in:
Mirco Wittrien 2022-09-27 20:05:55 +02:00
parent da84fe6516
commit 035aaacd78
4 changed files with 13 additions and 14 deletions

View File

@ -137,7 +137,6 @@
"PremiumConstants": {"props": ["PremiumTypes", "BoostedGuildFeatures"]},
"PrivateChannelUtils": {"props": ["addRecipient", "openPrivateChannel"]},
"QuerySearchUtils": {"props": ["queryGuilds", "queryGroupDMs"]},
"QueryUtils": {"props": ["AutocompleterQuerySymbols", "AutocompleterResultTypes"]},
"ReactionEmojiUtils": {"props": ["getReactionEmojiName", "getReactionEmojiName"]},
"ReactionUtils": {"props": ["addReaction", "removeReaction"]},
"RecentMentionUtils": {"props": ["deleteRecentMention", "fetchRecentMentions"]},

View File

@ -141,12 +141,12 @@ module.exports = (_ => {
let channel = BDFDB.LibraryStores.ChannelStore.getChannel(id);
if (channel && !channel.isCategory()) {
let category = channel.parent_id && BDFDB.LibraryStores.ChannelStore.getChannel(channel.parent_id);
if (((changedChannels[id] && changedChannels[id].name && changedChannels[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1) || (category && changedChannels[category.id] && changedChannels[category.id].name && changedChannels[category.id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1)) && !e.returnValue.find(n => n.record && n.record.id == id && (n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.VOICE_CHANNEL || n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.TEXT_CHANNEL))) e.returnValue.push({
if (((changedChannels[id] && changedChannels[id].name && changedChannels[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1) || (category && changedChannels[category.id] && changedChannels[category.id].name && changedChannels[category.id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1)) && !e.returnValue.find(n => n.record && n.record.id == id && (n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.VOICE_CHANNEL || n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.TEXT_CHANNEL))) e.returnValue.push({
comparator: channel.name,
record: channel,
score: 30000,
sortable: channel.name.toLocaleLowerCase(),
type: channel.isGuildVocal() ? BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.VOICE_CHANNEL : BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.TEXT_CHANNEL
type: channel.isGuildVocal() ? BDFDB.DiscordConstants.AutocompleterResultTypes.VOICE_CHANNEL : BDFDB.DiscordConstants.AutocompleterResultTypes.TEXT_CHANNEL
});
}
}

View File

@ -125,14 +125,14 @@ module.exports = (_ => {
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.QuerySearchUtils, "queryGuilds", {after: e => {
if (!e.methodArguments[0].query) return;
for (let id in changedGuilds) if (changedGuilds[id] && changedGuilds[id].name && changedGuilds[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.GUILD)) {
for (let id in changedGuilds) if (changedGuilds[id] && changedGuilds[id].name && changedGuilds[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.GUILD)) {
let guild = BDFDB.LibraryStores.GuildStore.getGuild(id);
if (guild) e.returnValue.push({
comparator: guild.name,
record: guild,
score: 30000,
sortable: guild.name.toLocaleLowerCase(),
type: BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.GUILD
type: BDFDB.DiscordConstants.AutocompleterResultTypes.GUILD
});
}
}});

View File

@ -256,40 +256,40 @@ module.exports = (_ => {
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.QuerySearchUtils, ["queryDMUsers", "queryFriends"], {after: e => {
if (!e.methodArguments[0].query) return;
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER)) {
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.USER)) {
let user = BDFDB.LibraryStores.UserStore.getUser(id);
if (user) e.returnValue.push({
comparator: user.username,
record: user,
score: 10,
sortable: user.username.toLocaleLowerCase(),
type: BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER
type: BDFDB.DiscordConstants.AutocompleterResultTypes.USER
});
}
}});
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.QuerySearchUtils, "queryGuildUsers", {after: e => {
if (!e.methodArguments[0].query) return;
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER)) {
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.USER)) {
let user = BDFDB.LibraryStores.UserStore.getUser(id);
let member = user && e.methodArguments[0].guildId && BDFDB.LibraryStores.GuildMemberStore.getMember(e.methodArguments[0].guildId, id);
if (user) e.returnValue.push({
comparator: member && member.nick ? member.nick.toLocaleLowerCase() : user.username.toLocaleLowerCase(),
record: user,
score: 0,
type: BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER
type: BDFDB.DiscordConstants.AutocompleterResultTypes.USER
});
}
}});
BDFDB.PatchUtils.patch(this, BDFDB.LibraryModules.QuerySearchUtils, "queryChannelUsers", {after: e => {
if (!e.methodArguments[0].query) return;
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER)) {
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.methodArguments[0].query.toLocaleLowerCase()) > -1 && !e.returnValue.find(n => n.record && n.record.id == id && n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.USER)) {
let user = BDFDB.LibraryStores.UserStore.getUser(id);
let member = user && e.methodArguments[0].channelId && BDFDB.LibraryStores.GuildMemberStore.getMember((BDFDB.LibraryStores.ChannelStore.getChannel(e.methodArguments[0].channelId) || {}).guild_id, id);
if (user) e.returnValue.push({
comparator: member && member.nick ? member.nick.toLocaleLowerCase() : user.username.toLocaleLowerCase(),
record: user,
score: 0,
type: BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER
type: BDFDB.DiscordConstants.AutocompleterResultTypes.USER
});
}
}});
@ -1201,14 +1201,14 @@ module.exports = (_ => {
}
processQuickSwitcherConnected (e) {
if (e.returnvalue && e.returnvalue.props && e.returnvalue.props.query && (!e.returnvalue.props.queryMode || e.returnvalue.props.queryMode == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER)) {
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.returnvalue.props.query.toLocaleLowerCase()) > -1 && !e.returnvalue.props.results.find(n => n.record && n.record.id == id && n.type == BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER)) {
if (e.returnvalue && e.returnvalue.props && e.returnvalue.props.query && (!e.returnvalue.props.queryMode || e.returnvalue.props.queryMode == BDFDB.DiscordConstants.AutocompleterResultTypes.USER)) {
for (let id in changedUsers) if (changedUsers[id] && changedUsers[id].name && changedUsers[id].name.toLocaleLowerCase().indexOf(e.returnvalue.props.query.toLocaleLowerCase()) > -1 && !e.returnvalue.props.results.find(n => n.record && n.record.id == id && n.type == BDFDB.DiscordConstants.AutocompleterResultTypes.USER)) {
let user = BDFDB.LibraryStores.UserStore.getUser(id);
if (user) e.returnvalue.props.results.splice(1, 0, {
comparator: `${user.username}#${user.discriminator}`,
record: user,
score: 30000,
type: BDFDB.LibraryModules.QueryUtils.AutocompleterResultTypes.USER
type: BDFDB.DiscordConstants.AutocompleterResultTypes.USER
});
}
}