Merge pull request #544 from warengroup/develop

Version 0.4.2
This commit is contained in:
Christer Warén 2023-05-24 02:56:00 +03:00 committed by GitHub
commit ecd158f926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 1426 additions and 699 deletions

View File

@ -12,7 +12,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2.2.1
uses: docker/setup-buildx-action@v2.5.0
id: buildx
with:
install: true

2067
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "eximiabots-radiox",
"version": "0.4.1",
"version": "0.4.2",
"description": "Internet Radio to your Discord guild",
"main": "index.js",
"scripts": {
@ -18,30 +18,30 @@
"url": "https://github.com/warengroup/eximiabots-radiox/issues"
},
"dependencies": {
"@discordjs/builders": "^1.4.0",
"@discordjs/builders": "^1.6.3",
"@discordjs/opus": "^0.9.0",
"@discordjs/rest": "^1.4.0",
"@discordjs/voice": "^0.14.0",
"discord-api-types": "^0.37.20",
"discord.js": "^14.7.0",
"@discordjs/rest": "^1.7.1",
"@discordjs/voice": "^0.16.0",
"discord-api-types": "^0.37.42",
"discord.js": "^14.11.0",
"dotenv": "^16.0.3",
"libsodium-wrappers": "^0.7.10",
"node-fetch": "^3.3.0",
"libsodium-wrappers": "^0.7.11",
"node-fetch": "^3.3.1",
"path": "^0.12.7"
},
"devDependencies": {
"@types/node": "^18.11.9",
"@types/ws": "^8.5.3",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"@types/node": "^20.2.3",
"@types/ws": "^8.5.4",
"@typescript-eslint/eslint-plugin": "^5.59.6",
"@typescript-eslint/parser": "^5.59.7",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"prettier": "^2.8.0",
"rimraf": "^3.0.2",
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"ts-node": "^10.9.1",
"tsc-watch": "^5.0.3",
"typescript": "^4.9.3"
"tsc-watch": "^6.0.4",
"typescript": "^5.0.4"
},
"engines": {
"node": ">=16.9.1",

View File

@ -1,4 +1,4 @@
import { ActionRowBuilder, EmbedBuilder, SelectMenuBuilder } from "discord.js";
import { ActionRowBuilder, EmbedBuilder, StringSelectMenuBuilder } from "discord.js";
import Streamer from "../classes/Streamer.js";
const _importDynamic = new Function('modulePath', 'return import(modulePath)');
const fetch = (...args) => _importDynamic('node-fetch').then(({default: fetch}) => fetch(...args));
@ -65,7 +65,7 @@ module.exports = {
const menu = new ActionRowBuilder()
.addComponents(
new SelectMenuBuilder()
new StringSelectMenuBuilder()
.setCustomId('maintenance')
.setPlaceholder('Select action')
.addOptions(options)

View File

@ -14,13 +14,13 @@ module.exports = {
.setTitle(message.statusTitle)
.setThumbnail("https://cdn.discordapp.com/emojis/" + client.messageEmojis["logo"].replace(/[^0-9]+/g, ''))
.setColor(client.config.embedColor)
.addFields([
.addFields(
{ name: client.messages.statusField1, value: uptime },
{ name: client.messages.statusField2, value: client.config.version },
{ name: client.messages.statusField3, value: Date.now() - interaction.createdTimestamp + "ms" },
{ name: client.messages.statusField4, value: client.ws.ping },
{ name: client.messages.statusField4, value: client.ws.ping.toString() },
{ name: client.messages.statusField5, value: client.config.hostedBy }
])
)
.setImage('https://waren.io/berriabot-temp-sa7a36a9xm6837br/images/empty-3.png')
.setFooter({
text: client.messages.footerText,

View File

@ -26,7 +26,7 @@ module.exports = {
});
console.error(error);
}
} else if (interaction.isSelectMenu() || interaction.isButton()){
} else if (interaction.isStringSelectMenu() || interaction.isButton()){
const commandName = interaction.customId;
const command = client.commands.get(commandName);
if (!command) return;

View File

@ -41,12 +41,12 @@ module.exports = {
show: true
});
setInterval(async () => {
/*setInterval(async () => {
await client.stations.fetch({
url: client.config.stationslistUrl,
show: false
});
}, 3600000);
}, 3600000);*/
client.streamer = new Streamer();
client.streamer.init(client);

View File

@ -1,4 +1,4 @@
import { ActionRowBuilder, SelectMenuBuilder } from "discord.js";
import { ActionRowBuilder, StringSelectMenuBuilder } from "discord.js";
module.exports = function listStations(client, interaction){
let stations = new Array();
@ -16,7 +16,7 @@ module.exports = function listStations(client, interaction){
const menu = new ActionRowBuilder()
.addComponents(
new SelectMenuBuilder()
new StringSelectMenuBuilder()
.setCustomId('play')
.setPlaceholder('Nothing selected')
.addOptions(options)