Issues and Requests cogs created

Author: starwiz-7

.gitignore

@@ -6,6 +6,8 @@ __pycache__/
 # C extensions
 *.so
 
+#Heroku
+Procfile
 # Distribution / packaging
 .Python
 build/

Hackbot/__main__.py renamed to Hackbot/bot.py

@@ -7,12 +7,12 @@
 from discord.utils import find
 from utils.db import new_hackathon
 def main():
-    token = "Nzk2NzI0MTkxNzUxNTY5NDc5.X_cFOQ.NYuv81J8cYlPBLic9L4d5UkyjSo"
-    if not token:
+    DISCORD_TOKEN = os.environ.get('DISCORD_TOKEN')
+    if not DISCORD_TOKEN:
         logging.error('Token missing')
         return
 
-    bot = commands.Bot(command_prefix=commands.when_mentioned_or('!hack '), case_sensitive=False)
+    bot = commands.Bot(command_prefix=commands.when_mentioned_or(';hack '), case_sensitive=False)
     for filename in os.listdir('./cogs'):
         if filename.endswith('.py'):
             bot.load_extension(f'cogs.{filename[:-3]}')
@@ -37,7 +37,12 @@ async def on_guild_join(guild):
             if channel.permissions_for(guild.me).send_messages:
                 await channel.send("```Hello guyss! HackBot is here to notify you all about the upcoming hackathons\nCommand Prefix: !hack\nFor help in commands type: !hack help```")
                 break
-    bot.run(token)
+
+    @bot.event
+    async def on_command_error(ctx,error):
+        if isinstance(error, commands.CommandNotFound):
+            await ctx.send("Please type `;hack help` for list of commands")
+    bot.run(DISCORD_TOKEN)
 
 if __name__ == '__main__':
     main()

Hackbot/cogs/hackathons.py

@@ -14,10 +14,8 @@ def __init__(self,bot):
 
     def get_channel_id(self,ctx,channel):
         channels = ctx.guild.text_channels
-        print(channel)
         for i in channels:
             if i.name == channel:
-                print(i.id)
                 return i.id
         return False
 
@@ -29,13 +27,14 @@ def save_channel_details(self, ctx, channel_id):
             update_channel(ctx.guild.id, channel_id)
 
     async def create_channel(self,ctx,channel):
-        await ctx.send("`Creating channel "+channel+"`")
+        message = await ctx.send("```Creating channel "+channel+"```")
         await ctx.guild.create_text_channel(channel)
         channel_id = self.get_channel_id(ctx,channel)
+        newcontent = "```Channel "+channel+" created and hacked for notifications.```"
+        await message.edit(content=newcontent)
 
     async def validate_channel(self,ctx, channel):
         channel = channel[0]
-        print(channel)
         channel_id = self.get_channel_id(ctx,channel)
         if channel_id != False:
             self.save_channel_details(ctx,channel_id)
@@ -49,13 +48,13 @@ async def no_channel(self,ctx,channel):
 
     @commands.guild_only()
     @commands.has_permissions(manage_channels=True,read_messages=True,send_messages=True)
-    @commands.command(brief="Hack a channel for further hackathon updates")
-    async def channel(self,ctx, *channel):
+    @commands.command(brief="Hack a channel for upcoming hackathon notifications.")
+    async def notify(self,ctx, *channel):
         await self.validate_channel(ctx,channel)
 
     @commands.guild_only()
     @commands.has_permissions(manage_channels=True,read_messages=True,send_messages=True)
-    @commands.command(brief="Unsubscribe the channel for further hackathon updates")
+    @commands.command(brief="Unsubscribe the channel.")
     async def unsub(self,ctx):
         delete_guild(ctx.guild_id)
         await ctx.send("Unsubscribed")
@@ -121,16 +120,17 @@ async def check_list(self,hackathon):
             await self.single_embed(hackathon)
 
     #Check after 1 minute if a new hackathon is added
-    @tasks.loop(seconds=60.0)
+    @tasks.loop(seconds=1860.0)
     async def check_if_new(self):
         hackathon = new_hackathon()
-        print(hackathon)
+        print("Running....")
         if len(hackathon) != 0:
             hackathon = sorted(hackathon, key=lambda x: x['website'])
             web_list = []
             k = hackathon[0]['website']
             for i in hackathon:
-                if i['name'] == k:
+                update_hackathon(i['name'], i['website'])
+                if i['website'] == k:
                     web_list.append(i)
                 else:
                     await self.check_list(web_list)
