Merge pull request #1 from RedCokeDevelopment/master

Updated Upstream

Author: RedTea

.github/workflows/python-app.yml

@@ -0,0 +1,40 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Teapot.py
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+      - dev
+    
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

README.md

@@ -1,10 +1,11 @@
 ![banner](https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png)
 
 <p align="center">
-    <a href="https://github.com/RedCokeDevelopment/Teapot.py/blob/dev/LICENSE"><img src="https://img.shields.io/github/license/redcokedevelopment/teapot.py.svg?style=flat-square" alt="GitHub License"></a>
+    <a href="https://github.com/RedCokeDevelopment/Teapot.py/blob/master/LICENSE"><img src="https://img.shields.io/github/license/redcokedevelopment/teapot.py.svg?style=flat-square" alt="GitHub License"></a>
     <a href="https://github.com/RedCokeDevelopment/Teapot.py/issues"><img src="https://img.shields.io/github/issues/redcokedevelopment/teapot.py.svg?color=purple&style=flat-square" alt="GitHub Issues"></a>
     <a href="https://github.com/RedCokeDevelopment/Teapot.py/pulls"><img src="https://img.shields.io/github/issues-pr/redcokedevelopment/teapot.py.svg?color=purple&style=flat-square" alt="GitHub Pull Requests"></a>
     <a href="https://github.com/RedCokeDevelopment/Teapot.py/stargazers"><img src="https://img.shields.io/github/stars/redcokedevelopment/teapot.py.svg?style=flat-square" alt="GitHub Stars"></a>
+   <img src="https://github.com/RedCokeDevelopment/Teapot.py/workflows/Teapot.py/badge.svg" alt="Teapot.py">
     <br><br>
     <a href="https://discord.gg/7BRGs6F"><img src="https://discordapp.com/api/guilds/667714189254459414/widget.png?style=banner3" alt="Discord Server"></a>
 </p>
@@ -13,13 +14,13 @@
     This project is currently in development!<br>
 </h2>
 <h4 align="center">
-    If you would  like to be notified when we commit, please watch this repository and join our Discord server.
+    If you would like to be notified when we commit, please watch this repository and join our Discord server.
 </h4>
 
 
 ## 👋 About
 
