Merge pull request #18 from teamboostify/change/selfhost-brand

Made embeds brandable for selfhosted versions

Author: breadddevv

package-lock.json

@@ -6,7 +6,7 @@
   "type": "module",
   "scripts": {
     "build": "tsc",
-    "start": "node --env-file=.env dist/index.js",
+    "start": "node --env-file=.env .",
     "dev": "tsx --env-file=.env src/index.ts",
     "prisma:generate": "prisma generate"
   },
@@ -20,8 +20,8 @@
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@prisma/adapter-pg": "^7.8.0",
-    "@prisma/client": "^7.8.0",
+    "@prisma/adapter-pg": "^7.9.0",
+    "@prisma/client": "^7.9.0",
     "axios": "^1.16.0",
     "chalk": "^4.1.2",
     "discord.js": "^14.27.0",

package.json

@@ -0,0 +1,34 @@
+import { ColorResolvable } from "discord.js";
+import { client } from "../../index.js";
+import { SystemColors } from "../../libs/colors.js";
+import { logger } from "../../libs/logger.js";
+
+const cachedColors = new Map<string, ColorResolvable>();
+
+export async function resolveColor(): Promise<ColorResolvable> {
+    if (process.env.CLIENT_ID == '1453802179789066442') return SystemColors.main; // custom branding coming as a future update
+
+    const guildid = process.env.GUILD_ID! || process.env.MASTER_GUILD!;
+
+    if (!guildid) {
+        return SystemColors.main;
+    }
+
+    if (cachedColors.has(guildid)) {
+        return cachedColors.get(guildid)!;
+    }
+
+    try {
+        const guild = await client.guilds.fetch(guildid);
+        const me = await guild.members.fetchMe();
+
+        const color = me.displayColor;
+        const resolved: ColorResolvable = color !== 0 ? color : SystemColors.main;
+
+        cachedColors.set(guildid, resolved);
+        return resolved;
+    } catch (err) {
+        logger.error(`Failed to resolve color for guild ${guildid}: ${err}`);
+        return SystemColors.main;
+    }
+}

src/base/functions/color-resolve.ts

@@ -0,0 +1,15 @@
+import { EmbedBuilder, ColorResolvable, ContainerBuilder, resolveColor as resolveColorValue } from "discord.js";
+import { resolveColor } from "./color-resolve.js";
+
+export async function Embed(color?: ColorResolvable): Promise<EmbedBuilder> {
+    const embedColor = color ?? await resolveColor();
+
+    return new EmbedBuilder().setColor(embedColor);
+}
+
+export async function Container(color?: ColorResolvable): Promise<ContainerBuilder> {
+    const embedColor = color ?? await resolveColor();
+    const accentColor = resolveColorValue(embedColor);
+
+    return new ContainerBuilder().setAccentColor(accentColor);
+}

src/base/functions/embed.ts

