From cf6fb6da9a81072cb7c492d85ba737a2b3bf9c43 Mon Sep 17 00:00:00 2001 From: bignutty <3515180-bignutty@users.noreply.gitlab.com> Date: Sat, 8 Jun 2024 13:40:37 +0200 Subject: [PATCH] use subpath import maps --- commands/interaction/context/audio.js | 7 +++--- commands/interaction/context/ocr.js | 13 +++++------ commands/interaction/context/ocrtr.js | 17 +++++++------- commands/interaction/context/reverse-image.js | 13 ++++++----- commands/interaction/context/transcribe.js | 13 +++++------ commands/interaction/slash/fun/otter.js | 7 +++--- commands/interaction/slash/info/avatar.js | 8 +++---- commands/interaction/slash/info/user.js | 15 ++++++------- commands/interaction/slash/rewrite.js | 10 ++++----- .../interaction/slash/search/google-images.js | 11 +++++----- commands/interaction/slash/search/google.js | 13 ++++++----- commands/interaction/slash/search/lyrics.js | 12 +++++----- .../interaction/slash/search/wolfram-alpha.js | 12 +++++----- commands/interaction/slash/search/xkcd.js | 9 ++++---- commands/interaction/slash/search/youtube.js | 17 +++++++------- .../interaction/slash/utils/dictionary.js | 12 +++++----- commands/interaction/slash/utils/emoji.js | 19 ++++++++-------- commands/interaction/slash/utils/emojiinfo.js | 13 ++++++----- .../interaction/slash/utils/screenshot.js | 6 ++--- commands/interaction/slash/utils/weather.js | 10 ++++----- .../subcommands/tts/imtranslator.js | 11 +++++----- .../interaction/subcommands/tts/microsoft.js | 11 +++++----- .../interaction/subcommands/tts/moonbase.js | 9 ++++---- .../interaction/subcommands/tts/playht.js | 11 +++++----- .../subcommands/tts/tiktok/character.js | 11 +++++----- .../subcommands/tts/tiktok/french.js | 11 +++++----- .../subcommands/tts/tiktok/german.js | 11 +++++----- .../subcommands/tts/tiktok/indonesian.js | 11 +++++----- .../subcommands/tts/tiktok/italian.js | 11 +++++----- .../subcommands/tts/tiktok/japanese.js | 11 +++++----- .../subcommands/tts/tiktok/korean.js | 11 +++++----- .../subcommands/tts/tiktok/pop-culture.js | 11 +++++----- .../subcommands/tts/tiktok/portugese.js | 11 +++++----- .../subcommands/tts/tiktok/song.js | 11 +++++----- .../subcommands/tts/tiktok/spanish.js | 11 +++++----- commands/interaction/user/avatar.js | 7 +++--- commands/interaction/user/banner.js | 7 +++--- commands/interaction/user/pride.js | 10 ++++----- commands/interaction/user/user.js | 15 ++++++------- commands/message/core/help.js | 14 ++++++------ commands/message/core/ping.js | 9 ++++---- commands/message/core/privacy.js | 10 +++++---- commands/message/core/shard.js | 9 ++++---- commands/message/core/stats.js | 11 +++++----- commands/message/core/undo.js | 5 +++-- commands/message/dev/deploy.js | 4 ++-- commands/message/dev/eval.js | 11 +++++----- commands/message/dev/refresh-configs.js | 6 ++--- commands/message/dev/reload.js | 9 ++++---- commands/message/dev/test.js | 3 ++- commands/message/dev/update.js | 4 ++-- commands/message/fun/art.js | 14 +++++++----- commands/message/fun/art2.js | 7 +++--- commands/message/fun/garfield.js | 9 ++++---- commands/message/fun/inferkit.js | 13 ++++++----- commands/message/fun/inspire.js | 11 +++++----- commands/message/fun/otter.js | 8 +++---- commands/message/genai/ask.js | 14 +++++++----- commands/message/genai/gemini-pro.js | 14 +++++++----- commands/message/genai/gemini-vision.js | 18 +++++++-------- commands/message/genai/gemini.js | 15 ++++++------- commands/message/genai/imagen.js | 15 +++++++------ commands/message/genai/palm.js | 15 ++++++------- commands/message/genai/summarize.js | 14 +++++++----- commands/message/genai/wallpaper.js | 15 +++++++------ commands/message/google/labels.js | 14 +++++++----- commands/message/google/safetylabels.js | 16 ++++++++------ commands/message/google/transcribe.js | 12 +++++----- commands/message/image/craiyon.js | 11 +++++----- commands/message/image/makesweet/billboard.js | 12 +++++----- .../message/image/makesweet/circuitboard.js | 12 +++++----- commands/message/image/makesweet/flag.js | 12 +++++----- .../message/image/makesweet/heartlocket.js | 12 +++++----- .../message/image/photofunia/retro-wave.js | 9 ++++---- commands/message/image/photofunia/yacht.js | 9 ++++---- commands/message/image/pride.js | 10 +++++---- commands/message/info/appinfo.js | 11 +++++----- commands/message/info/avatar.js | 9 ++++---- commands/message/info/guild.js | 11 +++++----- commands/message/info/guildicon.js | 5 +++-- commands/message/info/invite.js | 15 +++++++------ commands/message/info/user.js | 15 ++++++------- commands/message/mod/analyze.js | 15 +++++++------ commands/message/mod/perspective.js | 13 ++++++----- commands/message/mod/purge.js | 14 +++++++----- commands/message/search/audio.js | 13 ++++++----- commands/message/search/bing-images.js | 12 +++++----- commands/message/search/bing.js | 14 +++++++----- commands/message/search/google-images.js | 12 +++++----- commands/message/search/google.js | 14 +++++++----- commands/message/search/lyrics.js | 13 ++++++----- commands/message/search/quora.js | 18 +++++++-------- commands/message/search/reddit.js | 13 ++++++----- commands/message/search/reverse-image.js | 14 +++++++----- commands/message/search/rule34.js | 11 +++++----- commands/message/search/urbandictionary.js | 13 ++++++----- commands/message/search/wikihow.js | 11 +++++----- commands/message/search/wikipedia.js | 13 ++++++----- commands/message/search/wolfram-alpha.js | 13 ++++++----- commands/message/search/xkcd.js | 11 ++++++---- commands/message/search/youtube.js | 15 +++++++------ commands/message/utils/dictionary.js | 15 +++++++------ commands/message/utils/emoji.js | 22 ++++++++++--------- commands/message/utils/emojiinfo.js | 19 ++++++++-------- commands/message/utils/eval.js | 12 +++++----- commands/message/utils/latex.js | 18 ++++++++------- commands/message/utils/ocr.js | 14 +++++++----- commands/message/utils/ocrtr.js | 19 +++++++++------- commands/message/utils/qr.js | 14 ++++++------ commands/message/utils/screenshot.js | 15 ++++--------- commands/message/utils/translate.js | 16 +++++++------- commands/message/utils/weather.js | 11 +++++----- index.js | 14 +++++++----- labscore/client.js | 13 +++++------ package.json | 7 +++++- 115 files changed, 708 insertions(+), 664 deletions(-) diff --git a/commands/interaction/context/audio.js b/commands/interaction/context/audio.js index c2d3dc4..046a89d 100644 --- a/commands/interaction/context/audio.js +++ b/commands/interaction/context/audio.js @@ -1,10 +1,9 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes } = Constants; +const { renderMusicButtons } = require('#utils/buttons'); +const { createEmbed } = require('#utils/embed') -const { createEmbed } = require('../../../labscore/utils/embed') +const { InteractionCallbackTypes, ApplicationCommandTypes } = require("detritus-client/lib/constants");; const superagent = require('superagent') -const { renderMusicButtons } = require('../../../labscore/utils/buttons'); const urlr = /(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})/g diff --git a/commands/interaction/context/ocr.js b/commands/interaction/context/ocr.js index d92e918..7f843cf 100644 --- a/commands/interaction/context/ocr.js +++ b/commands/interaction/context/ocr.js @@ -1,12 +1,11 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes, MessageFlags } = Constants; +const { googleVisionOcr } = require('#api'); -const { googleVisionOcr } = require('../../../labscore/api'); -const { getMessageAttachment, validateAttachment } = require('../../../labscore/utils/attachment'); +const { getMessageAttachment, validateAttachment } = require('#utils/attachment'); +const { createEmbed } = require('#utils/embed'); +const { codeblock } = require('#utils/markdown'); +const { STATICS } = require('#utils/statics'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { codeblock } = require('../../../labscore/utils/markdown'); -const { STATICS } = require('../../../labscore/utils/statics'); +const { InteractionCallbackTypes, ApplicationCommandTypes, MessageFlags } = require("detritus-client/lib/constants"); module.exports = { name: 'OCR', diff --git a/commands/interaction/context/ocrtr.js b/commands/interaction/context/ocrtr.js index f9b1453..4c88055 100644 --- a/commands/interaction/context/ocrtr.js +++ b/commands/interaction/context/ocrtr.js @@ -1,14 +1,13 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes, MessageFlags } = Constants; +const { googleVisionOcr, googleTranslate } = require('#api'); +const { TRANSLATE_LANGUAGE_MAPPINGS, TRANSLATE_LANGUAGES } = require('#constants'); -const { googleVisionOcr, googleTranslate } = require('../../../labscore/api'); -const { getMessageAttachment, validateAttachment } = require('../../../labscore/utils/attachment'); +const { getMessageAttachment, validateAttachment } = require('#utils/attachment'); +const { createEmbed } = require('#utils/embed'); +const { editOrReply } = require('#utils/message'); +const { codeblock, icon, pill } = require('#utils/markdown'); +const { STATICS } = require('#utils/statics'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { codeblock, icon, pill } = require('../../../labscore/utils/markdown'); -const { STATICS } = require('../../../labscore/utils/statics'); -const { editOrReply } = require('../../../labscore/utils/message'); -const { TRANSLATE_LANGUAGE_MAPPINGS, TRANSLATE_LANGUAGES } = require('../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandTypes, MessageFlags } = require("detritus-client/lib/constants"); module.exports = { name: 'OCR Translate', diff --git a/commands/interaction/context/reverse-image.js b/commands/interaction/context/reverse-image.js index e83c156..95042a2 100644 --- a/commands/interaction/context/reverse-image.js +++ b/commands/interaction/context/reverse-image.js @@ -1,13 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { reverseImageSearch } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { reverseImageSearch } = require('../../../labscore/api'); +const { getMessageAttachment, validateAttachment } = require('#utils/attachment'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') const { InteractionCallbackTypes, ApplicationCommandTypes } = require("detritus-client/lib/constants"); -const { getMessageAttachment, validateAttachment } = require('../../../labscore/utils/attachment'); +// TODO: create a favicon() util function createReverseImageSearchResultPage(context, result, source) { let res = page( createEmbed("default", context, { diff --git a/commands/interaction/context/transcribe.js b/commands/interaction/context/transcribe.js index f634ad9..30e6e8a 100644 --- a/commands/interaction/context/transcribe.js +++ b/commands/interaction/context/transcribe.js @@ -1,12 +1,11 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes, MessageFlags } = Constants; +const { AudioTranscribe } = require('#obelisk'); -const { AudioTranscribe} = require('../../../labscore/api/obelisk'); +const { createEmbed } = require('#utils/embed'); +const { editOrReply } = require('#utils/message'); +const { codeblock } = require('#utils/markdown'); +const { STATICS } = require('#utils/statics'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { codeblock } = require('../../../labscore/utils/markdown'); -const { STATICS } = require('../../../labscore/utils/statics'); -const { editOrReply } = require('../../../labscore/utils/message'); +const { InteractionCallbackTypes, ApplicationCommandTypes, MessageFlags } = require("detritus-client/lib/constants");; module.exports = { name: 'Transcribe Voice Message', diff --git a/commands/interaction/slash/fun/otter.js b/commands/interaction/slash/fun/otter.js index aa0c28d..6fec94a 100644 --- a/commands/interaction/slash/fun/otter.js +++ b/commands/interaction/slash/fun/otter.js @@ -1,8 +1,9 @@ -const { createEmbed } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') +const { otter } = require('#api'); + +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') const { InteractionCallbackTypes } = require("detritus-client/lib/constants"); -const { otter } = require('../../../../labscore/api'); module.exports = { description: 'Shows a random otter picture.', diff --git a/commands/interaction/slash/info/avatar.js b/commands/interaction/slash/info/avatar.js index 828aaf5..7c259e4 100644 --- a/commands/interaction/slash/info/avatar.js +++ b/commands/interaction/slash/info/avatar.js @@ -1,9 +1,7 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { createEmbed } = require('#utils/embed'); +const { editOrReply } = require('#utils/message'); -const { createEmbed } = require('../../../../labscore/utils/embed'); - -const { editOrReply } = require('../../../../labscore/utils/message'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require("detritus-client/lib/constants"); module.exports = { description: 'Get someones avatar.', diff --git a/commands/interaction/slash/info/user.js b/commands/interaction/slash/info/user.js index f27d40d..058243e 100644 --- a/commands/interaction/slash/info/user.js +++ b/commands/interaction/slash/info/user.js @@ -1,12 +1,11 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { BADGE_ICONS } = require('#constants'); -const { createEmbed } = require('../../../../labscore/utils/embed'); -const { smallIconPill, highlight, smallPill, icon, timestamp } = require('../../../../labscore/utils/markdown'); -const { renderBadges } = require('../../../../labscore/utils/users'); -const { BADGE_ICONS } = require('../../../../labscore/constants'); -const { editOrReply } = require('../../../../labscore/utils/message'); -const { UserFlags } = require('detritus-client/lib/constants'); +const { createEmbed } = require('#utils/embed'); +const { smallIconPill, highlight, smallPill, icon, timestamp } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); +const { renderBadges } = require('#utils/users'); + +const { InteractionCallbackTypes, ApplicationCommandOptionTypes, UserFlags } = require("detritus-client/lib/constants"); module.exports = { description: 'Displays information about a user', diff --git a/commands/interaction/slash/rewrite.js b/commands/interaction/slash/rewrite.js index 9f015ac..1c0ff4b 100644 --- a/commands/interaction/slash/rewrite.js +++ b/commands/interaction/slash/rewrite.js @@ -1,11 +1,9 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { REWRITE_STYLES } = require('#constants'); -const { REWRITE_STYLES } = require('../../../labscore/constants'); +const { createEmbed } = require('#utils/embed'); +const { iconPill, codeblock } = require('#utils/markdown'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { iconPill, codeblock } = require('../../../labscore/utils/markdown'); -const { MessageFlags } = require('detritus-client/lib/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes, MessageFlags } = require('detritus-client/lib/constants'); const superagent = require('superagent') diff --git a/commands/interaction/slash/search/google-images.js b/commands/interaction/slash/search/google-images.js index b62de8b..a2ddc3f 100644 --- a/commands/interaction/slash/search/google-images.js +++ b/commands/interaction/slash/search/google-images.js @@ -1,12 +1,13 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { googleImages } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../../labscore/client'); -const { googleImages } = require('../../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); +// TODO: create a favicon() util function createImageResultPage(context, result) { let res = page(createEmbed("default", context, { author: { diff --git a/commands/interaction/slash/search/google.js b/commands/interaction/slash/search/google.js index c475206..6651066 100644 --- a/commands/interaction/slash/search/google.js +++ b/commands/interaction/slash/search/google.js @@ -1,13 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { link, citation } = require('../../../../labscore/utils/markdown') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { google } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../../labscore/client'); -const { google } = require('../../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, citation } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); +// TODO: create a favicon() util function createSearchResultPage(context, result){ let res; switch(result.type){ diff --git a/commands/interaction/slash/search/lyrics.js b/commands/interaction/slash/search/lyrics.js index 6740aa3..16b66cc 100644 --- a/commands/interaction/slash/search/lyrics.js +++ b/commands/interaction/slash/search/lyrics.js @@ -1,12 +1,12 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { lyrics } = require('#api'); +const { paginator } = require('#client'); -const { lyrics } = require('../../../../labscore/api'); -const { paginator } = require('../../../../labscore/client'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { smallIconPill } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); -const { smallIconPill } = require('../../../../labscore/utils/markdown'); const META_FIELDS = { "Album": "stat_videos", diff --git a/commands/interaction/slash/search/wolfram-alpha.js b/commands/interaction/slash/search/wolfram-alpha.js index 6b1cf31..cf3be95 100644 --- a/commands/interaction/slash/search/wolfram-alpha.js +++ b/commands/interaction/slash/search/wolfram-alpha.js @@ -1,10 +1,10 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { wolframAlpha } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../../labscore/client'); -const { wolframAlpha } = require('../../../../labscore/api'); -const { citation } = require('../../../../labscore/utils/markdown'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { citation } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); diff --git a/commands/interaction/slash/search/xkcd.js b/commands/interaction/slash/search/xkcd.js index 30fab28..a578610 100644 --- a/commands/interaction/slash/search/xkcd.js +++ b/commands/interaction/slash/search/xkcd.js @@ -1,11 +1,12 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') +const { paginator } = require('#client'); -const { paginator } = require('../../../../labscore/client'); -const superagent = require('superagent') +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); +const superagent = require('superagent') + module.exports = { name: 'xkcd', description: 'Search for XKCD comics.', diff --git a/commands/interaction/slash/search/youtube.js b/commands/interaction/slash/search/youtube.js index c04f4e0..4f43050 100644 --- a/commands/interaction/slash/search/youtube.js +++ b/commands/interaction/slash/search/youtube.js @@ -1,14 +1,13 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { link, iconPill, smallPill } = require('../../../../labscore/utils/markdown') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { youtube } = require('#api'); +const { paginator } = require('#client'); +const { YOUTUBE_CATEGORIES } = require('#constants'); -const { paginator } = require('../../../../labscore/client'); -const { youtube } = require('../../../../labscore/api'); - -const { Permissions } = require("detritus-client/lib/constants"); -const { YOUTUBE_CATEGORIES } = require('../../../../labscore/constants'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, iconPill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Move this to a numbers utility // https://www.html-code-generator.com/javascript/shorten-long-numbers const intToString = num => { num = num.toString().replace(/[^0-9.]/g, ''); diff --git a/commands/interaction/slash/utils/dictionary.js b/commands/interaction/slash/utils/dictionary.js index d5bc33a..23a4693 100644 --- a/commands/interaction/slash/utils/dictionary.js +++ b/commands/interaction/slash/utils/dictionary.js @@ -1,12 +1,12 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../../labscore/utils/embed') -const { link, iconPill, smallPill, icon, iconLinkPill, pill } = require('../../../../labscore/utils/markdown') -const { editOrReply } = require('../../../../labscore/utils/message') +const { dictionary } = require('#api'); +const { paginator } = require('#client'); +const { TRANSLATE_LANGUAGE_MAPPINGS, DICTIONARY_LANGUAGES } = require('#constants'); -const { paginator } = require('../../../../labscore/client'); -const { dictionary } = require('../../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, iconPill, smallPill, icon, iconLinkPill, pill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); -const { TRANSLATE_LANGUAGE_MAPPINGS, DICTIONARY_LANGUAGES } = require('../../../../labscore/constants'); const LABELS = { "offensive": `${iconPill("warning", "Offensive")}` diff --git a/commands/interaction/slash/utils/emoji.js b/commands/interaction/slash/utils/emoji.js index 30473bb..7fd2f93 100644 --- a/commands/interaction/slash/utils/emoji.js +++ b/commands/interaction/slash/utils/emoji.js @@ -1,14 +1,15 @@ -const { Constants, Utils } = require("detritus-client"); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require("detritus-client/lib/constants"); -const { emojipedia, emojiKitchen } = require("../../../../labscore/api"); +const { emojipedia, emojiKitchen } = require("#api"); -const { EMOJIPEDIA_PLATFORM_TYPES, EMOJIPEDIA_PLATFORM_TYPE_ALIASES } = require("../../../../labscore/constants"); -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { icon, pill, iconPill, highlight, timestamp } = require("../../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../../labscore/utils/message"); -const { STATICS } = require("../../../../labscore/utils/statics"); +const { createEmbed } = require("#utils/embed"); +const { icon, pill, iconPill, highlight, timestamp } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +const { ingest } = require("#logging"); + +const { Utils } = require("detritus-client"); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require("detritus-client/lib/constants"); const { Components, Snowflake } = require("detritus-client/lib/utils"); -const { ingest } = require("../../../../labscore/logging"); const onlyEmoji = require('emoji-aware').onlyEmoji; diff --git a/commands/interaction/slash/utils/emojiinfo.js b/commands/interaction/slash/utils/emojiinfo.js index 1780d5f..6594ec1 100644 --- a/commands/interaction/slash/utils/emojiinfo.js +++ b/commands/interaction/slash/utils/emojiinfo.js @@ -1,11 +1,12 @@ -const { InteractionCallbackTypes, MessageComponentButtonStyles, ApplicationCommandOptionTypes } = require("detritus-client/lib/constants"); -const { emojipedia } = require("../../../../labscore/api"); +const { emojipedia } = require("#api"); + +const { createEmbed } = require("#utils/embed"); +const { pill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { pill } = require("../../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../../labscore/utils/message"); -const { STATICS } = require("../../../../labscore/utils/statics"); const { Components } = require("detritus-client/lib/utils"); +const { InteractionCallbackTypes, MessageComponentButtonStyles, ApplicationCommandOptionTypes } = require("detritus-client/lib/constants"); const onlyEmoji = require('emoji-aware').onlyEmoji; diff --git a/commands/interaction/slash/utils/screenshot.js b/commands/interaction/slash/utils/screenshot.js index 56155c2..e9f1363 100644 --- a/commands/interaction/slash/utils/screenshot.js +++ b/commands/interaction/slash/utils/screenshot.js @@ -1,7 +1,7 @@ -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { editOrReply } = require("../../../../labscore/utils/message"); +const { WebUtilsWebPageScreenshot} = require("#obelisk"); -const { WebUtilsWebPageScreenshot} = require("../../../../labscore/api/obelisk"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); diff --git a/commands/interaction/slash/utils/weather.js b/commands/interaction/slash/utils/weather.js index f000314..0990618 100644 --- a/commands/interaction/slash/utils/weather.js +++ b/commands/interaction/slash/utils/weather.js @@ -1,11 +1,11 @@ -const { createEmbed } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') +const { darksky } = require('#api'); -const { darksky } = require('../../../../labscore/api'); -const { pill, iconPill, smallPill, weatherIcon, timestamp } = require('../../../../labscore/utils/markdown'); +const { createEmbed } = require('#utils/embed'); +const { pill, iconPill, smallPill, weatherIcon, timestamp } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); +const { STATICS } = require('#utils/statics'); const { ApplicationCommandOptionTypes, InteractionCallbackTypes } = require('detritus-client/lib/constants'); -const { STATICS } = require('../../../../labscore/utils/statics'); module.exports = { name: 'weather', diff --git a/commands/interaction/subcommands/tts/imtranslator.js b/commands/interaction/subcommands/tts/imtranslator.js index dd6ac27..558be22 100644 --- a/commands/interaction/subcommands/tts/imtranslator.js +++ b/commands/interaction/subcommands/tts/imtranslator.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { imtranslator } = require('#api'); +const { IMTRANSLATOR_VOICES } = require('#constants'); -const { imtranslator } = require('../../../../labscore/api'); -const { IMTRANSLATOR_VOICES } = require('../../../../labscore/constants'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../labscore/utils/markdown'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); module.exports = { description: 'Text to Speech with imtranslator voices', diff --git a/commands/interaction/subcommands/tts/microsoft.js b/commands/interaction/subcommands/tts/microsoft.js index dd82394..9fcb4b6 100644 --- a/commands/interaction/subcommands/tts/microsoft.js +++ b/commands/interaction/subcommands/tts/microsoft.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { sapi4 } = require('#api'); +const { MICROSOFT_VOICES, MICROSOFT_VOICE_CONFIG } = require('#constants'); -const { sapi4 } = require('../../../../labscore/api'); -const { MICROSOFT_VOICES, MICROSOFT_VOICE_CONFIG } = require('../../../../labscore/constants'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../labscore/utils/markdown'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); module.exports = { description: 'Text to Speech with microsoft voices', diff --git a/commands/interaction/subcommands/tts/moonbase.js b/commands/interaction/subcommands/tts/moonbase.js index bb3406c..d82f9d6 100644 --- a/commands/interaction/subcommands/tts/moonbase.js +++ b/commands/interaction/subcommands/tts/moonbase.js @@ -1,10 +1,9 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { moonbase } = require('#api'); -const { moonbase } = require('../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../labscore/utils/markdown'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); module.exports = { description: 'Moonbase Alpha text to speech voices', diff --git a/commands/interaction/subcommands/tts/playht.js b/commands/interaction/subcommands/tts/playht.js index c812107..0bb856c 100644 --- a/commands/interaction/subcommands/tts/playht.js +++ b/commands/interaction/subcommands/tts/playht.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { playht } = require('#api'); +const { PLAYHT_VOICES } = require('#constants'); -const { playht } = require('../../../../labscore/api'); -const { PLAYHT_VOICES } = require('../../../../labscore/constants'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../labscore/utils/markdown'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); module.exports = { description: 'Text to Speech with playht voices', diff --git a/commands/interaction/subcommands/tts/tiktok/character.js b/commands/interaction/subcommands/tts/tiktok/character.js index ff0fe7b..b4de5cf 100644 --- a/commands/interaction/subcommands/tts/tiktok/character.js +++ b/commands/interaction/subcommands/tts/tiktok/character.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_CHARACTERS } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_CHARACTERS } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_CHARACTERS)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/french.js b/commands/interaction/subcommands/tts/tiktok/french.js index b962e76..96e3bcd 100644 --- a/commands/interaction/subcommands/tts/tiktok/french.js +++ b/commands/interaction/subcommands/tts/tiktok/french.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_FRENCH } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_FRENCH } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_FRENCH)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/german.js b/commands/interaction/subcommands/tts/tiktok/german.js index d1652ff..25dc523 100644 --- a/commands/interaction/subcommands/tts/tiktok/german.js +++ b/commands/interaction/subcommands/tts/tiktok/german.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_GERMAN } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_GERMAN } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_GERMAN)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/indonesian.js b/commands/interaction/subcommands/tts/tiktok/indonesian.js index 16af237..2617d4b 100644 --- a/commands/interaction/subcommands/tts/tiktok/indonesian.js +++ b/commands/interaction/subcommands/tts/tiktok/indonesian.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_INDONESIAN } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_INDONESIAN } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_INDONESIAN)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/italian.js b/commands/interaction/subcommands/tts/tiktok/italian.js index 72f76ea..1cd9b98 100644 --- a/commands/interaction/subcommands/tts/tiktok/italian.js +++ b/commands/interaction/subcommands/tts/tiktok/italian.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_ITALIAN } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_ITALIAN } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_ITALIAN)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/japanese.js b/commands/interaction/subcommands/tts/tiktok/japanese.js index 28d53d6..9f1b07a 100644 --- a/commands/interaction/subcommands/tts/tiktok/japanese.js +++ b/commands/interaction/subcommands/tts/tiktok/japanese.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_JAPANESE } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_JAPANESE } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_JAPANESE)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/korean.js b/commands/interaction/subcommands/tts/tiktok/korean.js index d4ecafb..04def2d 100644 --- a/commands/interaction/subcommands/tts/tiktok/korean.js +++ b/commands/interaction/subcommands/tts/tiktok/korean.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_KOREAN } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_KOREAN } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_KOREAN)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/pop-culture.js b/commands/interaction/subcommands/tts/tiktok/pop-culture.js index 0b87e82..90d04c6 100644 --- a/commands/interaction/subcommands/tts/tiktok/pop-culture.js +++ b/commands/interaction/subcommands/tts/tiktok/pop-culture.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_POP_CULTURE } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_POP_CULTURE } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_POP_CULTURE)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/portugese.js b/commands/interaction/subcommands/tts/tiktok/portugese.js index 80195d8..39503bd 100644 --- a/commands/interaction/subcommands/tts/tiktok/portugese.js +++ b/commands/interaction/subcommands/tts/tiktok/portugese.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_PORTUGESE } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_PORTUGESE } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_PORTUGESE)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/song.js b/commands/interaction/subcommands/tts/tiktok/song.js index 82bb2ce..ce642e4 100644 --- a/commands/interaction/subcommands/tts/tiktok/song.js +++ b/commands/interaction/subcommands/tts/tiktok/song.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_SONG } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_SONG } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_SONG)) voices.unshift({ diff --git a/commands/interaction/subcommands/tts/tiktok/spanish.js b/commands/interaction/subcommands/tts/tiktok/spanish.js index 26c65a2..10bc511 100644 --- a/commands/interaction/subcommands/tts/tiktok/spanish.js +++ b/commands/interaction/subcommands/tts/tiktok/spanish.js @@ -1,11 +1,10 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = Constants; +const { tiktok } = require('#api'); +const { TIKTOK_VOICES_SPANISH } = require('#constants'); -const { tiktok } = require('../../../../../labscore/api'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); -const { createEmbed } = require('../../../../../labscore/utils/embed'); -const { icon, highlight } = require('../../../../../labscore/utils/markdown'); -const { TIKTOK_VOICES_SPANISH } = require('../../../../../labscore/constants'); +const { InteractionCallbackTypes, ApplicationCommandOptionTypes } = require('detritus-client/lib/constants'); let voices = [] for(const k of Object.keys(TIKTOK_VOICES_SPANISH)) voices.unshift({ diff --git a/commands/interaction/user/avatar.js b/commands/interaction/user/avatar.js index ed1b2a9..e144433 100644 --- a/commands/interaction/user/avatar.js +++ b/commands/interaction/user/avatar.js @@ -1,8 +1,7 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes } = Constants; +const { createEmbed } = require('#utils/embed'); +const { editOrReply } = require('#utils/message'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { editOrReply } = require('../../../labscore/utils/message'); +const { InteractionCallbackTypes, ApplicationCommandTypes } = require('detritus-client/lib/constants'); module.exports = { name: 'View User Avatar', diff --git a/commands/interaction/user/banner.js b/commands/interaction/user/banner.js index ecfef21..cbdc2ad 100644 --- a/commands/interaction/user/banner.js +++ b/commands/interaction/user/banner.js @@ -1,8 +1,7 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes } = Constants; +const { createEmbed } = require('#utils/embed'); +const { editOrReply } = require('#utils/message'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { editOrReply } = require('../../../labscore/utils/message'); +const { InteractionCallbackTypes, ApplicationCommandTypes } = require('detritus-client/lib/constants'); module.exports = { name: 'View User Banner', diff --git a/commands/interaction/user/pride.js b/commands/interaction/user/pride.js index 1df6f3a..ed620d6 100644 --- a/commands/interaction/user/pride.js +++ b/commands/interaction/user/pride.js @@ -1,9 +1,9 @@ -const { prideborder } = require("../../../labscore/api"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { prideborder } = require("#api"); -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes } = Constants; +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); + +const { InteractionCallbackTypes, ApplicationCommandTypes } = require('detritus-client/lib/constants'); module.exports = { name: 'Create Pride Avatar 🌈', diff --git a/commands/interaction/user/user.js b/commands/interaction/user/user.js index a4affa4..3370419 100644 --- a/commands/interaction/user/user.js +++ b/commands/interaction/user/user.js @@ -1,12 +1,11 @@ -const { Constants } = require('detritus-client'); -const { InteractionCallbackTypes, ApplicationCommandTypes } = Constants; +const { BADGE_ICONS } = require('#constants'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { smallIconPill, highlight, smallPill, icon, timestamp } = require('../../../labscore/utils/markdown'); -const { renderBadges } = require('../../../labscore/utils/users'); -const { BADGE_ICONS } = require('../../../labscore/constants'); -const { editOrReply } = require('../../../labscore/utils/message'); -const { UserFlags } = require('detritus-client/lib/constants'); +const { createEmbed } = require('#utils/embed'); +const { smallIconPill, highlight, smallPill, icon, timestamp } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); +const { renderBadges } = require('#utils/users'); + +const { InteractionCallbackTypes, ApplicationCommandTypes, UserFlags } = require('detritus-client/lib/constants'); module.exports = { name: 'View User Details', diff --git a/commands/message/core/help.js b/commands/message/core/help.js index 702ce6d..5e425f3 100644 --- a/commands/message/core/help.js +++ b/commands/message/core/help.js @@ -1,13 +1,13 @@ -const { codeblock, icon, link, pill, smallPill, iconPill, stringwrap } = require('../../../labscore/utils/markdown') -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') +const { paginator } = require('#client'); +const { DISCORD_INVITES, DEFAULT_PREFIXES } = require('#constants'); -const { DISCORD_INVITES, DEFAULT_PREFIXES } = require('../../../labscore/constants') - -const { paginator } = require('../../../labscore/client'); -const { editOrReply } = require('../../../labscore/utils/message'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { codeblock, icon, link, pill, smallPill, iconPill, stringwrap } = require('#utils/markdown') +const { editOrReply } = require('#utils/message'); +const { hasFeature } = require('#utils/testing'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { hasFeature } = require('../../../labscore/utils/testing'); function createHelpPage(context, title, contents, descriptions) { return page(createEmbed("default", context, { diff --git a/commands/message/core/ping.js b/commands/message/core/ping.js index 1d602bc..449c155 100644 --- a/commands/message/core/ping.js +++ b/commands/message/core/ping.js @@ -1,8 +1,9 @@ -const { format } = require('../../../labscore/utils/ansi') -const { codeblock, icon } = require('../../../labscore/utils/markdown') -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { format } = require('#utils/ansi') +const { createEmbed } = require('#utils/embed') +const { codeblock, icon } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/core/privacy.js b/commands/message/core/privacy.js index 836018f..af89a85 100644 --- a/commands/message/core/privacy.js +++ b/commands/message/core/privacy.js @@ -1,8 +1,10 @@ -const { icon, timestamp, link, iconLinkPill } = require('../../../labscore/utils/markdown') -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message'); -const { PRIVACY_POLICY_LAST_UPDATE, PRIVACY_POLICY_SECTIONS, DISCORD_INVITES, COLORS, PRIVACY_POLICY_PREVIOUS_REVISION } = require('../../../labscore/constants'); +const { PRIVACY_POLICY_LAST_UPDATE, PRIVACY_POLICY_SECTIONS, DISCORD_INVITES, COLORS, PRIVACY_POLICY_PREVIOUS_REVISION } = require('#constants'); +const { createEmbed } = require('#utils/embed'); +const { icon, timestamp, link, iconLinkPill } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/core/shard.js b/commands/message/core/shard.js index bad32bc..f7851c2 100644 --- a/commands/message/core/shard.js +++ b/commands/message/core/shard.js @@ -1,8 +1,9 @@ -const { codeblock } = require('../../../labscore/utils/markdown') -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message'); -const { format } = require('../../../labscore/utils/ansi'); +const { format } = require('#utils/ansi'); +const { createEmbed } = require('#utils/embed') +const { codeblock } = require('#utils/markdown') +const { editOrReply } = require('#utils/message'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/core/stats.js b/commands/message/core/stats.js index 2a6738c..88ac491 100644 --- a/commands/message/core/stats.js +++ b/commands/message/core/stats.js @@ -1,13 +1,14 @@ -const { highlight, iconPill, iconLinkPill } = require('../../../labscore/utils/markdown') -const { createEmbed } = require('../../../labscore/utils/embed') +const { OPEN_SOURCE_REPOSITORY_URL } = require('#constants'); -const { editOrReply } = require('../../../labscore/utils/message'); +const { createEmbed } = require('#utils/embed'); +const { highlight, iconPill, iconLinkPill } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { OPEN_SOURCE_REPOSITORY_URL } = require('../../../labscore/constants'); +// TODO: Move this into utils function format(seconds){ - function pad(s){ return (s < 10 ? '0' : '') + s; } diff --git a/commands/message/core/undo.js b/commands/message/core/undo.js index 81b6558..4b0f347 100644 --- a/commands/message/core/undo.js +++ b/commands/message/core/undo.js @@ -1,6 +1,7 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/dev/deploy.js b/commands/message/dev/deploy.js index e152393..b9b8129 100644 --- a/commands/message/dev/deploy.js +++ b/commands/message/dev/deploy.js @@ -1,5 +1,5 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') const superagent = require('superagent') diff --git a/commands/message/dev/eval.js b/commands/message/dev/eval.js index 435459e..6626efa 100644 --- a/commands/message/dev/eval.js +++ b/commands/message/dev/eval.js @@ -1,10 +1,11 @@ -const { Utils, Constants } = require("detritus-client"); -const { codeblock } = require("../../../labscore/utils/markdown"); +const { codeblock } = require("#utils/markdown"); + +const { Utils } = require("detritus-client"); +const { DiscordRegexNames } = require("detritus-client/lib/constants"); const AsyncFunction = Object.getPrototypeOf(async function(){}).constructor; -// TODO: remake this eventually, copy pasted it from v1 cause lazy - +// TODO: remake this eventually module.exports = { label: "code", name: "dev", @@ -25,7 +26,7 @@ module.exports = { run: async (context, args) => { await context.triggerTyping(); const { matches } = Utils.regex( - Constants.DiscordRegexNames.TEXT_CODEBLOCK, + DiscordRegexNames.TEXT_CODEBLOCK, args.code ); if (matches.length) { diff --git a/commands/message/dev/refresh-configs.js b/commands/message/dev/refresh-configs.js index e5964bf..498a58a 100644 --- a/commands/message/dev/refresh-configs.js +++ b/commands/message/dev/refresh-configs.js @@ -1,6 +1,6 @@ -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { getTestConfig } = require("../../../labscore/utils/testing"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { getTestConfig } = require("#utils/testing"); module.exports = { name: "refresh-configs", diff --git a/commands/message/dev/reload.js b/commands/message/dev/reload.js index 54285e9..a70ce7f 100644 --- a/commands/message/dev/reload.js +++ b/commands/message/dev/reload.js @@ -1,8 +1,7 @@ -// TODO: remake this eventually, copy pasted it from v1 cause lazy - -const { codeblock } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { codeblock } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +// TODO: remake this eventually module.exports = { name: "reload", aliases: ["rl"], @@ -17,7 +16,7 @@ module.exports = { run: async (context) => { await context.triggerTyping(); const time = Date.now(); - console.log(`v2 | command refresh requested @ ${Date.now()} by ${context.user.username}${context.user.discriminator} (${context.user.id})`) + console.log(`[${process.env.HOSTNAME}] refreshing all commands @ ${Date.now()} by ${context.user.username}${context.user.discriminator} (${context.user.id})`) let data; if(context.message.content.includes("-s")) data = await context.manager.broadcastEval(async (cluster) => { if (cluster.interactionCommandClient){ diff --git a/commands/message/dev/test.js b/commands/message/dev/test.js index da793f5..61aff41 100644 --- a/commands/message/dev/test.js +++ b/commands/message/dev/test.js @@ -1,5 +1,6 @@ const { prideborder } = require("#api"); -const { editOrReply } = require("../../../labscore/utils/message"); + +const { editOrReply } = require("#utils/message"); module.exports = { label: "text", diff --git a/commands/message/dev/update.js b/commands/message/dev/update.js index 8d2b496..48ca326 100644 --- a/commands/message/dev/update.js +++ b/commands/message/dev/update.js @@ -1,5 +1,5 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') const superagent = require('superagent') diff --git a/commands/message/fun/art.js b/commands/message/fun/art.js index 8e8d403..1d55827 100644 --- a/commands/message/fun/art.js +++ b/commands/message/fun/art.js @@ -1,11 +1,13 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { DEFAULT_PREFIXES } = require('#constants'); + +const { createEmbed } = require('#utils/embed') +const { codeblock } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') + +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const superagent = require('superagent'); -const { codeblock } = require('../../../labscore/utils/markdown'); - -const { Permissions } = require("detritus-client/lib/constants"); -const { DEFAULT_PREFIXES } = require('../../../labscore/constants'); const SIZES = Object.freeze({ "wallpaper": { x: 1920, y: 1200}, diff --git a/commands/message/fun/art2.js b/commands/message/fun/art2.js index bf475c0..e032b7d 100644 --- a/commands/message/fun/art2.js +++ b/commands/message/fun/art2.js @@ -1,8 +1,7 @@ -//https://resources.jetbrains.com/cai/eidos_231/goland/999.png - -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); const APPS = [ diff --git a/commands/message/fun/garfield.js b/commands/message/fun/garfield.js index e2d9ee3..4489b21 100644 --- a/commands/message/fun/garfield.js +++ b/commands/message/fun/garfield.js @@ -1,9 +1,10 @@ +const { garfield } = require('#api'); -const { garfield } = require('../../../labscore/api'); -const { createEmbed } = require('../../../labscore/utils/embed'); -const { timestamp } = require('../../../labscore/utils/markdown'); -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed'); +const { timestamp } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); const FUNNY_CAT_EMOJI = [ diff --git a/commands/message/fun/inferkit.js b/commands/message/fun/inferkit.js index 9b3c588..07c4cbe 100644 --- a/commands/message/fun/inferkit.js +++ b/commands/message/fun/inferkit.js @@ -1,11 +1,12 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { format } = require('../../../labscore/utils/ansi') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { inferkit } = require('#api'); -const { inferkit } = require('../../../labscore/api') -const { codeblock } = require('../../../labscore/utils/markdown') +const { format } = require('#utils/ansi'); +const { createEmbed } = require('#utils/embed'); +const { codeblock } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); +const { STATICS } = require('#utils/statics'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/fun/inspire.js b/commands/message/fun/inspire.js index 1fdbc47..0fc11ee 100644 --- a/commands/message/fun/inspire.js +++ b/commands/message/fun/inspire.js @@ -1,10 +1,11 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed'); +const { editOrReply } = require('#utils/message'); +const { STATICS } = require('#utils/statics'); + +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const superagent = require('superagent'); -const { STATICS } = require('../../../labscore/utils/statics'); - -const { Permissions } = require("detritus-client/lib/constants"); module.exports = { name: 'inspire', diff --git a/commands/message/fun/otter.js b/commands/message/fun/otter.js index f7f52d2..969f33e 100644 --- a/commands/message/fun/otter.js +++ b/commands/message/fun/otter.js @@ -1,10 +1,10 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { otter } = require('#api'); -const superagent = require('superagent'); +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { otter } = require('../../../labscore/api'); module.exports = { name: 'otter', diff --git a/commands/message/genai/ask.js b/commands/message/genai/ask.js index 73b7824..db049d8 100644 --- a/commands/message/genai/ask.js +++ b/commands/message/genai/ask.js @@ -1,13 +1,15 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { webAsk } = require('#obelisk'); -const { iconPill, smallIconPill } = require('../../../labscore/utils/markdown') +const { createEmbed } = require('#utils/embed') +const { iconPill, smallIconPill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATIC_ICONS } = require('#utils/statics'); +const { hasFeature } = require('#utils/testing'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS } = require('../../../labscore/utils/statics'); -const { webAsk } = require('../../../labscore/api/obelisk'); -const { hasFeature } = require('../../../labscore/utils/testing'); +// TODO: general purpose constant? const URL_REGEX = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([^> \n]*)/ module.exports = { diff --git a/commands/message/genai/gemini-pro.js b/commands/message/genai/gemini-pro.js index 074849d..bc837b2 100644 --- a/commands/message/genai/gemini-pro.js +++ b/commands/message/genai/gemini-pro.js @@ -1,12 +1,14 @@ -const { gemini, LlmModelsGenerate } = require("../../../labscore/api/obelisk"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { LlmModelsGenerate } = require("#obelisk"); +const { createEmbed } = require("#utils/embed"); +const { stringwrap, iconPill, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATIC_ICONS } = require("#utils/statics"); +const { hasFeature } = require("#utils/testing"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS } = require("../../../labscore/utils/statics"); -const { stringwrap, iconPill, smallIconPill } = require("../../../labscore/utils/markdown"); -const { hasFeature } = require("../../../labscore/utils/testing"); module.exports = { name: 'gemini-pro', label: 'text', diff --git a/commands/message/genai/gemini-vision.js b/commands/message/genai/gemini-vision.js index 73100d6..850282c 100644 --- a/commands/message/genai/gemini-vision.js +++ b/commands/message/genai/gemini-vision.js @@ -1,15 +1,15 @@ -const { geminiVision } = require("../../../labscore/api/obelisk"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { getUser } = require("../../../labscore/utils/users"); +const { geminiVision } = require("#obelisk"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { stringwrap, iconPill, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATIC_ICONS } = require("#utils/statics"); +const { hasFeature } = require("#utils/testing"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const superagent = require('superagent'); -const { STATIC_ICONS } = require("../../../labscore/utils/statics"); -const { stringwrap, iconPill, smallIconPill } = require("../../../labscore/utils/markdown"); -const { hasFeature } = require("../../../labscore/utils/testing"); module.exports = { name: 'gemini-vision', label: 'text', diff --git a/commands/message/genai/gemini.js b/commands/message/genai/gemini.js index 1805cc9..4da8410 100644 --- a/commands/message/genai/gemini.js +++ b/commands/message/genai/gemini.js @@ -1,15 +1,14 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { LlmPrivateBard } = require('#obelisk'); -const { STATIC_ICONS } = require('../../../labscore/utils/statics'); - -const superagent = require('superagent') -const { iconPill, stringwrap } = require('../../../labscore/utils/markdown') +const { createEmbed } = require('#utils/embed') +const { iconPill, stringwrap } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATIC_ICONS } = require('#utils/statics'); +const { hasFeature } = require('#utils/testing'); +// TODO: Turn this into a general purpose permissions constant const { Permissions, InteractionCallbackTypes } = require("detritus-client/lib/constants"); const { Components } = require('detritus-client/lib/utils'); -const { LlmPrivateBard } = require('../../../labscore/api/obelisk'); -const { hasFeature } = require('../../../labscore/utils/testing'); module.exports = { name: 'gemini', diff --git a/commands/message/genai/imagen.js b/commands/message/genai/imagen.js index 89f2688..df38f6e 100644 --- a/commands/message/genai/imagen.js +++ b/commands/message/genai/imagen.js @@ -1,13 +1,14 @@ -const { GenerativeImagesModelsImagen } = require("../../../labscore/api/obelisk"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { GenerativeImagesModelsImagen } = require("#obelisk"); +const { createEmbed } = require("#utils/embed"); +const { iconPill, stringwrap } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATIC_ICONS, STATIC_ASSETS } = require("#utils/statics"); +const { hasFeature } = require("#utils/testing"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS, STATIC_ASSETS } = require("../../../labscore/utils/statics"); -const { iconPill, stringwrap } = require("../../../labscore/utils/markdown"); -const { hasFeature } = require("../../../labscore/utils/testing"); - module.exports = { name: 'imagen', label: 'text', diff --git a/commands/message/genai/palm.js b/commands/message/genai/palm.js index f481696..8dbcbbe 100644 --- a/commands/message/genai/palm.js +++ b/commands/message/genai/palm.js @@ -1,14 +1,13 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { palm2 } = require('#obelisk'); -const { STATIC_ICONS } = require('../../../labscore/utils/statics'); - -const superagent = require('superagent') -const { iconPill, stringwrap, smallIconPill } = require('../../../labscore/utils/markdown') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { iconPill, stringwrap, smallIconPill } = require('#utils/markdown') +const { STATIC_ICONS } = require('#utils/statics'); +const { hasFeature } = require('#utils/testing'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { palm2 } = require('../../../labscore/api/obelisk'); -const { hasFeature } = require('../../../labscore/utils/testing'); module.exports = { name: 'palm', diff --git a/commands/message/genai/summarize.js b/commands/message/genai/summarize.js index e27e90b..91b9e41 100644 --- a/commands/message/genai/summarize.js +++ b/commands/message/genai/summarize.js @@ -1,13 +1,15 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { SparkWebSummarize } = require('#obelisk'); -const { iconPill, smallIconPill } = require('../../../labscore/utils/markdown') +const { createEmbed } = require('#utils/embed') +const { iconPill, smallIconPill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATIC_ICONS } = require('#utils/statics'); +const { hasFeature } = require('#utils/testing'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS } = require('../../../labscore/utils/statics'); -const { SparkWebSummarize } = require('../../../labscore/api/obelisk'); -const { hasFeature } = require('../../../labscore/utils/testing'); +// TODO: general purpose constant? regex util? const URL_REGEX = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([^> \n]*)/ module.exports = { diff --git a/commands/message/genai/wallpaper.js b/commands/message/genai/wallpaper.js index 6083733..61d105d 100644 --- a/commands/message/genai/wallpaper.js +++ b/commands/message/genai/wallpaper.js @@ -1,13 +1,14 @@ -const { wallpaper } = require("../../../labscore/api/obelisk"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { wallpaper } = require("#obelisk"); +const { createEmbed } = require("#utils/embed"); +const { iconPill, stringwrap } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATIC_ICONS, STATIC_ASSETS } = require("#utils/statics"); +const { hasFeature } = require("#utils/testing"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { STATIC_ICONS, STATIC_ASSETS } = require("../../../labscore/utils/statics"); -const { iconPill, stringwrap } = require("../../../labscore/utils/markdown"); -const { hasFeature } = require("../../../labscore/utils/testing"); - module.exports = { name: 'wallpaper', label: 'text', diff --git a/commands/message/google/labels.js b/commands/message/google/labels.js index 2898e1d..26d8a84 100644 --- a/commands/message/google/labels.js +++ b/commands/message/google/labels.js @@ -1,10 +1,12 @@ -const { googleVisionLabels } = require("../../../labscore/api"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { pill, smallPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); +const { googleVisionLabels } = require("#api"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { pill, smallPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/google/safetylabels.js b/commands/message/google/safetylabels.js index 6e696b9..cbc41b7 100644 --- a/commands/message/google/safetylabels.js +++ b/commands/message/google/safetylabels.js @@ -1,11 +1,13 @@ -const { googleVisionSafetyLabels } = require("../../../labscore/api"); -const { GOOGLE_CLOUD_SAFETY_LABELS, GOOGLE_CLOUD_SAFETY_LABELS_NAMES } = require("../../../labscore/constants"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { iconPill, smallPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); +const { googleVisionSafetyLabels } = require("#api"); +const { GOOGLE_CLOUD_SAFETY_LABELS, GOOGLE_CLOUD_SAFETY_LABELS_NAMES } = require("#constants"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { iconPill, smallPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/google/transcribe.js b/commands/message/google/transcribe.js index e3d671f..b07a060 100644 --- a/commands/message/google/transcribe.js +++ b/commands/message/google/transcribe.js @@ -1,11 +1,11 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { AudioTranscribe } = require('#obelisk'); -const { AudioTranscribe} = require('../../../labscore/api/obelisk'); - -const { STATICS } = require('../../../labscore/utils/statics'); -const { codeblock, icon } = require('../../../labscore/utils/markdown'); +const { createEmbed } = require('#utils/embed') +const { codeblock, icon } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/image/craiyon.js b/commands/message/image/craiyon.js index eadde75..cb16aa7 100644 --- a/commands/message/image/craiyon.js +++ b/commands/message/image/craiyon.js @@ -1,11 +1,12 @@ -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const superagent = require('superagent'); -const { Permissions } = require("detritus-client/lib/constants"); -const { STATICS } = require("../../../labscore/utils/statics"); - module.exports = { name: 'craiyon', label: 'query', diff --git a/commands/message/image/makesweet/billboard.js b/commands/message/image/makesweet/billboard.js index 78a91a8..439e572 100644 --- a/commands/message/image/makesweet/billboard.js +++ b/commands/message/image/makesweet/billboard.js @@ -1,12 +1,12 @@ -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { editOrReply } = require("../../../../labscore/utils/message"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); -const { getRecentImage } = require("../../../../labscore/utils/attachment"); +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const { billboardCityscape } = require("../../../../service/makesweet"); -const { STATICS } = require("../../../../labscore/utils/statics"); - -const { Permissions } = require("detritus-client/lib/constants"); module.exports = { name: 'billboard', diff --git a/commands/message/image/makesweet/circuitboard.js b/commands/message/image/makesweet/circuitboard.js index b883b6d..1a63569 100644 --- a/commands/message/image/makesweet/circuitboard.js +++ b/commands/message/image/makesweet/circuitboard.js @@ -1,12 +1,12 @@ -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { editOrReply } = require("../../../../labscore/utils/message"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); -const { getRecentImage } = require("../../../../labscore/utils/attachment"); +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const { circuitBoard } = require("../../../../service/makesweet"); -const { STATICS } = require("../../../../labscore/utils/statics"); - -const { Permissions } = require("detritus-client/lib/constants"); module.exports = { name: 'circuitboard', diff --git a/commands/message/image/makesweet/flag.js b/commands/message/image/makesweet/flag.js index 409d15f..a2b5230 100644 --- a/commands/message/image/makesweet/flag.js +++ b/commands/message/image/makesweet/flag.js @@ -1,12 +1,12 @@ -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { editOrReply } = require("../../../../labscore/utils/message"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); -const { getRecentImage } = require("../../../../labscore/utils/attachment"); +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const { flag } = require("../../../../service/makesweet"); -const { STATICS } = require("../../../../labscore/utils/statics"); - -const { Permissions } = require("detritus-client/lib/constants"); module.exports = { name: 'flag', diff --git a/commands/message/image/makesweet/heartlocket.js b/commands/message/image/makesweet/heartlocket.js index 089e06c..884b1b0 100644 --- a/commands/message/image/makesweet/heartlocket.js +++ b/commands/message/image/makesweet/heartlocket.js @@ -1,12 +1,12 @@ -const { createEmbed } = require("../../../../labscore/utils/embed"); -const { editOrReply } = require("../../../../labscore/utils/message"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); -const { getRecentImage } = require("../../../../labscore/utils/attachment"); +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const { heartLocket } = require("../../../../service/makesweet"); -const { STATICS } = require("../../../../labscore/utils/statics"); - -const { Permissions } = require("detritus-client/lib/constants"); module.exports = { name: 'heartlocket', diff --git a/commands/message/image/photofunia/retro-wave.js b/commands/message/image/photofunia/retro-wave.js index 40e260a..8f0592d 100644 --- a/commands/message/image/photofunia/retro-wave.js +++ b/commands/message/image/photofunia/retro-wave.js @@ -1,9 +1,10 @@ -const { createEmbed } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { retroWave } = require('#api') -const { retroWave } = require('../../../../labscore/api') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/image/photofunia/yacht.js b/commands/message/image/photofunia/yacht.js index 6a3ce3c..91ff0ca 100644 --- a/commands/message/image/photofunia/yacht.js +++ b/commands/message/image/photofunia/yacht.js @@ -1,9 +1,10 @@ -const { createEmbed } = require('../../../../labscore/utils/embed') -const { editOrReply } = require('../../../../labscore/utils/message') -const { STATICS } = require('../../../../labscore/utils/statics') +const { yacht } = require('#api') -const { yacht } = require('../../../../labscore/api') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/image/pride.js b/commands/message/image/pride.js index b124728..a8c5812 100644 --- a/commands/message/image/pride.js +++ b/commands/message/image/pride.js @@ -1,8 +1,10 @@ -const { prideborder } = require("../../../labscore/api"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { getUser } = require("../../../labscore/utils/users"); +const { prideborder } = require("#api"); +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { getUser } = require("#utils/users"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/info/appinfo.js b/commands/message/info/appinfo.js index bed9089..9d5a9f6 100644 --- a/commands/message/info/appinfo.js +++ b/commands/message/info/appinfo.js @@ -1,11 +1,12 @@ -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { icon, highlight, link, stringwrap } = require('../../../labscore/utils/markdown'); +const { createEmbed } = require("#utils/embed"); +const { icon, highlight, link, stringwrap } = require('#utils/markdown'); +const { editOrReply } = require("#utils/message"); + +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const superagent = require('superagent'); -const { Permissions } = require("detritus-client/lib/constants"); - const applicationFlags = { EMBEDDED_RELEASED: 1, GATEWAY_PRESENCE: 12, diff --git a/commands/message/info/avatar.js b/commands/message/info/avatar.js index ea5fc57..39f621c 100644 --- a/commands/message/info/avatar.js +++ b/commands/message/info/avatar.js @@ -1,9 +1,10 @@ -const { createEmbed, page } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { getMember, getUser } = require("../../../labscore/utils/users"); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); +const { createEmbed, page } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { getUser } = require("#utils/users"); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/info/guild.js b/commands/message/info/guild.js index 6270c34..6e3b09a 100644 --- a/commands/message/info/guild.js +++ b/commands/message/info/guild.js @@ -1,10 +1,11 @@ -const { createEmbed, page, formatPaginationEmbeds } = require("../../../labscore/utils/embed"); -const { guildFeaturesField } = require("../../../labscore/utils/fields"); -const { icon, highlight, timestamp, codeblock, iconPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); +const { createEmbed, page, formatPaginationEmbeds } = require("#utils/embed"); +const { guildFeaturesField } = require("#utils/fields"); +const { icon, highlight, timestamp, codeblock, iconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/info/guildicon.js b/commands/message/info/guildicon.js index 01cd129..9e69431 100644 --- a/commands/message/info/guildicon.js +++ b/commands/message/info/guildicon.js @@ -1,6 +1,7 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/info/invite.js b/commands/message/info/invite.js index 6e226ef..b8318e6 100644 --- a/commands/message/info/invite.js +++ b/commands/message/info/invite.js @@ -1,12 +1,13 @@ -const { DISCORD_INVITES, OPEN_SOURCE_REPOSITORY_URL } = require("../../../labscore/constants"); -const { createEmbed, formatPaginationEmbeds, page } = require("../../../labscore/utils/embed"); -const { guildFeaturesField } = require("../../../labscore/utils/fields"); -const { icon, highlight, timestamp, iconPill, iconLinkPill, link } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATIC_ASSETS } = require("../../../labscore/utils/statics"); +const { paginator } = require('#client'); +const { DISCORD_INVITES, OPEN_SOURCE_REPOSITORY_URL } = require("#constants"); -const { paginator } = require('../../../labscore/client'); +const { createEmbed, formatPaginationEmbeds, page } = require("#utils/embed"); +const { guildFeaturesField } = require("#utils/fields"); +const { icon, highlight, timestamp, iconPill, iconLinkPill, link } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATIC_ASSETS } = require("#utils/statics"); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/info/user.js b/commands/message/info/user.js index abce221..53b0b50 100644 --- a/commands/message/info/user.js +++ b/commands/message/info/user.js @@ -1,13 +1,12 @@ -const { BADGE_ICONS } = require("../../../labscore/constants"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { icon, highlight, timestamp, smallIconPill, smallPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { getUser, renderBadges } = require("../../../labscore/utils/users"); +const { BADGE_ICONS } = require("#constants"); -const { Constants } = require('detritus-client') -const { UserFlags } = Constants +const { createEmbed } = require("#utils/embed"); +const { icon, highlight, timestamp, smallIconPill, smallPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { getUser, renderBadges } = require("#utils/users"); -const { Permissions } = require("detritus-client/lib/constants"); +// TODO: Turn this into a general purpose permissions constant +const { UserFlags, Permissions } = require("detritus-client/lib/constants"); module.exports = { name: 'user', diff --git a/commands/message/mod/analyze.js b/commands/message/mod/analyze.js index 63c8e47..f20a428 100644 --- a/commands/message/mod/analyze.js +++ b/commands/message/mod/analyze.js @@ -1,13 +1,14 @@ -const { Components } = require("detritus-client/lib/utils"); -const { perspective } = require("../../../labscore/api"); -const { format } = require("../../../labscore/utils/ansi"); -const { createEmbed } = require("../../../labscore/utils/embed"); +const { perspective } = require("#api"); -const { icon, codeblock, iconPill, smallPill, stringwrap } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); +const { format } = require("#utils/ansi"); +const { createEmbed } = require("#utils/embed"); +const { icon, codeblock, iconPill, smallPill, stringwrap } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +const { Components } = require("detritus-client/lib/utils"); function getPerspectiveColor(score) { if (score >= 0.9) return "m" diff --git a/commands/message/mod/perspective.js b/commands/message/mod/perspective.js index 8d7f9bd..a810349 100644 --- a/commands/message/mod/perspective.js +++ b/commands/message/mod/perspective.js @@ -1,11 +1,12 @@ -const { perspective } = require("../../../labscore/api"); -const { format } = require("../../../labscore/utils/ansi"); -const { createEmbed } = require("../../../labscore/utils/embed"); +const { perspective } = require("#api"); -const { icon, codeblock, iconPill, stringwrap, link } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); +const { format } = require("#utils/ansi"); +const { createEmbed } = require("#utils/embed"); +const { codeblock, iconPill, stringwrap, link } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); function getPerspectiveColor(score) { diff --git a/commands/message/mod/purge.js b/commands/message/mod/purge.js index a374f2c..d6a6e0f 100644 --- a/commands/message/mod/purge.js +++ b/commands/message/mod/purge.js @@ -1,11 +1,13 @@ + +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +const { icon } = require("#utils/markdown"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { icon } = require("../../../labscore/utils/markdown"); - -// TODO: copy pasted from v1, rework this eventually - +// TODO: rework this eventually +// -> filter by user module.exports = { label: "filter", name: "purge", diff --git a/commands/message/search/audio.js b/commands/message/search/audio.js index 93ae699..ced4478 100644 --- a/commands/message/search/audio.js +++ b/commands/message/search/audio.js @@ -1,15 +1,16 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { renderMusicButtons } = require('#utils/buttons'); +const { createEmbed } = require('#utils/embed') +const { icon } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') -const { renderMusicButtons } = require('../../../labscore/utils/buttons'); +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const superagent = require('superagent') +// TODO: make this a constant, or add a URL util const urlr = /(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})/g -const { Permissions } = require("detritus-client/lib/constants"); -const { icon } = require('../../../labscore/utils/markdown'); - module.exports = { name: 'audio', aliases: ['aud'], diff --git a/commands/message/search/bing-images.js b/commands/message/search/bing-images.js index dbdd062..aece568 100644 --- a/commands/message/search/bing-images.js +++ b/commands/message/search/bing-images.js @@ -1,12 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { bingImages } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { bingImages } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +// TODO: create a favicon() util function createImageResultPage(context, result) { let res = page( createEmbed("default", context, { diff --git a/commands/message/search/bing.js b/commands/message/search/bing.js index 40e55ae..2ca08d9 100644 --- a/commands/message/search/bing.js +++ b/commands/message/search/bing.js @@ -1,13 +1,15 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { citation, link, codeblock } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { bing } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { bing } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { citation, link, codeblock } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +// TODO: create a favicon() util function createSearchResultPage(context, entry){ let res; switch(entry.type){ diff --git a/commands/message/search/google-images.js b/commands/message/search/google-images.js index 2e49e82..a341f63 100644 --- a/commands/message/search/google-images.js +++ b/commands/message/search/google-images.js @@ -1,12 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { googleImages } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { googleImages } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +// TODO: create a favicon() util function createImageResultPage(context, result) { let res = page(createEmbed("default", context, { author: { diff --git a/commands/message/search/google.js b/commands/message/search/google.js index 72b424f..d212299 100644 --- a/commands/message/search/google.js +++ b/commands/message/search/google.js @@ -1,13 +1,15 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { link, citation } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { google } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { google } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, citation } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +// TODO: create a favicon() util function createSearchResultPage(context, result){ let res; switch(result.type){ diff --git a/commands/message/search/lyrics.js b/commands/message/search/lyrics.js index 45c18eb..3264056 100644 --- a/commands/message/search/lyrics.js +++ b/commands/message/search/lyrics.js @@ -1,12 +1,13 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { lyrics } = require('#api'); +const { paginator } = require('#client'); -const { lyrics } = require('../../../labscore/api'); -const { paginator } = require('../../../labscore/client'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { smallIconPill } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { smallIconPill } = require('../../../labscore/utils/markdown'); const META_FIELDS = { "Album": "stat_videos", diff --git a/commands/message/search/quora.js b/commands/message/search/quora.js index 5689375..025a1ad 100644 --- a/commands/message/search/quora.js +++ b/commands/message/search/quora.js @@ -1,15 +1,15 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { link, pill } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { quora, quoraResult } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { quora, quoraResult } = require('../../../labscore/api'); -const { InteractionCallbackTypes } = require('detritus-client/lib/constants'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, pill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') + +// TODO: Turn this into a general purpose permissions constant +const { Permissions, InteractionCallbackTypes } = require("detritus-client/lib/constants"); const { Components } = require('detritus-client/lib/utils'); -const { Permissions } = require("detritus-client/lib/constants"); - function createQuoraAnswerPage(context, question, answer) { let tags = question.tags.map((t) => { return pill(t) diff --git a/commands/message/search/reddit.js b/commands/message/search/reddit.js index ac8287e..bd6a255 100644 --- a/commands/message/search/reddit.js +++ b/commands/message/search/reddit.js @@ -1,11 +1,12 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { link, icon, iconPill } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { reddit } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { reddit } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, icon, iconPill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); function createRedditPage(context, result) { diff --git a/commands/message/search/reverse-image.js b/commands/message/search/reverse-image.js index edad48a..1701121 100644 --- a/commands/message/search/reverse-image.js +++ b/commands/message/search/reverse-image.js @@ -1,13 +1,15 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') -const { getRecentImage } = require("../../../labscore/utils/attachment"); +const { reverseImageSearch } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { reverseImageSearch } = require('../../../labscore/api'); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +// TODO: create a favicon() util function createReverseImageSearchResultPage(context, result, source) { let res = page( createEmbed("default", context, { diff --git a/commands/message/search/rule34.js b/commands/message/search/rule34.js index 4fc4c92..8f96b2a 100644 --- a/commands/message/search/rule34.js +++ b/commands/message/search/rule34.js @@ -1,10 +1,11 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { pill } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') +const { rule34 } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { rule34 } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { pill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); function createRule34Page(context, result) { diff --git a/commands/message/search/urbandictionary.js b/commands/message/search/urbandictionary.js index 57f79be..923249a 100644 --- a/commands/message/search/urbandictionary.js +++ b/commands/message/search/urbandictionary.js @@ -1,11 +1,12 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { link, iconPill } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { urbandictionary } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { urbandictionary } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, iconPill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); function createUrbanPage(context, result){ diff --git a/commands/message/search/wikihow.js b/commands/message/search/wikihow.js index 8b56fb9..b6df28a 100644 --- a/commands/message/search/wikihow.js +++ b/commands/message/search/wikihow.js @@ -1,10 +1,11 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { wikihow } = require('#api'); +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const { wikihow } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); function createWikiHowPage(context, result){ diff --git a/commands/message/search/wikipedia.js b/commands/message/search/wikipedia.js index 71a920f..92817cf 100644 --- a/commands/message/search/wikipedia.js +++ b/commands/message/search/wikipedia.js @@ -1,13 +1,14 @@ +const { paginator } = require('#client'); -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') - -const { paginator } = require('../../../labscore/client'); -const superagent = require('superagent') +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +const superagent = require('superagent'); + module.exports = { name: 'wikipedia', label: 'query', diff --git a/commands/message/search/wolfram-alpha.js b/commands/message/search/wolfram-alpha.js index aadfeab..6dd66dd 100644 --- a/commands/message/search/wolfram-alpha.js +++ b/commands/message/search/wolfram-alpha.js @@ -1,11 +1,12 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { paginator } = require('#client'); +const { WolframQueryCompute } = require('#obelisk'); -const { paginator } = require('../../../labscore/client'); -const { wolframQuery, WolframQueryCompute } = require('../../../labscore/api/obelisk'); -const { citation, smallIconPill } = require('../../../labscore/utils/markdown'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { citation, smallIconPill } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); function createWolframPage(context, pod, query, sources) { diff --git a/commands/message/search/xkcd.js b/commands/message/search/xkcd.js index a967e4f..ee26b42 100644 --- a/commands/message/search/xkcd.js +++ b/commands/message/search/xkcd.js @@ -1,11 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { paginator } = require('#client'); -const { paginator } = require('../../../labscore/client'); -const superagent = require('superagent') +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); +const superagent = require('superagent') + +// TODO: create a favicon() util module.exports = { name: 'xkcd', label: 'query', diff --git a/commands/message/search/youtube.js b/commands/message/search/youtube.js index b465a57..347fbe7 100644 --- a/commands/message/search/youtube.js +++ b/commands/message/search/youtube.js @@ -1,13 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { link, iconPill, smallPill } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') -const { STATICS } = require('../../../labscore/utils/statics') +const { youtube } = require('#api'); +const { paginator } = require('#client'); +const { YOUTUBE_CATEGORIES } = require('#constants'); -const { paginator } = require('../../../labscore/client'); -const { youtube } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, iconPill, smallPill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics') +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { YOUTUBE_CATEGORIES } = require('../../../labscore/constants'); // https://www.html-code-generator.com/javascript/shorten-long-numbers const intToString = num => { diff --git a/commands/message/utils/dictionary.js b/commands/message/utils/dictionary.js index 82c054c..c900cf3 100644 --- a/commands/message/utils/dictionary.js +++ b/commands/message/utils/dictionary.js @@ -1,13 +1,14 @@ -const { createEmbed, formatPaginationEmbeds, page } = require('../../../labscore/utils/embed') -const { link, iconPill, smallPill, icon, iconLinkPill, pill } = require('../../../labscore/utils/markdown') -const { editOrReply } = require('../../../labscore/utils/message') +const { dictionary } = require('#api'); +const { paginator } = require('#client'); +const { TRANSLATE_LANGUAGE_MAPPINGS, DICTIONARY_LANGUAGES } = require('#constants'); -const { paginator } = require('../../../labscore/client'); -const { dictionary } = require('../../../labscore/api'); +const { createEmbed, formatPaginationEmbeds, page } = require('#utils/embed') +const { link, iconPill, smallPill, icon, iconLinkPill, pill } = require('#utils/markdown') +const { editOrReply } = require('#utils/message') +const { dictionaryGetCodeFromAny } = require('#utils/translate'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { dictionaryGetCodeFromAny } = require('../../../labscore/utils/translate'); -const { TRANSLATE_LANGUAGE_MAPPINGS, DICTIONARY_LANGUAGES } = require('../../../labscore/constants'); const LABELS = { "offensive": `${iconPill("warning", "Offensive")}` diff --git a/commands/message/utils/emoji.js b/commands/message/utils/emoji.js index fd744df..606df72 100644 --- a/commands/message/utils/emoji.js +++ b/commands/message/utils/emoji.js @@ -1,15 +1,17 @@ -const { Constants, Utils } = require("detritus-client"); -const { Permissions, InteractionCallbackTypes } = require("detritus-client/lib/constants"); -const { emojipedia, emojiKitchen } = require("../../../labscore/api"); +const { emojipedia, emojiKitchen } = require("#api"); +const { EMOJIPEDIA_PLATFORM_TYPES, EMOJIPEDIA_PLATFORM_TYPE_ALIASES } = require("#constants"); +const { ingest } = require("#logging"); -const { EMOJIPEDIA_PLATFORM_TYPES, EMOJIPEDIA_PLATFORM_TYPE_ALIASES } = require("../../../labscore/constants"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { icon, pill, iconPill, highlight, timestamp, smallIconPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); +const { createEmbed } = require("#utils/embed"); +const { icon, pill, iconPill, highlight, timestamp, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +const { Utils } = require("detritus-client"); const { Components, Snowflake } = require("detritus-client/lib/utils"); +// TODO: Turn this into a general purpose permissions constant +const { Permissions, InteractionCallbackTypes, DiscordRegexNames } = require("detritus-client/lib/constants"); const { bold } = require("detritus-client/lib/utils/markup"); -const { ingest } = require("../../../labscore/logging"); const onlyEmoji = require('emoji-aware').onlyEmoji; @@ -74,7 +76,7 @@ module.exports = { } const { matches } = Utils.regex( - Constants.DiscordRegexNames.EMOJI, + DiscordRegexNames.EMOJI, args.emoji ); embeds = [] diff --git a/commands/message/utils/emojiinfo.js b/commands/message/utils/emojiinfo.js index 96376df..0dd8540 100644 --- a/commands/message/utils/emojiinfo.js +++ b/commands/message/utils/emojiinfo.js @@ -1,14 +1,13 @@ -const { Constants, Utils } = require("detritus-client"); -const { Permissions, InteractionCallbackTypes, MessageComponentButtonStyles } = require("detritus-client/lib/constants"); -const { emojipedia, emojiKitchen } = require("../../../labscore/api"); +const { emojipedia } = require("#api"); -const { EMOJIPEDIA_PLATFORM_TYPES, EMOJIPEDIA_PLATFORM_TYPE_ALIASES } = require("../../../labscore/constants"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { icon, pill, iconPill, highlight, timestamp, smallIconPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); -const { Components, Snowflake } = require("detritus-client/lib/utils"); -const { bold } = require("detritus-client/lib/utils/markup"); +const { createEmbed } = require("#utils/embed"); +const { pill, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +// TODO: Turn this into a general purpose permissions constant +const { Permissions, InteractionCallbackTypes, MessageComponentButtonStyles } = require("detritus-client/lib/constants"); +const { Components } = require("detritus-client/lib/utils"); const onlyEmoji = require('emoji-aware').onlyEmoji; diff --git a/commands/message/utils/eval.js b/commands/message/utils/eval.js index 40d0139..a87ba96 100644 --- a/commands/message/utils/eval.js +++ b/commands/message/utils/eval.js @@ -1,15 +1,15 @@ +const { REXTESTER_LANGUAGES, COLORS, REXTESTER_COMPILER_ARGS } = require("#constants"); +const { createEmbed } = require("#utils/embed"); +const { codeblock, highlight } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); + +// TODO: Turn this into a general purpose permissions constant const { DiscordRegexNames, Permissions } = require("detritus-client/lib/constants"); const { Utils } = require("detritus-client"); -const { REXTESTER_LANGUAGES, COLORS, REXTESTER_COMPILER_ARGS } = require("../../../labscore/constants"); - const superagent = require('superagent') -const { createEmbed } = require("../../../labscore/utils/embed"); -const { codeblock, highlight } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); - module.exports = { label: 'code', name: 'eval', diff --git a/commands/message/utils/latex.js b/commands/message/utils/latex.js index c140425..87bce51 100644 --- a/commands/message/utils/latex.js +++ b/commands/message/utils/latex.js @@ -1,17 +1,19 @@ -const { paginator } = require("../../../labscore/client"); -const { createEmbed, page, formatPaginationEmbeds } = require("../../../labscore/utils/embed"); -const { codeblock, pill, smallIconPill } = require("../../../labscore/utils/markdown"); +const { paginator } = require("#client"); +const { COLORS } = require("#constants"); +const { createEmbed, page, formatPaginationEmbeds } = require("#utils/embed"); +const { codeblock, pill, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATIC_ICONS } = require("#utils/statics"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { editOrReply } = require("../../../labscore/utils/message"); + +const superagent = require('superagent'); const TEX_REGEX = /(\$.*?\$)/g const TEX_URL = `https://latex.codecogs.com/png.image?\\inline&space;\\huge&space;\\dpi{200}&space;\\color{white}` -const superagent = require('superagent'); -const { STATIC_ICONS } = require("../../../labscore/utils/statics"); -const { COLORS } = require("../../../labscore/constants"); - module.exports = { name: 'latex', aliases: ['tex'], diff --git a/commands/message/utils/ocr.js b/commands/message/utils/ocr.js index 9f21c37..4ec1dfa 100644 --- a/commands/message/utils/ocr.js +++ b/commands/message/utils/ocr.js @@ -1,10 +1,12 @@ -const { googleVisionOcr } = require("../../../labscore/api"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { codeblock, smallIconPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); +const { googleVisionOcr } = require("#api"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { codeblock, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/utils/ocrtr.js b/commands/message/utils/ocrtr.js index e9d4c97..724ac16 100644 --- a/commands/message/utils/ocrtr.js +++ b/commands/message/utils/ocrtr.js @@ -1,13 +1,16 @@ -const { googleVisionOcr, googleTranslate } = require("../../../labscore/api"); -const { TRANSLATE_LANGUAGES, TRANSLATE_LANGUAGE_MAPPINGS } = require("../../../labscore/constants"); -const { getRecentImage } = require("../../../labscore/utils/attachment"); -const { createEmbed } = require("../../../labscore/utils/embed"); -const { codeblock, icon, pill, limitedString, smallIconPill } = require("../../../labscore/utils/markdown"); -const { editOrReply } = require("../../../labscore/utils/message"); -const { STATICS } = require("../../../labscore/utils/statics"); -const { isSupported, getCodeFromAny } = require("../../../labscore/utils/translate"); +const { googleVisionOcr, googleTranslate } = require("#api"); +const { TRANSLATE_LANGUAGES, TRANSLATE_LANGUAGE_MAPPINGS } = require("#constants"); +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require("#utils/embed"); +const { codeblock, icon, pill, limitedString, smallIconPill } = require("#utils/markdown"); +const { editOrReply } = require("#utils/message"); +const { STATICS } = require("#utils/statics"); +const { isSupported, getCodeFromAny } = require('#utils/translate'); + +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); + module.exports = { name: 'ocrtr', label: 'to', diff --git a/commands/message/utils/qr.js b/commands/message/utils/qr.js index 4ffe0cd..7039ab9 100644 --- a/commands/message/utils/qr.js +++ b/commands/message/utils/qr.js @@ -1,14 +1,14 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { getRecentImage } = require("#utils/attachment"); +const { createEmbed } = require('#utils/embed') +const { editOrReply } = require('#utils/message') +const { codeblock, icon, smallIconPill } = require('#utils/markdown'); +const { STATICS } = require('#utils/statics'); -const { getRecentImage } = require("../../../labscore/utils/attachment"); -const { codeblock, icon, smallIconPill } = require('../../../labscore/utils/markdown'); +// TODO: Turn this into a general purpose permissions constant +const { Permissions } = require("detritus-client/lib/constants"); const superagent = require('superagent'); -const { Permissions } = require("detritus-client/lib/constants"); -const { STATICS } = require('../../../labscore/utils/statics'); - module.exports = { name: 'qr', label: 'text', diff --git a/commands/message/utils/screenshot.js b/commands/message/utils/screenshot.js index dab1146..5a70a3e 100644 --- a/commands/message/utils/screenshot.js +++ b/commands/message/utils/screenshot.js @@ -1,17 +1,10 @@ -const { createEmbed } = require("../../../labscore/utils/embed"); -const { editOrReply } = require("../../../labscore/utils/message"); +const { WebUtilsWebPageScreenshot} = require("#obelisk"); -const superagent = require('superagent') +const { createEmbed } = require("#utils/embed"); +const { editOrReply } = require("#utils/message"); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { WebUtilsWebPageScreenshot} = require("../../../labscore/api/obelisk"); - -async function processJob(jobUrl) { - let job = await superagent.get(jobUrl) - .set('User-Agent', 'labscore/1.0') - - return job.body; -} module.exports = { label: "url", diff --git a/commands/message/utils/translate.js b/commands/message/utils/translate.js index a4e6d5d..5d86f79 100644 --- a/commands/message/utils/translate.js +++ b/commands/message/utils/translate.js @@ -1,13 +1,13 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { googleTranslate } = require('#api'); +const { TRANSLATE_LANGUAGES, TRANSLATE_LANGUAGE_MAPPINGS } = require('#constants'); -const { codeblock, icon, pill, stringwrap, smallIconPill } = require('../../../labscore/utils/markdown'); - -const { isSupported, getCodeFromAny } = require('../../../labscore/utils/translate'); -const { googleTranslate } = require('../../../labscore/api'); -const { STATICS } = require('../../../labscore/utils/statics'); -const { TRANSLATE_LANGUAGES, TRANSLATE_LANGUAGE_MAPPINGS } = require('../../../labscore/constants'); +const { createEmbed } = require('#utils/embed') +const { codeblock, icon, pill, stringwrap, smallIconPill } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics'); +const { isSupported, getCodeFromAny } = require('#utils/translate'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); module.exports = { diff --git a/commands/message/utils/weather.js b/commands/message/utils/weather.js index 14512e3..944f0c3 100644 --- a/commands/message/utils/weather.js +++ b/commands/message/utils/weather.js @@ -1,11 +1,12 @@ -const { createEmbed } = require('../../../labscore/utils/embed') -const { editOrReply } = require('../../../labscore/utils/message') +const { darksky } = require('#api'); -const { darksky } = require('../../../labscore/api'); -const { pill, iconPill, smallPill, weatherIcon, timestamp } = require('../../../labscore/utils/markdown'); +const { createEmbed } = require('#utils/embed') +const { pill, iconPill, smallPill, weatherIcon, timestamp } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message') +const { STATICS } = require('#utils/statics'); +// TODO: Turn this into a general purpose permissions constant const { Permissions } = require("detritus-client/lib/constants"); -const { STATICS } = require('../../../labscore/utils/statics'); module.exports = { name: 'weather', diff --git a/index.js b/index.js index e1d9a71..82d566b 100644 --- a/index.js +++ b/index.js @@ -1,15 +1,14 @@ const { ClusterManager } = require('detritus-client'); -const { basecamp } = require('./labscore/logging'); const superagent = require('superagent') -const time = Date.now(); +const { basecamp } = require('#logging'); +const time = Date.now(); const token = process.env.token; // Get the correct path for each environment type let client = `./labscore/labscore/client.js`; -if(process.env.environment === "local") client = `./labscore/client.js` -if(["production","prod","prodnew"].includes(process.env.environment.toLowerCase())) client = `./labscore/labscore/client.js`; +if(process.env.environment === "local") client = `./labscore/client.js`; const SHARDS = process.env.SHARDS || 2; const SHARDS_PER_CLUSTER = process.env.SHARDS_PER_CLUSTER_OVERRIDE || 2; @@ -20,7 +19,7 @@ const manager = new ClusterManager(client, token, { }); (async () => { - console.log(`v2 | starting v2.`) + console.log(`[${process.env.HOSTNAME}] launching bot`) // Logging manager.on("clusterProcess", ({ clusterProcess }) => { @@ -34,8 +33,11 @@ const manager = new ClusterManager(client, token, { }) await manager.run(); - console.log(`v2 | ready. took ${(Date.now() - time) / 1000}.`) + console.log(`[${process.env.HOSTNAME}] bot ready. took ${(Date.now() - time) / 1000}.`) + // This is kind of a hack. + // Our current deployment system has a tendency to launch the bot twice, this "ensures" that + // incorrect instances close again. This should *probably* just be moved to dirigent instead. if(process.env.environment.toLowerCase() === "prod"){ let liveDeploy = await superagent.get(`${process.env.PB_MANAGER_HOST}_pbs/v1/GetPbServiceId`) if(process.env.HOSTNAME !== liveDeploy.body.d){ diff --git a/labscore/client.js b/labscore/client.js index 0d4b3a5..641646b 100644 --- a/labscore/client.js +++ b/labscore/client.js @@ -1,7 +1,7 @@ -const { Constants, ClusterClient, CommandClient, InteractionCommandClient } = require('detritus-client'); +const { ClusterClient, CommandClient, InteractionCommandClient } = require('detritus-client'); const { ActivityTypes, PresenceStatuses, GatewayIntents, Permissions, ClientEvents } = require('detritus-client/lib/constants'); -const { PERMISSIONS_TEXT, DEFAULT_BOT_NAME, DEFAULT_PREFIXES } = require('./constants'); +const { PERMISSIONS_TEXT, DEFAULT_BOT_NAME, DEFAULT_PREFIXES } = require('#constants'); const Paginator = require('./paginator').PaginatorCluster const cluster = new ClusterClient("", { @@ -82,12 +82,11 @@ const interactionClient = new InteractionCommandClient(cluster, { useClusterClient: true }) -const { maintower, basecamp, ingest } = require('./logging'); -const { icon, highlight } = require('./utils/markdown'); -const { editOrReply } = require('./utils/message'); +const { maintower, basecamp, ingest } = require('#logging'); -const { createEmbed } = require('./utils/embed'); -const superagent = require('superagent'); +const { createEmbed } = require('#utils/embed'); +const { icon, highlight } = require('#utils/markdown'); +const { editOrReply } = require('#utils/message'); // Analytics commandClient.on('commandRan', ({ context, command }) => { if(!command.metadata.use_custom_ingest) ingest(command.name, "command_ran")} ) diff --git a/package.json b/package.json index 3899397..54f2335 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,11 @@ "superagent": "^7.1.1" }, "imports": { - "#api": "./labscore/api/index.js" + "#api": "./labscore/api/index.js", + "#client": "./labscore/client.js", + "#constants": "./labscore/constants.js", + "#logging": "./labscore/logging.js", + "#obelisk": "./labscore/api/obelisk/index.js", + "#utils/*": "./labscore/utils/*.js" } }