idk man github desktop doing weird shit

.github/ISSUE_TEMPLATE.md

@@ -15,14 +15,8 @@ What type of issue are you creating?
 - [ ] Feature request
 - [ ] Question
 
-What OS are you on?
-
-- 
-
 ----
 
-
-
 ### Description of issue
 
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,6 @@ After creating your pull request, tick these boxes if they are applicable to you
 
 - [ ] I have tested my changes against the `review` branch (the latest developmental version), and this pull request is targeting that branch as a base
 - [ ] I have tested my changes on Python 3.8.7 or higher
-- [ ] I have ensured my code is formatted using [Black](https://github.com/psf/black)
 
 ----
 

bootstrap.py

@@ -54,9 +54,7 @@
 
 # Arguments
 ap = argparse.ArgumentParser()
-ap.add_argument(
-    "--dir", help="the name of the directory to install to (default: MusicBot)"
-)
+ap.add_argument("--dir", help="the name of the directory to install to (default: MusicBot)")
 args = ap.parse_args()
 
 # Logging setup goes here
@@ -163,9 +161,7 @@ def __getattribute__(self, item):
         if item.endswith("_dist"):
             try:
                 # check for dist aliases, ex: setup_dist -> setup_win32
-                return object.__getattribute__(
-                    self, item.rsplit("_", 1)[0] + "_" + SYS_PLATFORM
-                )
+                return object.__getattribute__(self, item.rsplit("_", 1)[0] + "_" + SYS_PLATFORM)
             except:
                 try:
                     # If there's no dist variant, try to fallback to the generic, ex: setup_dist -> setup
@@ -265,9 +261,7 @@ def setup_linux(self, data):
         # Restart into the new executable.
         print("Rebooting into Python {}...".format(TARGET_PY_VERSION))
         # Use os.execl to switch program
-        os.execl(
-            "/usr/local/bin/{}".format(executable), "{}".format(executable), __file__
-        )
+        os.execl("/usr/local/bin/{}".format(executable), "{}".format(executable), __file__)
 
     def download_darwin(self):
         pkg, _ = tmpdownload(self.PYTHON_PKG.format(ver=TARGET_PY_VERSION))
@@ -396,9 +390,7 @@ def check_win32(self):
 
     def check(self):
         try:
-            data = subprocess.check_output(
-                ["ffmpeg", "-version"], stderr=subprocess.STDOUT
-            )
+            data = subprocess.check_output(["ffmpeg", "-version"], stderr=subprocess.STDOUT)
         except FileNotFoundError:
             return False
         else:
@@ -532,13 +524,9 @@ class GitCloneMusicbot(SetupTask):
     def download(self):
         print("Cloning files using Git...")
         if os.path.isdir(INSTALL_DIR):
-            r = yes_no(
-                "A folder called %s already exists here. Overwrite?" % INSTALL_DIR
-            )
+            r = yes_no("A folder called %s already exists here. Overwrite?" % INSTALL_DIR)
             if r is False:
-                print(
-                    "Exiting. Use the --dir parameter when running this script to specify a different folder."
-                )
+                print("Exiting. Use the --dir parameter when running this script to specify a different folder.")
                 sys.exit(1)
             else:
                 os.rmdir(INSTALL_DIR)
@@ -592,8 +580,7 @@ def setup_darwin(self, data):
 def preface():
     print(" MusicBot Bootstrapper (v0.1) ".center(50, "#"))
     print(
-        "This script will install the MusicBot into a folder called '%s' in your current directory."
-        % INSTALL_DIR,
+        "This script will install the MusicBot into a folder called '%s' in your current directory." % INSTALL_DIR,
         "\nDepending on your system and environment, several packages and dependencies will be installed.",
         "\nTo ensure there are no issues, you should probably run this script as an administrator.",
     )

config/example_options.ini

@@ -189,19 +189,14 @@ LeaveServersWithoutOwner = no
 # Use command alias defined in aliases.json.
 UseAlias = yes
 
+
 # When enabled the bot will direct message the help menu instead of sending it to a channel. 
 DMHelp = yes
 
-# Use an altenate way to display the results from search command.
-SearchList = no
-
-# Set the amount of search results returned by default
-DefaultSearchResults = 3
-
 # Specify a custom message to use as the bots embed footer.
-CustomEmbedFooter =
+CustomEmbedFooter = 
 
 
 [Files]
 # Path to your i18n file. Do not set this if you do not know what it does.
-i18nFile = 
+i18nFile = 

config/example_permissions.ini

@@ -65,11 +65,6 @@
 ;    BypassKaraokeMode = no
 ;    Allows the user to queue songs even when karaoke mode is activated.
 ;
-;    SummonNoVoice = yes
-;    Allows the user to automatically summon the bot when using the play or the stream command if there is no voice channel
-;    that the bot is already joined in the server. It is also expected that the user have ability to invoke summon command to
-;    use this option.
-;
 ;    Extractors = example1 example2
 ;    Specify the name of youtube-dl extractors that people will be able to play using the bot. Seperated by spaces.
 ;    This is to allow restriction of playing porn videos through the bot, as these are supported by yt-dl. Leave blank to allow all.
@@ -103,7 +98,6 @@
 ; SkipWhenAbsent = no
 ; BypassKaraokeMode = yes
 ; ToggleAutoPlaylists = yes
-; SummonNoVoice = yes
 ; Extractors = 
 
 ; This is the fallback group for any users that don't get assigned to another group.  Don't remove/rename this group.
@@ -121,7 +115,6 @@ InstaSkip = no
 Remove = no
 SkipWhenAbsent = no
 BypassKaraokeMode = no
-SummonNoVoice = no
 Extractors = generic youtube youtube:playlist soundcloud
 
 ; This group has full permissions.
@@ -137,7 +130,6 @@ InstaSkip = yes
 Remove = yes
 SkipWhenAbsent = no
 BypassKaraokeMode = yes
-SummonNoVoice = yes
 Extractors = 
 
 ; This group can't use the blacklist and listids commands, but otherwise has full permissions.
@@ -154,7 +146,6 @@ InstaSkip = yes
 Remove = yes
 SkipWhenAbsent = no
 BypassKaraokeMode = yes
-SummonNoVoice = yes
 Extractors = generic youtube youtube:playlist soundcloud
 
 ; This group can only use the listed commands, can only use play/skip when in the bot's voice channel,
@@ -172,5 +163,4 @@ InstaSkip = no
 Remove = no
 SkipWhenAbsent = yes
 BypassKaraokeMode = no
-SummonNoVoice = no
 Extractors = generic youtube youtube:playlist

config/i18n/en.json

@@ -48,17 +48,9 @@
     "cmd-search-searchlimit": "You cannot search for more than %s videos",
     "cmd-search-searching": "Searching for videos...",
     "cmd-search-none": "No videos found.",
-    "cmd-search-header": "{0} search results: \n\n",
     "cmd-search-result": "Result {0}/{1}: {2}",
-    "cmd-search-list-entry": "**{0}**. **{1}** | {2}",
-    "cmd-search-result-list-noembed": "{0}",
     "cmd-search-accept": "Alright, coming right up!",
-    "cmd-search-accept-list-embed": "[{0}]({1}) added to queue",
-    "cmd-search-accept-list-noembed": "{0} added to queue",
     "cmd-search-decline": "Oh well :(",
-    "cmd-search-title": "{0} search results:",
-    "cmd-search-field-name": "Pick a song",
-    "cmd-search-invalid-option": "Your choice is not in the list. Please choose an option listed above",
     "cmd-np-action-streaming": "Streaming",
     "cmd-np-action-playing": "Playing",
     "cmd-np-reply-author": "Now {action}: **{title}** added by **{author}**\nProgress: {progress_bar} {progress}\n:point_right: <{url}>",
@@ -112,9 +104,5 @@
     "playlists-big": "Playlist has too many entries ({0} > {1})",
     "playlists-limit": "Playlist entries + your already queued songs reached limit ({0} + {1} > {2})",
     "karaoke-enabled": "Karaoke mode is enabled, please try again when its disabled!",
-    "left-no-owner-guilds": "Left `{}` due to bot owner not being found in it.",
-	"on_player_play-onChannel_authorNotInChannel_skipWhenAbsent": "Skipping next song in {channel}: {title} added by {author} as queuer not in voice!",
-	"on_player_play-onChannel_playingMention": "{author} - your song {title} is now playing in {channel}!",
-	"on_player_play-onChannel": "Now playing in {channel}: {title} added by {author}!",
-	"on_player_play-onChannel_noAuthor_autoplaylist": "Now playing automatically added entry {title} in {channel}!"
+    "left-no-owner-guilds": "Left `{}` due to bot owner not being found in it."
 }