forked from jagrosh/MusicBot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 8733899 Author: John Grosh <[email protected]> Date: Wed Jul 10 17:35:50 2024 -0400 Update bug-report.yml commit e5fd05e Author: Moritz Bender <[email protected]> Date: Wed Jul 10 13:19:13 2024 +0200 Update dependencies to fix youtube issues (jagrosh#1609) commit 6a5a9c7 Author: John Grosh <[email protected]> Date: Fri May 10 17:43:49 2024 -0400 Change playlist page count (jagrosh#1542) * change playlist page count * make the value configurable * small refactor commit 8557f7a Author: Michaili K <[email protected]> Date: Fri May 10 21:36:43 2024 +0200 Log track exceptions in the audio handler (jagrosh#1558) commit 48e62f1 Author: Michaili K <[email protected]> Date: Fri May 10 21:32:30 2024 +0200 Revert "Always self-deafen (jagrosh#1491)" (jagrosh#1551) This reverts commit a7807b9. commit 6f12c33 Author: John Grosh <[email protected]> Date: Fri May 10 15:23:30 2024 -0400 custom eval engine (jagrosh#1530) commit 0afb3db Author: Michaili K <[email protected]> Date: Fri May 10 20:19:11 2024 +0200 Switch to lavalink's new YouTube audio source manager (jagrosh#1552) * Switch to new lavalink's new YouTube audio source manager * Add back setPlaylistPageCount call for the youtube audio source manager * Manually add all the individual audio sources EXCEPT for old youtube * Remove unused import * Upgrade lavaplayer-youtube-source to 1.0.3 * Upgrade lavaplayer-youtube-source to 1.0.4 commit 81322ef Author: Michaili K <[email protected]> Date: Fri May 10 20:14:28 2024 +0200 Add seek command (supersedes jagrosh#344) (jagrosh#674) * Add seek command * Combine nested if statements * Put the seek command in correct place to keep alphabetical order * Add license header * Brackets on next line * Restructure if-statements * Check for permissions with DJCommand#checkDJPermission * Make regex slightly smaller * Optimize imports * Output length of current track if requested seek time is invalid * Restate seeked point when seeked successfully * Add empty newline at end of file to keep consistency * Create TimeUtil class for parsing and formatting time * Move FormatUtil#formatTime to TimeUtil, and refactor * Apply requested changes (Pass 2) * Seek based on current position in track * Apply requested changes (Pass 3) * Add javadoc param * Apply requested changes (Pass 4) * Fix merge * Avoid reassigning parameter (Codacy) * Rework timestamp parsing * Refactor timestamp parsing * Apply requested changes (Pass 5) * Add examples in help * Apply requested changes (Pass 6) * Fix missing import * Keep track of start timestamp & add "unit" times * Fix my abdominal merge with QueuedTrack * Use RequestMetadata to store start timestamp * Store request info in request metadata * Add regex to try getting a timestamp from the url * Require RequestMetadata for QueuedTracks * Add some unit tests for unit seeking * Add docs & examples --------- Co-authored-by: Whew., Inc <[email protected]>
- Loading branch information
Showing
21 changed files
with
516 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,40 +15,67 @@ | |
| */ | ||
| package com.jagrosh.jmusicbot.audio; | ||
|
|
||
| import com.jagrosh.jdautilities.command.CommandEvent; | ||
| import com.jagrosh.jmusicbot.utils.TimeUtil; | ||
| import com.sedmelluq.discord.lavaplayer.track.AudioTrack; | ||
| import net.dv8tion.jda.api.entities.User; | ||
|
|
||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * | ||
| * @author John Grosh ([email protected]) | ||
| */ | ||
| public class RequestMetadata | ||
| { | ||
| public static final RequestMetadata EMPTY = new RequestMetadata(null); | ||
| public static final RequestMetadata EMPTY = new RequestMetadata(null, null); | ||
|
|
||
| public final UserInfo user; | ||
| public final RequestInfo requestInfo; | ||
|
|
||
| public RequestMetadata(User user) | ||
| public RequestMetadata(User user, RequestInfo requestInfo) | ||
| { | ||
| this.user = user == null ? null : new UserInfo(user.getIdLong(), user.getName(), user.getDiscriminator(), user.getEffectiveAvatarUrl()); | ||
| this.requestInfo = requestInfo; | ||
| } | ||
|
|
||
| public long getOwner() | ||
| { | ||
| return user == null ? 0L : user.id; | ||
| } | ||
|
|
||
| public static RequestMetadata fromResultHandler(AudioTrack track, CommandEvent event) | ||
| { | ||
| return new RequestMetadata(event.getAuthor(), new RequestInfo(event.getArgs(), track.getInfo().uri)); | ||
| } | ||
|
|
||
| public class RequestInfo | ||
| public static class RequestInfo | ||
| { | ||
| public final String query, url; | ||
|
|
||
| private RequestInfo(String query, String url) | ||
| public final long startTimestamp; | ||
|
|
||
| public RequestInfo(String query, String url) | ||
| { | ||
| this(query, url, tryGetTimestamp(query)); | ||
| } | ||
|
|
||
| private RequestInfo(String query, String url, long startTimestamp) | ||
| { | ||
| this.query = query; | ||
| this.url = url; | ||
| this.query = query; | ||
| this.startTimestamp = startTimestamp; | ||
| } | ||
|
|
||
| private static final Pattern youtubeTimestampPattern = Pattern.compile("youtu(?:\\.be|be\\..+)/.*\\?.*(?!.*list=)t=([\\dhms]+)"); | ||
| private static long tryGetTimestamp(String url) | ||
| { | ||
| Matcher matcher = youtubeTimestampPattern.matcher(url); | ||
| return matcher.find() ? TimeUtil.parseUnitTime(matcher.group(1)) : 0; | ||
| } | ||
| } | ||
|
|
||
| public class UserInfo | ||
| public static class UserInfo | ||
| { | ||
| public final long id; | ||
| public final String username, discrim, avatar; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.