warengroup/eximiabots-radiox
warengroup/eximiabots-radiox
1
0
Fork 0
mirror of https://github.com/warengroup/eximiabots-radiox.git synced 2024-12-23 05:53:18 +00:00
Code Issues Packages Releases Activity

Merge pull request #25 from warengroup/develop

Browse Source 
Version 0.3.0
This commit is contained in:
Christer Warén 2021-08-31 17:39:49 +03:00 committed by GitHub
commit 0f184a9fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 676 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/typescript-build.yml vendored
View File

@ -2,7 +2,6 @@ name: TypeScript Build
on: on:
push: push:
pull_request:
jobs: jobs:
tsc: tsc:
@ -14,8 +13,6 @@ jobs:
uses: actions/setup-node@v2.3.1 uses: actions/setup-node@v2.3.1
with: with:
node-version: 16 node-version: 16
- name: npm install -g npm
run: npm install -g npm
- name: npm install - name: npm install
run: npm install run: npm install
- name: tsc - name: tsc

2
Dockerfile
View File

@ -10,8 +10,6 @@ WORKDIR /usr/src/app
COPY / /usr/src/app/ COPY / /usr/src/app/
RUN npm install -g npm
RUN npm install RUN npm install
RUN npm run build RUN npm run build

180
package-lock.json generated
View File

