aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--commands/util/status.js7
-rw-r--r--index.js1
-rw-r--r--package.json1
-rw-r--r--pnpm-lock.yaml61
5 files changed, 68 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index f2d781a..f02c2e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ typings/
# Yarn Integrity file
.yarn-integrity
+pnpm-lock.yaml
#ignore configs
events/*.json
diff --git a/commands/util/status.js b/commands/util/status.js
index e6d3f86..b3fcad7 100644
--- a/commands/util/status.js
+++ b/commands/util/status.js
@@ -4,12 +4,14 @@ let settings = require("../../src/settings")
let {limit_exp} = require("../../src/util")
const { EmbedBuilder,ActionRowBuilder,ButtonBuilder,ButtonStyle } = require("discord.js");
const {getLastCommit} = require("git-last-commit")
+const { execSync } = require('child_process');
var os = require('os');
let config_loc = __filename+".json"
let config = JSON.parse(fs.readFileSync(config_loc))
module.exports = {
name : "status",
command: ["status","server","uptime","vote","twitter","𝕏"],
+ //
mod_only: false,
config:config,
config_loc:config_loc,
@@ -20,7 +22,8 @@ module.exports = {
this.exec(client,interaction)
},
async exec(client,message){
- getLastCommit((err,commit)=>{
+ getLastCommit(async (err,commit)=>{
+ let changed = execSync('git --no-pager diff --minimal --name-only').toString().split('\n')
let seconds = Math.floor(message.client.uptime / 1000);
let minutes = Math.floor(seconds / 60);
let hours = Math.floor(minutes / 60);
@@ -56,7 +59,7 @@ module.exports = {
.setTitle("Server info")
.setDescription(uptime+"\n"+sys)
.setColor(settings.defaultColor)
- .setFooter({text:"running "+commit.shortHash+" ("+commit.branch+")"})
+ .setFooter({text:"running "+commit.shortHash+" ("+commit.branch+") + " + changed.length + " uncommited files"})
message.reply({embeds:[emoteembed],components:[row]})
})
}
diff --git a/index.js b/index.js
index 3b70443..321f1c4 100644
--- a/index.js
+++ b/index.js
@@ -95,7 +95,6 @@ function update_options(scom,options){
subcommand
.setName(opt.name)
.setDescription("test")
- console.log(opt.options)
return update_options(subcommand, opt.options)
})
break;
diff --git a/package.json b/package.json
index 140e8bf..8374f33 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"dotenv": "^9.0.2",
"express": "^4.17.1",
"ffmpeg-static": "^4.2.3",
+ "git-changed-files": "^1.0.0",
"git-last-commit": "^1.0.1",
"os-utils": "^0.0.14",
"sequelize": "^6.32.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fdbd78d..632a999 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,6 +29,9 @@ dependencies:
ffmpeg-static:
specifier: ^4.2.3
version: 4.4.1
+ git-changed-files:
+ specifier: ^1.0.0
+ version: 1.0.0
git-last-commit:
specifier: ^1.0.1
version: 1.0.1
@@ -431,6 +434,13 @@ packages:
resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
engines: {node: '>=8'}
+ /[email protected]:
+ resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+ engines: {node: '>=4'}
+ dependencies:
+ color-convert: 1.9.3
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
engines: {node: '>=8'}
@@ -583,6 +593,15 @@ packages:
resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
dev: false
+ /[email protected]:
+ resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+ engines: {node: '>=4'}
+ dependencies:
+ ansi-styles: 3.2.1
+ escape-string-regexp: 1.0.5
+ supports-color: 5.5.0
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
engines: {node: '>=10'}
@@ -606,12 +625,22 @@ packages:
dev: false
optional: true
+ /[email protected]:
+ resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+ dependencies:
+ color-name: 1.1.3
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
engines: {node: '>=7.0.0'}
dependencies:
color-name: 1.1.4
+ /[email protected]:
+ resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
@@ -860,6 +889,11 @@ packages:
resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
dev: false
+ /[email protected]:
+ resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+ engines: {node: '>=0.8.0'}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
engines: {node: '>=10'}
@@ -1161,6 +1195,14 @@ packages:
has-symbols: 1.0.3
dev: false
+ /[email protected]:
+ resolution: {integrity: sha512-nTwSAJRKZ1ztXaprexlnZgU9wUx0zwnS2sqy30HhSfSLx1MgbHK85ihRTOEHcnKjC3hc1jR1WYpjugjzFXrzMw==}
+ engines: {node: '>=6'}
+ dependencies:
+ chalk: 2.4.2
+ matcher: 1.1.1
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-FDSgeMqa7GnJDxt/q0AbrxbfeTyxp4ImxEw1e4nw6NUHA5FMhFUq33dTXI4Xdgcj1VQ1q5QLWF6WxFrJ8KCBOg==}
dev: false
@@ -1203,6 +1245,11 @@ packages:
resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
dev: true
+ /[email protected]:
+ resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+ engines: {node: '>=4'}
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
engines: {node: '>=8'}
@@ -1494,6 +1541,13 @@ packages:
dev: false
optional: true
+ /[email protected]:
+ resolution: {integrity: sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==}
+ engines: {node: '>=4'}
+ dependencies:
+ escape-string-regexp: 1.0.5
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
engines: {node: '>= 0.6'}
@@ -2300,6 +2354,13 @@ packages:
engines: {node: '>=8'}
dev: true
+ /[email protected]:
+ resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+ engines: {node: '>=4'}
+ dependencies:
+ has-flag: 3.0.0
+ dev: false
+
/[email protected]:
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
engines: {node: '>=8'}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 13:27:44 +0000