Merge dev

CHANGELOG.md

@@ -21,7 +21,7 @@ The most noteworthy of these, as well as any features and breaking changes, are
 * Added a Testbot for development.
 
 Contributors:
-[@Frederikam](https://github.com/Frederikam),
+[@freyacodes](https://github.com/freyacodes),
 [@Thewsomeguy](https://github.com/Thewsomeguy),
 [@Neuheit](https://github.com/Neuheit),
 [@Sangoon_Is_Noob](https://github.com/Sangoon_Is_Noob),
@@ -41,7 +41,7 @@ Contributors:
 ## v3.3.1.1
 * Updated Lavaplayer to `1.3.50`. This notably fixes YouTube search.
 
-Search patch contributed by [@Frederikam](https://github.com/Frederikam)
+Search patch contributed by [@freyacodes](https://github.com/freyacodes)
 
 ## v3.3.1
 * Update Magma and Lavaplayer.
@@ -51,7 +51,7 @@ Search patch contributed by [@Frederikam](https://github.com/Frederikam)
 * Docker images now use Zulu JDK 13 to mitigate TLS 1.3 problems.
 
 Contributors:
-[@Frederikam](https://github.com/Frederikam),
+[@freyacodes](https://github.com/freyacodes),
 [@duncte123](https://github.com/duncte123),
 [@ByteAlex](https://github.com/ByteAlex), and
 [@Xavinlol](https://github.com/Xavinlol)
@@ -66,7 +66,7 @@ Officially limit Lavalink to JRE 11 and up. Magma has long been having issues wi
 * Docker container now uses a non-root user.
 
 Contributors:
-[@Frederikam](https://github.com/Frederikam),
+[@freyacodes](https://github.com/freyacodes),
 [@ByteAlex](https://github.com/ByteAlex),
 [@duncte123](https://github.com/duncte123), and
 [@james7132](https://github.com/james7132)
@@ -77,7 +77,7 @@ https://github.com/sedmelluq/lavaplayer/pull/199
 * Made the WebSocket handshake return code 401 instead of 200 on bad auth. #208
 
 Contributors:
-[@Frederikam](https://github.com/Frederikam) and
+[@freyacodes](https://github.com/freyacodes) and
 [@Devoxin](https://github.com/Devoxin)
 
 
@@ -90,7 +90,7 @@ Contributors:
 Contributors:
 [@Devoxin](https://github.com/Devoxin),
 [@duncte123](https://github.com/duncte123),
-[@Frederikam](https://github.com/Frederikam), and
+[@freyacodes](https://github.com/freyacodes), and
 [@napstr](https://github.com/napstr)
 
 ## v3.2.0.3
@@ -103,20 +103,20 @@ Contributor:
 * Patched magma
 
 Contributor:
-[@Frederikam](https://github.com/Frederikam/)
+[@freyacodes](https://github.com/freyacodes/)
 
 ## v3.2.0.1
 * Bumped to Java 11. Treating this as a patch version, as v3.2 still requires Java 11 due to a Magma update. 
 
-[@Frederikam](https://github.com/Frederikam)
+[@freyacodes](https://github.com/freyacodes)
 
 ## v3.2
 * Added support for resuming
 * Added noReplace option to the play op
 * Sending the same voice server update will not cause an existing connection to reconnect
 
 Contributor:
-[@Frederikam](https://github.com/Frederikam)
+[@freyacodes](https://github.com/freyacodes)
 
 ## v3.1.2
 * Add API version header to all responses
@@ -132,7 +132,7 @@ Contributor:
 
 Contributors:
 [@Devoxin](https://github.com/Devoxin),
-[@Frederikam](https://github.com/Frederikam/),
+[@freyacodes](https://github.com/freyacodes/),
 [@calebj](https://github.com/calebj)
 
 ## v3.1
@@ -146,49 +146,49 @@ server and port. Port is specified by `server.port`.
 **Please note**: Java 10 will be obsolete
 as of [September 2018 with the release of Java 11](http://www.java-countdown.xyz/). Expect a Lavalink major version release that will be targetting
 Java 11 by that time.
-* **Breaking:** Changes to the output of the /loadtracks endpoint. [\#91](https://github.com/Frederikam/Lavalink/pull/91), [\#114](https://github.com/Frederikam/Lavalink/pull/114), [\#116](https://github.com/Frederikam/Lavalink/pull/116)
-* **Breaking:** The Java client has been moved to a [new repository](https://github.com/FredBoat/Lavalink-Client).
-* **Breaking:** The Java client has been made generic. This is a breaking change so please read the [migration guide](https://github.com/FredBoat/Lavalink-Client#migrating-from-v2-to-v3).
-* Better configurable logging. [\#97](https://github.com/Frederikam/Lavalink/pull/97)
-* Add custom sentry tags, change sentry dsn configuration location. [\#103](https://github.com/Frederikam/Lavalink/pull/103)
-* Add Lavalink version header to websocket handshake. [\#111](https://github.com/Frederikam/Lavalink/pull/111)
-* Use git tags for easier version visibility. [\#129](https://github.com/Frederikam/Lavalink/pull/129)
+* **Breaking:** Changes to the output of the /loadtracks endpoint. [\#91](https://github.com/freyacodes/Lavalink/pull/91), [\#114](https://github.com/freyacodes/Lavalink/pull/114), [\#116](https://github.com/freyacodes/Lavalink/pull/116)
+* **Breaking:** The Java client has been moved to a [new repository](https://github.com/freyacodes/Lavalink-Client).
+* **Breaking:** The Java client has been made generic. This is a breaking change so please read the [migration guide](https://github.com/freyacodes/Lavalink-Client#migrating-from-v2-to-v3).
+* Better configurable logging. [\#97](https://github.com/freyacodes/Lavalink/pull/97)
+* Add custom sentry tags, change sentry dsn configuration location. [\#103](https://github.com/freyacodes/Lavalink/pull/103)
+* Add Lavalink version header to websocket handshake. [\#111](https://github.com/freyacodes/Lavalink/pull/111)
+* Use git tags for easier version visibility. [\#129](https://github.com/freyacodes/Lavalink/pull/129)
 
 Contributors:
 [@Devoxin](https://github.com/Devoxin),
-[@Frederikam](https://github.com/Frederikam/),
+[@freyacodes](https://github.com/freyacodes/),
 [@napstr](https://github.com/napstr),
 [@SamOphis](https://github.com/SamOphis)
 
 ## v2.2
-* Lavaplayer updated to 1.3.x [\#115](https://github.com/Frederikam/Lavalink/pull/115)
-* Version command line flag [\#121](https://github.com/Frederikam/Lavalink/pull/121)
-* Fix race condition in `/loadtracks` endpoint leading to some requests never completing [\#125](https://github.com/Frederikam/Lavalink/pull/125)
+* Lavaplayer updated to 1.3.x [\#115](https://github.com/freyacodes/Lavalink/pull/115)
+* Version command line flag [\#121](https://github.com/freyacodes/Lavalink/pull/121)
+* Fix race condition in `/loadtracks` endpoint leading to some requests never completing [\#125](https://github.com/freyacodes/Lavalink/pull/125)
 
 Contributors:
 [@Devoxin](https://github.com/Devoxin),
-[@Frederikam](https://github.com/Frederikam/),
+[@freyacodes](https://github.com/freyacodes/),
 [@napstr](https://github.com/napstr)
 
 ## v2.1
-* Add prometheus metrics [\#105](https://github.com/Frederikam/Lavalink/pull/105), [\#106](https://github.com/Frederikam/Lavalink/pull/106)
+* Add prometheus metrics [\#105](https://github.com/freyacodes/Lavalink/pull/105), [\#106](https://github.com/freyacodes/Lavalink/pull/106)
 
 Contributors:
-[@Frederikam](https://github.com/Frederikam/),
+[@freyacodes](https://github.com/freyacodes/),
 [@napstr](https://github.com/napstr),
 [@Repulser](https://github.com/Repulser/)
 
 ## v2.0.1
-* Configurable playlist load limit [\#60](https://github.com/Frederikam/Lavalink/pull/60)
-* [Docker Releases](https://hub.docker.com/r/fredboat/lavalink/), [\#74](https://github.com/Frederikam/Lavalink/pull/74)
+* Configurable playlist load limit [\#60](https://github.com/freyacodes/Lavalink/pull/60)
+* [Docker Releases](https://hub.docker.com/r/fredboat/lavalink/), [\#74](https://github.com/freyacodes/Lavalink/pull/74)
 
 Contributors:
 [@Devoxin](https://github.com/Devoxin),
-[@Frederikam](https://github.com/Frederikam/),
+[@freyacodes](https://github.com/freyacodes/),
 [@itslukej](https://github.com/itslukej/),
 [@napstr](https://github.com/napstr),
 [@Repulser](https://github.com/Repulser/)
 
 ## v2.0
-Please see [here](https://github.com/Frederikam/Lavalink/commit/b8dd3c8a7e186755c1ab343d19a552baecf138e7)
-and [here](https://github.com/Frederikam/Lavalink/commit/08a34c99a47a18ade7bd14e6c55ab92348caaa88)
+Please see [here](https://github.com/freyacodes/Lavalink/commit/b8dd3c8a7e186755c1ab343d19a552baecf138e7)
+and [here](https://github.com/freyacodes/Lavalink/commit/08a34c99a47a18ade7bd14e6c55ab92348caaa88)

IMPLEMENTATION.md

@@ -1,5 +1,5 @@
 # Implementation guidelines
-How to write your own client. The Java [Lavalink-Client](https://github.com/FredBoat/Lavalink-Client) will serve as an example implementation.
+How to write your own client. The Java [Lavalink-Client](https://github.com/freyacodes/lavalink-client) will serve as an example implementation.
 The Java client has support for JDA, but can also be adapted to work with other JVM libraries.
 
 ## Requirements
@@ -228,7 +228,7 @@ and you can send the same VOICE_SERVER_UPDATE to a new node.
 
 ### Incoming messages
 
-See [LavalinkSocket.java](https://github.com/FredBoat/Lavalink-Client/blob/master/src/main/java/lavalink/client/io/LavalinkSocket.java) for client implementation
+See [LavalinkSocket.java](https://github.com/freyacodes/lavalink-client/blob/master/src/main/java/lavalink/client/io/LavalinkSocket.java) for client implementation
 
 This event includes:
 * Unix timestamp in milliseconds.
@@ -382,7 +382,8 @@ Response:
         "isStream": false,
         "position": 0,
         "title": "Rick Astley - Never Gonna Give You Up",
-        "uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+        "uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
+        "sourceName": "youtube"
       }
     }
   ]
@@ -426,6 +427,65 @@ A severity level of `COMMON` indicates that the error is non-fatal and that the
 }
 ```
 
+### Track Decoding API
+
+Decode a single track into its info
+```
+GET /decodetrack?track=QAAAjQIAJVJpY2sgQXN0bGV5IC0gTmV2ZXIgR29ubmEgR2l2ZSBZb3UgVXAADlJpY2tBc3RsZXlWRVZPAAAAAAADPCAAC2RRdzR3OVdnWGNRAAEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9ZFF3NHc5V2dYY1EAB3lvdXR1YmUAAAAAAAAAAA== HTTP/1.1
+Host: localhost:8080
+Authorization: youshallnotpass
+```
+
+Response:
+```json
+{
+  "identifier": "dQw4w9WgXcQ",
+  "isSeekable": true,
+  "author": "RickAstleyVEVO",
+  "length": 212000,
+  "isStream": false,
+  "position": 0,
+  "title": "Rick Astley - Never Gonna Give You Up",
+  "uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
+  "sourceName": "youtube"
+}
+```
+
+Decode multiple tracks into info their info
+```
+POST /decodetracks HTTP/1.1
+Host: localhost:8080
+Authorization: youshallnotpass
+```
+
+Request:
+```json
+[
+   "QAAAjQIAJVJpY2sgQXN0bGV5IC0gTmV2ZXIgR29ubmEgR2l2ZSBZb3UgVXAADlJpY2tBc3RsZXlWRVZPAAAAAAADPCAAC2RRdzR3OVdnWGNRAAEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9ZFF3NHc5V2dYY1EAB3lvdXR1YmUAAAAAAAAAAA==",
+   ...
+]
+```
+
+Response:
+```json
+[
+    {
+      "track": "QAAAjQIAJVJpY2sgQXN0bGV5IC0gTmV2ZXIgR29ubmEgR2l2ZSBZb3UgVXAADlJpY2tBc3RsZXlWRVZPAAAAAAADPCAAC2RRdzR3OVdnWGNRAAEAK2h0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9ZFF3NHc5V2dYY1EAB3lvdXR1YmUAAAAAAAAAAA==",
+      "info": {
+        "identifier": "dQw4w9WgXcQ",
+        "isSeekable": true,
+        "author": "RickAstleyVEVO",
+        "length": 212000,
+        "isStream": false,
+        "position": 0,
+        "title": "Rick Astley - Never Gonna Give You Up",
+        "uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
+        "sourceName": "youtube"
+      }
+    },
+    ...
+]
+```
 ---
 
 ### RoutePlanner API

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Frederik Ar. Mikkelsen
+Copyright (c) 2021 Freya Arbjerg and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/Launcher.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -125,6 +125,6 @@ object Launcher {
                 }
         )
         sa.run(*args)
-        log.info("You can safely ignore the big red warning about illegal reflection. See https://github.com/Frederikam/Lavalink/issues/295")
+        log.info("You can safely ignore the big red warning about illegal reflection. See https://github.com/freyacodes/Lavalink/issues/295")
     }
 }

LavalinkServer/src/main/java/lavalink/server/config/ServerConfig.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/io/SocketContext.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/io/SocketServer.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/io/StatsTask.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/io/WSCodes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/player/AudioLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/player/AudioLoaderRestHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +72,8 @@ private JSONObject trackToJSON(AudioTrack audioTrack) {
                 .put("uri", trackInfo.uri)
                 .put("isStream", trackInfo.isStream)
                 .put("isSeekable", audioTrack.isSeekable())
-                .put("position", audioTrack.getPosition());
+                .put("position", audioTrack.getPosition())
+                .put("sourceName", audioTrack.getSourceManager() == null ? null : audioTrack.getSourceManager().getSourceName());
     }
 
     private JSONObject encodeLoadResult(LoadResult result) {

LavalinkServer/src/main/java/lavalink/server/player/AudioLossCounter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/player/EventEmitter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/player/Player.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/player/TrackEndMarkerHandler.java

@@ -1,6 +1,6 @@
 package lavalink.server.player;
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/player/filters/FilterChain.kt

@@ -21,7 +21,7 @@ class FilterChain : PcmFilterFactory {
     private val timescale: TimescaleConfig? = null
     private val tremolo: TremoloConfig? = null
     private val vibrato: VibratoConfig? = null
-    private val distorsion: DistortionConfig? = null
+    private val distortion: DistortionConfig? = null
     private val rotation: RotationConfig? = null
 
     private fun buildList() = listOfNotNull(
@@ -31,7 +31,7 @@ class FilterChain : PcmFilterFactory {
             timescale,
             tremolo,
             vibrato,
-            distorsion,
+            distortion,
             rotation
     )
 
@@ -51,4 +51,4 @@ class FilterChain : PcmFilterFactory {
         return pipeline.reversed().toMutableList() // Output last
     }
 
-}
+}

LavalinkServer/src/main/java/lavalink/server/util/ResetableCountDownLatch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

LavalinkServer/src/main/java/lavalink/server/util/Util.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Frederik Ar. Mikkelsen & NoobLance
+ * Copyright (c) 2021 Freya Arbjerg and contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal