From 295072d3882ef6e6f1813ae6f90298cabaa55662 Mon Sep 17 00:00:00 2001 From: bignutty <3515180-bignutty@users.noreply.gitlab.com> Date: Thu, 26 Dec 2024 23:16:52 +0100 Subject: [PATCH] ensure all icons are retrieved through the helper --- commands/message/genai/gemini.js | 4 ++-- commands/message/genai/palm.js | 7 ++++--- labscore/constants.js | 19 ++++++++++++++++++- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/commands/message/genai/gemini.js b/commands/message/genai/gemini.js index 3c4208b..6b86fc1 100644 --- a/commands/message/genai/gemini.js +++ b/commands/message/genai/gemini.js @@ -3,7 +3,7 @@ const { LlmPrivateBard } = require('#obelisk'); const { createEmbed } = require('#utils/embed'); const { acknowledge } = require('#utils/interactions'); -const { iconPill, stringwrap } = require('#utils/markdown') +const { iconPill, stringwrap, icon } = require('#utils/markdown') const { editOrReply } = require('#utils/message') const { STATIC_ICONS } = require('#utils/statics'); const { hasFeature } = require('#utils/testing'); @@ -16,7 +16,7 @@ module.exports = { label: 'text', aliases: ["bard","gem"], metadata: { - description: `${iconPill("generative_ai", "LIMITED TESTING")}\n\nChat with <:ico_gemini_spark:1320506533003530270> Gemini.`, + description: `${iconPill("generative_ai", "LIMITED TESTING")}\n\nChat with ${icon("brand_google_gemini")} Gemini.`, description_short: 'Chat with Gemini.', examples: ['gemini How many otter species are there?'], category: 'limited', diff --git a/commands/message/genai/palm.js b/commands/message/genai/palm.js index be1b60a..9d1de21 100644 --- a/commands/message/genai/palm.js +++ b/commands/message/genai/palm.js @@ -3,7 +3,7 @@ const { PERMISSION_GROUPS } = require('#constants'); const { createEmbed } = require('#utils/embed') const { editOrReply } = require('#utils/message') -const { iconPill, stringwrap, smallIconPill } = require('#utils/markdown') +const { iconPill, stringwrap, smallIconPill, icon } = require('#utils/markdown') const { STATIC_ICONS } = require('#utils/statics'); const { hasFeature } = require('#utils/testing'); const { acknowledge } = require('#utils/interactions'); @@ -13,10 +13,10 @@ module.exports = { label: 'text', aliases: ['palm2'], metadata: { - description: `${iconPill("generative_ai", "LIMITED TESTING")}\n${smallIconPill("reply", "Supports Replies")}\n\nTalk to <:palm2:1163200685177839666> PaLM 2.`, + description: `${iconPill("generative_ai", "LIMITED TESTING")}\n${smallIconPill("reply", "Supports Replies")}\n\nTalk to ${icon("brand_google_palm2")} PaLM 2.`, description_short: 'Chat with PaLM 2.', examples: ['palm How many otter species are there?'], - category: 'limited', + category: 'broken', usage: 'palm [-prompt ]' }, args: [ @@ -25,6 +25,7 @@ module.exports = { ], permissionsClient: [...PERMISSION_GROUPS.baseline, ...PERMISSION_GROUPS.attachments], run: async (context, args) => { + return; if(!await hasFeature(context, "ai/palm")) return; await acknowledge(context); diff --git a/labscore/constants.js b/labscore/constants.js index 679e663..121f92c 100644 --- a/labscore/constants.js +++ b/labscore/constants.js @@ -333,6 +333,10 @@ module.exports.ICONS = Object.freeze({ "maps_worship_sikh_pin": "<:maps_worship_sikh_pin:1307493454053376020>", "maps_worship_temple_pin": "<:maps_worship_temple_pin:1307493467793915924>", + /* Various Brand Icons */ + "brand_google_gemini": "<:brand_google_gemini:1320506533003530270>", + "brand_google_palm2": "<:brand_google_palm2:1321959401376186492>", + "information": "<:ico_information:1263590946226835510>", "question": "<:ico_question:1263590898906697800>", "warning": "<:ico_warning:1263590857072967832>", @@ -342,7 +346,20 @@ module.exports.ICONS = Object.freeze({ // Legacy Icon Compat "success_simple": "<:ico_check:1263594912692178974>", - "failiure_simple": "<:ico_cross:1263594899048235100>" + "failiure_simple": "<:ico_cross:1263594899048235100>", + + /* + Webhook Icons + + These emoji are located on the + china (682672131359637534) server + since webhooks can't access bot-owned emoji. + */ + "webhook_exclaim_0": "<:ico_exclaim_0:1321960522547068938>", + "webhook_exclaim_1": "<:ico_exclaim_1:1321960524300292146> ", + "webhook_exclaim_2": "<:ico_exclaim_2:1321960526162694225> ", + "webhook_exclaim_3": "<:ico_exclaim_3:1321960528058253524> ", + "webhook_exclaim_4": "<:ico_exclaim_4:1321960529811738776>", }) module.exports.MUSIC_PLATFORM_ICONS = Object.freeze({