-Teapot.py is an open source Discord bot that aims to be as customisable as possible as well as providing essential tools for server administrators to run their Discord server!
+Teapot.py is an open-source Discord bot that aims to be as customizable as possible as well as providing essential tools for server administrators to run their Discord server!
 
 If you want to try it out by yourself, feel free to invite it to your Discord server by clicking [Here](https://discordapp.com/oauth2/authorize?client_id=669880564270104586&permissions=8&scope=bot)!
 
@@ -32,10 +33,10 @@ If you want to try it out by yourself, feel free to invite it to your Discord se
 
 ## 📖 Wiki
 
-Our wiki is currently work in progreses, please check back later!
+Our wiki is currently work in progress, please check back later!
 
 ## 🤝 Contributing
-Contributions, feedback and bug reports are welcome! Feel free to check out our [issues page](https://github.com/RedCokeDevelopment/Teapot.py/issues) to find out what you could do!
+Contributions, feedback, and bug reports are welcome! Feel free to check out our [issues page](https://github.com/RedCokeDevelopment/Teapot.py/issues) to find out what you could do!
 
 Before contributing, we recommend you say hi over in our [Discord server](https://discord.gg/7BRGs6F)! We can provide support with any issues you may have 🙂
 
@@ -50,10 +51,10 @@ There are two owners for this project. They all contribute massively to the runn
 ## 📜 Requirements
 These are the requirements for the bot, and they will be bundled in future releases.
 
-- [Python 3.7](https://www.python.org/downloads/release/python-376/) (Required packages listed in requirements.txt)
+- [Python 3.8](https://www.python.org/downloads/release/python-382/) (Required packages listed in requirements.txt)
 - [LavaLink Server](https://github.com/Frederikam/Lavalink) (Java 11 required)
 
 ## 💛 Credits
 The projects listed in below have provided inspiration, and we thought we'd mention them:
 
-- LavaLink: https://github.com/Frederikam/Lavalink
+- LavaLink: https://github.com/Frederikam/Lavalink

Teapot.py

@@ -35,21 +35,32 @@
         if not versionlisted:
             print("You are currently using an unlisted version!\n")
 elif req.status_code == 404:
-    print("Unable to fetch the latest Teapot.py version from GitHub!\n")
+    # 404 Not Found
+    print("Latest Teapot.py version not found!\n")
+elif req.status_code == 500:
+    # 500 Internal Server Error
+    print("An error occurred while fetching the latest Teapot.py version. [500 Internal Server Error]\n")
+elif req.status_code == 502:
+    # 502 Bad Gateway
+    print("An error occurred while fetching the latest Teapot.py version. [502 Bad Gateway]\n")
+elif req.status_code == 503:
+    # 503 Service Unavailable
+    print("An error occurred while fetching the latest Teapot.py version. [503 Service Unavailable]\n")
 else:
-    print("An unknown error has occurred when fetching the latest version of Teapot.py\n")
+    print("An unknown error has occurred when fetching the latest Teapot.py version\n")
+    print("HTML Error Code:" + str(req.status_code))
 
 load_dotenv(join(dirname(__file__), '.env'))
 
 if os.getenv('CONFIG_VERSION') != teapot.config_version():
     if os.path.isfile('.env'):
-        print("Missing environment variables. Please delete .env and run Teapot.py again.")
-        quit()
-    print("Unable to find required environment variables. Running setup.py...")
-    teapot.setup.__init__()
+        print("Missing environment variables. Please backup and delete .env, then run Teapot.py again.")
+        quit(2)
+    print("Unable to find required environment variables. Running setup.py...")  # if .env not found
+    teapot.setup.__init__() # run setup.py
 
 print("Initializing bot...")
-if teapot.config.storage_type() == "mysql":
+if teapot.config.storage_type() == "mysql": # if .env use mysql, create the table if table not exists
     time_start = time.perf_counter()
     database = teapot.managers.database.__init__()
     db = teapot.managers.database.db(database)
@@ -72,8 +83,10 @@
                (teapot.time(), "BOT_START", __name__, "Initialized bot"))
     database.commit()
 
-bot = dcmd.Bot(command_prefix=teapot.config.bot_prefix())
-
+intents = discord.Intents.default()
+intents.members = True
+intents.typing = False
+bot = dcmd.Bot(intents=intents, command_prefix=teapot.config.bot_prefix())
 
 @bot.event
 async def on_ready():
@@ -90,17 +103,19 @@ async def on_ready():
         for guild in bot.guilds:
             teapot.managers.database.create_guild_table(guild)
     elif teapot.config.storage_type() == "sqlite":
-        print("[!] SQLite storage has not been implemented yet. MySQL database is recommended")
+        print("[!] Warning: SQLite storage has not been implemented yet. MySQL is recommended")  # WIP
     print(f"Registered commands and events in {round(time.perf_counter() - time_start, 2)}s")
-    await bot.change_presence(status=discord.Status.online, activity=discord.Game(teapot.config.bot_status()))
-
+    await bot.change_presence(status=discord.Status.online,
+                              activity=discord.Game(teapot.config.bot_status()))  # Update Bot status
 
 
 try:
     discord_time_start = time.perf_counter()
     bot.run(teapot.config.bot_token())
 except Exception as e:
-    print(f"[/!\\] Failed to connect to DiscordAPI. Please check your bot token!\n{e}")
+    print(f"[/!\\] Error: Failed to connect to DiscordAPI. Please check your bot token!\n{e}")
     if teapot.config.storage_type() == "mysql":
         db.execute("INSERT INTO `bot_logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
                    (teapot.time(), "ERROR", __name__, e))
+    time.sleep(5)
+    exit(1)

requirements.txt

@@ -1,18 +1,21 @@
-aiohttp==3.6.2
-async-timeout==3.0.1
-attrs==19.3.0
-beautifulsoup4==4.8.2
-bs4==0.0.1
-certifi==2019.11.28
-chardet==3.0.4
-discord.py==1.3.0
-idna==2.8
-lavalink==3.0.0
-multidict==4.7.4
-mysql-connector==2.2.9
-python-dotenv==0.10.5
-requests==2.22.0
-soupsieve==1.9.5
-urllib3==1.25.8
-websockets==6.0
-yarl==1.4.2
+aiohttp>=3.6.2
+async-timeout>=3.0.1
+attrs>=19.3.0
+beautifulsoup4>=4.9.1
+bs4>=0.0.1
+certifi>=2020.6.20
+chardet>=3.0.4
+discord.py>=1.5.1
+idna>=2.10
+lavalink>=3.1.2
+multidict>=4.7.6
+mysql-connector>=2.2.9
+psutil>=5.7.2
+python-dotenv>=0.14.0
+requests>=2.24.0
+soupsieve>=2.0.1
+typing-extensions>=3.7.4.2
+urllib3>=1.25.10
+websockets>=8.1
+yarl>=1.5.1
+mysql-connector-python>=8.0.21

teapot/__init__.py

@@ -8,11 +8,11 @@
 
 
 def version():
-    return "v0.0.1.4"
+    return "v0.0.1.7"
 
 
 def config_version():
-    return "0.1"
+    return "0.1"  # do not edit this!
 
 
 def time():

teapot/cogs/cat.py

@@ -21,24 +21,30 @@ async def cat(self, ctx):
         """ Get a cat image """
         req = requests.get('https://api.thecatapi.com/v1/images/search')
         if req.status_code != 200:
+            await ctx.message.add_reaction(emoji='❌')
+            await ctx.send("API error, could not get a meow")
             print("Could not get a meow")
         catlink = json.loads(req.text)[0]
         rngcat = catlink["url"]
         em = dmbd.newembed()
         em.set_image(url=rngcat)
         await ctx.send(embed=em)
+        await ctx.message.add_reaction(emoji='✅')
 
     @commands.command(pass_context=True, aliases=['woof'])
     async def dog(self, ctx):
         """ Get a dog image """
         req = requests.get('http://random.dog/')
         if req.status_code != 200:
+            await ctx.message.add_reaction(emoji='❌')
+            await ctx.send("API error, could not get a woof")
             print("Could not get a woof")
         doglink = BeautifulSoup(req.text, 'html.parser')
         rngdog = 'http://random.dog/' + doglink.img['src']
         em = dmbd.newembed()
         em.set_image(url=rngdog)
         await ctx.send(embed=em)
+        await ctx.message.add_reaction(emoji='✅')
 
 
 def setup(bot):