kirameki-cafe-mirror/Yumi
1
0
Fork 0
mirror of https://github.com/kirameki-cafe/Yumi.git synced 2026-09-13 18:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Service Announcement crash

Browse Source
This commit is contained in:
yuzu
2022-06-29 21:38:35 +07:00
parent 872e8455e0
commit 074bd35bdd
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/Developer/ServiceAnnouncement.ts
+13 -8
View File
@@ -1,4 +1,4 @@
import { Message, EmbedBuilder, Interaction, CommandInteraction, TextChannel, BaseInteraction } from 'discord.js'; import { Message, EmbedBuilder, Interaction, CommandInteraction, TextChannel, BaseInteraction, EmbedData, EmbedFieldData, EmbedProviderData } from 'discord.js';
import { Promise } from 'bluebird'; import { Promise } from 'bluebird';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
@@ -21,6 +21,8 @@ import DiscordProvider from '../../providers/Discord';
import Prisma from '../../providers/Prisma'; import Prisma from '../../providers/Prisma';
import Users from '../../services/Users'; import Users from '../../services/Users';
const hexToDecimal = (hex: string) => parseInt(hex.replace('#', ''), 16);
const EMBEDS = { const EMBEDS = {
ANNOUNCEMENT_INFO: (data: Message | BaseInteraction) => { ANNOUNCEMENT_INFO: (data: Message | BaseInteraction) => {
return makeInfoEmbed({ return makeInfoEmbed({
@@ -42,14 +44,14 @@ const EMBEDS = {
user: data instanceof BaseInteraction ? data.user : data.author user: data instanceof BaseInteraction ? data.user : data.author
}); });
}, },
MAKE_PAYLOAD: (payload: any) => { MAKE_PAYLOAD: (payload: EmbedData) => {
const user = DiscordProvider.client.user; const user = DiscordProvider.client.user;
payload.footer = { payload.footer = {
text: `${user?.username}`, text: `${user?.username}`,
iconURL: `${user?.displayAvatarURL()}?size=4096` iconURL: `${user?.displayAvatarURL()}?size=4096`
}; };
if (!payload.timestamp) payload.timestamp = new Date(); if (!payload.timestamp) payload.timestamp = new Date().getTime() / 1000;
if (payload.thumbnail?.url === 'bot_avatar') if (payload.thumbnail?.url === 'bot_avatar')
payload.thumbnail.url = `${user?.displayAvatarURL()}?size=4096`; payload.thumbnail.url = `${user?.displayAvatarURL()}?size=4096`;
@@ -58,7 +60,10 @@ const EMBEDS = {
payload.image.url = `${user?.displayAvatarURL()}?size=4096`; payload.image.url = `${user?.displayAvatarURL()}?size=4096`;
if (payload.description) if (payload.description)
payload.description = payload.description.replaceAll('{bot_username}', user?.username); payload.description = payload.description.replaceAll('{bot_username}', user?.username!);
if (payload.color && isNaN(payload.color))
payload.color = hexToDecimal(payload.color.toString());
return new EmbedBuilder(payload); return new EmbedBuilder(payload);
}, },
@@ -100,7 +105,7 @@ const EMBEDS = {
let Announcements = { let Announcements = {
News: { News: {
color: '#FAEDF0', color: hexToDecimal('#FAEDF0'),
title: '📰 Newsletter', title: '📰 Newsletter',
description: 'Some description here', description: 'Some description here',
thumbnail: { thumbnail: {
@@ -108,7 +113,7 @@ let Announcements = {
} }
}, },
Maintenance: { Maintenance: {
color: '#383b80', color: hexToDecimal('#383b80'),
title: '🔧 Maintenance', title: '🔧 Maintenance',
description: 'The bot is going offline for maintenance.', description: 'The bot is going offline for maintenance.',
thumbnail: { thumbnail: {
@@ -116,7 +121,7 @@ let Announcements = {
} }
}, },
Message: { Message: {
color: '#A1DE93', color: hexToDecimal('#A1DE93'),
title: '✉️ Message', title: '✉️ Message',
description: 'Some description here', description: 'Some description here',
thumbnail: { thumbnail: {
@@ -124,7 +129,7 @@ let Announcements = {
} }
}, },
Alert: { Alert: {
color: '#EC255A', color: hexToDecimal('#EC255A'),
title: '🚨 Alert', title: '🚨 Alert',
description: 'Some description here', description: 'Some description here',
thumbnail: { thumbnail: {