Skip to content

Commit 15fd02b

Browse files
authored
Merge branch 'master' into dev
2 parents c4351be + c2431ce commit 15fd02b

File tree

9 files changed

+59
-52
lines changed

9 files changed

+59
-52
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ A [basic example bot](Testbot) is available.
4343
* Basic authentication
4444
* Prometheus metrics
4545
* Docker images
46-
* [Plugin support](PLUGINS.md)
46+
* [Plugin support](https://lavalink.dev/plugins.html)
4747

4848
## Requirements
4949

docs/api/rest.md

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ When Lavalink encounters an error, it will respond with a JSON object containing
3030
| message | string | The error message |
3131
| path | string | The request path |
3232

33-
<details>
33+
<details markdown="1">
3434
<summary>Example Payload</summary>
3535

3636
```json
@@ -128,7 +128,7 @@ Response:
128128

129129
[Track](#track) object with the loaded track.
130130

131-
<details>
131+
<details markdown="1">
132132
<summary>Example Payload</summary>
133133

134134
```yaml
@@ -153,7 +153,7 @@ Response:
153153
| pluginInfo | Object | Addition playlist info provided by plugins |
154154
| tracks | array of [Track](#track) objects | The tracks of the playlist |
155155

156-
<details>
156+
<details markdown="1">
157157
<summary>Example Payload</summary>
158158

159159
```yaml
@@ -173,7 +173,7 @@ Response:
173173

174174
Array of [Track](#track) objects from the search result.
175175

176-
<details>
176+
<details markdown="1">
177177
<summary>Example Payload</summary>
178178

179179
```yaml
@@ -197,7 +197,7 @@ Array of [Track](#track) objects from the search result.
197197

198198
Empty object.
199199

200-
<details>
200+
<details markdown="1">
201201
<summary>Example Payload</summary>
202202

203203
```yaml
@@ -213,7 +213,7 @@ Empty object.
213213

214214
[Exception](websocket.md#exception-object) object with the error.
215215

216-
<details>
216+
<details markdown="1">
217217
<summary>Example Payload</summary>
218218

219219
```yaml
@@ -243,7 +243,7 @@ Response:
243243

244244
[Track](#track) object
245245

246-
<details>
246+
<details markdown="1">
247247
<summary>Example Payload</summary>
248248

249249
```yaml
@@ -281,7 +281,7 @@ Request:
281281

282282
Array of track data strings
283283

284-
<details>
284+
<details markdown="1">
285285
<summary>Example Payload</summary>
286286

287287
```yaml
@@ -297,7 +297,7 @@ Response:
297297

298298
Array of [Track](#track) objects
299299

300-
<details>
300+
<details markdown="1">
301301
<summary>Example Payload</summary>
302302

303303
```yaml
@@ -361,27 +361,27 @@ with the Voice Server Update. Please refer to https://discord.com/developers/doc
361361

362362
Filters are used in above requests and look like this
363363

364-
| Field | Type | Description |
365-
|----------------|------------------------------------------------|----------------------------------------------------------------------------------------------|
366-
| volume? | float | Adjusts the player volume from 0.0 to 5.0, where 1.0 is 100%. Values >1.0 may cause clipping |
367-
| equalizer? | array of [Equalizer](#equalizer) objects | Adjusts 15 different bands |
368-
| karaoke? | [Karaoke](#karaoke) object | Eliminates part of a band, usually targeting vocals |
369-
| timescale? | [Timescale](#timescale) object | Changes the speed, pitch, and rate |
370-
| tremolo? | [Tremolo](#tremolo) object | Creates a shuddering effect, where the volume quickly oscillates |
371-
| vibrato? | [Vibrato](#vibrato) object | Creates a shuddering effect, where the pitch quickly oscillates |
372-
| rotation? | [Rotation](#rotation) object | Rotates the audio around the stereo channels/user headphones (aka Audio Panning) |
373-
| distortion? | [Distortion](#distortion) object | Distorts the audio |
374-
| channelMix? | [Channel Mix](#channel-mix) object | Mixes both channels (left and right) |
375-
| lowPass? | [Low Pass](#low-pass) object | Filters higher frequencies |
376-
| pluginFilters? | map of [Plugin Filter](#plugin-filter) objects | Filter plugin configurations |
364+
| Field | Type | Description |
365+
|----------------|--------------------------------------------------|----------------------------------------------------------------------------------------------|
366+
| volume? | float | Adjusts the player volume from 0.0 to 5.0, where 1.0 is 100%. Values >1.0 may cause clipping |
367+
| equalizer? | array of [Equalizer](#equalizer) objects | Adjusts 15 different bands |
368+
| karaoke? | [Karaoke](#karaoke) object | Eliminates part of a band, usually targeting vocals |
369+
| timescale? | [Timescale](#timescale) object | Changes the speed, pitch, and rate |
370+
| tremolo? | [Tremolo](#tremolo) object | Creates a shuddering effect, where the volume quickly oscillates |
371+
| vibrato? | [Vibrato](#vibrato) object | Creates a shuddering effect, where the pitch quickly oscillates |
372+
| rotation? | [Rotation](#rotation) object | Rotates the audio around the stereo channels/user headphones (aka Audio Panning) |
373+
| distortion? | [Distortion](#distortion) object | Distorts the audio |
374+
| channelMix? | [Channel Mix](#channel-mix) object | Mixes both channels (left and right) |
375+
| lowPass? | [Low Pass](#low-pass) object | Filters higher frequencies |
376+
| pluginFilters? | map of [Plugin Filters](#plugin-filters) objects | Filter plugin configurations |
377377

378378
##### Equalizer
379379

380380
There are 15 bands (0-14) that can be changed.
381381
"gain" is the multiplier for the given band. The default value is 0. Valid values range from -0.25 to 1.0,
382382
where -0.25 means the given band is completely muted, and 0.25 means it is doubled. Modifying the gain could also change the volume of the output.
383383

384-
<details>
384+
<details markdown="1">
385385
<summary>Band Frequencies</summary>
386386

387387
| Band | Frequency |
@@ -498,7 +498,7 @@ Any smoothing values equal to or less than 1.0 will disable the filter.
498498

499499
Plugins can add their own filters. The key is the name of the plugin, and the value is the configuration for that plugin. The configuration is plugin specific. See [Plugins](plugins.md) for more plugin information.
500500

501-
<details>
501+
<details markdown="1">
502502
<summary>Example Payload</summary>
503503

504504
```json
@@ -571,7 +571,7 @@ Returns a list of players in this specific session.
571571
GET /v4/sessions/{sessionId}/players
572572
```
573573

574-
<details>
574+
<details markdown="1">
575575
<summary>Example Payload</summary>
576576

577577
```yaml
@@ -631,7 +631,7 @@ Response:
631631

632632
[Player](#Player) object
633633

634-
<details>
634+
<details markdown="1">
635635
<summary>Example Payload</summary>
636636

637637
```yaml
@@ -724,7 +724,7 @@ Request:
724724

725725
When `identifier` is used, Lavalink will try to resolve the identifier as a single track. An HTTP `400` error is returned when resolving a playlist, search result, or no tracks.
726726

727-
<details>
727+
<details markdown="1">
728728
<summary>Example Payload</summary>
729729

730730
```yaml
@@ -753,7 +753,7 @@ Response:
753753

754754
[Player](#Player) object
755755

756-
<details>
756+
<details markdown="1">
757757
<summary>Example Payload</summary>
758758

759759
```yaml
@@ -827,7 +827,7 @@ Request:
827827
| resuming? | bool | Whether resuming is enabled for this session or not |
828828
| timeout? | int | The timeout in seconds (default is 60s) |
829829

830-
<details>
830+
<details markdown="1">
831831
<summary>Example Payload</summary>
832832

833833
```json
@@ -846,7 +846,7 @@ Response:
846846
| resuming | bool | Whether resuming is enabled for this session or not |
847847
| timeout | int | The timeout in seconds (default is 60s) |
848848

849-
<details>
849+
<details markdown="1">
850850
<summary>Example Payload</summary>
851851

852852
```json
@@ -911,7 +911,7 @@ Parsed [Semantic Versioning 2.0.0](https://semver.org/)
911911
| name | string | The name of the plugin |
912912
| version | string | The version of the plugin |
913913

914-
<details>
914+
<details markdown="1">
915915
<summary>Example Payload</summary>
916916

917917
```json
@@ -988,7 +988,7 @@ Response:
988988
`frameStats` is always missing for this endpoint.
989989
[Stats](websocket.md#stats-object) object
990990

991-
<details>
991+
<details markdown="1">
992992
<summary>Example Payload</summary>
993993

994994
```json
@@ -1079,7 +1079,7 @@ Response:
10791079
| class | ?[Route Planner Type](#route-planner-types) | The name of the RoutePlanner implementation being used by this server |
10801080
| details | ?[Details](#details-object) object | The status details of the RoutePlanner |
10811081

1082-
<details>
1082+
<details markdown="1">
10831083
<summary>Example Payload</summary>
10841084

10851085
```json
@@ -1119,7 +1119,7 @@ Request:
11191119
|---------|--------|-----------------------------------------------------------------------------|
11201120
| address | string | The address to unmark as failed. This address must be in the same ip block. |
11211121

1122-
<details>
1122+
<details markdown="1">
11231123
<summary>Example Payload</summary>
11241124

11251125
```json

docs/api/websocket.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ When opening a websocket connection, you must supply 3 required headers:
1919

2020
**\*For more information on resuming see [Resuming](index.md#resuming)**
2121

22-
<details>
22+
<details markdown="1">
2323
<summary>Example Headers</summary>
2424

2525
```
@@ -37,7 +37,7 @@ Websocket messages all follow the following standard format:
3737
| op | [OP Type](#op-types) | The op type |
3838
| ... | ... | Extra fields depending on the op type |
3939

40-
<details>
40+
<details markdown="1">
4141
<summary>Example Payload</summary>
4242

4343
```yaml
@@ -67,7 +67,7 @@ Dispatched by Lavalink upon successful connection and authorization. Contains fi
6767
| resumed | bool | Whether this session was resumed |
6868
| sessionId | string | The Lavalink session id of this connection. Not to be confused with a Discord voice session id |
6969

70-
<details>
70+
<details markdown="1">
7171
<summary>Example Payload</summary>
7272

7373
```json
@@ -100,7 +100,7 @@ Dispatched every x seconds (configurable in `application.yml`) with the current
100100
| connected | bool | Whether Lavalink is connected to the voice gateway |
101101
| ping | int | The ping of the node to the Discord voice server in milliseconds (`-1` if not connected) |
102102

103-
<details>
103+
<details markdown="1">
104104
<summary>Example Payload</summary>
105105

106106
```json
@@ -162,7 +162,7 @@ A collection of statistics sent every minute.
162162

163163
\* The expected amount of frames is 3000 (1 every 20 ms) per player. If the `deficit` is negative, too many frames were sent, and if it's positive, not enough frames got sent.
164164

165-
<details>
165+
<details markdown="1">
166166
<summary>Example Payload</summary>
167167

168168
```json
@@ -204,7 +204,7 @@ Server dispatched an event. See the [Event Types](#event-types) section for more
204204
| guildId | string | The guild id |
205205
| ... | ... | Extra fields depending on the event |
206206

207-
<details>
207+
<details markdown="1">
208208
<summary>Example Payload</summary>
209209

210210
```yaml
@@ -236,7 +236,7 @@ Dispatched when a track starts playing.
236236
|-------|-------------------------------|--------------------------------|
237237
| track | [Track](rest.md#track) object | The track that started playing |
238238

239-
<details>
239+
<details markdown="1">
240240
<summary>Example Payload</summary>
241241

242242
```json
@@ -287,7 +287,7 @@ Dispatched when a track ends.
287287
| `replaced` | The track was replaced | false |
288288
| `cleanup` | The track was cleaned up | false |
289289

290-
<details>
290+
<details markdown="1">
291291
<summary>Example Payload</summary>
292292

293293
```json
@@ -345,7 +345,7 @@ Dispatched when a track throws an exception.
345345
| `suspicious` | The cause might not be exactly known, but is possibly caused by outside factors. For example when an outside service responds in a format that we do not expect |
346346
| `fault` | The probable cause is an issue with the library or there is no way to tell what the cause might be. This is the default level and other levels are used in cases where the thrower has more in-depth knowledge about the error |
347347

348-
<details>
348+
<details markdown="1">
349349
<summary>Example Payload</summary>
350350

351351
```json
@@ -391,7 +391,7 @@ Dispatched when a track gets stuck while playing.
391391
| track | [Track](rest.md#track) object | The track that got stuck |
392392
| thresholdMs | int | The threshold in milliseconds that was exceeded |
393393

394-
<details>
394+
<details markdown="1">
395395
<summary>Example Payload</summary>
396396

397397
```json
@@ -437,7 +437,7 @@ See the [Discord Docs](https://discord.com/developers/docs/topics/opcodes-and-st
437437
| reason | string | The close reason |
438438
| byRemote | bool | Whether the connection was closed by Discord |
439439

440-
<details>
440+
<details markdown="1">
441441
<summary>Example Payload</summary>
442442

443443
```json

docs/changelog/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The most noteworthy of these, as well as any features and breaking changes, are
2626

2727
All websocket ops are removed as of `v4.0.0` and replaced with the following endpoints and json fields:
2828

29-
* `play` -> [Update Player Endpoint](#update-player) `encodedTrack` or `identifier` field
29+
* `play` -> [Update Player Endpoint](#update-player) `track`->`encoded` or `track`->`identifier` field
3030
* `stop` -> [Update Player Endpoint](#update-player) `encodedTrack` field with `null`
3131
* `pause` -> [Update Player Endpoint](#update-player) `pause` field
3232
* `seek` -> [Update Player Endpoint](#update-player) `position` field

docs/clients.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ description: A list of Lavalink client libraries.
99
| [Lavalink-Client](https://github.com/lavalink-devs/Lavalink-Client) | Java/Kotlin/JVM | JDA/Discord4J/**Any** | Uses reactor |
1010
| [Lavalink.kt](https://github.com/DRSchlaubi/Lavalink.kt) | Kotlin | Kord/JDA/**Any** | Kotlin Coroutines |
1111
| [DisGoLink](https://github.com/disgoorg/disgolink) | Go | **Any** | |
12+
| [lavalink.py](https://github.com/devoxin/lavalink.py) | Python | **Any** | |
1213
| [Mafic](https://github.com/ooliver1/mafic) | Python | discord.py **V2**/nextcord/disnake/py-cord | |
1314
| [Wavelink](https://github.com/PythonistaGuild/Wavelink) | Python | discord.py **V2** | |
1415
| [Moonlink.js](https://github.com/1Lucas1apk/moonlink.js) | Node.js | **Any** | |
@@ -20,8 +21,10 @@ description: A list of Lavalink client libraries.
2021
| [Riffy](https://github.com/riffy-team/riffy) | Node.js | **Any** | |
2122
| [DisCatSharp](https://github.com/Aiko-IT-Systems/DisCatSharp) | .NET | DisCatSharp | v10.4.2+ |
2223
| [Lavalink4NET](https://github.com/angelobreuer/Lavalink4NET) | .NET | Discord.Net/DSharpPlus/Remora | v4+ |
24+
| [Nomia](https://github.com/DHCPCD9/Nomia) | .NET | DSharpPlus | |
2325
| [Coglink](https://github.com/PerformanC/Coglink) | C | Concord | |
2426
| [lavalink-rs](https://gitlab.com/vicky5124/lavalink-rs) | Rust, Python | **Any** | `tokio`-based, `asyncio`-based |
27+
| [lavalink](https://github.com/nyxx-discord/nyxx_lavalink) | Dart | nyxx/**Any** | |
2528

2629
<details markdown="1">
2730
<summary>v3.7 supporting Client Libraries</summary>
@@ -38,7 +41,6 @@ description: A list of Lavalink client libraries.
3841
| [Shoukaku](https://github.com/Deivu/Shoukaku) | Node.js | **Any** | |
3942
| [Cosmicord.js](https://github.com/SudhanPlayz/Cosmicord.js) | Node.js | **Any** | |
4043
| [DisCatSharp](https://github.com/Aiko-IT-Systems/DisCatSharp) | .NET | DisCatSharp | Only prior v10.4.1 |
41-
| [Nomia](https://github.com/DHCPCD9/Nomia) | .NET | DSharpPlus | |
4244
| [Lavalink4NET](https://github.com/angelobreuer/Lavalink4NET) | .NET | Discord.Net/DSharpPlus | < v4 |
4345
| [DisGoLink](https://github.com/disgoorg/disgolink) | Go | **Any** | |
4446

docs/configuration/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The server configuration is done in `application.yml`. You can find an example b
88

99
## Example application.yml
1010

11-
<details>
11+
<details markdown="1">
1212
<summary>application.yml</summary>
1313

1414
```yaml title="application.yml"
@@ -22,7 +22,7 @@ For arrays, the index is appended to the key, starting at 0. For example, `LAVAL
2222

2323
## Example environment variables
2424

25-
<details>
25+
<details markdown="1">
2626
<summary>environment variables</summary>
2727

2828
```env title="enviroment variables"

ROUTEPLANNERS.md renamed to docs/configuration/routeplanner.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# RoutePlanner Strategies
1+
---
2+
description: Lavalink RoutePlanner Strategies
3+
---
24

35
## Terminology
46

docs/mkdocs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ nav:
2424
- Binary: configuration/binary.md
2525
- Systemd: configuration/systemd.md
2626
- Docker: configuration/docker.md
27+
- RoutePlanner: configuration/routeplanner.md
2728
- Clients: clients.md
2829
- Plugins: plugins.md
2930
- API:

0 commit comments

Comments
 (0)