Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #1146

Closed
wants to merge 16 commits into from
Closed

Update #1146

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: docker-build-publish

on:
push:
branches:
- "master"

jobs:
build:
runs-on: self-hosted
steps:
-
name: Checkout
uses: actions/checkout@v3
-
name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Build and push
uses: docker/build-push-action@v4
with:
context: .
file: Dockerfile
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/muse:latest
-
name: Webhook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.PORTAINER_WEBHOOK }}
webhook_secret: "thereisnosecret"
147 changes: 0 additions & 147 deletions .github/workflows/publish.yml

This file was deleted.

4 changes: 2 additions & 2 deletions src/commands/clear.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Command from './index.js';
export default class implements Command {
public readonly slashCommand = new SlashCommandBuilder()
.setName('clear')
.setDescription('clears all songs in queue except currently playing song');
.setDescription('Clears all songs in queue except currently playing song');

public requiresVC = true;

Expand All @@ -22,6 +22,6 @@ export default class implements Command {
public async execute(interaction: ChatInputCommandInteraction) {
this.playerManager.get(interaction.guild!.id).clear();

await interaction.reply('clearer than a field after a fresh harvest');
await interaction.reply('queue cleared');
}
}
2 changes: 1 addition & 1 deletion src/commands/disconnect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ export default class implements Command {

player.disconnect();

await interaction.reply('u betcha, disconnected');
await interaction.reply('disconnected');
}
}
2 changes: 1 addition & 1 deletion src/commands/loop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ export default class implements Command {

player.loopCurrentSong = !player.loopCurrentSong;

await interaction.reply((player.loopCurrentSong ? 'looped :)' : 'stopped looping :('));
await interaction.reply((player.loopCurrentSong ? 'song looped' : 'stopped looping'));
}
}
2 changes: 1 addition & 1 deletion src/commands/pause.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ export default class implements Command {
}

player.pause();
await interaction.reply('the stop-and-go light is now red');
await interaction.reply('player paused');
}
}
2 changes: 1 addition & 1 deletion src/commands/resume.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default class implements Command {
await player.play();

await interaction.reply({
content: 'the stop-and-go light is now green',
content: 'player resumed',
embeds: [buildPlayingMessageEmbed(player)],
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/skip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default class implements Command {
try {
await player.forward(numToSkip);
await interaction.reply({
content: 'keep \'er movin\'',
content: 'song skipped',
embeds: player.getCurrent() ? [buildPlayingMessageEmbed(player)] : [],
});
} catch (_: unknown) {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/stop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ export default class implements Command {
}

player.stop();
await interaction.reply('u betcha, stopped');
await interaction.reply('player stopped');
}
}
2 changes: 1 addition & 1 deletion src/commands/unskip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default class implements Command {
try {
await player.back();
await interaction.reply({
content: 'back \'er up\'',
content: 'song unskipped',
embeds: player.getCurrent() ? [buildPlayingMessageEmbed(player)] : [],
});
} catch (_: unknown) {
Expand Down
4 changes: 2 additions & 2 deletions src/services/add-query-to-queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ export default class AddQueryToQueue {
}

if (newSongs.length === 1) {
await interaction.editReply(`u betcha, **${firstSong.title}** added to the${addToFrontOfQueue ? ' front of the' : ''} queue${skipCurrentTrack ? 'and current track skipped' : ''}${extraMsg}`);
await interaction.editReply(`**${firstSong.title}** added to the${addToFrontOfQueue ? ' front of the' : ''} queue${skipCurrentTrack ? 'and current track skipped' : ''}${extraMsg}`);
} else {
await interaction.editReply(`u betcha, **${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue${skipCurrentTrack ? 'and current track skipped' : ''}${extraMsg}`);
await interaction.editReply(`**${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue${skipCurrentTrack ? 'and current track skipped' : ''}${extraMsg}`);
}
}

Expand Down
Loading