Merge branch 'master' into development

CHANGELOG.md

@@ -1,5 +1,31 @@
-## 2.2.0
+## 2.2.2
+
+### Changelog
+
+- fixed error that stopped users being able to vote skip a song when vote skip is enabled
+
+---
+
+#### Update Notes
+
+To update, just `git pull` inside of the working directory. Make sure to update dependencies using `python3 -m pip install -Ur requirements.txt` in your venv before you run the bot.
+
+
+## 2.2.1
 
+### Changelog
+
+- fixed bug where single player trivia games broke at the end
+- fixed join leave reactions in a trivia game showing for a solo game
+
+---
+
+#### Update Notes
+
+To update, just `git pull` inside of the working directory. Make sure to update dependencies using `python3 -m pip install -Ur requirements.txt` in your venv before you run the bot.
+
+
+## 2.2.0
 
 ### Changelog
 

README.md

@@ -1,4 +1,4 @@
-[![Banner](https://i.imgur.com/TltWlJN.png)](https://github.com/Roxxers)
+[![Banner](docs/assets/images/roxbotbanner.png)](https://github.com/Roxxers)
 
 [![MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=for-the-badge&maxAge=300)](https://gitlab.roxxers.xyz/roxxers/roxbot/blob/master/LICENSE)
 [![Python](https://img.shields.io/badge/Python-3.7%2B-blue.svg?style=for-the-badge&maxAge=300)](https://gitlab.roxxers.xyz/roxxers/roxbot)
@@ -26,7 +26,27 @@ Find out how to install Roxbot to your Linux machine [here](https://roxxers.gith
 
 If you want Roxbot support, a support Discord can be found by clicking the Discord banner at the top of the readme or clicking [here](https://discord.gg/Mpz8nv7),
 
-## Support Me <small>If you want/can</small>
+## Support Me and Roxbot <small>If you want/can</small>
+Check out my Patreon to help support Roxbot development!
+
+<a href="https://patreon.com/Roxxers" target="_blank" alt="Roxxers' Patreon"><img name="Support me on Patreon!" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height=36px></a>
+
+For one time payments, Ko-Fi can be used!
+
+<a href="https://ko-fi.com/roxxers" target="_blank" alt="Roxxers' Kofi"><img name="Support me on Kofi!" src="https://i.imgur.com/IE2Qg79.png" height=36px></a>
+
+
+## Supporters
+
+This is a list of $2.50+ tier Patreon's of mine that help me create Roxbot. Thanks!
+
+Even if you have only been on this tier for one month, you will show up in this file. This is because every small amount given helps 💙
+
+```
+Asuna Gilfoyle
+Lo_Fi
+Mark Travis 
+```
+
 
-[![KoFi](https://i.imgur.com/IE2Qg79.png)](https://ko-fi.com/roxxers)
 

SUPPORTERS.md

@@ -0,0 +1,11 @@
+## Supporters
+
+This is a list of $2.50+ tier Patreon's of mine that help me create Roxbot. Thanks!
+
+Even if you have only been on this tier for one month, you will show up in this file. This is because every small amount given helps 💙
+
+```
+Asuna Gilfoyle
+Lo_Fi
+Mark Travis 
+```

docs/index.md

@@ -5,7 +5,7 @@ authors:
     - Roxanne Gibson
 ---
 
-[![Banner](https://i.imgur.com/TltWlJN.png)](https://github.com/Roxxers)
+[![Banner](assets/images/roxbotbanner.png)](https://github.com/Roxxers)
 
 [![MIT](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=for-the-badge&maxAge=300)](https://gitlab.roxxers.xyz/roxxers/roxbot/blob/master/LICENSE)
 [![Python](https://img.shields.io/badge/Python-3.7%2B-blue.svg?style=for-the-badge&maxAge=300)](https://gitlab.roxxers.xyz/roxxers/roxbot)
@@ -33,7 +33,27 @@ Find out how to install Roxbot to your Linux machine [here](https://roxxers.gith
 
 If you want Roxbot support, a support Discord can be found by clicking the Discord banner at the top of the readme or clicking [here](https://discord.gg/Mpz8nv7),
 
-## Support Me <small>If you want/can</small>
+## Support Me and Roxbot <small>If you want/can</small>
+Check out my Patreon to help support Roxbot development!
+
+<a href="https://patreon.com/Roxxers" target="_blank" alt="Roxxers' Patreon"><img name="Support me on Patreon!" src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png" height=36px></a>
+
+For one time payments, Ko-Fi can be used!
+
+<a href="https://ko-fi.com/roxxers" target="_blank" alt="Roxxers' Kofi"><img name="Support me on Kofi!" src="https://i.imgur.com/IE2Qg79.png" height=36px></a>
+
+
+## Supporters
+
+This is a list of $2.50+ tier Patreon's of mine that help me create Roxbot. Thanks!
+
+Even if you have only been on this tier for one month, you will show up in this file. This is because every small amount given helps 💙
+
+```
+Asuna Gilfoyle
+Lo_Fi
+Mark Travis 
+```
+
 
-[![KoFi](https://i.imgur.com/IE2Qg79.png)](https://ko-fi.com/roxxers)
 

mkdocs.yml

@@ -30,7 +30,7 @@ repo_name: "roxxers/roxbot"
 repo_url: "https://github.com/roxxers/roxbot"
 
 # Copyright
-copyright: 'Copyright © 2017 - 2018 Roxanne Gibson'
+copyright: 'Copyright © 2017 - 2019 Roxanne Gibson'
 
 # Layout
 nav:

roxbot/__init__.py

@@ -12,7 +12,7 @@ __title__ = "roxbot"
 __author__ = "Roxanne Gibson"
 __license__ = "MIT"
 __copyright__ = "Copyright 2015-2017 Roxanne Gibson <me@roxxers.xyz>"
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 __description__ = """Roxbot: An inclusive modular multi-purpose Discord bot. Built with love (and discord.py) by Roxxers#7443.
 
 Roxbot is designed be a multi-purpose bot and provide many different services for users and moderators alike with a focus on customisability. 

roxbot/cogs/customcommands.py

@@ -128,15 +128,15 @@ class CustomCommands(commands.Cog):
         with db_session:
             if msg.startswith(self.bot.command_prefix):
                 command_name = msg.split(self.bot.command_prefix)[1]
-                command = CCCommands.get(name=command_name, guild_id=message.guild.id)
                 try:
+                    command = CCCommands.get(name=command_name, guild_id=message.guild.id)
                     if command.type == 1:
                         output = self._get_output(command.output)
                         return await channel.send(output)
                     elif command.type == 2:
                         embed = self._cc_to_embed(command.output)
                         return await channel.send(embed=embed)
-                except AttributeError:
+                except (ValueError, AttributeError):
                     pass
             else:
                 try:

roxbot/cogs/trivia.py

@@ -170,8 +170,6 @@ class Leaderboard:
             self.diffs[player] = 0
 
 
-
-
 class TriviaGame:
     """
     Trivia Game Object
@@ -305,10 +303,11 @@ class TriviaGame:
             sleep = 20
 
         self.start_message = await self.ctx.send(embed=embed)
-        await self.start_message.add_reaction(self.correct_emoji)
-        await self.start_message.add_reaction(self.incorrect_emoji)
-        await asyncio.sleep(sleep)
-        await self.start_message.clear_reactions()
+        if not self.solo:
+            await self.start_message.add_reaction(self.correct_emoji)
+            await self.start_message.add_reaction(self.incorrect_emoji)
+            await asyncio.sleep(sleep)
+            await self.start_message.clear_reactions()
 
         # Checks if there is any players to play the game still
         if not self.leaderboard.players:
@@ -418,15 +417,14 @@ class TriviaGame:
 
             ranks = self.leaderboard.ranks_from_scores
 
-            if final_scores[0][1] == final_scores[1][1]:
-                # This means there is a tie of any size for first place
-                winner_text = "It's a tie! With a score of {}...".format(final_scores[0][1])
-            else:
-                winner = self.ctx.guild.get_member(final_scores[0][0])
-                winning_score = final_scores[0][1]
-                winner_text = "{0} won with a score of {1}".format(winner.mention, winning_score)
+            winner = self.ctx.guild.get_member(final_scores[0][0])
+            winning_score = final_scores[0][1]
+            winner_text = "{0} won with a score of {1}".format(winner.mention, winning_score)
 
             if len(final_scores) > 1:
+                if final_scores[0][1] == final_scores[1][1]:
+                    # This means there is a tie of any size for first place
+                    winner_text = "It's a tie! With a score of {}...".format(final_scores[0][1])
                 results_text = "\n\nResults:\n"
                 prev_pos = 0
                 for player in final_scores:

roxbot/cogs/voice.py

@@ -431,7 +431,7 @@ class Voice(commands.Cog):
                 self.skip_votes[ctx.guild.id].append(ctx.author)
                 # -1 due to the bot being counted in the members generator
                 ratio = len(self.skip_votes[ctx.guild.id]) / (len(ctx.voice_client.channel.members) - 1)
-                needed_users = ceil((len(ctx.voice_client.channel.members) - 1) * voice["skip_ratio"])
+                needed_users = ceil((len(ctx.voice_client.channel.members) - 1) * voice.skip_ratio)
                 if ratio >= voice.skip_ratio:
                     await ctx.send("{} voted the skip the video.".format(ctx.author))
                     await ctx.send("Votes to skip now playing has been met. Skipping video...")