diff --git a/.cspell.json b/.cspell.json new file mode 100755 index 0000000..95b5ced --- /dev/null +++ b/.cspell.json @@ -0,0 +1,44 @@ +{ + "version": "0.2", + "language": "en", + "dictionaries": [], + "languageSettings": [ + { + "languageId": "typescript", + "words": [ + "tryforge" + ] + }, + { + "languageId": "markdown", + "words": [ + "Recieved", + "botforge", + "nolonger" + ] + } + ], + "words": [ + "actionscript", + "agreedtoterms", + "atleast", + "Automod", + "botchannel", + "bughunter", + "cmdid", + "commandinfo", + "errorid", + "fieldone", + "fieldthree", + "freechannel", + "givemoney", + "howto", + "hypesquad", + "ibrokesomething", + "ifoundabug", + "Lynnux", + "reactionroles", + "useravatar", + "whois" + ] +} diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.vscode/settings.json b/.vscode/settings.json old mode 100644 new mode 100755 index d82fabc..f0e0711 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,22 +7,41 @@ }, "i18n-ally.localesPaths": [], "cSpell.words": [ + "akiradb", + "animelookup", + "authorname", + "boop", + "booped", "Català", "Čeština", + "cleardata", "commandblocked", "Dansk", "Deutsch", "endfulfulll", + "fieldtwo", + "Frieren", + "highfive", "iconicayansh", "Italiano", + "jifoiwjoiwfjop", + "nommed", "Norsk", + "parttime", "Polski", "Português", + "removedata", "renancolombini", + "SHFEUHFWJFI", + "smugged", "Svenska", + "thumbsup", "Tiếng", + "topgg", + "tryforge", "Türkçe", "Việt", + "whattheanime", "Ελληνικά", "Русский", "Српски", diff --git a/ChangeLog.md b/ChangeLog.md old mode 100644 new mode 100755 index 72660cf..9599261 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,15 +6,19 @@ - [Dev] pulled to [Main] -## [[Dev]] ChangeLog | Aug 22 2024 +## [[Dev]] ChangeLog | Nov 12 2024 ### Added +- Voting command `a.vote`. +- About command `a.about`. - UserInfo `a.userInfo` +- Different languages using i18n. ### Changed - Anime Lookup (`/anime`) +- Swapped from plain JavaScript to TypeScript. ### Versions used diff --git a/Errors.md b/Errors.md old mode 100644 new mode 100755 index 1d31bcd..818e3e0 --- a/Errors.md +++ b/Errors.md @@ -12,7 +12,7 @@ table of content | 100 | Continue | Indicates that the initial part of a request has been received. | | 101 | Command Recieved | This code indicates that Akira has successfully received a command but hasn't started processing it yet. | | 102 | Slash Recieved | Similar to 101, but with slash command. | -| 200 | Default Success | Used when a request is succesful.| +| 200 | Default Success | Used when a request is successful.| | 201 | Created | The bot successfully processed the command and performed the requested action. | | 204 | No Content | Akira executed the command, but there is no content to return | | 301 | Moved Permanently | The command used has been deprecated. | @@ -33,6 +33,7 @@ table of content | 502 | Bad Gateway | Akira failed to retrieve or process data from an external API she relies on. | | 503 | Service Unavailable | Akira's services are temporarily unavailable, possibly due to maintenance or an issue with the hosting service.| | 504 | Gateway Timeout | Similar to 502, but specifically indicates that the server, while acting as a gateway or proxy, did not receive a timely response from the upstream server. | +| 600 | User tos missing | the user used doesn't have tos accepted. | | 701 | Command not enabled | The command exists but is currently disabled by the bot owner or admins. | | 702 | Unavailable In Channel | The requested feature or command is not available in the current channel.| | 703 | User Blacklisted | The user is blacklisted and cannot use the bot's commands. | @@ -46,14 +47,14 @@ table of content | 711 | Command Requires Setup | The command cannot be executed because the bot or server requires initial setup. | | 712 | Command Timed Out | The command was initiated but took too long to complete, and the bot timed out. | | 713 | Disabled by Admin | The command has been explicitly disabled by a server admin or the bot owner, making it unavailable. | -| 714 | Invalid Command | The command was used in an wrong envirment, such as trying to use a server-specific command in a direct message. | +| 714 | Invalid Command | The command was used in an wrong environment, such as trying to use a server-specific command in a direct message. | | 715 | Requires Elevated Role | The user needs a specific role to execute the command, and they lack that role. | -| 716 | Wrong author | The author using the interaction is not the author of the origional command. | +| 716 | Wrong author | The author using the interaction is not the author of the original command. | | 717 | Missing Arguments | The user did not provide enough argument for this command. | | 718 | Cannot be a guildID | The given argument is a guildID, which is not accepted in this field. | | 718 | Need user/role/channel | The given argument expected a user, role or channel input. | -| 719 | should be m/r/c | Input should be a memer/role/channel | -| 720 | User doesnt have perms | The user who ran the command doesn't have the right server specific perms. | +| 719 | should be m/r/c | Input should be a member/role/channel | +| 720 | User doesn't have perms | The user who ran the command doesn't have the right server specific perms. | | 721 | User cannot be Author | The user given cannot be the author. | | 722 | Target user blocked | The user given has blocked someone/anyone from using this command on them. | | 801 | Perms reply | when the user uses perms reply with wrong input. | diff --git a/NM-Edited.md b/NM-Edited.md old mode 100644 new mode 100755 index be832d3..3a5debe --- a/NM-Edited.md +++ b/NM-Edited.md @@ -17,7 +17,7 @@ This removes the Function Spam from Function overrides. ### encrypt.js / decrypt.js -Changed FIXED_IV to a custom IV so it doenst use the default IV of [ForgeScript] +Changed FIXED_IV to a custom IV so it doesn't use the default IV of [ForgeScript] - location: `node_modules/@tryforge/forgescript/dist/native/crypto/` [.](./node_modules/@tryforge/forgescript/dist/native/crypto/encrypt.js) diff --git a/README.md b/README.md old mode 100644 new mode 100755 index e3dc003..efc0501 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -
- +

Akira Bot

-

For ForgeScript v1.4.0

+

For ForgeScript v1.5.0

## ✨Latest Updates + > - *Changed package to ForgeScript.* ## 🚧 Prerequisites @@ -13,18 +13,22 @@ - [Node.js 18+](https://nodejs.org/en/download/) - [ForgeScript](https://www.npmjs.com/package/forgescript/) -> ##### **Note:** We try to use the latest version of ForgeScript at all time but it can take some time to update commands to new versions. +> **Note:** We try to use the latest version of ForgeScript at all time but it can take some time to update commands to new versions. ## 📝 Tutorials -Copy to [*Repl.it*](./) `(soon)`
+ +Copy to [*Repl.it*](./) `(soon)` + Copy to a [*VPS/Server*](./) `(soon)` ## 📝 [Support Server](https://discord.gg/6JayS72cnF) + If you have major coding issues with this bot, please join and ask for help. ## 📸 Screenshots +
- +
@@ -34,9 +38,11 @@ If you have major coding issues with this bot, please join and ask for help.
## 💨 Run the projects -[![Remix on Glitch](https://cdn.glitch.com/2703baf2-b643-4da7-ab91-7ee2a2d00b5b%2Fremix-button.svg)](#) `(soon)` + +[![Remix on Glitch](https://cdn.glitch.com/2703baf2-b643-4da7-ab91-7ee2a2d00b5b%2Fremix-button.svg)](./#) `(soon)` ## ✨ Contributors + Contributions are always welcomed :D Make sure to follow [contribute.md](contribute.md) diff --git a/files/anime/2dfee968ccecc8aaa5c9d6106405f560d883e60c6f87edd10214437c49c41683.json b/files/anime/2dfee968ccecc8aaa5c9d6106405f560d883e60c6f87edd10214437c49c41683.json old mode 100644 new mode 100755 diff --git a/files/anime/51041e5f-31cf-44e1-9af1-66ee3d139c65.json b/files/anime/51041e5f-31cf-44e1-9af1-66ee3d139c65.json old mode 100644 new mode 100755 diff --git a/files/anime/e4eedaeb-8c72-457e-afc3-0d32fa5d774a.json b/files/anime/e4eedaeb-8c72-457e-afc3-0d32fa5d774a.json old mode 100644 new mode 100755 diff --git a/files/anime/not-found.json b/files/anime/not-found.json old mode 100644 new mode 100755 diff --git a/files/commands.json b/files/commands.json old mode 100644 new mode 100755 diff --git a/files/errors.json b/files/errors.json old mode 100644 new mode 100755 index 8629b76..356d5d4 --- a/files/errors.json +++ b/files/errors.json @@ -62,6 +62,12 @@ "description": "I didn't find this command, perhaps due to a typo or this is a non-existent command.", "from": "Any" }, + "600": { + "title": ["User missing from database"], + "meaning": "User not found in database", + "description": "The user used was not found in the database and/or didn’t accept the terms of service.", + "from": "Client" + }, "706": { "title": "Permission Denied! I Guess I'm Not That Powerful... Yet!", "meaning": "Insufficient Bot Perms", diff --git a/files/result.json b/files/result.json old mode 100644 new mode 100755 diff --git a/files/result.txt b/files/result.txt old mode 100644 new mode 100755 diff --git a/files/test.json b/files/test.json old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 index a26859e..0c7ec6c --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "author": "Lynnux", "license": "MIT", "dependencies": { - "@tryforge/forge.api": "github:tryforge/ForgeAPI", - "@tryforge/forge.db": "github:tryforge/forgedb#dev", + "@tryforge/forge.api": "github:tryforge/ForgeAPI#dev", + "@tryforge/forge.db": "github:tryforge/ForgeDB#dev", "@tryforge/forge.topgg": "github:tryforge/ForgeTopGG#dev", - "@tryforge/forgescript": "github:tryforge/forgescript#dev", + "@tryforge/forgescript": "github:tryforge/ForgeScript#dev", "@types/i18next": "^12.1.0", "@types/node": "^22.5.0", "@types/ws": "^8.5.12", diff --git a/src/Api/Commands.ts b/src/Api/Commands.ts old mode 100644 new mode 100755 diff --git a/src/Api/KoFi.ts b/src/Api/KoFi.ts old mode 100644 new mode 100755 diff --git a/src/Api/test.ts b/src/Api/test.ts old mode 100644 new mode 100755 diff --git a/src/Api/variables/deleteVar.ts b/src/Api/variables/deleteVar.ts old mode 100644 new mode 100755 diff --git a/src/Api/variables/fetchVar.ts b/src/Api/variables/fetchVar.ts old mode 100644 new mode 100755 diff --git a/src/Api/variables/getVar.ts b/src/Api/variables/getVar.ts old mode 100644 new mode 100755 diff --git a/src/Api/variables/setVar.ts b/src/Api/variables/setVar.ts old mode 100644 new mode 100755 diff --git a/src/commands/Utility/settings.ts b/src/commands/Utility/settings.ts deleted file mode 100644 index 66fb55f..0000000 --- a/src/commands/Utility/settings.ts +++ /dev/null @@ -1,34 +0,0 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} - -const commands: Command[] = [ - { - name: "settings", - aliases: ["setting", "seting"], - description: "Change your settings", - type: "messageCreate", - module: "Information", - version: "1.0.0", - sourcecode: "src/commands/utility/settings.ts", - documentation: "settings", - usage: "settings", - example: "settings", - code: ` - $c[----------------------------------ONLY-IF---------------------------------] - This command will be added in v 1.3.0 - ` - } -] - -export default commands; \ No newline at end of file diff --git a/src/commands/Dev/djseval.ts b/src/commands/dev/djseval.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Dev/djseval.ts rename to src/commands/dev/djseval.ts diff --git a/src/commands/Dev/eval.ts b/src/commands/dev/eval.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Dev/eval.ts rename to src/commands/dev/eval.ts diff --git a/src/commands/Dev/globalVars.ts b/src/commands/dev/globalVars.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Dev/globalVars.ts rename to src/commands/dev/globalVars.ts diff --git a/src/commands/Dev/reload.ts b/src/commands/dev/reload.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Dev/reload.ts rename to src/commands/dev/reload.ts diff --git a/src/commands/Dev/test.ts b/src/commands/dev/test.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Dev/test.ts rename to src/commands/dev/test.ts diff --git a/src/commands/Global-Interactions/avatar.ts b/src/commands/globalInteractions/avatar.ts old mode 100644 new mode 100755 similarity index 91% rename from src/commands/Global-Interactions/avatar.ts rename to src/commands/globalInteractions/avatar.ts index 8414aff..65ac968 --- a/src/commands/Global-Interactions/avatar.ts +++ b/src/commands/globalInteractions/avatar.ts @@ -1,18 +1,6 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { InteractionCommand } from '@/types' -const commands: Command[] = [ +const commands: InteractionCommand[] = [ { type: "interactionCreate", description: "Interaction used for userinfo and avatar", diff --git a/src/commands/Global-Interactions/close.ts b/src/commands/globalInteractions/close.ts old mode 100644 new mode 100755 similarity index 67% rename from src/commands/Global-Interactions/close.ts rename to src/commands/globalInteractions/close.ts index 6de9f1e..27f64e5 --- a/src/commands/Global-Interactions/close.ts +++ b/src/commands/globalInteractions/close.ts @@ -1,18 +1,6 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { InteractionCommand } from '@/types' -const commands: Command[] = [ +const commands: InteractionCommand[] = [ { type: "interactionCreate", description: "Close an interaction", @@ -30,19 +18,28 @@ const commands: Command[] = [ $splitText[2] == origin if given ] - $disableConsoleErrors $onlyIf[$splitText[0]==close;] $onlyIf[$splitText[1]==$authorID;] + $switch[$splitText[2]; $case[anime; $if[$fileExists[./files/$getUserVar[uuid;$authorID;not-found].json]==true; $deleteFile[./files/$getUserVar[uuid;$authorID;not-found].json] ] ] + $case[message; + $if[$splitText[3]!=; + $if[$guildID!=; + $if[$channelHasPerms[$channelID;$clientID;ManageMessages]==true; + $!deleteMessage[$channelID;$splitText[3]] + ] + ] + ] + ] ] - $deleteCommand + $!deleteCommand ` } diff --git a/src/commands/Global-Interactions/loop/onEveryFirstOfMonth.ts b/src/commands/globalInteractions/loop/onEveryFirstOfMonth.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/loop/onEveryFirstOfMonth.ts rename to src/commands/globalInteractions/loop/onEveryFirstOfMonth.ts diff --git a/src/commands/Global-Interactions/loop/onEveryHour.ts b/src/commands/globalInteractions/loop/onEveryHour.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/loop/onEveryHour.ts rename to src/commands/globalInteractions/loop/onEveryHour.ts diff --git a/src/commands/Global-Interactions/profile/commandTracker.ts b/src/commands/globalInteractions/profile/commandTracker.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/profile/commandTracker.ts rename to src/commands/globalInteractions/profile/commandTracker.ts diff --git a/src/commands/Global-Interactions/search/anime-character.ts b/src/commands/globalInteractions/search/anime-character.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/search/anime-character.ts rename to src/commands/globalInteractions/search/anime-character.ts diff --git a/src/commands/Global-Interactions/search/anime-favorite.ts b/src/commands/globalInteractions/search/anime-favorite.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/search/anime-favorite.ts rename to src/commands/globalInteractions/search/anime-favorite.ts diff --git a/src/commands/Global-Interactions/search/anime-next.ts b/src/commands/globalInteractions/search/anime-next.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/search/anime-next.ts rename to src/commands/globalInteractions/search/anime-next.ts diff --git a/src/commands/Global-Interactions/search/anime-previous.ts b/src/commands/globalInteractions/search/anime-previous.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/search/anime-previous.ts rename to src/commands/globalInteractions/search/anime-previous.ts diff --git a/src/commands/Global-Interactions/settings/agreedToTos.ts b/src/commands/globalInteractions/settings/agreedToTos.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/settings/agreedToTos.ts rename to src/commands/globalInteractions/settings/agreedToTos.ts diff --git a/src/commands/Global-Interactions/triggers/onError.ts b/src/commands/globalInteractions/triggers/onError.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/triggers/onError.ts rename to src/commands/globalInteractions/triggers/onError.ts diff --git a/src/commands/Global-Interactions/triggers/onInteractionCreate.ts b/src/commands/globalInteractions/triggers/onInteractionCreate.ts old mode 100644 new mode 100755 similarity index 58% rename from src/commands/Global-Interactions/triggers/onInteractionCreate.ts rename to src/commands/globalInteractions/triggers/onInteractionCreate.ts index 8d5dbf9..b379f62 --- a/src/commands/Global-Interactions/triggers/onInteractionCreate.ts +++ b/src/commands/globalInteractions/triggers/onInteractionCreate.ts @@ -1,18 +1,6 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { InteractionCommand } from '@/types' -const commands: Command[] = [ +const commands: InteractionCommand[] = [ { type: "interactionCreate", description: "Runs on every interaction.", diff --git a/src/commands/Global-Interactions/triggers/onReady.ts b/src/commands/globalInteractions/triggers/onReady.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Global-Interactions/triggers/onReady.ts rename to src/commands/globalInteractions/triggers/onReady.ts diff --git a/src/commands/globalInteractions/utility/vote.ts b/src/commands/globalInteractions/utility/vote.ts new file mode 100755 index 0000000..176d022 --- /dev/null +++ b/src/commands/globalInteractions/utility/vote.ts @@ -0,0 +1,121 @@ +import { InteractionCommand } from '@/types' + +const commands: InteractionCommand[] = [ + { + type: "interactionCreate", + version: "v1.0.0", + code: ` + $textSplit[$customID;~] + + $onlyIf[$splitText[0]==voteRewards;] + $onlyIf[$splitText[1]==$authorID;] + + $interactionUpdate[ + $color[$if[$getUserVar[color;$get[uuid];false]!=false;$getUserVar[color;$get[uuid];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $title[Earn Rewards by Voting for Me!] + $description[Every vote you give me helps me grow and add new features! Plus, I have some special rewards just for you. ❤️] + $addField[Commutative votes:;\`\`\`sql\n- 1 Vote: I’ll send you 100 coins!\n- 10 Votes: You’ll get a special profile role.\n- 25 Votes: Unlock exclusive commands!\`\`\`] + $addField[Singular votes:;\`\`\`sql\n- 65 Coins each vote you make.\n- limited timed voter badge on your profile.\n- More coming soon.\n\`\`\`\n-# some rewards can only be gained once at the same time.] + $addField[My Top Voters;\`\`\`graphql\n1. @unknown - 0 votes\n2. @unknown - 0 votes\n3. @unknown - 0 votes\`\`\`;false] + $footer[I really appreciate each and every vote! 💖 Thank you for supporting me!] + $addActionRow + $addButton[voteReturn~$authorID;Return;Danger;;false] + $addButton[voteReminder~$authorID~NA;Vote Reminder;Secondary;;false] + ] + ` + }, { + type: "interactionCreate", + version: "v1.0.0", + code: ` + $textSplit[$customID;~] + + $onlyIf[$splitText[0]==voteReturn;] + $onlyIf[$splitText[1]==$authorID;] + + $interactionUpdate[ + $color[$if[$getUserVar[color;$get[uuid];false]!=false;$getUserVar[color;$get[uuid];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $author[Here are the links to vote for me!;$userAvatar[$clientID]] + $description[Voting helps me to spread to even more servers, \nthe bigger I become the more my developer can work on me!\n\n> 1. [top.gg\\](https://top.gg/bot/738057910923296839/vote) (every 12h)\n> 2. [discord.boat\\](https://discord.boats/bot/738057910923296839/vote) (every 24h)\n> 3. [discord bot list\\](https://discordbotlist.com/bots/akira-8248/upvote) (every 24h)\n> 4. [Void Bots\\](https://voidbots.net/bot/738057910923296839/vote) (every 12h)] + + $addActionRow + $addButton[voteRewards~$authorID;Rewards;Success;;false] + $addButton[voteReminder~$authorID~NA;Vote Reminder;Secondary;;false] + ] + ` + }, { + type: "interactionCreate", + version: "v1.0.0", + code: ` + $textSplit[$customID;~] + + $onlyIf[$splitText[0]==voteReminder;] + $onlyIf[$splitText[1]==$authorID;] + $onlyIf[$splitText[2]==NA;] + $let[author;$getUserVar[uuid;$customEncrypt[encrypt;$authorID]]] + + $let[reminder;$getUserVar[voteReminder;$get[author];false]] + + $let[description;You currently have vote reminders **$if[$get[reminder]==false;disabled;enabled]** this means you will$if[$get[reminder]==false; not;] be notified when you can vote again.\nYou can change this by using the "Enable Reminder" button under this message.] + + $interactionUpdate[ + $color[$if[$getUserVar[color;$get[uuid];false]!=false;$getUserVar[color;$get[uuid];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $title[Vote Reminders!] + $description[$get[description]] + $addField[What will you get?:;\`\`\`sql\n- 65 Coins each vote you make.\n- 1 Vote: I’ll send you 100 coins!\n- 10 Votes: You’ll get a special profile role.\n- 25 Votes: Unlock exclusive commands!\`\`\`] + $addActionRow + $addButton[voteReturn~$authorID;Return;Danger;;false] + $if[$get[reminder]==false; + $addButton[voteReminder~$authorID~enable;Enable Reminder;Secondary;;false] + ; + $addButton[voteReminder~$authorID~disable;Disable Reminder;Secondary;;false] + ] + ] + ` + }, { + type: "interactionCreate", + version: "v1.0.0", + code: ` + $textSplit[$customID;~] + + $onlyIf[$splitText[0]==voteReminder;] + $onlyIf[$splitText[1]==$authorID;] + $onlyIf[$splitText[2]==disable;] + $let[author;$getUserVar[uuid;$customEncrypt[encrypt;$authorID]]] + $setUserVar[voteReminder;false;$get[author]] + + $interactionUpdate[ + $color[$if[$getUserVar[color;$get[uuid];false]!=false;$getUserVar[color;$get[uuid];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $title[Vote Reminders: disabled!] + $description[I see you’ve disabled my vote reminders. 😢\nI won’t be able to remind you when it’s time to vote again, but I know you’ll still help me grow!] + $addField[No Reminders:;I won’t bother you with reminders anymore, but you can always turn them back on if you change your mind! 💖] + $addActionRow + $addButton[voteReturn~$authorID;Return;Danger;;false] + $addButton[voteReminder~$authorID~enable;Enable Reminder;Secondary;;false] + ] + ` + }, { + type: "interactionCreate", + version: "v1.0.0", + code: ` + $textSplit[$customID;~] + + $onlyIf[$splitText[0]==voteReminder;] + $onlyIf[$splitText[1]==$authorID;] + $onlyIf[$splitText[2]==enable;] + $let[author;$getUserVar[uuid;$customEncrypt[encrypt;$authorID]]] + $setUserVar[voteReminder;true;$get[author]] + + $interactionUpdate[ + $color[$if[$getUserVar[color;$get[uuid];false]!=false;$getUserVar[color;$get[uuid];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $title[Vote Reminders: Enabled!] + $description[I’ve successfully enabled your vote reminders! 🎉 \nYou’ll get a reminder from me when it’s time to vote again. I don’t want you to miss a chance to help me grow! 💖] + $addField[When will you be reminded?;Starting the next time you vote, i will remind you to vote every 12 or 24 Hours depending on the platform you voted on.] + $addActionRow + $addButton[voteReturn~$authorID;Return;Danger;;false] + $addButton[voteReminder~$authorID~disable;Disable Reminder;Secondary;;false] + ] + ` + } +] + +export default commands; \ No newline at end of file diff --git a/src/commands/Permissions/Blacklist.ts b/src/commands/permissions/Blacklist.ts old mode 100644 new mode 100755 similarity index 65% rename from src/commands/Permissions/Blacklist.ts rename to src/commands/permissions/Blacklist.ts index 6e5c09a..bbd87c3 --- a/src/commands/Permissions/Blacklist.ts +++ b/src/commands/permissions/Blacklist.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/BotChannel.ts b/src/commands/permissions/BotChannel.ts old mode 100644 new mode 100755 similarity index 68% rename from src/commands/Permissions/BotChannel.ts rename to src/commands/permissions/BotChannel.ts index f16eae0..c21fe43 --- a/src/commands/Permissions/BotChannel.ts +++ b/src/commands/permissions/BotChannel.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Default.ts b/src/commands/permissions/Default.ts old mode 100644 new mode 100755 similarity index 66% rename from src/commands/Permissions/Default.ts rename to src/commands/permissions/Default.ts index 4b31b31..1a4cb77 --- a/src/commands/Permissions/Default.ts +++ b/src/commands/permissions/Default.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Disable.ts b/src/commands/permissions/Disable.ts old mode 100644 new mode 100755 similarity index 65% rename from src/commands/Permissions/Disable.ts rename to src/commands/permissions/Disable.ts index debebe3..0bc2752 --- a/src/commands/Permissions/Disable.ts +++ b/src/commands/permissions/Disable.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Enable.ts b/src/commands/permissions/Enable.ts old mode 100644 new mode 100755 similarity index 76% rename from src/commands/Permissions/Enable.ts rename to src/commands/permissions/Enable.ts index ec62e79..ceb75eb --- a/src/commands/Permissions/Enable.ts +++ b/src/commands/permissions/Enable.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/FreeChannel.ts b/src/commands/permissions/FreeChannel.ts old mode 100644 new mode 100755 similarity index 66% rename from src/commands/Permissions/FreeChannel.ts rename to src/commands/permissions/FreeChannel.ts index f4a57b0..223edba --- a/src/commands/Permissions/FreeChannel.ts +++ b/src/commands/permissions/FreeChannel.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Ignore.ts b/src/commands/permissions/Ignore.ts old mode 100644 new mode 100755 similarity index 67% rename from src/commands/Permissions/Ignore.ts rename to src/commands/permissions/Ignore.ts index 3aee874..39f88bd --- a/src/commands/Permissions/Ignore.ts +++ b/src/commands/permissions/Ignore.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Listen.ts b/src/commands/permissions/Listen.ts old mode 100644 new mode 100755 similarity index 68% rename from src/commands/Permissions/Listen.ts rename to src/commands/permissions/Listen.ts index b785a84..7da8063 --- a/src/commands/Permissions/Listen.ts +++ b/src/commands/permissions/Listen.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Perms.ts b/src/commands/permissions/Perms.ts old mode 100644 new mode 100755 similarity index 98% rename from src/commands/Permissions/Perms.ts rename to src/commands/permissions/Perms.ts index a69ef81..05011c4 --- a/src/commands/Permissions/Perms.ts +++ b/src/commands/permissions/Perms.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Permissions/Whitelist.ts b/src/commands/permissions/Whitelist.ts old mode 100644 new mode 100755 similarity index 65% rename from src/commands/Permissions/Whitelist.ts rename to src/commands/permissions/Whitelist.ts index 493b494..59d5638 --- a/src/commands/Permissions/Whitelist.ts +++ b/src/commands/permissions/Whitelist.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/profile/profile.ts b/src/commands/profile/profile.ts old mode 100644 new mode 100755 index ff6e9b9..ba6ebcd --- a/src/commands/profile/profile.ts +++ b/src/commands/profile/profile.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { @@ -25,7 +13,7 @@ const commands: Command[] = [ documentation: "profile/", example: "profile @dark-lynn", code: ` - + TBA ` } ] diff --git a/src/commands/profile/setlang.ts b/src/commands/profile/setlang.ts old mode 100644 new mode 100755 index a8ed911..e5162da --- a/src/commands/profile/setlang.ts +++ b/src/commands/profile/setlang.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Roleplay/block.ts b/src/commands/roleplay/block.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Roleplay/block.ts rename to src/commands/roleplay/block.ts diff --git a/src/commands/roleplay/negative/bite.ts b/src/commands/roleplay/negative/bite.ts new file mode 100755 index 0000000..4d8afb7 --- /dev/null +++ b/src/commands/roleplay/negative/bite.ts @@ -0,0 +1,49 @@ +import { Command } from "@/types" + +const commands: Command[] = [ + { + name: "bite", + aliases: ["rp-bite"], + description: "Give them a bite", + type: "messageCreate", + module: "Roleplay", + version: "1.0.0", + sourcecode: "src/commands/Roleplay/negative/bite.ts", + documentation: "roleplay", + usage: "bite {message}", + example: "bite @dark-lynn NEVER do that again.", + code: ` + $c[------------------------------------LET-----------------------------------] + $let[author;$getUserVar[uuid;$customEncrypt[encrypt;$authorID]]] + $let[lang;$if[$getUserVar[language;$get[author]]!=;$getUserVar[language;$get[author]];$if[$guildID!=;$guildPreferredLocale;en-us]]] + $let[userID;$findUser[$message[0];true]] + $let[user;$getUserVar[uuid;$get[userID];null]] + + $get[lang] + $c[----------------------------------ONLY-IF---------------------------------] + $onlyIf[$getUserVar[AgreedToTos;$get[author];false]==true;$callEmbed[agreeToTerms]] + $onlyIf[$channelID==$getGuildVar[BotChannel;$guildID;$channelID];$getGlobalVar[BotChannelError]] + $onlyIf[$findUser[$message[1;true]!=$authorID];wrong usage of bite, bite a user.] + + $onlyIf[$checkContains[$getUserVar[rp-commandblocked;$get[user]];*;bite]==false;$customError[722;bite]] + $onlyIf[$checkContains[$getUserVar[rp-blocked;$get[user]];$get[author]]!=true;$customError[722;bite]] + + $c[-----------------------------------MAIN-----------------------------------] + $let[message;$replace[$replace[$message;$message[0] ;];$message[0];]] + $let[msg;$i18n[$get[lang];message.roleplay.negative.bite.description]] + + $if[$getUserVar[bite-give;$get[author]]==;$setUserVar[bite-give;$get[author];0]] + $if[$getUserVar[bite-give;$get[author]]==;$if[$get[user]==null;$let[userAgree;false];$let[userAgree;true]$setUserVar[bite-give;$get[author];0]]] + + $setVar[bite-give;$get[author];$sum[$getVar[bite-give;$get[author]];1]] + $if[$get[user]!=null;$setVar[bite-got;$get[user];$sum[$getVar[bite-got;$get[user]];1]]] + + $color[$getVar[color;default]] + $image[$callFunction[roleplay;bite]] + $description[$replace[$replace[$get[msg];{{author}};**$nickname**;1];{{user}};**$username[$get[userID]]**;1]$if[$get[message]!=;\n"$get[message]"]] + $footer[$replace[$replace[$i18n[$get[lang];message.roleplay.negative.bite.$if[$getUserVar[bite-got;$get[author]]==1;footer.oneSingle;footer.one]];{{author}};$nickname;1];{{amount}};$getVar[bite-give;$get[author]];1] | $replace[$replace[$i18n[$get[lang];message.roleplay.negative.bite.$if[$getUserVar[bite-got;$get[user]]>=2;footer.two;footer.twoSingle]];{{amount}};$if[$get[userAgree]==true;$getVar[bite-got;$get[user]];0];1];{{user}};$nickname[$guildID;$get[userID]];1]] + ` + } +] + +export default commands; \ No newline at end of file diff --git a/src/commands/Roleplay/Wholesome/blush.ts b/src/commands/roleplay/wholesome/blush.ts old mode 100644 new mode 100755 similarity index 100% rename from src/commands/Roleplay/Wholesome/blush.ts rename to src/commands/roleplay/wholesome/blush.ts diff --git a/src/commands/Roleplay/Wholesome/hug.ts b/src/commands/roleplay/wholesome/hug.ts old mode 100644 new mode 100755 similarity index 91% rename from src/commands/Roleplay/Wholesome/hug.ts rename to src/commands/roleplay/wholesome/hug.ts index fa29bd8..7a012b2 --- a/src/commands/Roleplay/Wholesome/hug.ts +++ b/src/commands/roleplay/wholesome/hug.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from "@/types" const commands: Command[] = [ { diff --git a/src/commands/Roleplay/Wholesome/kiss.ts b/src/commands/roleplay/wholesome/kiss.ts old mode 100644 new mode 100755 similarity index 92% rename from src/commands/Roleplay/Wholesome/kiss.ts rename to src/commands/roleplay/wholesome/kiss.ts index 6d0416c..fdfac8a --- a/src/commands/Roleplay/Wholesome/kiss.ts +++ b/src/commands/roleplay/wholesome/kiss.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from "@/types" const commands: Command[] = [ { diff --git a/src/commands/Search/anime.ts b/src/commands/search/anime.ts old mode 100644 new mode 100755 similarity index 71% rename from src/commands/Search/anime.ts rename to src/commands/search/anime.ts index 73b752b..d22a66d --- a/src/commands/Search/anime.ts +++ b/src/commands/search/anime.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from "@/types" const commands: Command[] = [ { @@ -23,7 +11,7 @@ const commands: Command[] = [ version: "1.0.0", sourcecode: "src/commands/search/anime.ts", documentation: "anime/", - example: "anime frieren", + example: "anime Frieren", code: ` $let[author;$callFunction[customEncrypt;encrypt;$authorID]] $let[uuid;$getUserVar[uuid;$get[author]]] @@ -35,7 +23,7 @@ const commands: Command[] = [ $title[$userGlobalName[$authorID]'s favorite anime:] $description[- $replace[$replace[$getUserVar[anime~favorite;$authorID];,;;1];,;\n\n- ;-1]] ; - YOU DON'T HAVE ANY FAVORITED ANIME + YOU DON'T HAVE ANY FAVORITE ANIME ] ] $case[default; @@ -50,7 +38,7 @@ const commands: Command[] = [ $arrayMap[genres;genre;$jsonLoad[uwu;$env[genre]]$return[$env[uwu;name]];final] $let[amount;$env[result;pagination;items;count]] - $let[TitleOrigional;$env[result;data;0;title]] + $let[TitleOriginal;$env[result;data;0;title]] $let[TitleDefault;$env[result;data;0;title_english]] $let[TitleJapanese;$env[result;data;0;title_japanese]] $let[TrailerUrl;$env[result;data;0;trailer;url]] @@ -65,19 +53,19 @@ $c[=====-=====-===== EDIT EMBED ===-=====-=====-=====-=====-=====-=====-=====-== $customError[400;anime] ; $color[$if[$getUserVar[color;$get[author];false]!=false;$getUserVar[color;$get[author];#ff47ff];$getUserVar[color;$get[guild];#ff47ff]]] - $title[$if[$get[TitleDefault]!=null;$get[TitleDefault];$get[TitleOrigional]] - ($get[TitleJapanese]);$if[$get[TrailerUrl]==null;https://akira.lynnux.xyz/anime?id=$splitText[4];$get[TrailerUrl]]] + $title[$if[$get[TitleDefault]!=null;$get[TitleDefault];$get[TitleOriginal]] - ($get[TitleJapanese]);$if[$get[TrailerUrl]==null;https://akira.lynnux.xyz/anime?id=$splitText[4];$get[TrailerUrl]]] $description[$djsEval[function trimString(str, maxLength) {if (str.length > maxLength) {return str.slice(0, maxLength - 3) + '...';}return str;}const longString = \`$get[description]\`;const trimmedString = trimString(longString, 450);trimmedString;]] $thumbnail[$httpResult[data;0;images;webp;image_url]] $switch[$env[result;data;0;type]; - $case[TV Special;$addField[TV Special: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;untill;-1]\n<:Episode:1275135592140640403> **Episodes:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] - $case[TV;$addField[TV Series: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;untill;-1]\n<:Episode:1275135592140640403> **Episodes:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] - $case[Music;$addField[Music: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;untill;-1]\n<:Music:1275405140232372336>**Tracks:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] - $case[Movie;$addField[Movie: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;untill;-1]\n<:Movie:1275435316441907321>**Genres:** $arrayJoin[final;, ]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] - $case[OVA;$addField[Origional Video Animation: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;untill;-1]\n<:Episode:1275135592140640403> **Episodes:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] - $case[ONA;$addField[Web Anime: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;untill;-1]\n<:Movie:1275435316441907321> **Genres:** $arrayJoin[final;, ]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] + $case[TV Special;$addField[TV Special: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;until;-1]\n<:Episode:1275135592140640403> **Episodes:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] + $case[TV;$addField[TV Series: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;until;-1]\n<:Episode:1275135592140640403> **Episodes:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] + $case[Music;$addField[Music: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;until;-1]\n<:Music:1275405140232372336>**Tracks:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] + $case[Movie;$addField[Movie: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;until;-1]\n<:Movie:1275435316441907321>**Genres:** $arrayJoin[final;, ]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] + $case[OVA;$addField[Original Video Animation: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;until;-1]\n<:Episode:1275135592140640403> **Episodes:** $env[result;data;0;episodes]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] + $case[ONA;$addField[Web Anime: Info;<:Clock:1271543787637833759> **Duration:** $env[result;data;0;duration]\n<:Date:1271543843157971014> **Aired:** $replace[$replace[$env[result;data;0;aired;string];to ?;Until $if[$env[result;data;0;status]==Currently Airing;Present;Unknown];1];tp;until;-1]\n<:Movie:1275435316441907321> **Genres:** $arrayJoin[final;, ]\n<:Plus:1271544047579693148> **Age Rating:** $env[result;data;0;rating]]] ] $addActionRow - $addButton[anime~favorite~$authorID~$get[page]~$get[malID];;$if[$checkContains[$getuserVar[anime~favorite;$get[author]];$get[malID]]==true;Success;Secondary];⭐;false] + $addButton[anime~favorite~$authorID~$get[page]~$get[malID];;$if[$checkContains[$getUserVar[anime~favorite;$get[author]];$get[malID]]==true;Success;Secondary];⭐;false] $addButton[anime~previous~$authorID~$math[$get[page]-1]~$get[malID];;Primary;◀️;$if[$get[page]==0;true;false]] $addButton[NoReply~$authorID;$math[$get[page]+1]/$get[amount];Secondary;;true] $addButton[anime~next~$authorID~$math[$get[page]+1]~$get[malID];;Primary;▶️;$if[$get[amount]==1;true;false]] @@ -89,7 +77,7 @@ $c[=====-=====-===== EDIT EMBED ===-=====-=====-=====-=====-=====-=====-=====-== $ephemeral $color[$getGlobalVar[colorError]] $title[Woops Whats this anime?] - $description[I couldnt find the anime \`$get[query]\` sorry.] + $description[I couldn't find the anime \`$get[query]\` sorry.] ] ] $case[default; diff --git a/src/commands/Search/animechar.ts b/src/commands/search/animechar.ts old mode 100644 new mode 100755 similarity index 91% rename from src/commands/Search/animechar.ts rename to src/commands/search/animechar.ts index d8a2f04..bde8ce6 --- a/src/commands/Search/animechar.ts +++ b/src/commands/search/animechar.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from "@/types" const commands: Command[] = [ { @@ -57,11 +45,11 @@ const commands: Command[] = [ $if[$get[animeRequest]==200;$author[From the anime: "$httpResult[data;0;anime;title]"]] ] $case[default; - $customError[500;animechar] + $customError[500;animeChar] ] ] ; - WHAT CHARACTER ARE YOU LOOKIGN FOR? + WHAT CHARACTER ARE YOU LOOKING FOR? ] ` } diff --git a/src/commands/Utility/about.ts b/src/commands/utility/about.ts old mode 100644 new mode 100755 similarity index 89% rename from src/commands/Utility/about.ts rename to src/commands/utility/about.ts index 9fa7b16..6c477c3 --- a/src/commands/Utility/about.ts +++ b/src/commands/utility/about.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from "@/types" const commands: Command[] = [ { diff --git a/src/commands/Utility/avatar.ts b/src/commands/utility/avatar.ts old mode 100644 new mode 100755 similarity index 83% rename from src/commands/Utility/avatar.ts rename to src/commands/utility/avatar.ts index 3d5f2e5..c7be310 --- a/src/commands/Utility/avatar.ts +++ b/src/commands/utility/avatar.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from "@/types" const commands: Command[] = [ { @@ -25,13 +13,14 @@ const commands: Command[] = [ example: "avatar @dark-lynn", version: "1.0.0", code: ` + $let[SHFEUHFWJFI;jifoiwjoiwfjop] + $get[SHFEUHFWJFI] $textSplit[userAvatar~$findUser[$message[0];true]~$authorID;~] $c[ $splitText[0] == Custom ID Name $splitText[1] == userID $splitText[2] == authorID ] - $onlyForUsers[;705306248538488947;392609934744748032] $if[$authorID==705306248538488947;Ping: \`$pingMS\` | Uptime: ;] $disableConsoleErrors diff --git a/src/commands/Utility/cleardata.ts b/src/commands/utility/cleardata.ts old mode 100644 new mode 100755 similarity index 88% rename from src/commands/Utility/cleardata.ts rename to src/commands/utility/cleardata.ts index 2f4a2d4..c21dc0e --- a/src/commands/Utility/cleardata.ts +++ b/src/commands/utility/cleardata.ts @@ -1,18 +1,6 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description?: string; - module?: string; - sourcecode?: string; - documentation?: string; - usage?: string; - example?: string; - version?: string; - code: string; -} +import { InteractionCommand } from "@/types" -const commands: Command[] = [ +const commands: InteractionCommand[] = [ { name: "cleardata", aliases: ['removedata'], @@ -22,7 +10,7 @@ const commands: Command[] = [ sourcecode: "/SRC/commands/utility/cleardata.js", documentation: "cleardata", usage: "cleardata", - example: "cleardata", + example: "clearData", version: "1.0.0", code: ` $title[Are you sure you?] @@ -31,12 +19,13 @@ const commands: Command[] = [ $footer[I will also leave any servers you own.] $color[$getGlobalVar[color]] $addActionRow - $addButton[cleardata_0~$authorID;Nevermind;Secondary] + $addButton[cleardata_0~$authorID;never-mind;Secondary] $addButton[cleardata_1~$authorID;Delete my data;Danger] ` }, { type: "interactionCreate", + version: "V1.0.0", code: ` $textSplit[$customID;~] $onlyIf[$startsWith[$splitText[0];cleardata]==true;] diff --git a/src/commands/Utility/commandInfo.ts b/src/commands/utility/commandInfo.ts old mode 100644 new mode 100755 similarity index 91% rename from src/commands/Utility/commandInfo.ts rename to src/commands/utility/commandInfo.ts index 4e844c3..170e869 --- a/src/commands/Utility/commandInfo.ts +++ b/src/commands/utility/commandInfo.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Utility/donate.ts b/src/commands/utility/donate.ts old mode 100644 new mode 100755 similarity index 86% rename from src/commands/Utility/donate.ts rename to src/commands/utility/donate.ts index 4343c62..d9563d6 --- a/src/commands/Utility/donate.ts +++ b/src/commands/utility/donate.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Utility/help.ts b/src/commands/utility/help.ts old mode 100644 new mode 100755 similarity index 99% rename from src/commands/Utility/help.ts rename to src/commands/utility/help.ts index b4d13ba..81a7c7c --- a/src/commands/Utility/help.ts +++ b/src/commands/utility/help.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Utility/report.ts b/src/commands/utility/report.ts old mode 100644 new mode 100755 similarity index 68% rename from src/commands/Utility/report.ts rename to src/commands/utility/report.ts index 1ebbeec..b05d28a --- a/src/commands/Utility/report.ts +++ b/src/commands/utility/report.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/utility/settings.ts b/src/commands/utility/settings.ts new file mode 100755 index 0000000..7690e4e --- /dev/null +++ b/src/commands/utility/settings.ts @@ -0,0 +1,38 @@ +import { Command } from '@/types' + +const commands: Command[] = [ + { + name: "settings", + aliases: ["setting", "setting"], + description: "Change your settings", + type: "messageCreate", + module: "Utility", + version: "1.0.0", + sourcecode: "src/commands/utility/settings.ts", + documentation: "settings", + usage: "settings", + example: "settings", + code: ` + $let[author;$getUserVar[uuid;$customEncrypt[encrypt;$authorID]]] + $onlyIf[$getUserVar[AgreedToTos;$get[author]]==true;$getGlobalVar[AgreedToTosEmbedReply]] + $let[authorID;$authorID] + $if[$botOwnerID==$authorID;$if[$message[0]!=;$let[authorID;$findUser[$message[0]]]$let[author;$getUserVar[uuid;$customEncrypt[encrypt;$findUser[$message[0]]]]]] + $onlyIf[$getUserVar[AgreedToTos;$get[author]]==true;$customError[600;settings]] + + $if[$guildID==;$let[type;dm];$let[type;guild]$let[perms;false]] + $if[$get[type]==guild;$if[$hasPerms[$guildID;$authorID;Administrator]==true;$let[perms;true];$if[$checkContains[$getGuildVar[perms~$get[author];$guildID];+ $toLowercase[guild.settings]]==true;$let[perms;true];$let[perms;false]]]]] + + $author[User Settings: "@$userGlobalName[$get[authorID]]";$userAvatar[$get[authorID];64;webp]] + $color[$if[$getUserVar[color;$get[author];false]!=false;$getUserVar[color;$get[author];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $addField[Preferences:;Language: \`en-US\`\nResponse: \`DM\`;true] + $addField[Customization:;Prefix: \`$getUserVar[prefix;$get[author]]\`\nColor: \`$getUserVar[color;$get[author];#ff47ff]\`;true] + $footer[Your UUID: "$get[author]"] + + $addActionRow + $addButton[guildSettings;Guild Settings;Secondary;;$if[$get[perms]==false;true;false]] + $addButton[close~$authorID~message~$messageID;Close;Danger] + ` + } +] + +export default commands; \ No newline at end of file diff --git a/src/commands/Utility/translate.ts b/src/commands/utility/translate.ts old mode 100644 new mode 100755 similarity index 97% rename from src/commands/Utility/translate.ts rename to src/commands/utility/translate.ts index 4818739..3f79693 --- a/src/commands/Utility/translate.ts +++ b/src/commands/utility/translate.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/Utility/userInfo.ts b/src/commands/utility/userInfo.ts old mode 100644 new mode 100755 similarity index 96% rename from src/commands/Utility/userInfo.ts rename to src/commands/utility/userInfo.ts index 8280ccd..a32835e --- a/src/commands/Utility/userInfo.ts +++ b/src/commands/utility/userInfo.ts @@ -1,16 +1,4 @@ -interface Command { - name?: string; - aliases?: string[]; - type: string; - description: string; - module: string; - sourcecode: string; - documentation?: string; - usage?: string; - example?: string; - version: string; - code: string; -} +import { Command } from '@/types' const commands: Command[] = [ { diff --git a/src/commands/utility/vote.ts b/src/commands/utility/vote.ts new file mode 100755 index 0000000..49685ed --- /dev/null +++ b/src/commands/utility/vote.ts @@ -0,0 +1,24 @@ +import { Command } from '@/types' + +const commands: Command[] = [ + { + name: "vote", + type: "messageCreate", + description: "Get info on how to vote for akira.", + module: "Utility", + version: "V1.0.0", + sourcecode: "src/commands/utility/vote.ts", + code: + ` + $color[$if[$getUserVar[color;$get[uuid];false]!=false;$getUserVar[color;$get[uuid];#ff47ff];$getUserVar[color;$guildID;#ff47ff]]] + $author[Here are the links to vote for me!;$userAvatar[$clientID]] + $description[Voting helps me to spread to even more servers, \nthe bigger I become the more my developer can work on me!\n\n> 1. [top.gg\\](https://top.gg/bot/738057910923296839/vote) (every 12h)\n> 2. [discord.boat\\](https://discord.boats/bot/738057910923296839/vote) (every 24h)\n> 3. [discord bot list\\](https://discordbotlist.com/bots/akira-8248/upvote) (every 24h)\n> 4. [Void Bots\\](https://voidbots.net/bot/738057910923296839/vote) (every 12h)] + + $addActionRow + $addButton[voteRewards~$authorID;Rewards;Success;;false] + $addButton[voteReminder~$authorID~NA;Vote Reminder;Secondary;;false] + ` + } +] + +export default commands; \ No newline at end of file diff --git a/src/functions/callEmbed.ts b/src/functions/callEmbed.ts old mode 100644 new mode 100755 diff --git a/src/functions/containsCommand.ts b/src/functions/containsCommand.ts old mode 100644 new mode 100755 index 0709192..4e9ae94 --- a/src/functions/containsCommand.ts +++ b/src/functions/containsCommand.ts @@ -9,7 +9,7 @@ const functions: CustomFunction[] = [ name: "containsCommand", params: ["command"], code: ` - $return[$checkContains[$toLowerCase[$env[command]];blacklist;black-list;botchannel;bot-channel;default;default-channels;disable;disable-command;enable-command;enable;freechannel;free-channel;free;ignore;ignore-channel;listen;listen-channel;permission;permissions;perm;perms;white-list;whitelist;anime;animelookup;whattheanime;about;info;information;avatar;useravatar;cleardata;removedata;cmd;commandinfo;command-info;command;sos;help;help-me;what;howto;how-to;report;ifoundabug;ibrokesomething;settings;setting;seting;userinfo;user;whois]] + $return[$checkContains[$toLowerCase[$env[command]];blacklist;black-list;botchannel;bot-channel;default;default-channels;disable;disable-command;enable-command;enable;freechannel;free-channel;free;ignore;ignore-channel;listen;listen-channel;permission;permissions;perm;perms;white-list;whitelist;anime;animelookup;whattheanime;about;info;information;avatar;useravatar;cleardata;removedata;cmd;commandinfo;command-info;command;sos;help;help-me;what;howto;how-to;report;ifoundabug;ibrokesomething;settings;setting;setting;userinfo;user;whois]] ` } ] diff --git a/src/functions/containsModule.ts b/src/functions/containsModule.ts old mode 100644 new mode 100755 diff --git a/src/functions/customEncrypt.ts b/src/functions/customEncrypt.ts old mode 100644 new mode 100755 diff --git a/src/functions/customError.ts b/src/functions/customError.ts old mode 100644 new mode 100755 diff --git a/src/functions/emoji.ts b/src/functions/emoji.ts old mode 100644 new mode 100755 diff --git a/src/functions/errorEmbed.ts b/src/functions/errorEmbed.ts old mode 100644 new mode 100755 index f624e82..ab644b4 --- a/src/functions/errorEmbed.ts +++ b/src/functions/errorEmbed.ts @@ -23,7 +23,7 @@ const functions: CustomFunction[] = [ $description[**in:** $replace[$env[command;$env[type];$env[cmdid];main];{prefix};$getGuildVar[prefix;$customEncrypt[encrypt;$guildID;$getGlobalVar[prefix;a.]]]]\n**Error:** \`$env[errorid] ($env[result;$env[errorid];meaning])\`\n**Error Message:** \n\`\`\`$env[result;$env[errorid];description]\`\`\`] ] ] - $addField[Isued:;**Author:** <@$authorID> ||$authorID||\n**Usage:** \n\`$env[command;slash;$env[cmdid];main] $getUserVar[error;$authorID]\`;true] + $addField[Issued:;**Author:** <@$authorID> ||$authorID||\n**Usage:** \n\`$env[command;slash;$env[cmdid];main] $getUserVar[error;$authorID]\`;true] $if[$guildID!=; $attachment[$memberPerms[$guildID;$clientID;,\n];result.actionscript;true] $addField[GuildInfo:;**Guild**: $guildName[$guildID] ~ ||$guildID||\n**Permissions**: \`in file attached\`;true] diff --git a/src/functions/i18n.ts b/src/functions/i18n.ts old mode 100644 new mode 100755 diff --git a/src/functions/i18nRequest.ts b/src/functions/i18nRequest.ts old mode 100644 new mode 100755 index 93d0984..3b7605d --- a/src/functions/i18nRequest.ts +++ b/src/functions/i18nRequest.ts @@ -12,10 +12,10 @@ const functions: CustomFunction[] = [ $textSplit[$env[lang];-] $let[lang;$toLowercase[$splitText[0]]-$toUpperCase[$splitText[1]]] - $switch[$replace[$get[lang];default;origional;1]; + $switch[$replace[$get[lang];default;original;1]; $case[custom; ] - $case[origional; + $case[original; $c[Counts as default input] ] $case[default; @@ -23,7 +23,7 @@ const functions: CustomFunction[] = [ $return[$djsEval[const path = require('path');const { loadYaml } = require(path.join(__dirname, '../../../../../../dist/i18n.js'));const successMessage = loadYaml("$get[lang]", '$env[string]');successMessage]] ] ] - $return[$checkContains[$toLowerCase[$env[command]];blacklist;black-list;botchannel;bot-channel;default;default-channels;disable;disable-command;enable-command;enable;freechannel;free-channel;free;ignore;ignore-channel;listen;listen-channel;permission;permissions;perm;perms;white-list;whitelist;anime;animelookup;whattheanime;about;info;information;avatar;useravatar;cleardata;removedata;cmd;commandinfo;command-info;command;sos;help;help-me;what;howto;how-to;report;ifoundabug;ibrokesomething;settings;setting;seting;userinfo;user;whois]] + $return[$checkContains[$toLowerCase[$env[command]];blacklist;black-list;botchannel;bot-channel;default;default-channels;disable;disable-command;enable-command;enable;freechannel;free-channel;free;ignore;ignore-channel;listen;listen-channel;permission;permissions;perm;perms;white-list;whitelist;anime;animelookup;whattheanime;about;info;information;avatar;useravatar;cleardata;removedata;cmd;commandinfo;command-info;command;sos;help;help-me;what;howto;how-to;report;ifoundabug;ibrokesomething;settings;setting;setting;userinfo;user;whois]] ` } ] diff --git a/src/functions/nekosbest.ts b/src/functions/nekosbest.ts old mode 100644 new mode 100755 diff --git a/src/functions/roleplay.ts b/src/functions/roleplay.ts old mode 100644 new mode 100755 diff --git a/src/handler/events.ts b/src/handler/events.ts old mode 100644 new mode 100755 index 8661d2e..5ccc124 --- a/src/handler/events.ts +++ b/src/handler/events.ts @@ -24,7 +24,7 @@ const events: (keyof ClientEvents)[] = [ //"guildAuditLogEntryCreate", // This event is called when a guild audit log entry is created //"guildAvailable", // This event is called when a guild becomes available //"guildBanAdd", // This event is called when a ban is added - //"guildBanRemove", // This evemt is called when a ban is removed + //"guildBanRemove", // This event is called when a ban is removed //"guildCreate", // This event is called when the bot is added to a guild //"guildDelete", // This event is called when the bot is removed from a guild "guildMemberAdd", // This event is called when a member joins the guild diff --git a/src/handler/intents.ts b/src/handler/intents.ts old mode 100644 new mode 100755 diff --git a/src/i18n.ts b/src/i18n.ts old mode 100644 new mode 100755 diff --git a/src/index.ts b/src/index.ts old mode 100644 new mode 100755 index f594f93..c184be8 --- a/src/index.ts +++ b/src/index.ts @@ -97,11 +97,12 @@ ForgeDB.variables({ currentFulltimeJob: "none", // [ Errors ] AgreedToTosError: "$ephemeral $color[#ff47ff] $title[Before we continue:] $footer[You have to agree with these terms before using akira.] $description[Before you proceed, please make sure to read and agree to our [Terms of Service\\](https://akira.lynnux.xyz/terms) and [Privacy Policy\\](https://akira.lynnux.xyz/policy).\n\nBy using the button below, you confirm that you have read and agree to abide by our terms and policies.\n\nIf you have any questions or concerns, feel free to contact our support team.] $addActionRow $addButton[AcceptTerms-$authorID;I have read and agree to abide by these terms and policies.;Success;;false]", - BotChannelError: "$try[$!addMessageReactions[$channelID;$messageID;<:Wrong:1176924307834814564>];$ephemeral $interactionReply[<:Wrong:1176924307834814564> This channel is ignored, please use this command in the bot specific chanenl (<#$getVar[BotChannel;$guildID]>)]]", - BotChannelAlreadyFreedError: "$color[#d50056] $title[Something went wrong:] $description[<:Wrong:1176924307834814564> There doesnt seem to be a bot Channel.]", + BotChannelError: "$try[$!addMessageReactions[$channelID;$messageID;<:Wrong:1176924307834814564>];$ephemeral $interactionReply[<:Wrong:1176924307834814564> This channel is ignored, please use this command in the bot specific channel (<#$getVar[BotChannel;$guildID]>)]]", + BotChannelAlreadyFreedError: "$color[#d50056] $title[Something went wrong:] $description[<:Wrong:1176924307834814564> There doesn't seem to be a bot Channel.]", NotEnoughUsersFoundOrMentionedError: "$title[Something went wrong:] $description[<:Wrong:1176924307834814564> You need to mention someone to kick.]$color[#d50056]", BotChannelAlreadySetError: "$color[#d50056] $title[Something went wrong:] $description[<:Wrong:1176924307834814564> The channel <#$channelID> is already set as the bot channel already.]", // NEW + voteReminder: false, AgreedToTosEmbedReply: "$interactionReply $color[#ff47ff] $title[Before we continue:] $footer[You have to agree with these terms before using akira.] $description[Before you proceed, please make sure to read and agree to our [Terms of Service\\](https://akira.lynnux.xyz/terms) and [Privacy Policy\\](https://akira.lynnux.xyz/policy).\n\nBy using the button below, you confirm that you have read and agree to abide by our terms and policies.\n\nIf you have any questions or concerns, feel free to contact our support team.] $addActionRow $addButton[AcceptTerms-$authorID;I have read and agree to abide by these terms and policies.;Success;;false]", userIsBannedSlashError: "$ephemeral $color[#d50056 $title[You're banned!] $description[<:Error:1269706678039744574> One of my developers has banned you from using any of my commands,\nif you think this is a error, or want to apply for an unban please contact us by using `soon`.]]", // [ ADDED }) diff --git a/src/slash/job/apply.ts b/src/slash/job/apply.ts old mode 100644 new mode 100755 index 2aad8b3..49a218d --- a/src/slash/job/apply.ts +++ b/src/slash/job/apply.ts @@ -1,5 +1,8 @@ // @ts-nocheck // @ts-ignore +// cspell:words actionscript onthego + + module.exports = { name: "apply", code: ` diff --git a/src/slash/job/details.ts b/src/slash/job/details.ts old mode 100644 new mode 100755 diff --git a/src/slash/job/economy.md b/src/slash/job/economy.md old mode 100644 new mode 100755 index a5bee62..cec85d9 --- a/src/slash/job/economy.md +++ b/src/slash/job/economy.md @@ -1,7 +1,7 @@ # Akira Economy Modules - [Akira Economy Modules](#akira-economy-modules) - - [Incomming](#incomming) + - [Incoming](#incoming) - [Work](#work) - [Normal Work](#normal-work) - [Special Work](#special-work) @@ -20,13 +20,13 @@ - [Programmer Exp](#programmer-exp) - [Ideas](#ideas) -## Incomming +## Incoming ### Work `Normal Work = normal stamina usage | normal hours | Cooldown` -`c/H = Coins per hour.` | `w/H = wood per hour` | `a/H = Artifects per hour` | `s/H = Stone per hour` | `f/H = Fish per hour` +`c/H = Coins per hour.` | `w/H = wood per hour` | `a/H = Artifacts per hour` | `s/H = Stone per hour` | `f/H = Fish per hour` `(A) = Rare` | `(S) = Super Rare` @@ -43,9 +43,9 @@ | Work Name | Description | Default Income | Type of income | Work Time | Cooldown | note | |-----------|-------------|------------------|----------------|-----------|----------|-------------------------| | Timer | Hard Work | 2 to 3 W/H | Wood/Coins(R) | 7H to 12H | 15 Hours | Min = 175 \| Max 450 | -| Explorer | Hard Work | 0.25 to 1.50 a/H | Artifect/Coins | 7H to 13H | 14 Hours | Min = 49.35 \| Max 550 | +| Explorer | Hard Work | 0.25 to 1.50 a/H | Artifacts/Coins| 7H to 13H | 14 Hours | Min = 49.35 \| Max 550 | | Miner | Hard Work | 10/25 s/H | Stone/Ruby(S) | 7H to 12H | 15 Hours | Min = 187 \| Max 510 | -| Fishher | Hard Work | 0.33 to 12 f/H | Fish/Boot(R) | 10 Hours | 10 Hours | Min = 14.025 \| max 510 | +| Fisher | Hard Work | 0.33 to 12 f/H | Fish/Boot(R) | 10 Hours | 10 Hours | Min = 14.025 \| max 510 | ### Special income @@ -66,7 +66,7 @@ | 1x | Boot | 7.0 Coins | 15 Coins | | 1X | Stone | 1.7 Coins | 3.0 Coins | | 1x | Ruby | 120 Coins | 175 Coins | -| 1x | Artifect | 28.2 Coins | 45 Coins | +| 1x | Artifacts | 28.2 Coins | 45 Coins | ## Outgoing diff --git a/src/slash/job/promotion.ts b/src/slash/job/promotion.ts old mode 100644 new mode 100755 diff --git a/src/slash/job/quit.ts b/src/slash/job/quit.ts old mode 100644 new mode 100755 diff --git a/src/slash/job/tasks.ts b/src/slash/job/tasks.ts old mode 100644 new mode 100755 diff --git a/src/slash/job/work.ts b/src/slash/job/work.ts old mode 100644 new mode 100755 diff --git a/src/slash/roleplay/neutral.ts b/src/slash/roleplay/neutral.ts old mode 100644 new mode 100755 index 0285ada..66d5f7c --- a/src/slash/roleplay/neutral.ts +++ b/src/slash/roleplay/neutral.ts @@ -10,8 +10,10 @@ module.exports = { $onlyIf[$checkContains[$getVar[rp-commandblocked;$get[user]];*]==false;:x: All roleplay commands are blocked by $get[user1].] $onlyIf[$checkContains[$getVar[rp-commandblocked;$get[user]];$get[type]]==false;:x: This roleplay command is blocked by $get[user1].] $onlyIf[$getVar[rp-blocked-$authorID;$get[user]]!=true;:x: Sorry but $get[user1] blocked you from using roleplay commands on you.$ephemeral] + $setVar[$get[type]-give;$authorID;$sum[$getVar[$get[type]-give;$authorID];1]] $setVar[$get[type]-got;$get[user];$sum[$getVar[$get[type]-got;$get[user]];1]] + $let[msg; $if[$get[type]==bonk;$get[user1] got bonked by $get[user2].; $if[$get[type]==bored;$get[user2] got bored of $get[user1]; diff --git a/src/slash/roleplay/wholesome.ts b/src/slash/roleplay/wholesome.ts old mode 100644 new mode 100755 index 2334b68..313c9f6 --- a/src/slash/roleplay/wholesome.ts +++ b/src/slash/roleplay/wholesome.ts @@ -12,7 +12,7 @@ module.exports = { $c[=================================================== PERMS ============================================================================================================================================================] $if[$checkContains[$getGuildVar[perms~roleplay;$get[guild]];- $get[channel]]==false;$let[passChannel;true];$let[passChannel;false]$let[error;902]] - $if[$checkContains[$getGuildVar[perms~whoesome;$get[guild]];- $get[channel]]==false;$let[passChannel;true];$let[passChannel2;false]$let[error;500]] + $if[$checkContains[$getGuildVar[perms~wholesome;$get[guild]];- $get[channel]]==false;$let[passChannel;true];$let[passChannel2;false]$let[error;500]] $onlyIf[$get[passChannel]==true;$customError[901;wholesome]] $onlyIf[$get[passChannel2]==true;$customError[500;wholesome]] @@ -26,13 +26,13 @@ $c[=================================================== PERMS =================== $let[type;$option[type]] $if[$get[user]!=NAN; - $let[userid;$if[$option[user]==;NAN;$option[user]]] + $let[userID;$if[$option[user]==;NAN;$option[user]]] $let[username;**$username[$get[user]]**] $let[user;$customEncrypt[encrypt;$get[user]]] ] $let[message;$option[message]] - $onlyIf[$get[userid]!=$authorID;You cant do this to yourself.] + $onlyIf[$get[userID]!=$authorID;You cant do this to yourself.] $onlyIf[$checkContains[$getUserVar[rp-commandblocked;$get[user]];*]==false;:x: All roleplay commands are blocked by $get[user1].] $onlyIf[$checkContains[$getUserVar[rp-commandblocked;$get[user]];$get[type]]==false;:x: This roleplay command is blocked by $get[user1].] $onlyIf[$getUserVar[rp-blocked-$authorID;$get[user]]!=true;:x: Sorry but $get[user1] blocked you from using roleplay commands on you.$ephemeral] diff --git a/src/types.ts b/src/types.ts old mode 100644 new mode 100755 index 8dc676d..844143c --- a/src/types.ts +++ b/src/types.ts @@ -1,7 +1,7 @@ export interface Command { name?: string; aliases?: string[]; - type: string; + type: "messageCreate" | "debug" | "ready" | "interactionCreate"; description: string; module: string; sourcecode: string; @@ -10,4 +10,24 @@ export interface Command { example?: string; version: string; code: string; +} + +export interface InteractionCommand { + name?: string; + aliases?: string[]; + type:"interactionCreate" | "messageCreate" ; + description?: string; + module?: string; + sourcecode?: string; + documentation?: string; + usage?: string; + example?: string; + version: string; + code: string; +} + +export interface customFunction { + name: string; + params?: string[]; + code: string; } \ No newline at end of file diff --git a/tags.md b/tags.md old mode 100644 new mode 100755 index 25ee2c7..8e081f9 --- a/tags.md +++ b/tags.md @@ -10,9 +10,9 @@ ## Main tags -| Tag | description | Exaple | -|------------|--------------------------------------------|--------| -| {{prefix}} | Gets replaced with the User/Server prefix. | a. | +| Tag | description | Example | +|------------|--------------------------------------------|---------| +| {{prefix}} | Gets replaced with the User/Server prefix. | a. | ## Linking pages diff --git a/tsconfig.json b/tsconfig.json old mode 100644 new mode 100755