Merge pull request #297 from practical-python-org/deploy

fix: Line ending enforcement and auto-deployment

Author: Xarlos89

.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{md,mdx}]
+trim_trailing_whitespace = false

.gitattributes

@@ -1 +1,2 @@
+* text=auto eol=lf
 src/zorak/_version.py export-subst

.github/workflows/deploy.yml

@@ -0,0 +1,23 @@
+name: Deploy to EC2
+
+on:
+  push:
+    branches:
+      - Main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: SSH and Deploy
+        run: |
+          ssh -o StrictHostKeyChecking=no -i ${{ secrets.SSH_KEY }} ${{ secrets.USERNAME }}@${{ secrets.HOST }} << 'ENDSSH'
+            cd /srv/ZorakBot
+            sudo git pull
+            docker-compose up -d --build zorak_bot_prod
+          ENDSSH
+        env:
+          SSH_KEY: ${{ secrets.SSH_KEY }}

requirements.txt

@@ -1,16 +1,16 @@
-py-cord
-beautifulsoup4
-requests
-matplotlib
-DateTime
-pytz
-pistonapi
-toml
-feedparser
-html2text
-pymongo
-PyNaCl==1.5.0
-ffmpeg-python==0.2.0
-yt-dlp==2023.11.16
-googletrans==3.1.0a0
+py-cord
+beautifulsoup4
+requests
+matplotlib
+DateTime
+pytz
+pistonapi
+toml
+feedparser
+html2text
+pymongo
+PyNaCl==1.5.0
+ffmpeg-python==0.2.0
+yt-dlp==2023.11.16
+googletrans==3.1.0a0
 dnspython==2.3.0

src/zorak/cogs/general/general_trivia.py

@@ -1,83 +1,83 @@
-"""
-A trivia command.
-"""
-import logging
-import json
-from discord.ui.item import Item
-import requests
-import urllib
-import html
-from discord.ext import commands
-import discord
-import random
-logger = logging.getLogger(__name__)
-
-class GeneralTrivia(commands.Cog):
-    """
-    # Hits the trivia API and returns the response
-    """
-
-    def __init__(self, bot):
-        self.bot = bot
-
-    @commands.slash_command()
-    async def trivia_cmd(self, ctx):
-        """
-        Sends a trivia using an API
-        """
-        logger.info("%s used the %s command."
-                    , ctx.author.name
-                    , ctx.command)
-        req = requests.get("https://opentdb.com/api.php?amount=1&category=18&difficulty=medium&type=multiple")
-        if req.json()['response_code'] == 0:
-            
-            await ctx.respond(html.unescape(req.json()['results'][0]['question']))
-            view = discord.ui.View()
-            answer_list = []
-            for i in req.json()['results'][0]['incorrect_answers']:
-                answer_list.append((i,False))
-            answer_list.append((req.json()['results'][0]['correct_answer'],True))
-            al = answer_list[:]
-            correct_ans = len(answer_list)-1
-            button_list = []
-            async def empty(interaction:discord.Interaction):
-                pass
-            async def correct(interaction:discord.Interaction):
-                if interaction.user == ctx.author:
-                    await interaction.response.defer()
-                    await interaction.followup.send(content="The answer is correct, good job human")
-                    for i in button_list:
-                        i.callback = empty
-
-            async def wrong(interaction:discord.Interaction):
-                if interaction.user == ctx.author:
-                    await interaction.response.defer()
-                    await interaction.followup.send(content=f"Wrong answer, the answer was {answer_list[correct_ans][0]}")
-                    await interaction.edit_original_response()
-                    for i in button_list:
-                        i.callback = empty
-            for i in range(correct_ans+1):
-                index = random.randint(0,len(al)-1)
-                label = html.unescape(al[index][0])
-                button = discord.ui.Button(label=label)
-                button_list.append(button)
-                #print(button.callback)
-                if al[index][1]:
-                    
-                    button.callback = correct
-                else:
-                    button.callback = wrong
-                del al[index]
-                view.add_item(button)
-            msg = await ctx.send(view=view)
-
-        else:
-            await ctx.respond('Oops the server seems to have made a mistake, try the command again')
-
-
-
-def setup(bot):
-    """
-    Required.
-    """
-    bot.add_cog(GeneralTrivia(bot))
+"""
+A trivia command.
+"""
+import logging
+import json
+from discord.ui.item import Item
+import requests
+import urllib
+import html
+from discord.ext import commands
+import discord
+import random
+logger = logging.getLogger(__name__)
+
+class GeneralTrivia(commands.Cog):
+    """
+    # Hits the trivia API and returns the response
+    """
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.slash_command()
+    async def trivia_cmd(self, ctx):
+        """
+        Sends a trivia using an API
+        """
+        logger.info("%s used the %s command."
+                    , ctx.author.name
+                    , ctx.command)
+        req = requests.get("https://opentdb.com/api.php?amount=1&category=18&difficulty=medium&type=multiple")
+        if req.json()['response_code'] == 0:
+            
+            await ctx.respond(html.unescape(req.json()['results'][0]['question']))
+            view = discord.ui.View()
+            answer_list = []
+            for i in req.json()['results'][0]['incorrect_answers']:
+                answer_list.append((i,False))
+            answer_list.append((req.json()['results'][0]['correct_answer'],True))
+            al = answer_list[:]
+            correct_ans = len(answer_list)-1
+            button_list = []
+            async def empty(interaction:discord.Interaction):
+                pass
+            async def correct(interaction:discord.Interaction):
+                if interaction.user == ctx.author:
+                    await interaction.response.defer()
+                    await interaction.followup.send(content="The answer is correct, good job human")
+                    for i in button_list:
+                        i.callback = empty
+
+            async def wrong(interaction:discord.Interaction):
+                if interaction.user == ctx.author:
+                    await interaction.response.defer()
+                    await interaction.followup.send(content=f"Wrong answer, the answer was {answer_list[correct_ans][0]}")
+                    await interaction.edit_original_response()
+                    for i in button_list:
+                        i.callback = empty
+            for i in range(correct_ans+1):
+                index = random.randint(0,len(al)-1)
+                label = html.unescape(al[index][0])
+                button = discord.ui.Button(label=label)
+                button_list.append(button)
+                #print(button.callback)
+                if al[index][1]:
+                    
+                    button.callback = correct
+                else:
+                    button.callback = wrong
+                del al[index]
+                view.add_item(button)
+            msg = await ctx.send(view=view)
+
+        else:
+            await ctx.respond('Oops the server seems to have made a mistake, try the command again')
+
+
+
+def setup(bot):
+    """
+    Required.
+    """
+    bot.add_cog(GeneralTrivia(bot))