@@ -8,6 +8,7 @@ import {
   SeparatorSpacingSize,
   ButtonBuilder,
   ButtonStyle,
+  Colors,
 } from "discord.js";
 import {
   getBooster,
@@ -21,6 +22,7 @@ import {
 } from "../services/boosterService.js";
 import { Command } from "../base/classes/command.js";
 import { logger } from "../libs/logger.js";
+import { Container, Embed } from "../base/functions/embed.js";
 
 export default new Command({
   info: new SlashCommandBuilder()
@@ -106,9 +108,8 @@ export default new Command({
       if (!result.data) {
         if (isBoostingServer && member && member.premiumSince) {
           const discordBoost = `🟢 Boosting since <t:${Math.floor(member.premiumSince.getTime() / 1000)}:D>`;
-          const embed = new EmbedBuilder()
-            .setColor(0xff73fa)
-            .setTitle(`Here is the Booster Information for ${user.id}!`)
+          const embed = await Embed();
+            embed.setTitle(`Here is the Booster Information for ${user.id}!`)
             .setThumbnail(avatarUrl)
             .addFields(
               {
@@ -126,8 +127,8 @@ export default new Command({
           return;
         }
 
-        const container = new ContainerBuilder()
-          .setAccentColor(0xe642a4)
+        const container = await Container();
+          container.setAccentColor(0xe642a4)
           .addTextDisplayComponents(
             new TextDisplayBuilder().setContent("**Uh oh!**"),
             new TextDisplayBuilder().setContent(
@@ -157,9 +158,8 @@ export default new Command({
             .setLabel("Our Support Server")
             .setURL("https://discord.gg/NUtyKs7hA6");
 
-          const container = new ContainerBuilder()
-            .setAccentColor(0xe642a4)
-            .addTextDisplayComponents(
+          const container = await Container(Colors.Red)
+            container.addTextDisplayComponents(
               new TextDisplayBuilder().setContent("**Uh oh!**"),
               new TextDisplayBuilder().setContent(
                 `It looks like we ran into an issue\n-# If this issue is persistent, please consult your console logs if you're using a self-hosted version of Boostify, and create an issue on our [Repository](https://github.com/teamboostify/boostify/issues), or use our support server!.`,
@@ -184,8 +184,8 @@ export default new Command({
       const isActiveBooster =
         booster.active && booster.boostCounts > 0 && !!premiumSince;
 
-      const embed = new EmbedBuilder()
-        .setColor(booster.active ? 0xf47fff : 0x99aab5)
+      const embed = await Embed();
+        embed.setColor(booster.active ? 0xf47fff : 0x99aab5)
         .setTitle(`Booster Info: ${user.username}`)
         .setThumbnail(avatarUrl)
         .addFields(
@@ -253,9 +253,8 @@ export default new Command({
       }
 
       const boostWord = amount === 1 ? "boost" : "boosts";
-      const container = new ContainerBuilder()
-        .setAccentColor(0xe642a4)
-        .addTextDisplayComponents(
+      const container = await Container();
+        container.addTextDisplayComponents(
           new TextDisplayBuilder().setContent(`**Boost successfully added!**`),
           new TextDisplayBuilder().setContent(
             `We've successfully added ${amount} ${boostWord} to ${user}'s profile.`,
@@ -294,9 +293,8 @@ export default new Command({
         getTotalBoosts(discordGuild.id),
       ]);
 
-      const embed = new EmbedBuilder()
-        .setColor(0xf47fff)
-        .setTitle("Server Boost Statistics")
+      const embed = await Embed();
+        embed.setTitle("Server Boost Statistics")
         .addFields(
           {
             name: "Current Boosters",

src/commands/booster.ts

@@ -6,6 +6,7 @@ import {
 } from "discord.js";
 import { Command } from "../base/classes/command.js";
 import { SystemColors } from "../libs/colors.js";
+import { Container } from "../base/functions/embed.js";
 
 const knowledgebase: Record<string, string> = {
   booster:
@@ -574,17 +575,16 @@ export default new Command({
     const sub = interaction.options.getString("command", true);
 
     if (knowledgebase[sub]) {
-      const container = new ContainerBuilder()
-      .setAccentColor(SystemColors.main)
-      .addTextDisplayComponents(txt => txt.setContent(
+      const container = await Container()
+      container.addTextDisplayComponents(txt => txt.setContent(
         `## Command info: \`/${sub}\`\n`+
         knowledgebase[sub] 
       ));
 
       await interaction.reply({ components: [container], flags: [MessageFlags.IsComponentsV2]})
     } else {
-      const container = new ContainerBuilder()
-      .setAccentColor(Colors.Red)
+      const container = await Container(Colors.Red);
+      container.setAccentColor(Colors.Red)
       .addTextDisplayComponents(txt => txt.setContent(
         `## Command not found\n`+
         `We couldn't find any resources matching the command \`${sub}\`, please try later.` 

src/commands/help.ts

@@ -8,6 +8,7 @@ import {
 import axios from "axios";
 import { Command } from "../base/classes/command.js";
 import packageInfo from "../../package.json" with { type: "json" };
+import { Embed } from "../base/functions/embed.js";
 
 interface GithubRes {
   login: string,
@@ -33,16 +34,15 @@ export default new Command({
 
     const uptimeString = `${days}d ${hours}h ${minutes}m ${seconds}s`;
 
-    const embed = new EmbedBuilder()
-      .setColor(16712630)
-      .setThumbnail(interaction.client.user.displayAvatarURL({ size: 2048 }))
+    const embed = await Embed();
+      embed.setThumbnail(interaction.client.user.displayAvatarURL({ size: 2048 }))
       .setTitle("Bot information")
       .setDescription(
         "Boostify is a Discord bot designed to help you manage your server boosts."
       )
       .addFields(
         {
-          name: "Developers",
+          name: `Contributors [${info.data.length}]`,
           value: info.data
             .map((user) => `[@${user.login}](${user.html_url})`)
             .join("\n"),