StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed unnecessary string literal and simplified stuff

Browse source
This commit is contained in:
almeidx 2021-07-29 10:08:55 +01:00
parent 392e7fc56e
commit afe0ec1194
No known key found for this signature in database
GPG key ID: 8558FBFF849BD664
17 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/pluginUtils.ts
View file

@ -198,7 +198,7 @@ export async function sendSuccessMessage(
return channel return channel
.send({ ...content }) // Force line break .send({ ...content }) // Force line break
.catch(err => { .catch(err => {
const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : `${channel.id}`; const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : channel.id;
logger.warn(`Failed to send success message to ${channelInfo}): ${err.code} ${err.message}`); logger.warn(`Failed to send success message to ${channelInfo}): ${err.code} ${err.message}`);
return undefined; return undefined;
}); });
@ -219,7 +219,7 @@ export async function sendErrorMessage(
return channel return channel
.send({ ...content }) // Force line break .send({ ...content }) // Force line break
.catch(err => { .catch(err => {
const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : `${channel.id}`; const channelInfo = channel.guild ? `${channel.id} (${channel.guild.id})` : channel.id;
logger.warn(`Failed to send error message to ${channelInfo}): ${err.code} ${err.message}`); logger.warn(`Failed to send error message to ${channelInfo}): ${err.code} ${err.message}`);
return undefined; return undefined;
}); });

6
backend/src/plugins/Cases/functions/createCase.ts
View file

@ -7,15 +7,15 @@ import { postCaseToCaseLogChannel } from "./postToCaseLogChannel";
export async function createCase(pluginData: GuildPluginData<CasesPluginType>, args: CaseArgs) { export async function createCase(pluginData: GuildPluginData<CasesPluginType>, args: CaseArgs) {
const user = await resolveUser(pluginData.client, args.userId); const user = await resolveUser(pluginData.client, args.userId);
const userName = `${user.tag}`; const userName = user.tag;
const mod = await resolveUser(pluginData.client, args.modId); const mod = await resolveUser(pluginData.client, args.modId);
const modName = `${mod.tag}`; const modName = mod.tag;
let ppName: string | null = null; let ppName: string | null = null;
if (args.ppId) { if (args.ppId) {
const pp = await resolveUser(pluginData.client, args.ppId); const pp = await resolveUser(pluginData.client, args.ppId);
ppName = `${pp.tag}`; ppName = pp.tag;
} }
if (args.auditLogId) { if (args.auditLogId) {

2
backend/src/plugins/Cases/functions/createCaseNote.ts
View file

@ -16,7 +16,7 @@ export async function createCaseNote(pluginData: GuildPluginData<CasesPluginType
throw new RecoverablePluginError(ERRORS.INVALID_USER); throw new RecoverablePluginError(ERRORS.INVALID_USER);
} }
const modName = `${mod.tag}`; const modName = mod.tag;
let body = args.body; let body = args.body;

2
backend/src/plugins/ModActions/commands/CasesModCmd.ts
View file

@ -29,7 +29,7 @@ export const CasesModCmd = modActionsCmd({
async run({ pluginData, message: msg, args }) { async run({ pluginData, message: msg, args }) {
const modId = args.mod || msg.author.id; const modId = args.mod || msg.author.id;
const mod = await resolveUser(pluginData.client, modId); const mod = await resolveUser(pluginData.client, modId);
const modName = mod instanceof User ? `${mod.tag}` : modId; const modName = mod instanceof User ? mod.tag : modId;
const casesPlugin = pluginData.getPlugin(CasesPlugin); const casesPlugin = pluginData.getPlugin(CasesPlugin);
const totalCases = await casesPlugin.getTotalCasesByMod(modId); const totalCases = await casesPlugin.getTotalCasesByMod(modId);

2
backend/src/plugins/ModActions/commands/CasesUserCmd.ts
View file

@ -61,7 +61,7 @@ export const CasesUserCmd = modActionsCmd({
const normalCases = cases.filter(c => !c.is_hidden); const normalCases = cases.filter(c => !c.is_hidden);
const hiddenCases = cases.filter(c => c.is_hidden); const hiddenCases = cases.filter(c => c.is_hidden);
const userName = user instanceof UnknownUser && cases.length ? cases[cases.length - 1].user_name : `${user.tag}`; const userName = user instanceof UnknownUser && cases.length ? cases[cases.length - 1].user_name : user.tag;
if (cases.length === 0) { if (cases.length === 0) {
msg.channel.send(`No cases found for **${userName}**`); msg.channel.send(`No cases found for **${userName}**`);

2
backend/src/plugins/ModActions/commands/DeleteCaseCmd.ts
View file

@ -68,7 +68,7 @@ export const DeleteCaseCmd = modActionsCmd({
} }
} }
const deletedByName = `${message.author.tag}`; const deletedByName = message.author.tag;
const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin); const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
const deletedAt = timeAndDate.inGuildTz().format(timeAndDate.getDateFormat("pretty_datetime")); const deletedAt = timeAndDate.inGuildTz().format(timeAndDate.getDateFormat("pretty_datetime"));

2
backend/src/plugins/ModActions/commands/NoteCmd.ts
View file

@ -30,7 +30,7 @@ export const NoteCmd = modActionsCmd({
return; return;
} }
const userName = `${user.tag}`; const userName = user.tag;
const reason = formatReasonWithAttachments(args.note, msg.attachments.array()); const reason = formatReasonWithAttachments(args.note, msg.attachments.array());
const casesPlugin = pluginData.getPlugin(CasesPlugin); const casesPlugin = pluginData.getPlugin(CasesPlugin);

2
backend/src/plugins/Mutes/commands/MutesCmd.ts
View file

@ -119,7 +119,7 @@ export const MutesCmd = mutesCmd({
lines = filteredMutes.map(mute => { lines = filteredMutes.map(mute => {
const user = pluginData.client.users.resolve(mute.user_id as Snowflake); const user = pluginData.client.users.resolve(mute.user_id as Snowflake);
const username = user ? `${user.tag}` : "Unknown#0000"; const username = user ? user.tag : "Unknown#0000";
const theCase = muteCasesById.get(mute.case_id); const theCase = muteCasesById.get(mute.case_id);
const caseName = theCase ? `Case #${theCase.case_number}` : "No case"; const caseName = theCase ? `Case #${theCase.case_number}` : "No case";

4
backend/src/plugins/NameHistory/commands/NamesCmd.ts
View file

@ -30,8 +30,8 @@ export const NamesCmd = nameHistoryCmd({
); );
const usernameRows = usernames.map(r => `\`[${r.timestamp}]\` **${disableCodeBlocks(r.username)}**`); const usernameRows = usernames.map(r => `\`[${r.timestamp}]\` **${disableCodeBlocks(r.username)}**`);
const user = await pluginData.client.users.fetch(args.userId as Snowflake); const user = await pluginData.client.users.fetch(args.userId as Snowflake).catch(() => null);
const currentUsername = user ? `${user.tag}` : args.userId; const currentUsername = user ? user.tag : args.userId;
const nicknameDays = Math.round(NICKNAME_RETENTION_PERIOD / DAYS); const nicknameDays = Math.round(NICKNAME_RETENTION_PERIOD / DAYS);
const usernameDays = Math.round(NICKNAME_RETENTION_PERIOD / DAYS); const usernameDays = Math.round(NICKNAME_RETENTION_PERIOD / DAYS);

2
backend/src/plugins/Post/util/actualPostCmd.ts
View file

@ -138,7 +138,7 @@ export async function actualPostCmd(
await pluginData.state.scheduledPosts.create({ await pluginData.state.scheduledPosts.create({
author_id: msg.author.id, author_id: msg.author.id,
author_name: `${msg.author.tag}`, author_name: msg.author.tag,
channel_id: targetChannel.id, channel_id: targetChannel.id,
content, content,
attachments: msg.attachments.array(), attachments: msg.attachments.array(),

6
backend/src/plugins/ReactionRoles/events/ButtonInteractionEvt.ts
View file

@ -17,10 +17,8 @@ export const ButtonInteractionEvt = reactionRolesEvt({
event: "interactionCreate", event: "interactionCreate",
async listener(meta) { async listener(meta) {
const int = meta.args.interaction.isMessageComponent() const int = meta.args.interaction;
? (meta.args.interaction as MessageComponentInteraction) if (!int.isMessageComponent()) return;
: null;
if (!int) return;
const cfg = meta.pluginData.config.get(); const cfg = meta.pluginData.config.get();
const split = int.customId.split(BUTTON_CONTEXT_SEPARATOR); const split = int.customId.split(BUTTON_CONTEXT_SEPARATOR);

2
backend/src/plugins/Starboard/util/createStarboardEmbedFromMessage.ts
View file

@ -18,7 +18,7 @@ export function createStarboardEmbedFromMessage(
text: `#${(msg.channel as GuildChannel).name}`, text: `#${(msg.channel as GuildChannel).name}`,
}, },
author: { author: {
name: `${msg.author.tag}`, name: msg.author.tag,
}, },
fields: [], fields: [],
timestamp: msg.createdTimestamp, timestamp: msg.createdTimestamp,

2
backend/src/plugins/UsernameSaver/updateUsername.ts
View file

@ -4,7 +4,7 @@ import { UsernameSaverPluginType } from "./types";
export async function updateUsername(pluginData: GuildPluginData<UsernameSaverPluginType>, user: User) { export async function updateUsername(pluginData: GuildPluginData<UsernameSaverPluginType>, user: User) {
if (!user) return; if (!user) return;
const newUsername = `${user.tag}`; const newUsername = user.tag;
const latestEntry = await pluginData.state.usernameHistory.getLastEntry(user.id); const latestEntry = await pluginData.state.usernameHistory.getLastEntry(user.id);
if (!latestEntry || newUsername !== latestEntry.username) { if (!latestEntry || newUsername !== latestEntry.username) {
await pluginData.state.usernameHistory.addEntry(user.id, newUsername); await pluginData.state.usernameHistory.addEntry(user.id, newUsername);

2
backend/src/plugins/Utility/commands/HelpCmd.ts
View file

@ -80,7 +80,7 @@ export const HelpCmd = utilityCmd({
? `Results (${totalResults} total, showing first ${limitedResults.length}):\n\n` ? `Results (${totalResults} total, showing first ${limitedResults.length}):\n\n`
: ""; : "";
message += `${commandSnippets.join("\n\n")}`; message += commandSnippets.join("\n\n");
createChunkedMessage(msg.channel, message); createChunkedMessage(msg.channel, message);
}, },
}); });

2
backend/src/plugins/Utility/functions/getServerInfoEmbed.ts
View file

@ -65,7 +65,7 @@ export async function getServerInfoEmbed(
if (thisServer) { if (thisServer) {
const owner = await resolveUser(pluginData.client, thisServer.ownerId); const owner = await resolveUser(pluginData.client, thisServer.ownerId);
const ownerName = `${owner.tag}`; const ownerName = owner.tag;
basicInformation.push(`Owner: **${ownerName}** (\`${thisServer.ownerId}\`)`); basicInformation.push(`Owner: **${ownerName}** (\`${thisServer.ownerId}\`)`);
// basicInformation.push(`Voice region: **${thisServer.region}**`); Outdated, as automatic voice regions are fully live // basicInformation.push(`Voice region: **${thisServer.region}**`); Outdated, as automatic voice regions are fully live

4
backend/src/plugins/Utility/search.ts
View file

@ -391,7 +391,7 @@ async function performMemberSearch(
return true; return true;
} }
const fullUsername = `${member.user.tag}`; const fullUsername = member.user.tag;
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true; if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false; return false;
@ -458,7 +458,7 @@ async function performBanSearch(
const execRegExp = getOptimizedRegExpRunner(pluginData, isSafeRegex); const execRegExp = getOptimizedRegExpRunner(pluginData, isSafeRegex);
matchingBans = await asyncFilter(matchingBans, async user => { matchingBans = await asyncFilter(matchingBans, async user => {
const fullUsername = `${user.tag}`; const fullUsername = user.tag;
if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true; if (await execRegExp(queryRegex, fullUsername).catch(allowTimeout)) return true;
return false; return false;
}); });

2
backend/src/utils/configAccessibleObjects.ts
View file

@ -40,7 +40,7 @@ export interface IConfigAccessibleMember extends IConfigAccessibleUser {
} }
export function userToConfigAccessibleUser(user: User | UnknownUser): IConfigAccessibleUser { export function userToConfigAccessibleUser(user: User | UnknownUser): IConfigAccessibleUser {
if (`${user.tag}` === "Unknown#0000") { if (user.tag === "Unknown#0000") {
const toReturnPartial: IConfigAccessibleUser = { const toReturnPartial: IConfigAccessibleUser = {
id: user.id, id: user.id,
username: "Unknown", username: "Unknown",