diff --git a/commands/message/genai/imagen.js b/commands/message/genai/imagen.js index e713ed0..68ae190 100644 --- a/commands/message/genai/imagen.js +++ b/commands/message/genai/imagen.js @@ -1,12 +1,10 @@ -const { geminiVision, aiWallpaper, imagen } = require("../../../labscore/api/obelisk"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); +const { imagen } = require("../../../labscore/api/obelisk"); const { createEmbed } = require("../../../labscore/utils/embed"); const { editOrReply } = require("../../../labscore/utils/message"); -const { getUser } = require("../../../labscore/utils/users"); const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS } = require("../../../labscore/utils/statics"); +const { STATIC_ICONS, STATIC_ASSETS } = require("../../../labscore/utils/statics"); const { iconPill, stringwrap } = require("../../../labscore/utils/markdown"); const { hasFeature } = require("../../../labscore/utils/testing"); @@ -29,12 +27,19 @@ module.exports = { if(!args.text) return editOrReply(context, createEmbed("warning", context, `Missing Parameter (prompt).`)) try{ - await editOrReply(context, createEmbed("defaultNoFooter", context, { + let load = createEmbed("defaultNoFooter", context, { + url: "https://bignutty.gitlab.io", author: { iconUrl: STATIC_ICONS.ai_image_processing, name: "Generating images..." + }, + image: { + url: STATIC_ASSETS.image_loading } - })) + }) + let loadingEmbeds = [load, load, load, load] + + await editOrReply(context, {embeds: loadingEmbeds}); let res = await imagen(context, args.text); diff --git a/commands/message/genai/wallpaper.js b/commands/message/genai/wallpaper.js index 7a34a7a..6083733 100644 --- a/commands/message/genai/wallpaper.js +++ b/commands/message/genai/wallpaper.js @@ -1,12 +1,10 @@ -const { geminiVision, aiWallpaper, imagen, wallpaper } = require("../../../labscore/api/obelisk"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); +const { wallpaper } = require("../../../labscore/api/obelisk"); const { createEmbed } = require("../../../labscore/utils/embed"); const { editOrReply } = require("../../../labscore/utils/message"); -const { getUser } = require("../../../labscore/utils/users"); const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS } = require("../../../labscore/utils/statics"); +const { STATIC_ICONS, STATIC_ASSETS } = require("../../../labscore/utils/statics"); const { iconPill, stringwrap } = require("../../../labscore/utils/markdown"); const { hasFeature } = require("../../../labscore/utils/testing"); @@ -32,12 +30,19 @@ module.exports = { if(!args.text) return editOrReply(context, createEmbed("warning", context, `Missing Parameter (prompt).`)) if(!["wide","square"].includes(args.format.toLowerCase())) return editOrReply(context, createEmbed("warning", context, `Invalid Parameter (format).`)) try{ - await editOrReply(context, createEmbed("defaultNoFooter", context, { + let load = createEmbed("defaultNoFooter", context, { + url: "https://bignutty.gitlab.io", author: { iconUrl: STATIC_ICONS.ai_image_processing, name: "Generating images..." + }, + image: { + url: STATIC_ASSETS.image_loading } - })) + }) + let loadingEmbeds = [load, load, load, load] + + await editOrReply(context, {embeds: loadingEmbeds}); let res = await wallpaper(context, args.text, args.format.toLowerCase()); diff --git a/labscore/utils/statics.js b/labscore/utils/statics.js index 3f424b6..03c2fbf 100644 --- a/labscore/utils/statics.js +++ b/labscore/utils/statics.js @@ -8,6 +8,10 @@ const Statics = Object.freeze({ file: "loading/05_chat_loading.7y2ji893rho0.gif", revision: 0 }, + image_loading: { + file: "loading/image_loading_splash.2elegsql1j8k.png", + revision: 1 + }, embed_invite_spacer: { file: "misc/embed-spacer-botinvite.png", revision: 0 @@ -231,5 +235,6 @@ module.exports.STATIC_ICONS = Object.freeze({ module.exports.STATIC_ASSETS = Object.freeze({ chat_loading: staticAsset(Statics.assets.chat_loading), + image_loading: staticAsset(Statics.assets.image_loading), embed_invite_spacer: staticAsset(Statics.assets.embed_invite_spacer) }) \ No newline at end of file