AirDog46/MusicBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jagrosh/MusicBot

Browse Source
This commit is contained in:
John Grosh
2022-09-02 21:56:23 -04:00
parent aee076c854 b76f6fa07c
commit 2faef67b30
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/make-release.yml vendored
View File

@@ -67,4 +67,4 @@ jobs:
### Setup
https://jmusicbot.com/setup
https://jmusicbot.com/config
# Download *only* the `.jar` file below!
# Download: [JMusicBot-${{ github.event.inputs.version_number }}.jar](https://github.com/jagrosh/MusicBot/releases/download/${{ github.event.inputs.version_number }}/JMusicBot-${{ github.event.inputs.version_number }}.jar)

2
pom.xml
View File

@@ -83,7 +83,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.14.2</version>
<version>1.15.3</version>
</dependency>
<!-- Testing Dependencies -->

6
src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java
View File

@@ -16,6 +16,7 @@
package com.jagrosh.jmusicbot.audio;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import com.jagrosh.jmusicbot.queue.Queueable;
import com.jagrosh.jmusicbot.utils.FormatUtil;
import net.dv8tion.jda.api.entities.User;
@@ -53,6 +54,9 @@ public class QueuedTrack implements Queueable
@Override
public String toString()
{
return "`[" + FormatUtil.formatTime(track.getDuration()) + "]` [**" + track.getInfo().title + "**]("+track.getInfo().uri+") - <@" + track.getUserData(RequestMetadata.class).getOwner() + ">";
String entry = "`[" + FormatUtil.formatTime(track.getDuration()) + "]` ";
AudioTrackInfo trackInfo = track.getInfo();
entry = entry + (trackInfo.uri.startsWith("http") ? "[**" + trackInfo.title + "**]("+trackInfo.uri+")" : "**" + trackInfo.title + "**");
return entry + " - <@" + track.getUserData(RequestMetadata.class).getOwner() + ">";
}
}

1
src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java
View File

@@ -20,7 +20,6 @@ import com.jagrosh.jmusicbot.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.RequestMetadata;
import com.jagrosh.jmusicbot.commands.DJCommand;
import net.dv8tion.jda.api.entities.User;
/**
*

1
src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java
View File

@@ -20,7 +20,6 @@ import com.jagrosh.jmusicbot.Bot;
import com.jagrosh.jmusicbot.audio.AudioHandler;
import com.jagrosh.jmusicbot.audio.RequestMetadata;
import com.jagrosh.jmusicbot.commands.MusicCommand;
import net.dv8tion.jda.api.entities.User;
/**
*

2
src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java
View File

@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
*
* @author John Grosh (john.a.grosh@gmail.com)
*/
public class SettingsManager implements GuildSettingsManager
public class SettingsManager implements GuildSettingsManager<Settings>
{
private final static double SKIP_RATIO = .55;
private final HashMap<Long,Settings> settings;