Skip to content

Commit

Permalink
Merge pull request #34 from LynnuxDev/backup-branch
Browse files Browse the repository at this point in the history
Backup branch
  • Loading branch information
Dark-LYNN authored Jan 8, 2025
2 parents 1ef6c3d + 8ea7857 commit 151c011
Show file tree
Hide file tree
Showing 10 changed files with 312 additions and 163 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.

## [0.6.0](https://github.com/LynnuxDev/Akira/compare/v0.5.14...v0.6.0) (2025-01-08)


### Bug Fixes

* Changed to subcommands ([ccca2fb](https://github.com/LynnuxDev/Akira/commit/ccca2fbc0cfb8b8e46d6efc1dbcd5cfdf24ab79d))
* using all the same Modules now. ([7e78e6f](https://github.com/LynnuxDev/Akira/commit/7e78e6f81369c05ec02214b5430ef52f0e3641c6))


### Chores

* added error ([780bee5](https://github.com/LynnuxDev/Akira/commit/780bee5454ce272e8d1a6fb5bb6358c299f2ced4))


### Code Refactoring

* File counter.ts has 336 lines of code (exceeds 250). ([1c62510](https://github.com/LynnuxDev/Akira/commit/1c62510d45118038f85af71383c2d8cd68ef33f5))
* File counter.ts has 336 lines of code (exceeds 250). ([a2be48e](https://github.com/LynnuxDev/Akira/commit/a2be48ee5dbbf9e8f7423a2e0700526364a11ef0))
* Similar blocks of code found in 2 locations. ([22087bb](https://github.com/LynnuxDev/Akira/commit/22087bb6e27e9417fa356f664766b0804e9d7c78))
* Similar blocks of code found in 2 locations. ([5dcdc7a](https://github.com/LynnuxDev/Akira/commit/5dcdc7a96bab32c9c19a7db3ec7474fca14f6703))
* Similar blocks of code found in 2 locations. ([efddbcb](https://github.com/LynnuxDev/Akira/commit/efddbcb9addd31aaf60bc482039f6cdb24b9a531))
* Similar blocks of code found in 2 locations. FIX ([9837bd7](https://github.com/LynnuxDev/Akira/commit/9837bd74b84d1a865eb28b55c310c04a9199c487))

## [0.5.14](https://github.com/LynnuxDev/Akira/compare/v0.5.13...v0.5.14) (2025-01-07)


Expand Down
4 changes: 4 additions & 0 deletions INFO/Errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ table of content
| 810 | WelcomeMSG invalid MNT | The input for welcome message mention is not valid. |
| 811 | WelcomeMSG invalid TYPE| The input for welcome message type is not valid. |
| 812 | Prefix to long | The used prefix is to long, max characters are 8. |
| 813 | Language not supported | This language is not supported |
| 814 | Only one language allowed | Due to discord limitations we needed to split our language input in 2 but only 1 can be used max. |
| 815 | At least one language required | You need to atleast give a language to change to. |
| 816 | Language already in use| The given language is already the set language. |
| 901 | Perms Channel denied | The perms for this command have been disabled for this channel |
| 902 | Perms User denied | The perms for this command have been disabled for this user |
| 903 | Perms Role denied | The perms for this command have been disabled for a role the user has |
Expand Down
62 changes: 62 additions & 0 deletions files/errors.json
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,68 @@
"description": "The provided prefix exceeds the maximum character limit of `8`. Please use a shorter prefix.",
"from": "Client"
},
"813": {
"title": [
"Lost in Translation",
"Unsupported Tongue",
"Language Barrier Alert",
"Say What?",
"Not on the Language Menu",
"Unsupported Lexicon",
"Out of Linguistic Bounds"
],
"meaning": "Language not supported",
"description": "The provided language is not supported. Please double-check your spelling. If you'd like this language to be added, suggest it using `{{prefix}}suggest`.",
"from": "Client"
},
"814": {
"title": [
"One Is the Loneliest Number",
"Language Solo Only",
"Too Many Tongues!",
"Pick One,Please!",
"Discord Says No to Duo",
"A One-Language Limit",
"Language Overload Averted",
"Keep It Simple,Linguist"
],
"meaning": "Only one language allowed",
"description": "Due to Discord limitations, we had to split our language input into two fields, but only one can be used at a time. Please select a single language.",
"from": "Client"
},
"815": {
"title": [
"Lost in Silence",
"Where's the Language?",
"Say Something!",
"Don't Leave Me Hanging",
"Language Required",
"Fill in the Blank",
"Forgot Something?",
"No Language, No Fun"
],
"meaning": "At least one language required",
"description": "You need to provide at least one language to change to. Please specify the language you'd like to use.",
"from": "Client"
},
"816": {
"title": [
"Déjà Vu?",
"Already Speaking That!",
"Same Language, Same Page",
"Why Fix What Ain't Broke?",
"No Change Detected",
"You're Already There",
"Language Unchanged",
"Still English, Fancy That!",
"\"If it ain't broke, don't fix it!\"",
"Copy-Paste Much?"
],
"meaning": "Language already in use",
"description": "You're already using this language! No changes were made. If you'd like to try another, feel free to pick a different language.",
"from": "Client"
},

"901": {
"title": ["Permission, denied.", "Sorry,Can't do that here."],
"meaning": "Perms Channel denied.",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "akira",
"version": "0.5.14",
"version": "0.6.0",
"description": "Akira's yet another multipurpose discord bot.",
"author": "LynnuxDev",
"license": "BSD-4-Clause",
Expand All @@ -19,11 +19,10 @@
"dependencies": {
"@tryforge/forge.db": "github:tryforge/ForgeDB#dev",
"@tryforge/forge.topgg": "github:tryforge/ForgeTopGG#dev",
"@tryforge/forgescript": "github:tryforge/Forgescript#dev",
"axios": "^1.7.9",
"discord.js": "^14.16.3",
"dotenv": "^16.4.7",
"forge.quirks": "github:LynnuxDev/forge.quirks",
"forge.quirks": "github:LynnuxDev/forge.quirks#dev",
"fs": "0.0.1-security",
"js-yaml": "^4.1.0",
"mysql": "^2.18.1",
Expand All @@ -34,6 +33,7 @@
"typescript": "^5.7.2"
},
"devDependencies": {
"@tryforge/forgescript": "github:tryforge/forgescript#dev",
"@types/deasync": "^0.1.5",
"@types/js-yaml": "^4.0.9",
"@types/node": "^22.10.2",
Expand Down
4 changes: 3 additions & 1 deletion src/commands/Interactions/dev/panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ const Panel: Command[] = [
$title[Developer Panel:]
$thumbnail[$userAvatar[$clientID]]
$addField[Server Info;- <:Website:$if[$environment==main;1263809959267930213;1271544143423996005]> Ip: ||$get[ip]||\n- <:Clock:$if[$environment==main;1263809772478529576;1271543787637833759]> Uptime: <t:$round[$math[$round[$math[$getTimestamp/1000];0]-$osUptime];0]:R>\n- <:CPU:$if[$environment==main;1263809787661910050;1271543827395772517]> CPU: \`$round[$get[cpuUsage];2]%\` - {$cpuCores}\n- <:Server:$if[$environment==main;1263809924295819285;1271544093838938235]> Ram: \`$ram[true;true]\`;true]
$addField[Process Info;- <:Clock:$if[$environment==main;1263809772478529576;1271543787637833759]> Uptime: <t:$round[$math[$math[$getTimestamp-$uptime]/1000];0]:R>\n- <:CPU:$if[$environment==main;1263809787661910050;1271543827395772517]> CPU: \`$cpuUsage[false]% {$cpuCores}\`\n- <:Server:$if[$environment==main;1263809924295819285;1271544093838938235]> Ram: \`$ram[true;false]\`;true]
$addField[Process Info;- <:Clock:$if[$environment==main;1263809772478529576;1271543787637833759]> Uptime: <t:$round[$math[$math[$getTimestamp-$uptime]/1000];0]:R>\n- <:CPU:$if[$environment==main;1263809787661910050;1271543827395772517]> CPU: \n- <:Server:$if[$environment==main;1263809924295819285;1271544093838938235]> Ram: \`$ram[true;false]\`;true]
$addField[;;true]
$addField[Client Info;**Client Stats:**\n- <:Roles:$if[$environment==main;1263809915529728072;1271544076491292736]> Guilds: \`$guildCount\`\n- <:members:$if[$environment==main;1263809852145270926;1271543939576627322]> Users: \`$userCount\`\n- <:shard:$if[$environment==main;1263809940569456650;1271544119080259666]> Shards: \`$shardsOnline/$shardCount\`\n- <:Plus:$if[$environment==main;1263809898878210149;1271544047579693148]> Commands: \`$commandCount\`;true]
$addField[<:Spacer:$if[$environment==main;1324808760207736842;1275843251349356675]>;<:Spacer:$if[$environment==main;1324808760207736842;1275843251349356675]>\n- <:Akira_Active_Dev:$if[$environment==main;1263809801817821278;1271546151543373906]> CMDs since startup: \`$getGlobalVar[startCommands]\`\n- <:ping:$if[$environment==main;1263809890468499508;1271544029053452297]> DB Latency: \`$dbPing\`\n- <:ping:$if[$environment==main;1263809890468499508;1271544029053452297]> WS Latency: \`$pingms\`\n- <:ping:$if[$environment==main;1263809890468499508;1271544029053452297]> RoundTrip Latency: \`$roundtrip\`;true]
Expand Down
17 changes: 17 additions & 0 deletions src/commands/dev/cpu.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Command } from '@/types';

const commands: Command[] = [
{
name: 'cpu',
type: 'messageCreate',
module: 'dev',
description: 'cpu.',
sourcecode: 'src/commands/dev/cpu.ts',
version: 'v1.0.0',
code: `
$cpuUsage[true]
`
}
];

export default commands;
24 changes: 3 additions & 21 deletions src/commands/dev/test.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
import { Command } from '../../types';
//@ts-ignore
//@ts-nocheck

const commands: Command[] = [
{
name: 'test',
description: 'test file for devs.',
type: 'messageCreate',
sourcecode: 'src/commands/dev/test.ts',
module: 'dev',
version: 'v1.0.0',
code: `
$onlyIf[$checkContains[$botOwnerID[true;,];$authorID];]
$httpAddHeader[Authorization;Bearer ${process.env.CROWDIN_API_TOKEN}]
$httpRequest[https://api.crowdin.com/api/v2/projects/717569/languages/en/progress;GET;process]
$logger[Info;$env[process;data;0;data;translationProgress]]
`
}
];

export default commands;
// This file is used to test user commands
138 changes: 0 additions & 138 deletions src/slash/settings/change.ts

This file was deleted.

Loading

0 comments on commit 151c011

Please sign in to comment.