From f3231682b0b24bbf8ccb4d20eee13fb53fe1a95a Mon Sep 17 00:00:00 2001
From: Draper <27962761+Drapersniper@users.noreply.github.com>
Date: Wed, 19 May 2021 20:17:37 +0100
Subject: [PATCH] Update application.yml + remove mixer support. (#5013)

---
 redbot/cogs/audio/audio_dataclasses.py        |  2 --
 redbot/cogs/audio/core/commands/audioset.py   |  2 +-
 .../cogs/audio/core/utilities/validation.py   |  2 --
 redbot/cogs/audio/data/application.yml        | 36 +++++++++++++++----
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/redbot/cogs/audio/audio_dataclasses.py b/redbot/cogs/audio/audio_dataclasses.py
index afb7cb6e3..eb721c819 100644
--- a/redbot/cogs/audio/audio_dataclasses.py
+++ b/redbot/cogs/audio/audio_dataclasses.py
@@ -578,8 +578,6 @@ class Query:
                             returning["single"] = True
                     elif url_domain == "vimeo.com":
                         returning["vimeo"] = True
-                    elif url_domain in ["mixer.com", "beam.pro"]:
-                        returning["mixer"] = True
                     elif url_domain == "twitch.tv":
                         returning["twitch"] = True
                         if "?t=" in track:
diff --git a/redbot/cogs/audio/core/commands/audioset.py b/redbot/cogs/audio/core/commands/audioset.py
index 2c5eafe15..43135e6c4 100644
--- a/redbot/cogs/audio/core/commands/audioset.py
+++ b/redbot/cogs/audio/core/commands/audioset.py
@@ -923,7 +923,7 @@ class AudioSetCommands(MixinMeta, metaclass=CompositeMetaClass):
         """Toggle the domain restriction on Audio.
 
         When toggled off, users will be able to play songs from non-commercial websites and links.
-        When toggled on, users are restricted to YouTube, SoundCloud, Mixer, Vimeo, Twitch, and
+        When toggled on, users are restricted to YouTube, SoundCloud, Vimeo, Twitch, and
         Bandcamp links.
         """
         restrict = await self.config.restrict()
diff --git a/redbot/cogs/audio/core/utilities/validation.py b/redbot/cogs/audio/core/utilities/validation.py
index 0e3c3d084..f183b23a2 100644
--- a/redbot/cogs/audio/core/utilities/validation.py
+++ b/redbot/cogs/audio/core/utilities/validation.py
@@ -40,8 +40,6 @@ class ValidationUtilities(MixinMeta, metaclass=CompositeMetaClass):
             "soundcloud.com",
             "bandcamp.com",
             "vimeo.com",
-            "beam.pro",
-            "mixer.com",
             "twitch.tv",
             "spotify.com",
             "localtracks",
diff --git a/redbot/cogs/audio/data/application.yml b/redbot/cogs/audio/data/application.yml
index 46c8c3eb1..3ebbb9c3d 100644
--- a/redbot/cogs/audio/data/application.yml
+++ b/redbot/cogs/audio/data/application.yml
@@ -1,6 +1,6 @@
-server:
-  host: "localhost"
-  port: 2333 # WS port
+server: # REST and WS server
+  port: 2333
+  address: "localhost"
 lavalink:
   server:
     password: "youshallnotpass"
@@ -10,17 +10,39 @@ lavalink:
       soundcloud: true
       twitch: true
       vimeo: true
-      mixer: true
       http: true
       local: true
-    sentryDsn: ""
-    bufferDurationMs: 1000
-    youtubePlaylistLoadLimit: 10000
+    bufferDurationMs: 1000 # Length of track to buffer into memory in miliseconds.
+    youtubePlaylistLoadLimit: 10000 # Number of pages at 100 each
+    playerUpdateInterval: 1 # How frequently to send player updates to clients, in seconds
+    youtubeSearchEnabled: true
+    soundcloudSearchEnabled: true
+    gc-warnings: true
+    #ratelimit:
+      #ipBlocks: ["1.0.0.0/8", "..."] # list of ip blocks
+      #excludedIps: ["...", "..."] # ips which should be explicit excluded from usage by lavalink
+      #strategy: "RotateOnBan" # RotateOnBan | LoadBalance | NanoSwitch | RotatingNanoSwitch
+      #searchTriggersFail: true # Whether a search 429 should trigger marking the ip as failing
+      #retryLimit: -1 # -1 = use default lavaplayer value | 0 = infinity | >0 = retry will happen this numbers times
+
+metrics:
+  prometheus:
+    enabled: false
+    endpoint: /metrics
+
+sentry:
+  dsn: ""
+  environment: ""
+#  tags:
+#    some_key: some_value
+#    another_key: another_value
+
 logging:
   file:
     max-history: 7
     max-size: 1GB
   path: ./logs/
+
   level:
     root: INFO
     lavalink: INFO