@ -1,15 +1,17 @@
{ {
"name": "eximiabots-radiox", "name": "eximiabots-radiox",
"version": "0.2.4", "version": "0.3.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "eximiabots-radiox", "name": "eximiabots-radiox",
"version": "0.2.4", "version": "0.3.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@discordjs/builders": "^0.6.0",
"@discordjs/opus": "^0.6.0", "@discordjs/opus": "^0.6.0",
"@discordjs/rest": "^0.1.1-canary.0",
"@discordjs/voice": "^0.6.0", "@discordjs/voice": "^0.6.0",
"discord-api-types": "^0.22.0", "discord-api-types": "^0.22.0",
"discord.js": "^13.1.0", "discord.js": "^13.1.0",
@ -19,19 +21,19 @@
"path": "^0.12.7" "path": "^0.12.7"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^16.6.1", "@types/node": "^16.7.8",
"@types/ws": "^7.4.7", "@types/ws": "^7.4.7",
"@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.2", "@typescript-eslint/parser": "^4.29.3",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.1", "eslint-plugin-prettier": "^4.0.0",
"nodemon": "^2.0.12", "nodemon": "^2.0.12",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "^10.2.1", "ts-node": "^10.2.1",
"tsc-watch": "^4.5.0", "tsc-watch": "^4.5.0",
"typescript": "^4.3.5" "typescript": "^4.4.2"
}, },
"engines": { "engines": {
"node": ">=16.6.0", "node": ">=16.6.0",
@ -163,15 +165,15 @@
} }
}, },
"node_modules/@discordjs/builders": { "node_modules/@discordjs/builders": {
"version": "0.5.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz", "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz",
"integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==", "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==",
"dependencies": { "dependencies": {
"@sindresorhus/is": "^4.0.1", "@sindresorhus/is": "^4.0.1",
"discord-api-types": "^0.22.0", "discord-api-types": "^0.22.0",
"ow": "^0.27.0", "ow": "^0.27.0",
"ts-mixer": "^6.0.0", "ts-mixer": "^6.0.0",
"tslib": "^2.3.0" "tslib": "^2.3.1"
}, },
"engines": { "engines": {
"node": ">=14.0.0", "node": ">=14.0.0",
@ -231,6 +233,24 @@
"node": ">=12.0.0" "node": ">=12.0.0"
} }
}, },
"node_modules/@discordjs/rest": {
"version": "0.1.1-canary.0",
"resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-0.1.1-canary.0.tgz",
"integrity": "sha512-zUhGBok8eVJYkQjhOVTxVKwglQd0lElhkwCfvRus5xVD46zyz4h0UzoZFVpeAb9GNaAmEazcw/j/2s07DnQcnw==",
"dependencies": {
"@discordjs/collection": "^0.2.1",
"@sapphire/async-queue": "^1.1.4",
"@sapphire/snowflake": "^2.0.0",
"abort-controller": "^3.0.0",
"discord-api-types": "^0.22.0",
"form-data": "^4.0.0",
"node-fetch": "^2.6.1",
"tslib": "^2.3.0"
},
"engines": {
"node": ">=16.0.0"
}
},
"node_modules/@discordjs/voice": { "node_modules/@discordjs/voice": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz", "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@ -377,6 +397,15 @@
"npm": ">=6" "npm": ">=6"
} }
}, },
"node_modules/@sapphire/snowflake": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-2.0.0.tgz",
"integrity": "sha512-gPSOQKmEWeuif2ftmW7gyToCnOoqpDqTSNrxX7HsoMwGNLtrT9p5DHcQolkBg5CEK3ooDFy5DNEFKUshQU7vyQ==",
"engines": {
"node": ">=12",
"npm": ">=6"
}
},
"node_modules/@sindresorhus/is": { "node_modules/@sindresorhus/is": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
@ -604,6 +633,17 @@
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
}, },
"node_modules/abort-controller": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
"integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
"dependencies": {
"event-target-shim": "^5.0.0"
},
"engines": {
"node": ">=6.5"
}
},
"node_modules/acorn": { "node_modules/acorn": {
"version": "7.4.1", "version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@ -1273,6 +1313,22 @@
"npm": ">=7.0.0" "npm": ">=7.0.0"
} }
}, },
"node_modules/discord.js/node_modules/@discordjs/builders": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz",
"integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==",
"dependencies": {
"@sindresorhus/is": "^4.0.1",
"discord-api-types": "^0.22.0",
"ow": "^0.27.0",
"ts-mixer": "^6.0.0",
"tslib": "^2.3.0"
},
"engines": {
"node": ">=14.0.0",
"npm": ">=7.0.0"
}
},
"node_modules/doctrine": { "node_modules/doctrine": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@ -1437,9 +1493,9 @@
} }
}, },
"node_modules/eslint-plugin-prettier": { "node_modules/eslint-plugin-prettier": {
"version": "3.4.1", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
"integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"prettier-linter-helpers": "^1.0.0" "prettier-linter-helpers": "^1.0.0"
@ -1448,8 +1504,8 @@
"node": ">=6.0.0" "node": ">=6.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"eslint": ">=5.0.0", "eslint": ">=7.28.0",
"prettier": ">=1.13.0" "prettier": ">=2.0.0"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
"eslint-config-prettier": { "eslint-config-prettier": {
@ -1632,6 +1688,14 @@
"through": "~2.3.1" "through": "~2.3.1"
} }
}, },
"node_modules/event-target-shim": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
"integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
"engines": {
"node": ">=6"
}
},
"node_modules/fast-deep-equal": { "node_modules/fast-deep-equal": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@ -1724,6 +1788,19 @@
"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
"dev": true "dev": true
}, },
"node_modules/form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"dependencies": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/from": { "node_modules/from": {
"version": "0.1.7", "version": "0.1.7",
"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
@ -3940,15 +4017,15 @@
} }
}, },
"@discordjs/builders": { "@discordjs/builders": {
"version": "0.5.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz", "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.6.0.tgz",
"integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==", "integrity": "sha512-mH3Gx61LKk2CD05laCI9K5wp+a3NyASHDUGx83DGJFkqJlRlSV5WMJNY6RS37A5SjqDtGMF4wVR9jzFaqShe6Q==",
"requires": { "requires": {
"@sindresorhus/is": "^4.0.1", "@sindresorhus/is": "^4.0.1",
"discord-api-types": "^0.22.0", "discord-api-types": "^0.22.0",
"ow": "^0.27.0", "ow": "^0.27.0",
"ts-mixer": "^6.0.0", "ts-mixer": "^6.0.0",
"tslib": "^2.3.0" "tslib": "^2.3.1"
} }
}, },
"@discordjs/collection": { "@discordjs/collection": {
@ -3991,6 +4068,21 @@
"node-addon-api": "^4.0.0" "node-addon-api": "^4.0.0"
} }
}, },
"@discordjs/rest": {
"version": "0.1.1-canary.0",
"resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-0.1.1-canary.0.tgz",
"integrity": "sha512-zUhGBok8eVJYkQjhOVTxVKwglQd0lElhkwCfvRus5xVD46zyz4h0UzoZFVpeAb9GNaAmEazcw/j/2s07DnQcnw==",
"requires": {
"@discordjs/collection": "^0.2.1",
"@sapphire/async-queue": "^1.1.4",
"@sapphire/snowflake": "^2.0.0",
"abort-controller": "^3.0.0",
"discord-api-types": "^0.22.0",
"form-data": "^4.0.0",
"node-fetch": "^2.6.1",
"tslib": "^2.3.0"
}
},
"@discordjs/voice": { "@discordjs/voice": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz", "resolved": "https://registry.npmjs.org/@discordjs/voice/-/voice-0.6.0.tgz",
@ -4094,6 +4186,11 @@
"resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.4.tgz", "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.1.4.tgz",
"integrity": "sha512-fFrlF/uWpGOX5djw5Mu2Hnnrunao75WGey0sP0J3jnhmrJ5TAPzHYOmytD5iN/+pMxS+f+u/gezqHa9tPhRHEA==" "integrity": "sha512-fFrlF/uWpGOX5djw5Mu2Hnnrunao75WGey0sP0J3jnhmrJ5TAPzHYOmytD5iN/+pMxS+f+u/gezqHa9tPhRHEA=="
}, },
"@sapphire/snowflake": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-2.0.0.tgz",
"integrity": "sha512-gPSOQKmEWeuif2ftmW7gyToCnOoqpDqTSNrxX7HsoMwGNLtrT9p5DHcQolkBg5CEK3ooDFy5DNEFKUshQU7vyQ=="
},
"@sindresorhus/is": { "@sindresorhus/is": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
@ -4238,6 +4335,14 @@
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
}, },
"abort-controller": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
"integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
"requires": {
"event-target-shim": "^5.0.0"
}
},
"acorn": { "acorn": {
"version": "7.4.1", "version": "7.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@ -4746,6 +4851,20 @@
"discord-api-types": "^0.22.0", "discord-api-types": "^0.22.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"ws": "^7.5.1" "ws": "^7.5.1"
},
"dependencies": {
"@discordjs/builders": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-0.5.0.tgz",
"integrity": "sha512-HP5y4Rqw68o61Qv4qM5tVmDbWi4mdTFftqIOGRo33SNPpLJ1Ga3KEIR2ibKofkmsoQhEpLmopD1AZDs3cKpHuw==",
"requires": {
"@sindresorhus/is": "^4.0.1",
"discord-api-types": "^0.22.0",
"ow": "^0.27.0",
"ts-mixer": "^6.0.0",
"tslib": "^2.3.0"
}
}
} }
}, },
"doctrine": { "doctrine": {
@ -4893,9 +5012,9 @@
"requires": {} "requires": {}
}, },
"eslint-plugin-prettier": { "eslint-plugin-prettier": {
"version": "3.4.1", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
"integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"prettier-linter-helpers": "^1.0.0" "prettier-linter-helpers": "^1.0.0"
@ -5012,6 +5131,11 @@
"through": "~2.3.1" "through": "~2.3.1"
} }
}, },
"event-target-shim": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
"integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
},
"fast-deep-equal": { "fast-deep-equal": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@ -5092,6 +5216,16 @@
"integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
"dev": true "dev": true
}, },
"form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
}
},
"from": { "from": {
"version": "0.1.7", "version": "0.1.7",
"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",

14
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "eximiabots-radiox", "name": "eximiabots-radiox",
"version": "0.2.4", "version": "0.3.0",
"description": "Internet Radio to your Discord guild", "description": "Internet Radio to your Discord guild",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -18,7 +18,9 @@
"url": "https://github.com/warengroup/eximiabots-radiox/issues" "url": "https://github.com/warengroup/eximiabots-radiox/issues"
}, },
"dependencies": { "dependencies": {
"@discordjs/builders": "^0.6.0",
"@discordjs/opus": "^0.6.0", "@discordjs/opus": "^0.6.0",
"@discordjs/rest": "^0.1.1-canary.0",
"@discordjs/voice": "^0.6.0", "@discordjs/voice": "^0.6.0",
"discord-api-types": "^0.22.0", "discord-api-types": "^0.22.0",
"discord.js": "^13.1.0", "discord.js": "^13.1.0",
@ -28,19 +30,19 @@
"path": "^0.12.7" "path": "^0.12.7"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^16.6.1", "@types/node": "^16.7.8",
"@types/ws": "^7.4.7", "@types/ws": "^7.4.7",
"@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.2", "@typescript-eslint/parser": "^4.29.3",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.1", "eslint-plugin-prettier": "^4.0.0",
"nodemon": "^2.0.12", "nodemon": "^2.0.12",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "^10.2.1", "ts-node": "^10.2.1",
"tsc-watch": "^4.5.0", "tsc-watch": "^4.5.0",
"typescript": "^4.3.5" "typescript": "^4.4.2"
}, },
"engines": { "engines": {
"node": ">=16.6.0", "node": ">=16.6.0",

14
src/Client.ts
View File

@ -5,18 +5,16 @@ import Datastore from "./client/datastore.js";
import { command, radio } from "./client/utils/typings.js"; import { command, radio } from "./client/utils/typings.js";
import config from "./config.js"; import config from "./config.js";
import messages from "./client/messages.js"; import messages from "./client/messages.js";
import path from "path" import path from "path";
const GatewayIntents = new Discord.Intents(); const GatewayIntents = new Discord.Intents();
GatewayIntents.add( GatewayIntents.add(
1 << 0, // GUILDS 1 << 0, // GUILDS
1 << 7, // GUILD_VOICE_STATES 1 << 7, // GUILD_VOICE_STATES
1 << 9 // GUILD_MESSAGES
); );
class RadioClient extends Client { class RadioClient extends Client {
readonly commands: Collection<string, command>; readonly commands: Collection<string, command>;
readonly commandAliases: Collection<string, command>;
readonly radio: Map<string, radio>; readonly radio: Map<string, radio>;
public funcs: any; public funcs: any;
readonly config = config; readonly config = config;
@ -27,7 +25,6 @@ class RadioClient extends Client {
intents: GatewayIntents intents: GatewayIntents
}); });
this.commands = new Collection(); this.commands = new Collection();
this.commandAliases = new Collection();
this.radio = new Map(); this.radio = new Map();
this.datastore = null; this.datastore = null;
@ -35,23 +32,22 @@ class RadioClient extends Client {
this.funcs.check = require("./client/funcs/check.js"); this.funcs.check = require("./client/funcs/check.js");
this.funcs.checkFetchStatus = require("./client/funcs/checkFetchStatus.js"); this.funcs.checkFetchStatus = require("./client/funcs/checkFetchStatus.js");
this.funcs.isDev = require("./client/funcs/isDev.js"); this.funcs.isDev = require("./client/funcs/isDev.js");
this.funcs.logger = require("./client/funcs/logger.js");
this.funcs.msToTime = require("./client/funcs/msToTime.js"); this.funcs.msToTime = require("./client/funcs/msToTime.js");
this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js"); this.funcs.statisticsUpdate = require("./client/funcs/statisticsUpdate.js");
const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js")); const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
for (const file of commandFiles) { for (const file of commandFiles) {
const command = require(`./client/commands/${file}`); const command = require(`./client/commands/${file}`);
command.uses = 0;
this.commands.set(command.name, command); this.commands.set(command.name, command);
this.commandAliases.set(command.alias, command);
} }
this.on("ready", () => { this.on("ready", () => {
require(`${events}ready`).execute(this, Discord); require(`${events}ready`).execute(this);
this.datastore = new Datastore(); this.datastore = new Datastore();
}); });
this.on("messageCreate", msg => { this.on("interactionCreate", interaction => {
require(`${events}msg`).execute(this, msg, Discord); require(`${events}interactionCreate`).execute(this, interaction);
}); });
this.on("voiceStateUpdate", (oldState, newState) => { this.on("voiceStateUpdate", (oldState, newState) => {
require(`${events}voiceStateUpdate`).execute(this, oldState, newState); require(`${events}voiceStateUpdate`).execute(this, oldState, newState);

67
src/client/commands.js Normal file
View File

@ -0,0 +1,67 @@
const { SlashCommandBuilder } = require('@discordjs/builders');
const { REST } = require('@discordjs/rest');
const { Routes } = require('discord-api-types/v9');
const { token, version } = require('../config.js');
const fs = require('fs');
const path = require ('path');
module.exports = {
async execute(client) {
const commands = [];
const commandFiles = fs.readdirSync(path.join("./src/client/commands")).filter(f => f.endsWith(".js"));
for (const file of commandFiles) {
const command = require(`./commands/${file}`);
command.data = new SlashCommandBuilder()
.setName(command.name)
.setDescription(command.description);
command.data = command.data.toJSON();
if(command.options) {
command.options.forEach(function(option) {
if(option.type == "STRING") option.type = 3;
command.data.options.push(option);
});
}
commands.push(command.data);
}
const rest = new REST({ version: '9' }).setToken(token);
(async () => {
try {
client.funcs.logger('Slash Commands', 'Started refreshing application (/) commands.');
if(version.includes("-dev")){
await rest.put(
Routes.applicationCommands(client.user.id),
{ body: [] },
);
let guilds = await client.guilds.fetch();
guilds.forEach(async guild => {
try {
await rest.put(
Routes.applicationGuildCommands(client.user.id, guild.id),
{ body: commands },
);
} catch (DiscordAPIError) {
}
});
} else {
await rest.put(
Routes.applicationCommands(client.user.id),
{ body: commands },
);
}
client.funcs.logger('Slash Commands', 'Successfully reloaded application (/) commands.' + "\n");
} catch (error) {
client.funcs.logger('Slash Commands', 'Reloading application (/) commands failed.' + "\n");
console.error(error);
}
})();
}
}

7
src/client/commands/bug.js
View File

@ -5,7 +5,7 @@ module.exports = {
description: 'Report a bug', description: 'Report a bug',
permission: 'none', permission: 'none',
category: 'info', category: 'info',
async execute(msg, args, client, Discord, command) { async execute(interaction, client, Discord, command) {
let message = {}; let message = {};
message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username); message.bugTitle = client.messages.bugTitle.replace("%client.user.username%", client.user.username);
@ -17,7 +17,10 @@ module.exports = {
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setDescription(message.bugDescription) .setDescription(message.bugDescription)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

30
src/client/commands/help.js
View File

@ -5,31 +5,12 @@ module.exports = {
description: 'Get help using bot', description: 'Get help using bot',
permission: 'none', permission: 'none',
category: 'info', category: 'info',
execute(msg, args, client, Discord, command) { execute(interaction, client, Discord, command) {
let message = {}; let message = {};
if (args[1]) {
if (!client.commands.has(args[1]) || (client.commands.has(args[1]) && client.commands.get(args[1]).omitFromHelp === true)) return msg.channel.send('That command does not exist');
const command = client.commands.get(args[1]);
message.helpCommandTitle = client.messages.helpCommandTitle.replace("%client.config.prefix%", client.config.prefix);
message.helpCommandTitle = message.helpCommandTitle.replace("%command.name%", command.name);
message.helpCommandTitle = message.helpCommandTitle.replace("%command.usage%", command.usage);
message.helpCommandDescription = client.messages.helpCommandDescription.replace("%command.description%", command.description);
message.helpCommandDescription = message.helpCommandDescription.replace("%command.alias%", command.alias);
const embed = new Discord.MessageEmbed()
.setTitle(message.helpCommandTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor)
.setDescription(message.helpCommandDescription)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
msg.channel.send({ embeds: [embed] });
} else {
const categories = []; const categories = [];
let commandsToArray = Array.from(client.commands.values());
for (let i = 0; i < client.commands.size; i++) { for (let i = 0; i < client.commands.size; i++) {
if (!categories.includes(commandsToArray[i].category)) categories.push(commandsToArray[i].category); if (!categories.includes([...client.commands.values()][i].category)) categories.push([...client.commands.values()][i].category);
} }
let commands = ''; let commands = '';
for (let i = 0; i < categories.length; i++) { for (let i = 0; i < categories.length; i++) {
@ -46,7 +27,10 @@ module.exports = {
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setDescription(message.helpDescription) .setDescription(message.helpDescription)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
msg.channel.send({ embeds: [embed] });
} interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

10
src/client/commands/invite.js
View File

@ -5,14 +5,18 @@ module.exports = {
description: 'Invite Bot', description: 'Invite Bot',
permission: 'none', permission: 'none',
category: 'info', category: 'info',
execute(msg, args, client, Discord, command) { execute(interaction, client, Discord, command) {
let message = {}; let message = {};
message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username); message.inviteTitle = client.messages.inviteTitle.replace("%client.user.username%", client.user.username);
const embed = new Discord.MessageEmbed() const embed = new Discord.MessageEmbed()
.setTitle(message.inviteTitle) .setTitle(message.inviteTitle)
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setURL("https://discordapp.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=3427328&scope=bot") .setURL("https://discordapp.com/api/oauth2/authorize?client_id=" + client.user.id + "&permissions=2184465408&scope=applications.commands%20bot") //View Channels, Send Messages, Embed Links, Use External Emojis, Use Slash Commands, Connect, Speak, Use Voice Activity
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
return msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

14
src/client/commands/list.js
View File

@ -2,19 +2,19 @@ module.exports = {
name: 'list', name: 'list',
alias: 'l', alias: 'l',
usage: '', usage: '',
description: 'List radio stations.', description: 'List radio stations',
permission: 'none', permission: 'none',
category: 'radio', category: 'radio',
execute(msg, args, client, Discord, command) { execute(interaction, client, Discord, command) {
let message = {}; let message = {};
if(!client.stations) { if(!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild); message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist); return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
} }
let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}` let stations = `${client.stations.map(s => `**#** ${s.name}`).join('\n')}`
const hashs = stations.split('**#**').length; const hashs = stations.split('**#**').length;
for (let i = 0; i < hashs; i++) { for (let i = 0; i < hashs; i++) {
stations = stations.replace('**#**', `**${i + 1}**`); stations = stations.replace('**#**', `**${i + 1}.**`);
} }
const embed = new Discord.MessageEmbed() const embed = new Discord.MessageEmbed()
@ -23,6 +23,10 @@ module.exports = {
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setDescription(stations) .setDescription(stations)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
return msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

16
src/client/commands/maintenance.js
View File

@ -5,14 +5,14 @@ module.exports = {
description: 'Bot Maintenance', description: 'Bot Maintenance',
permission: 'none', permission: 'none',
category: 'info', category: 'info',
execute(msg, args, client, Discord, command) { execute(interaction, client, Discord, command) {
let message = {}; let message = {};
if(!client.funcs.isDev(client.config.devId, msg.author.id)) return msg.channel.send(client.messageEmojis["error"] + client.messages.notAllowed); if(!client.funcs.isDev(client.config.devId, interaction.user.id)) return interaction.reply(client.messageEmojis["error"] + client.messages.notAllowed);
if(!client.stations) { if(!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild); message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist); return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
} }
let currentRadios = client.radio.keys(); let currentRadios = client.radio.keys();
@ -27,8 +27,8 @@ module.exports = {
if(currentRadio){ if(currentRadio){
client.funcs.statisticsUpdate(client, currentRadio.currentGuild.guild, currentRadio); client.funcs.statisticsUpdate(client, currentRadio.currentGuild.guild, currentRadio);
currentRadio.connection.destroy(); currentRadio.connection?.destroy();
currentRadio.audioPlayer.stop(); currentRadio.audioPlayer?.stop();
const cembed = new Discord.MessageEmbed() const cembed = new Discord.MessageEmbed()
.setTitle(client.messages.maintenanceTitle) .setTitle(client.messages.maintenanceTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, '')) .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["maintenance"].replace(/[^0-9]+/g, ''))
@ -48,6 +48,10 @@ module.exports = {
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setDescription("Stopped all radios" + "\n" + stoppedRadios) .setDescription("Stopped all radios" + "\n" + stoppedRadios)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
return msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

22
src/client/commands/nowplaying.js
View File

@ -5,19 +5,23 @@ module.exports = {
description: 'Current Radio Station', description: 'Current Radio Station',
permission: 'none', permission: 'none',
category: 'radio', category: 'radio',
async execute(msg, args, client, Discord, command) { async execute(interaction, client, Discord, command) {
let message = {}; let message = {};
const radio = client.radio.get(msg.guild.id); const radio = client.radio.get(interaction.guild.id);
if (!radio) return msg.channel.send('There is nothing playing.'); if (!radio) return interaction.reply('There is nothing playing.');
if(!client.stations) { if(!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild); message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist); return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
} }
const completed = (radio.connection.dispatcher.streamTime.toFixed(0));
let date = new Date();
radio.currentTime = date.getTime();
radio.playTime = parseInt(radio.currentTime)-parseInt(radio.startTime);
const completed = (radio.playTime);
message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name); message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner); message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed, \"hh:mm:ss\")%", client.funcs.msToTime(completed, "hh:mm:ss")); message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", client.funcs.msToTime(completed));
const embed = new Discord.MessageEmbed() const embed = new Discord.MessageEmbed()
.setTitle(client.messages.nowplayingTitle) .setTitle(client.messages.nowplayingTitle)
@ -25,6 +29,10 @@ module.exports = {
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setDescription(message.nowplayingDescription) .setDescription(message.nowplayingDescription)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
return msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

233
src/client/commands/play.js
View File

@ -9,88 +9,150 @@ module.exports = {
name: "play", name: "play",
alias: "p", alias: "p",
usage: "<song name>", usage: "<song name>",
description: "Play some music.", description: "Play radio",
options: [
{ type: "STRING", name: "query", description: "Select station", required: false}
],
permission: "none", permission: "none",
category: "radio", category: "radio",
async execute(msg, args, client, Discord, command) { async execute(interaction, client, Discord, command) {
let message = {}; let message = {};
let url = args[1] ? args[1].replace(/<(.+)>/g, "$1") : ""; let query = interaction.options?.getString("query") ?? interaction.values?.[0];
const radio = client.radio.get(msg.guild.id); if(!query){
const voiceChannel = msg.member.voice.channel; if(!client.stations) {
if (!radio) { message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
if (!msg.member.voice.channel) return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
return msg.channel.send( }
client.messageEmojis["error"] + client.messages.noVoiceChannel
let stations = new Array();
let options = new Array();
options[1] = new Array();
options[2] = new Array();
stations[1] = client.stations.slice(0,24).forEach(station => {
station = {
label: station.name,
description: station.owner,
value: station.name
};
options[1].push(station);
});
stations[2] = client.stations.slice(25).forEach(station => {
station = {
label: station.name,
description: station.owner,
value: station.name
};
options[2].push(station);
});
const menu = new Discord.MessageActionRow()
.addComponents(
new Discord.MessageSelectMenu()
.setCustomId('play')
.setPlaceholder('Nothing selected')
.addOptions(options[1])
.addOptions(options[2])
); );
stations = null;
options = null;
return interaction.reply({
content: '**Select station:**',
components: [menu],
ephemeral: true
});
}
let url = query ? query.replace(/<(.+)>/g, "$1") : "";
const radio = client.radio.get(interaction.guild.id);
const voiceChannel = interaction.member.voice.channel;
if (!radio) {
if (!interaction.member.voice.channel)
return interaction.reply({
content: client.messageEmojis["error"] + client.messages.noVoiceChannel,
ephemeral: true
});
} else { } else {
if (voiceChannel !== radio.voiceChannel) if (voiceChannel !== radio.voiceChannel)
return msg.channel.send( return interaction.reply({
client.messageEmojis["error"] + client.messages.wrongVoiceChannel content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
); ephemeral: true
});
} }
if (!client.stations) { if (!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace( message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace(
"%client.config.supportGuild%", "%client.config.supportGuild%",
client.config.supportGuild client.config.supportGuild
); );
return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist); return interaction.reply({
content: client.messageEmojis["error"] + message.errorToGetPlaylist,
ephemeral: true
});
} }
if (!args[1]) return msg.channel.send(client.messages.noQuery); if (!query) return interaction.reply(client.messages.noQuery);
const permissions = voiceChannel.permissionsFor(msg.client.user); const permissions = voiceChannel.permissionsFor(interaction.client.user);
if (!permissions.has("CONNECT")) { if (!permissions.has("CONNECT")) {
return msg.channel.send(client.messageEmojis["error"] + client.messages.noPermsConnect); return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsConnect);
} }
if (!permissions.has("SPEAK")) { if (!permissions.has("SPEAK")) {
return msg.channel.send(client.messageEmojis["error"] + client.messages.noPermsSpeak); return interaction.reply(client.messageEmojis["error"] + client.messages.noPermsSpeak);
} }
let station; let station;
const number = parseInt(args[1] - 1); const number = parseInt(query - 1);
if (url.startsWith("http")) { if (url.startsWith("http")) {
return msg.channel.send( return interaction.reply({
client.messageEmojis["error"] + client.messages.errorStationURL content: client.messageEmojis["error"] + client.messages.errorStationURL,
); ephemeral: true
});
} else if (!isNaN(number)) { } else if (!isNaN(number)) {
if (number > client.stations.length - 1) { if (number > client.stations.length - 1) {
return msg.channel.send( return interaction.reply({
client.messageEmojis["error"] + client.messages.wrongStationNumber content: client.messageEmojis["error"] + client.messages.wrongStationNumber,
); ephemeral: true
});
} else { } else {
url = client.stations[number].stream[client.stations[number].stream.default]; url = client.stations[number].stream[client.stations[number].stream.default];
station = client.stations[number]; station = client.stations[number];
} }
} else { } else {
if (args[1].length < 3) if (query.length < 3)
return msg.channel.send( return interaction.reply({
client.messageEmojis["error"] + client.messages.tooShortSearch content: client.messageEmojis["error"] + client.messages.tooShortSearch,
); ephemeral: true
const sstation = await searchStation(args.slice(1).join(" "), client); });
const sstation = await searchStation(query, client);
if (!sstation) if (!sstation)
return msg.channel.send( return interaction.reply({
client.messageEmojis["error"] + client.messages.noSearchResults content: client.messageEmojis["error"] + client.messages.noSearchResults,
); ephemeral: true
});
url = sstation.stream[sstation.stream.default]; url = sstation.stream[sstation.stream.default];
station = sstation; station = sstation;
} }
if (radio) { if (radio) {
client.funcs.statisticsUpdate(client, msg.guild, radio); client.funcs.statisticsUpdate(client, interaction.guild, radio);
radio.audioPlayer.stop(); radio.audioPlayer.stop();
radio.station = station; radio.station = station;
radio.textChannel = msg.channel; radio.textChannel = interaction.channel;
play(msg.guild, client, url); play(interaction, interaction.guild, client, url, Discord);
return; return;
} }
const construct = { const construct = {
textChannel: msg.channel, textChannel: interaction.channel,
voiceChannel: voiceChannel, voiceChannel: voiceChannel,
connection: null, connection: null,
message: null,
audioPlayer: createAudioPlayer(), audioPlayer: createAudioPlayer(),
station: station station: station
}; };
client.radio.set(msg.guild.id, construct); client.radio.set(interaction.guild.id, construct);
try { try {
const connection = const connection =
@ -103,25 +165,26 @@ module.exports = {
construct.connection = connection; construct.connection = connection;
let date = new Date(); let date = new Date();
construct.startTime = date.getTime(); construct.startTime = date.getTime();
play(msg.guild, client, url); play(interaction, interaction.guild, client, url, Discord);
client.datastore.checkEntry(msg.guild.id); client.datastore.checkEntry(interaction.guild.id);
construct.currentGuild = client.datastore.getEntry(msg.guild.id); construct.currentGuild = client.datastore.getEntry(interaction.guild.id);
if (!construct.currentGuild.statistics[construct.station.name]) { if (!construct.currentGuild.statistics[construct.station.name]) {
construct.currentGuild.statistics[construct.station.name] = {}; construct.currentGuild.statistics[construct.station.name] = {};
construct.currentGuild.statistics[construct.station.name].time = 0; construct.currentGuild.statistics[construct.station.name].time = 0;
construct.currentGuild.statistics[construct.station.name].used = 0; construct.currentGuild.statistics[construct.station.name].used = 0;
client.datastore.updateEntry(msg.guild, construct.currentGuild); client.datastore.updateEntry(interaction.guild, construct.currentGuild);
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
client.radio.delete(msg.guild.id); client.radio.delete(interaction.guild.id);
return msg.channel.send(client.messageEmojis["error"] + `An error occured: ${error}`); return interaction.reply(client.messageEmojis["error"] + `An error occured: ${error}`);
} }
} }
}; };
function play(guild, client, url) {
async function play(interaction, guild, client, url, Discord) {
let message = {}; let message = {};
const radio = client.radio.get(guild.id); const radio = client.radio.get(guild.id);
const resource = createAudioResource(url); const resource = createAudioResource(url);
@ -129,24 +192,85 @@ function play(guild, client, url) {
radio.audioPlayer.play(resource); radio.audioPlayer.play(resource);
resource.playStream resource.playStream
.on("readable", () => { .on("readable", () => {
console.log("Stream started"); client.funcs.logger('Radio', 'Stream started' + " / " + guild.id + " / " + radio.station.name);
}) })
.on("finish", () => { .on("finish", () => {
console.log("Stream finished"); client.funcs.logger('Radio', 'Stream finished' + " / " + guild.id);
client.funcs.statisticsUpdate(client, guild, radio); client.funcs.statisticsUpdate(client, guild, radio);
radio.connection.destroy(); radio.connection?.destroy();
radio.audioPlayer?.stop();
client.radio.delete(guild.id); client.radio.delete(guild.id);
return; return;
}) })
.on("error", error => { .on("error", error => {
client.funcs.logger('Radio', 'Stream errored');
console.error(error); console.error(error);
radio.connection.destroy(); radio.connection?.destroy();
radio.audioPlayer?.stop();
client.radio.delete(guild.id); client.radio.delete(guild.id);
return radio.textChannel.send(client.messages.errorPlaying); return interaction.reply(client.messages.errorPlaying);
}); });
message.nowplayingDescription = client.messages.nowplayingDescription.replace("%radio.station.name%", radio.station.name);
message.nowplayingDescription = message.nowplayingDescription.replace("%radio.station.owner%", radio.station.owner);
message.nowplayingDescription = message.nowplayingDescription.replace("%client.funcs.msToTime(completed)%", "");
message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
message.nowplayingDescription = message.nowplayingDescription.replace("**", "");
const embed = new Discord.MessageEmbed()
.setTitle(client.user.username)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["play"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor)
.addField(client.messages.nowplayingTitle, message.nowplayingDescription, true)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
const buttons = new Discord.MessageActionRow()
.addComponents(
new Discord.MessageButton()
.setCustomId('list')
.setEmoji(client.messageEmojis["list"])
.setStyle('SECONDARY')
)
.addComponents(
new Discord.MessageButton()
.setCustomId('prev')
.setEmoji(client.messageEmojis["prev"])
.setStyle('SECONDARY')
.setDisabled(true)
)
.addComponents(
new Discord.MessageButton()
.setCustomId('stop')
.setEmoji(client.messageEmojis["stop"])
.setStyle('SECONDARY')
)
.addComponents(
new Discord.MessageButton()
.setCustomId('next')
.setEmoji(client.messageEmojis["next"])
.setStyle('SECONDARY')
.setDisabled(true)
)
.addComponents(
new Discord.MessageButton()
.setCustomId('statistics')
.setEmoji(client.messageEmojis["statistics"])
.setStyle('SECONDARY')
);
if(!radio.message){
radio.message = await radio.textChannel.send({ embeds: [embed], components: [buttons] });
} else {
radio.message.edit({ embeds: [embed], components: [buttons] });
}
message.play = client.messages.play.replace("%radio.station.name%", radio.station.name); message.play = client.messages.play.replace("%radio.station.name%", radio.station.name);
radio.textChannel.send(client.messageEmojis["play"] + message.play);
interaction.reply({
content: client.messageEmojis["play"] + message.play,
ephemeral: true
});
} }
function searchStation(key, client) { function searchStation(key, client) {
@ -154,6 +278,15 @@ function searchStation(key, client) {
let foundStations = []; let foundStations = [];
if (!key) return false; if (!key) return false;
if (key == "radio") return false; if (key == "radio") return false;
client.stations
.filter(
x => x.name.toUpperCase().includes(key.toUpperCase()) || x === key
)
.forEach(x =>
foundStations.push({ station: x, name: x.name, probability: 100 })
);
if (key.startsWith("radio ")) key = key.slice(6); if (key.startsWith("radio ")) key = key.slice(6);
const probabilityIncrement = 100 / key.split(" ").length / 2; const probabilityIncrement = 100 / key.split(" ").length / 2;
for (let i = 0; i < key.split(" ").length; i++) { for (let i = 0; i < key.split(" ").length; i++) {

16
src/client/commands/statistics.js
View File

@ -2,18 +2,18 @@ module.exports = {
name: 'statistics', name: 'statistics',
alias: 'stats', alias: 'stats',
usage: '', usage: '',
description: 'Show usage statistics.', description: 'Show statistics',
permission: 'none', permission: 'none',
category: 'info', category: 'info',
execute(msg, args, client, Discord, command) { execute(interaction, client, Discord, command) {
let message = {}; let message = {};
let stations = client.stations; let stations = client.stations;
let currentGuild = client.datastore.getEntry(msg.guild.id); let currentGuild = client.datastore.getEntry(interaction.guild.id);
let statistics = ""; let statistics = "";
if(!client.stations) { if(!client.stations) {
message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild); message.errorToGetPlaylist = client.messages.errorToGetPlaylist.replace("%client.config.supportGuild%", client.config.supportGuild);
return msg.channel.send(client.messageEmojis["error"] + message.errorToGetPlaylist); return interaction.reply(client.messageEmojis["error"] + message.errorToGetPlaylist);
} }
if(!currentGuild || currentGuild && !currentGuild.statistics){ if(!currentGuild || currentGuild && !currentGuild.statistics){
@ -22,7 +22,7 @@ module.exports = {
Object.keys(stations).forEach(function(station) { Object.keys(stations).forEach(function(station) {
if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) > 0 && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) > 0){ if(currentGuild.statistics[stations[station].name] && currentGuild.statistics[stations[station].name].time && parseInt(currentGuild.statistics[stations[station].name].time) > 0 && currentGuild.statistics[stations[station].name].used && parseInt(currentGuild.statistics[stations[station].name].used) > 0){
statistics += `**${parseInt(station) + 1}** ` + stations[station].name + " \n"; statistics += `**${parseInt(station) + 1}** ` + stations[station].name + " \n";
statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time, "dd:hh:mm:ss") + "\n"; statistics += "Time: " + client.funcs.msToTime(currentGuild.statistics[stations[station].name].time) + "\n";
statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n"; statistics += "Used: " + currentGuild.statistics[stations[station].name].used + "\n";
} }
}); });
@ -34,6 +34,10 @@ module.exports = {
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.setDescription(statistics) .setDescription(statistics)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
return msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

14
src/client/commands/status.js
View File

@ -1,27 +1,31 @@
module.exports = { module.exports = {
name: 'status', name: 'status',
alias: 'none', alias: 'st',
usage: '', usage: '',
description: 'Bot Status', description: 'Bot Status',
permission: 'none', permission: 'none',
category: 'info', category: 'info',
async execute(msg, args, client, Discord, command) { async execute(interaction, client, Discord, command) {
let message = {}; let message = {};
message.statusTitle = client.messages.statusTitle.replace("%client.user.username%", client.user.username); message.statusTitle = client.messages.statusTitle.replace("%client.user.username%", client.user.username);
let uptime = client.funcs.msToTime(client.uptime, "dd:hh:mm:ss"); let uptime = client.funcs.msToTime(client.uptime);
const embed = new Discord.MessageEmbed() const embed = new Discord.MessageEmbed()
.setTitle(message.statusTitle) .setTitle(message.statusTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, '')) .setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor) .setColor(client.config.embedColor)
.addField(client.messages.statusField1, Date.now() - msg.createdTimestamp + "ms", true) .addField(client.messages.statusField1, Date.now() - interaction.createdTimestamp + "ms", true)
.addField(client.messages.statusField2, client.ws.ping + "ms", true) .addField(client.messages.statusField2, client.ws.ping + "ms", true)
.addField(client.messages.statusField3, uptime, true) .addField(client.messages.statusField3, uptime, true)
.addField(client.messages.statusField4, client.config.version, true) .addField(client.messages.statusField4, client.config.version, true)
.addField(client.messages.statusField5, client.config.hostedBy, true) .addField(client.messages.statusField5, client.config.hostedBy, true)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, '')); .setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
msg.channel.send({ embeds: [embed] });
interaction.reply({
embeds: [embed],
ephemeral: true
});
} }
}; };

37
src/client/commands/stop.js
View File

@ -1,18 +1,41 @@
module.exports = { module.exports = {
name: 'stop', name: 'stop',
description: 'Stop command.', description: 'Stop radio',
alias: 's', alias: 's',
usage: '', usage: '',
permission: 'none', permission: 'none',
category: 'radio', category: 'radio',
execute(msg, args, client, Discord, command) { async execute(interaction, client, Discord, command) {
const radio = client.radio.get(msg.guild.id); const radio = client.radio.get(interaction.guild.id);
if (client.funcs.check(client, msg, command)) { if (client.funcs.check(client, interaction, command)) {
client.funcs.statisticsUpdate(client, msg.guild, radio); client.funcs.statisticsUpdate(client, interaction.guild, radio);
radio.connection?.destroy(); radio.connection?.destroy();
radio.audioPlayer?.stop(); radio.audioPlayer?.stop();
client.radio.delete(msg.guild.id); client.funcs.logger('Radio', 'Stream stopped' + " / " + interaction.guild.id);
msg.channel.send(client.messageEmojis["stop"] + client.messages.stop);
const embed = new Discord.MessageEmbed()
.setTitle(client.user.username)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["stop"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor)
.addField(client.messages.nowplayingTitle, "-", true)
.setFooter(client.messages.footerText, "https://cdn.discordapp.com/emojis/" + client.messageEmojis["eximiabots"].replace(/[^0-9]+/g, ''));
if(!radio.message){
radio.message = await radio.textChannel.send({ embeds: [embed], components: [] });
} else {
radio.message.edit({ embeds: [embed], components: [] });
}
setTimeout(function() {
radio.message.delete();
}, 5000);
client.radio.delete(interaction.guild.id);
interaction.reply({
content: client.messageEmojis["stop"] + client.messages.stop,
ephemeral: true
});
} }
} }
}; };

8
src/client/emojis.js
View File

@ -9,7 +9,9 @@ module.exports = {
stop: "<:RadioXStop:688541155377414168>", stop: "<:RadioXStop:688541155377414168>",
statistics: "<:RadioXStatistics:694954485507686421>", statistics: "<:RadioXStatistics:694954485507686421>",
maintenance: "<:RadioXMaintenance:695043843057254493>", maintenance: "<:RadioXMaintenance:695043843057254493>",
error: "<:RadioXError:688541155792781320>" error: "<:RadioXError:688541155792781320>",
prev: "<:RadioXPrev:882153637370023957>",
next: "<:RadioXNext:882153637474893834>"
}; };
let fallbackEmojis = { let fallbackEmojis = {
@ -20,7 +22,9 @@ module.exports = {
stop: "⏹️", stop: "⏹️",
statistics: "📊", statistics: "📊",
maintenance: "🛠️", maintenance: "🛠️",
error: "❌" error: "❌",
prev: "⏪",
next: "⏩"
}; };
client.messageEmojis = {}; client.messageEmojis = {};

35
src/client/events/interactionCreate.js Normal file
View File

@ -0,0 +1,35 @@
import Discord from "discord.js";
module.exports = {
name: 'interactionCreate',
async execute(client, interaction) {
/*if (!interaction.isCommand()) return;*/
const permissions = interaction.channel.permissionsFor(interaction.client.user);
if (!permissions.has('EMBED_LINKS')) return interaction.send(client.messages.noPermsEmbed);
if(interaction.isCommand()){
const commandName = interaction.commandName;
const command = client.commands.get(commandName);
if (!command) return;
try {
command.execute(interaction, client, Discord, command);
} catch (error) {
interaction.reply(client.messages.runningCommandFailed);
console.error(error);
}
} else if (interaction.isSelectMenu() || interaction.isButton()){
const commandName = interaction.customId;
const command = client.commands.get(commandName);
if (!command) return;
try {
command.execute(interaction, client, Discord, command);
} catch (error) {
interaction.reply(client.messages.runningCommandFailed);
console.error(error);
}
}
}
}

27
src/client/events/msg.js
View File

@ -1,27 +0,0 @@
module.exports = {
name: 'message',
async execute(client, msg, Discord) {
if (msg.author.bot || !msg.guild) return;
let prefix = client.config.prefix;
if(msg.mentions.members.first()){
if(msg.mentions.members.first().user.id === client.user.id){
prefix = "<@!" + client.user.id + "> ";
}
}
const args = msg.content.slice(prefix.length).split(' ');
if (!msg.content.startsWith(prefix)) return;
if (!args[0]) return;
const commandName = args[0].toLowerCase();
if (commandName === 'none') return;
const command = client.commands.get(commandName) || client.commands.find(cmd => cmd.aliases && cmd.aliases.includes(commandName)) || client.commandAliases.get(commandName);
if (!command && msg.content !== `${prefix}`) return;
const permissions = msg.channel.permissionsFor(msg.client.user);
if (!permissions.has('EMBED_LINKS')) return msg.channel.send(client.messages.noPermsEmbed);
try {
command.execute(msg, args, client, Discord, command);
} catch (error) {
msg.reply(client.messages.runningCommandFailed);
console.error(error);
}
}
}

47
src/client/events/ready.js
View File

@ -2,38 +2,59 @@ const fetch = require('node-fetch');
module.exports = { module.exports = {
name: 'ready', name: 'ready',
async execute(client, Discord) { async execute(client) {
console.log('RadioX'); console.log('RadioX ' + client.config.version);
console.log('Internet Radio to your Discord guild'); console.log('Internet Radio to your Discord guild');
console.log('(c)2020-2021 EximiaBots by Warén Group'); console.log('(c)2020-2021 EximiaBots by Warén Group');
console.log('');
/*DEVELOPERS*/
client.funcs.logger('Developers', 'List');
client.developers = ""; client.developers = "";
let user = ""; let user = "";
for (let i = 0; i < client.config.devId.length; i++) { for (let i = 0; i < client.config.devId.length; i++) {
user = await client.users.fetch(client.config.devId[i]); user = await client.users.fetch(client.config.devId[i]);
console.log(" - " + user.tag);
if (i == client.config.devId.length - 1) { if (i == client.config.devId.length - 1) {
client.developers += user.tag; client.developers += user.tag;
} else { } else {
client.developers += user.tag + " & "; client.developers += user.tag + " & ";
} }
} }
console.log("\n");
/*STATIONS*/
try { try {
client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
client.stations = await fetch(client.config.stationslistUrl) client.stations = await fetch(client.config.stationslistUrl)
.then(client.funcs.checkFetchStatus) .then(client.funcs.checkFetchStatus)
.then(response => response.json()); .then(response => response.json());
client.funcs.logger('Stations', 'List');
client.stations.forEach(station => {
console.log(" - " + station.name);
});
console.log("\n");
client.funcs.logger('Stations', 'Successfully fetched list');
} catch (error) { } catch (error) {
console.error(error); client.funcs.logger('Stations', 'Fetching list failed');
console.error(error + "\n");
} }
setInterval(async () => { setInterval(async () => {
try { try {
client.funcs.logger('Stations', 'Started fetching list – ' + client.config.stationslistUrl);
client.stations = await fetch(client.config.stationslistUrl) client.stations = await fetch(client.config.stationslistUrl)
.then(client.funcs.checkFetchStatus) .then(client.funcs.checkFetchStatus)
.then(response => response.json()); .then(response => response.json());
client.funcs.logger('Stations', 'Successfully fetched list');
} catch (error) { } catch (error) {
console.error(error); client.funcs.logger('Stations', 'Fetching list failed');
//console.error(error);
} }
}, 3600000); }, 3600000);
@ -41,8 +62,26 @@ module.exports = {
client.user.setStatus('dnd'); client.user.setStatus('dnd');
} }
/*GUILDS*/
client.funcs.logger('Guilds', 'Started fetching list');
client.funcs.logger('Guilds', 'List');
let guilds = await client.guilds.fetch();
guilds.forEach(guild => {
console.log(" - " + guild.id + ": " + guild.name);
});
console.log("\n");
client.funcs.logger('Guilds', 'Successfully fetched list');
/*STATISTICS*/
client.datastore.calculateGlobal(client); client.datastore.calculateGlobal(client);
/*EMOJIS*/
require(`../emojis.js`).execute(client); require(`../emojis.js`).execute(client);
/*COMMANDS*/
require(`../commands.js`).execute(client);
} }
} }

5
src/client/events/voiceStateUpdate.js
View File

@ -17,6 +17,7 @@ module.exports = {
client.funcs.statisticsUpdate(client, newState.guild, radio); client.funcs.statisticsUpdate(client, newState.guild, radio);
radio.connection?.destroy(); radio.connection?.destroy();
radio.audioPlayer?.stop(); radio.audioPlayer?.stop();
client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
return client.radio.delete(newState.guild.id); return client.radio.delete(newState.guild.id);
} }
@ -38,6 +39,7 @@ module.exports = {
client.funcs.statisticsUpdate(client, newState.guild, radio); client.funcs.statisticsUpdate(client, newState.guild, radio);
radio.connection?.destroy(); radio.connection?.destroy();
radio.audioPlayer?.stop(); radio.audioPlayer?.stop();
client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
client.radio.delete(oldState.guild.id); client.radio.delete(oldState.guild.id);
} }
return; return;
@ -56,9 +58,10 @@ module.exports = {
client.funcs.statisticsUpdate(client, newState.guild, radio); client.funcs.statisticsUpdate(client, newState.guild, radio);
radio.connection?.destroy(); radio.connection?.destroy();
radio.audioPlayer?.stop(); radio.audioPlayer?.stop();
client.funcs.logger('Radio', 'Stream stopped' + " / " + newState.guild.id);
client.radio.delete(newState.guild.id); client.radio.delete(newState.guild.id);
} }
}, 120000); }, 60000);
} }
}, },
}; };

23
src/client/funcs/check.js
View File

@ -1,19 +1,28 @@
module.exports = function (client, msg, command) { module.exports = function (client, interaction, command) {
let message = {}; let message = {};
const radio = client.radio.get(msg.guild.id); const radio = client.radio.get(interaction.guild.id);
const permissions = msg.channel.permissionsFor(msg.author); const permissions = interaction.channel.permissionsFor(interaction.user);
if (!radio) { if (!radio) {
msg.channel.send(client.messageEmojis["error"] + client.messages.notPlaying); interaction.reply({
content: client.messageEmojis["error"] + client.messages.notPlaying,
ephemeral: true
});
return false; return false;
} }
if (msg.member.voice.channel !== radio.voiceChannel) { if (interaction.member.voice.channel !== radio.voiceChannel) {
msg.channel.send(client.messageEmojis["error"] + client.messages.wrongVoiceChannel); interaction.reply({
content: client.messageEmojis["error"] + client.messages.wrongVoiceChannel,
ephemeral: true
});
return false; return false;
} }
if(!command.permission == 'none'){ if(!command.permission == 'none'){
if (!permissions.has(command.permission)) { if (!permissions.has(command.permission)) {
message.noPerms = client.messages.noPerms.replace("%command.permission%", command.permission); message.noPerms = client.messages.noPerms.replace("%command.permission%", command.permission);
msg.channel.send(client.messageEmojis["error"] + message.noPerms); interaction.reply({
content: client.messageEmojis["error"] + message.noPerms,
ephemeral: true
});
return false; return false;
} else return true; } else return true;
} else return true; } else return true;

4
src/client/funcs/logger.js Normal file
View File

@ -0,0 +1,4 @@
module.exports = function (area, text){
let date = new Date();
console.log('[' + area + '] – ' + date.toISOString() + '\n' + text + '\n');
}

19
src/client/funcs/msToTime.js
View File

@ -1,17 +1,12 @@
module.exports = function msToTime(duration, format) { module.exports = function msToTime(duration) {
var seconds = Math.floor((duration / 1000) % 60), let seconds = Math.floor((duration / 1000) % 60),
minutes = Math.floor((duration / (1000 * 60)) % 60), minutes = Math.floor((duration / (1000 * 60)) % 60),
hours = Math.floor((duration / (1000 * 60 * 60)) % 24), hours = Math.floor((duration / (1000 * 60 * 60)) % 24),
days = Math.floor((duration / (1000 * 60 * 60 * 24))); days = Math.floor((duration / (1000 * 60 * 60 * 24)));
days = (days < 10) ? "0" + days : days; return +days > 0
hours = (hours < 10) ? "0" + hours : hours; ? `${days}:${+hours < 10 ? `0${hours}` : hours}:${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`
minutes = (minutes < 10) ? "0" + minutes : minutes; : +hours > 0
seconds = (seconds < 10) ? "0" + seconds : seconds; ? `${+hours < 10 ? `0${hours}` : hours}:${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`
: `${+minutes < 10 ? `0${minutes}` : minutes}:${+seconds < 10 ? `0${seconds}` : seconds}`;
if (format === "hh:mm:ss") {
return `${hours}:${minutes}:${seconds}`;
} else if (format === "dd:hh:mm:ss") {
return `${days}:${hours}:${minutes}:${seconds}`;
}
} }

2
src/client/messages.js
View File

@ -13,7 +13,7 @@ module.exports = {
inviteTitle: "Invite %client.user.username% to your Discord server!", inviteTitle: "Invite %client.user.username% to your Discord server!",
listTitle: "Radio Stations", listTitle: "Radio Stations",
nowplayingTitle: "Now Playing", nowplayingTitle: "Now Playing",
nowplayingDescription: "**%radio.station.name%** \n Owner: %radio.station.owner% \n %client.funcs.msToTime(completed, \"hh:mm:ss\")%", nowplayingDescription: "**%radio.station.name%** \n Owner: %radio.station.owner% \n %client.funcs.msToTime(completed)%",
noVoiceChannel: "You need to be in a voice channel to play radio!", noVoiceChannel: "You need to be in a voice channel to play radio!",
noQuery: "You need to use a number or search for a supported station!", noQuery: "You need to use a number or search for a supported station!",
noPermsConnect: "I cannot connect to your voice channel.", noPermsConnect: "I cannot connect to your voice channel.",

3
src/config.js
View File

@ -21,6 +21,7 @@ module.exports = {
//Settings //Settings
prefix: process.env.RADIOX_PREFIX || "rx-", prefix: process.env.RADIOX_PREFIX || "rx-",
version: process.env.RADIOX_VERSION || process.env.npm_package_version version: process.env.RADIOX_VERSION || process.env.npm_package_version,
debug: process.env.DEBUG_MODE || false
} }