@@ -141,7 +141,6 @@ async def check_if_new(self):
 
     @check_if_new.before_loop
     async def before_print(self):
-        print("waiting..")
         await self.bot.wait_until_ready()
 
 

Hackbot/cogs/issues.py

@@ -0,0 +1,39 @@
+import discord
+from github import Github
+from discord.ext import commands, tasks
+import asyncio
+import os
+GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN")
+g = Github(GITHUB_TOKEN)
+
+repo = g.get_repo("starwiz-7/HackBot")
+
+
+class IssueError(commands.CommandError):
+    pass
+
+class Issue(commands.Cog):
+    def __init__(self,bot):
+        self.bot = bot
+
+    def create_issue(self,*issue):
+        issue = issue[1]
+        title = ""
+        description =  ""
+        if len(issue) >1:
+            title = issue[0]
+            description = issue[1]
+            repo.create_issue(title=title, body=description)
+        else:
+            title = issue[0]
+            repo.create_issue(title=title)
+        
+
+    @commands.guild_only()
+    @commands.command(brief="Request a feature, or report an issue.")
+    async def issue(self,ctx, *issue):
+        self.create_issue(ctx, issue)
+        await ctx.send("Reported to HackBot developer.\nhttps://github.com/starwiz-7/HackBot")
+
+def setup(bot):
+    bot.add_cog(Issue(bot))

Hackbot/cogs/websites.py

@@ -6,7 +6,7 @@ class SourceCogError(commands.CommandError):
     pass
 
 class Source(commands.Cog):
-    def __inti__(self,bot):
+    def __init__(self,bot):
         self.bot = bot
 
     def parse_hackathons(self,hackathons):
@@ -17,7 +17,6 @@ def parse_hackathons(self,hackathons):
             l.append(i)
             k+=1
             if(k %5 == 0):
-                # print(l)
                 yield l
                 k = 1
                 l = []
@@ -34,18 +33,15 @@ async def web(self,ctx, *string):
             hackathons = get_hackathon(website)
             print(hackathons)
             if len(hackathons[0])>0:
-                hackathons = list(self.parse_hackathons(hackathons))
+                hackathon = list(self.parse_hackathons(hackathons))
                 asset = get_asset(website)
-                for i in hackathons:
-                    
+                for i in hackathon:
+                    print(i)
                     msg = discord.Embed(title=f'Hackathons listed on {website}')
-                    # print(asset)
                     msg.set_thumbnail(url=asset[0]['thumbnail'])
-                    # print(i[0])
                     for j in i:
-                        # print(j)
-                        msg.add_field(name=j['name'],value=j['url'],inline=False)
-                    await ctx.send(embed=msg)
+                        await msg.add_field(name=j['name'],value=j['url'],inline=False)
+                    
 
 
 def setup(bot):

Hackbot/requirements.txt

@@ -0,0 +1,18 @@
+aiohttp==3.7.3
+async-timeout==3.0.1
+attrs==20.3.0
+certifi==2020.12.5
+chardet==3.0.4
+Deprecated==1.2.11
+discord.py==1.6.0
+dnspython==2.1.0
+idna==2.10
+multidict==5.1.0
+PyGithub==1.54.1
+PyJWT==1.7.1
+pymongo==3.11.2
+requests==2.25.1
+typing-extensions==3.7.4.3
+urllib3==1.26.2
+wrapt==1.12.1
+yarl==1.6.3

Hackbot/utils/db.py

@@ -1,14 +1,9 @@
 from datetime import datetime
 from pymongo import MongoClient
-from mongotriggers import MongoTrigger
 import pymongo
-import asyncio
-import logging
-import sys
-sys.path.append('..')
-client = MongoClient(
-    "mongodb+srv://Admin:AdminHackBot@hackbot.g1uz8.mongodb.net/HackBot?retryWrites=true&w=majority"
-)
+import os
+MONGO_URI = os.environ.get('MONGO_URI')
+client = MongoClient(MONGO_URI)
 bot_db = client.get_database("HackBot")
 guilds = bot_db.get_collection("Guild-channels")
 hackathons = bot_db.get_collection("Hackathons")

README.md

@@ -48,7 +48,7 @@ To use HackBot, follow these steps:
 -   Run the following command
 
 ```
-python __main__.py
+python bot.py
 ```
 
 ## Roadmap