diff --git a/package.json b/package.json index 9e14db7..d99a1d3 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "@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", "axios": "^1.7.9", "discord.js": "^14.16.3", "dotenv": "^16.4.7", diff --git a/src/commands/dev/panel.ts b/src/commands/dev/panel.ts index 38a7e32..d4518f1 100644 --- a/src/commands/dev/panel.ts +++ b/src/commands/dev/panel.ts @@ -24,11 +24,11 @@ const Panel: Command[] = [{ $color[$getGlobalVar[color]] $title[Developer Panel:] - $addField[Server Info;- <:Website:1271544143423996005> Ip: ||$get[ip]||\n- <:Clock:1271543787637833759> Uptime: \n- <:CPU:1271543827395772517> CPU: \`$cpuUsage[true]%\` - {$cpuCores}\n- <:Server:1271544093838938235> Ram: \`$ram[true;true]\`;true] - $addField[Process Info;\n- <:Clock:1271543787637833759> Uptime: \n- <:CPU:1271543827395772517> CPU: \`$cpuUsage[false]% {$cpuCores}\`\n- <:Server:1271544093838938235> Ram: \`$ram[true;false]\`;true] + $addField[Server Info;- <:Website:$if[$environment==main;1263809959267930213;1271544143423996005]> Ip: ||$get[ip]||\n- <:Clock:$if[$environment==main;1263809772478529576;1271543787637833759]> Uptime: \n- <:CPU:$if[$environment==main;1263809787661910050;1271543827395772517]> CPU: \`$cpuUsage[true]%\` - {$cpuCores}\n- <:Server:$if[$environment==main;1263809924295819285;1271544093838938235]> Ram: \`$ram[true;true]\`;true] + $addField[Process Info;\n- <:Clock:$if[$environment==main;1263809772478529576;1271543787637833759]> Uptime: \n- <:CPU:$if[$environment==main;1263809787661910050;1271543827395772517]> CPU: \`$cpuUsage[false]% {$cpuCores}\`\n- <:Server:$if[$environment==main;1263809924295819285;1271544093838938235]> Ram: \`$ram[true;false]\`;true] $addField[;;true] - $addField[Client Info;**Client Stats:**\n- <:Roles:1271544076491292736> Guilds: \`$guildCount\`\n- <:members:1271543939576627322> Users: \`$userCount\`\n- <:shard:1271544119080259666> Shards: \`$shardsOnline/$shardCount\`\n- <:Plus:1271544047579693148> Commands: \`$commandCount\`;true] - $addField[<:Spacer:1275843251349356675>;<:Spacer:1275843251349356675>\n- <:Akira_Active_Dev:1271546151543373906> Commands used since startup: \`$getGlobalVar[startCommands]\`\n- <:ping:1271544029053452297> DB Latency: \`$dbPing\`\n- <:ping:1271544029053452297> WS Latency: \`$pingms\`\n- <:ping:1271544029053452297> RoundTrip Latency: \`$roundtrip\`;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]> Commands used 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]> RT Latency: \`$roundtrip\`;true] $addField[;;true] $addActionRow diff --git a/src/functions/environment.ts b/src/functions/environment.ts new file mode 100644 index 0000000..c3faeee --- /dev/null +++ b/src/functions/environment.ts @@ -0,0 +1,12 @@ +import { CustomFunction } from '@/types'; + +const functions: CustomFunction[] = [ + { + name: 'environment', + code: ` + $return[$if[$clientID==737388665260605480;dev;main]] + ` + } +]; + +export default functions; \ No newline at end of file diff --git a/src/functions/i18nRequest.ts b/src/functions/i18nRequest.ts index ddaa6f2..eacd0d6 100755 --- a/src/functions/i18nRequest.ts +++ b/src/functions/i18nRequest.ts @@ -16,7 +16,7 @@ const functions: CustomFunction[] = [ ] $case[default; $c[Any language.] - $return[$djsEval[const path = require('path');const { loadYaml } = require('@dist/i18n.js');const successMessage = loadYaml("$get[lang]", '$env[string]');successMessage]] + $return[$djsEval[const path = require('path');const join = path.join;const { loadYaml } = require(join(process.cwd(),'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;setting;userinfo;user;whois]]