Skip to content

Commit 4f14037

Browse files
committed
Merge branch 'master' into dev
2 parents 31d3c66 + 26cfc2a commit 4f14037

File tree

4 files changed

+28
-11
lines changed

4 files changed

+28
-11
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
Each release usually includes various fixes and improvements.
44
The most noteworthy of these, as well as any features and breaking changes, are listed here.
55

6+
## 3.3.2.5
7+
* Update Lavaplayer to 1.3.76
8+
9+
## 3.3.2.4
10+
* Update Lavaplayer to 1.3.74
11+
12+
## 3.3.2.3
13+
* Update Lavaplayer to 1.3.65, fixes Soundcloud
14+
615
## v3.3.2.2
716
* Updated Lavaplayer to 1.3.61
817
* Fixed a ConcurrentModificationException ([Thewsomeguy](https://github.com/Thewsomeguy))

IMPLEMENTATION.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ Response:
404404
}
405405
```
406406

407-
If the identifier leads to a playlist, `playlistInfo` will contain two properties, `name` and `selectedTrack`
407+
If the identifier leads to a playlist, `playlistInfo` will contain two properties, `name` and `selectedTrack`(-1 if no selectedTrack found)
408408
```json
409409
{
410410
"loadType": "PLAYLIST_LOADED",
@@ -460,8 +460,12 @@ Response:
460460
"isStream": false,
461461
"position": 0,
462462
"title": "Rick Astley - Never Gonna Give You Up",
463+
<<<<<<< HEAD
463464
"uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
464465
"sourceName": "youtube"
466+
=======
467+
"uri": "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
468+
>>>>>>> master
465469
}
466470
```
467471

LavalinkServer/application.yml.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ lavalink:
1010
soundcloud: true
1111
twitch: true
1212
vimeo: true
13-
mixer: true
1413
http: true
1514
local: false
1615
bufferDurationMs: 400 # The duration of the NAS buffer. Higher values fare better against longer GC pauses

README.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ The public api ("api" in a very broad sense) of Lavalink can be categorized into
4343
- **Server Domain:** The server application with its runtime environment, its configuration, etc.
4444

4545
Changes that might be breaking to one domain need not be breaking to the other.
46-
Examples:
46+
Examples:
4747
- Removing an endpoint. This is a breaking change for the client domain, but is
4848
not a breaking change for running the server itself.
4949
- Upgrading the minimum Java version: This is a breaking change for the server domain,
50-
but client implementations couldn't care less about it.
50+
but client implementations couldn't care less about it.
5151

5252
Given the above, the following versioning pattern lends itself well to the Lavalink project:
5353

5454
_**api.major.minor.patch**_
5555

56-
- **Api**: Bumped when breaking changes are comitted to the client domain of Lavalink
57-
Examples: Removing an endpoint, altering output of an endpoint in a non backwards compatible manner
58-
- **Major**: Bumped when breaking changes are comitted to the Lavalink server domain
56+
- **Api**: Bumped when breaking changes are comitted to the client domain of Lavalink
57+
Examples: Removing an endpoint, altering output of an endpoint in a non backwards compatible manner
58+
- **Major**: Bumped when breaking changes are comitted to the Lavalink server domain
5959
Examples: Bumping the required Java version, altering the configuration in a non backwards compatible manner
6060
- **Minor**: New features in any domain
6161
Examples: New optional endpoint or op code, additional configuration options, change of large subsystems or dependencies
@@ -64,36 +64,41 @@ Examples: Fixing a race condition, fixing unexpected exceptions, fixing output t
6464

6565
While major, minor and patch will do a best effort to adhere to [Semantic Versioning](https://semver.org/),
6666
prepending it with an additional api version makes life easier for developers of client implementations
67-
in two ways: It is a clear way for the Lavalink project to communicate the actually relevant breaking changes
67+
in two ways: It is a clear way for the Lavalink project to communicate the actually relevant breaking changes
6868
to client developers, and in turn, client developers can use the api version to clearly communicate to their
6969
users about the compatibility of their clients to the Lavalink server.
7070

7171

7272
## Client libraries:
7373
* [Lavalink-Client](https://github.com/freyacodes/lavalink-client) (JDA or generic, Java)
7474
* [LavaClient](https://github.com/SamOphis/LavaClient) (Java)
75+
* [Lavalink.kt](https://github.com/DRSchlaubi/lavalink.kt) (Kord, JDA, generic, Kotlin (Coroutines))
7576
* [Lavalink.py](https://github.com/Devoxin/Lavalink.py) (discord.py, Python)
7677
* [pylava](https://github.com/Pandentia/pylava) (discord.py, Python)
7778
* [playlink](https://github.com/OverleapCo/Playlink) (Javascript/Typescript)
7879
* [SandySounds](https://github.com/MrJohnCoder/SandySounds) (JavaScript)
7980
* [Gorilink](https://github.com/Gorillas-Team/Gorilink) (JavaScript)
8081
* [eris-lavalink](https://github.com/briantanner/eris-lavalink) ([eris](https://github.com/abalabahaha/eris), JavaScript)
8182
* [LavaClient](https://github.com/lavaclient/lavaclient) (JavaScript)
82-
* [Shoukaku](https://github.com/Deivu/Shoukaku) (JavaScript)
83+
* [Shoukaku](https://github.com/Deivu/Shoukaku) ([discord.js](https://github.com/discordjs/discord.js), JavaScript)
8384
* [erela.js](https://github.com/MenuDocs/erela.js) (JavaScript)
8485
* [Lavacord](https://github.com/lavacord/lavacord) (JavaScript)
85-
* [LavaJS](https://github.com/Overleap/LavaJS) ([discord.js](https://github.com/discordjs/discord.js), JavaScript/TypeScript)
86+
* [LavaJS](https://github.com/OverleapCo/LavaJS) ([discord.js](https://github.com/discordjs/discord.js), JavaScript/TypeScript)
87+
* [@skyra/audio](https://github.com/skyra-project/audio) ([discord.js](https://github.com/discordjs/discord.js), JavaScript/TypeScript)
8688
* [EvoLava](https://github.com/EvolveJS/EvoLava) ([EvolveJS](https://github.com/EvolveJS/EvolveJS), Javascript/Typescript)
8789
* [SharpLink](https://github.com/Devoxin/SharpLink) ([Discord.Net](https://github.com/RogueException/Discord.Net), .NET)
8890
* [Victoria](https://github.com/Yucked/Victoria) ([Discord.NET](https://github.com/RogueException/Discord.Net), .NET)
8991
* [Lavalink.NET](https://github.com/Dev-Yukine/Lavalink.NET) (.NET)
9092
* [DSharpPlus.Lavalink](https://github.com/DSharpPlus/DSharpPlus/tree/master/DSharpPlus.Lavalink) ([DSharpPlus](https://github.com/DSharpPlus/DSharpPlus/), .NET)
9193
* [Lavalink4NET](https://github.com/angelobreuer/Lavalink4NET) ([Discord.Net](https://github.com/RogueException/Discord.Net), [DSharpPlus](https://github.com/DSharpPlus/DSharpPlus/), .NET)
9294
* [gavalink](https://github.com/foxbot/gavalink) (Go)
95+
* [waterlink](https://github.com/lukasl-dev/waterlink) (Go)
9396
* [Magma](https://github.com/initzx/magma/) (discord.py, Python)
9497
* [lavapotion](https://github.com/SamOphis/lavapotion) (Elixir)
9598
* [WaveLink](https://github.com/EvieePy/Wavelink) (discord.py, Python)
96-
* [Lavalink-rs](https://gitlab.com/nitsuga5124/lavalink-rs/) (Async Libraries, Rust)
99+
* [Lavalink-rs](https://gitlab.com/vicky5124/lavalink-rs/) (All `tokio` Libraries, Rust)
100+
* [lavasnek_rs](https://github.com/vicky5124/lavasnek_rs/) (All `asyncio` Libraries, Python)
101+
* [Pomice](https://github.com/cloudwithax/pomice) (discord.py, Python)
97102
* Or [create your own](https://github.com/freyacodes/Lavalink/blob/master/IMPLEMENTATION.md)
98103

99104
## Server configuration

0 commit comments

Comments
 (0)