Merge pull request #1 from verixx/rewrite

update

Author: ravener

README.md

@@ -2,7 +2,7 @@
         <p> <img src="https://i.imgur.com/lBSqWgt.png"/> </p>
         <p><i><b>Moderation, fun, utility and much more! (Rewrite)</b></i></p>
 	<p> 
-		<a href="https://discord.gg/pmQSbAd"><img src="https://discordapp.com/api/guilds/345787308282478592/widget.png?style=banner2" alt="" /></a>
+		<a href="https://discord.gg/2B4UvKx"><img src="https://discordapp.com/api/guilds/376697605029101569/widget.png?style=banner2" alt="" /></a>
 	</p>
 	<p>	<img src="https://img.shields.io/badge/build-passing-brightgreen.svg" alt="passing" /></a>
 		<img src="https://img.shields.io/badge/python-3.6-brightgreen.svg" alt="python 3.6" /></a>
@@ -40,6 +40,6 @@ Currently available cogs:-
 
 Note: You **do not** have to add default cogs into `data/community_cogs.txt`.
 
-## Acknowledgements
+## Acknowledgements 
 
 > Eval and google commands by [Rapptz](https://github.com/Rapptz) from R.Danny

cogs/gitcog.py

@@ -0,0 +1,92 @@
+import discord
+from discord.ext import commands
+import os
+import json
+import aiohttp
+import traceback
+
+class Git:
+    '''Github Cog, facilitates viewing and creating issues'''
+    def __init__(self, bot):
+        self.bot = bot
+        self.session = aiohttp.ClientSession()
+
+    @property
+    def githubtoken(self):
+        '''
+        Returns your token wherever it is
+
+        This token can give any user complete access to the account.
+        https://github.com/settings/tokens is where you make a token.
+        '''
+        with open('data/config.json') as f:
+            config = json.load(f)
+            return os.environ.get('GITHUBTOKEN') or config.get('GITHUBTOKEN')
+
+    async def githubusername(self):
+        '''Returns Github Username'''
+        async with self.session.get('https://api.github.com/user', headers={"Authorization": f"Bearer {self.githubtoken}"}) as resp: #get username 
+            if 300 > resp.status >= 200:
+                return (await resp.json())['login']
+
+    async def starred(self, repo):
+        async with self.session.get('https://api.github.com/user/starred/' + repo, headers={"Authorization": f"Bearer {self.githubtoken}"}) as resp:
+            if resp.status == 204:
+                return True
+            if resp.status == 404:
+                return False
+
+    @commands.command()
+    async def issue(self, ctx, repo, issueid):
+        '''View an issue from Github!'''
+        async with ctx.session.get(f"https://api.github.com/repos/{repo}/issues/{issueid}") as resp:
+            if resp.status == 200 or resp.status == 201:
+                issueinfo = await resp.json()
+            else:
+                return await ctx.send('ConnectionError: Github API Issue.')
+        async with ctx.session.get(issueinfo['comments_url']) as resp:
+            if resp.status == 200 or resp.status == 201:
+                commentsinfo = await resp.json()
+            else:
+                return await ctx.send('ConnectionError: Github API Issue.')
+
+        if issueinfo['state'] == 'closed': colour = 0xcb2431
+        elif issueinfo['state'] == 'open': colour = 0x2cbe4e
+        else: colour = 0xffffff
+        try:
+            issueinfo['pull_request']
+        except KeyError:
+            issuetype = 'Issue'
+        else:
+            issuetype = 'Pull Request'
+        em = discord.Embed(title=issueinfo['title'] + ' (#' + str(issueinfo['number']) + ')', description=issueinfo['body'], url=issueinfo['html_url'], color=colour)
+        em.set_author(name=issueinfo['user']['login'] + ' (' + issueinfo['author_association'].capitalize() + ')', icon_url=issueinfo['user']['avatar_url'])
+        em.set_footer(text=issuetype + ' | ' + issueinfo['created_at'])
+        for comment in commentsinfo:
+            em.add_field(name=comment['user']['login'] + ' (' + comment['author_association'].capitalize() + ')', value=comment['body'], inline=False)
+        await ctx.send(embed=em)
+    
+    @commands.command()
+    async def makeissue(self, ctx, repo, title, *, body):
+        '''Create an issue! `{}makeissue <title> | <body>`'''.format(ctx.prefix)
+        async with ctx.session.post(f'https://api.github.com/repos/{repo}/issues', json={"title": title, "body": body}, headers={'Authorization': f'Bearer {self.githubtoken}'}) as resp:
+            if resp.status == 200 or resp.status == 201:
+                issueinfo = await resp.json()
+            else:
+                return await ctx.send('ConnectionError: Github API Issue.')
+
+        em = discord.Embed(title=issueinfo['title'] + ' (#' + str(issueinfo['number']) + ')', description=issueinfo['body'], url=issueinfo['html_url'], color=0xcb2431)
+        em.set_author(name=issueinfo['user']['login'] + ' (' + issueinfo['author_association'].capitalize() + ')', icon_url=issueinfo['user']['avatar_url'])
+        em.set_footer(text='Issue | ' + issueinfo['created_at'])
+        await ctx.send(embed=em)
+
+    @commands.command()
+    async def comment(self, ctx, repo, issueid:int, *, content):
+        '''Comment on a Github Issue'''
+        async with ctx.session.post(f'https://api.github.com/repos/{repo}/issues/{issueid}/comments', json={"body": content}, headers={'Authorization': f'Bearer {self.githubtoken}'}) as resp:
+            if resp.status != 200 and resp.status != 201:
+                return await ctx.send('ConnectionError: Github API Issue.')
+        await ctx.send('Submitted comment to issue ' + str(issueid))
+
+def setup(bot):
+    bot.add_cog(Git(bot))

cogs/info.py

@@ -31,6 +31,7 @@
 import psutil
 import random
 import pip
+import json
 import os
 import io
 
@@ -40,26 +41,36 @@ def __init__(self, bot):
         self.bot = bot
 
     @commands.command(no_pm=True)
-    async def channels(self, ctx):
+    async def channels(self, ctx, serverid:int = None):
         """Shows ALL channels, use wisely!"""
 
+        if serverid is None:
+            server = ctx.guild
+        else:
+            server = discord.utils.get(self.bot.guilds, id=serverid)
+            if server is None:
+                return await ctx.send('Server not found!')
+
         e = discord.Embed()
         e.color = await ctx.get_dominant_color()
 
         voice = ''
         text = ''
         categories = ''
 
-        for channel in ctx.guild.voice_channels:
+        for channel in server.voice_channels:
             voice += f'\U0001f508 {channel}\n'
-        for channel in ctx.guild.categories:
+        for channel in server.categories:
             categories += f'\U0001f4da {channel}\n'
-        for channel in ctx.guild.text_channels:
+        for channel in server.text_channels:
             text += f'\U0001f4dd {channel}\n'
 
-        e.add_field(name='Text Channels', value=f'```{text}```')
-        e.add_field(name='Categories', value=f'```{categories}```')
-        e.add_field(name='Voice Channels', value=f'```{voice}```')
+        if len(server.text_channels) > 0:
+            e.add_field(name='Text Channels', value=f'```{text}```')
+        if len(server.categories) > 0:
+            e.add_field(name='Categories', value=f'```{categories}```')
+        if len(server.voice_channels) > 0:
+            e.add_field(name='Voice Channels', value=f'```{voice}```')
 
         try:
             await ctx.send(embed=e)
@@ -188,6 +199,32 @@ async def serverinfo(self, ctx, server_id : int=None):
             for page in em_list:
                 await ctx.send(page)
 
+    @commands.command()
+    async def tags(self, ctx, *, text: str=None):
+        ''' Get useful selfbot tags & tutorials '''
+        try:
+            await ctx.message.delete()
+        except discord.Forbidden:
+            pass
+        with open('data/tags.json', 'r') as f:
+            s = f.read()
+            tags = json.loads(s)
+        if text in tags:
+            await ctx.send(f'{tags[str(text)]}')
+        else:
+            p = f' {ctx.prefix}{ctx.invoked_with} '
+            usage = f'\n***AVAILABLE TAGS:***\n\n' \
+                    f'`1.`{p}heroku\n`2.`{p}change-token\n' \
+                    f'`3.`{p}hosting\n`4.`{p}rules-selfbot\n`5.`{p}tutorial\n' \
+                    f'`6.`{p}update\n`7.`{p}support-invite\n`8.`{p}support\n' \
+                    f'`9.`{p}android-token\n`10.`{p}android-heroku'
+            e = discord.Embed()
+            e.color = await ctx.get_dominant_color(url=ctx.message.author.avatar_url)
+            e.add_field(name='Tag not found!', value=usage)
+            try:
+                await ctx.send(embed=e, delete_after=15)
+            except Exception as e:
+                await ctx.send(f'```{e}```')
 
     @commands.command(aliases=['ui'], no_pm=True)
     @commands.guild_only()
@@ -262,7 +299,7 @@ async def about(self, ctx):
         uptime = fmt.format(d=days, h=hours, m=minutes, s=seconds)
 
         github = '[Click Here](https://github.com/verixx/selfbot.py/)'
-        server = '[Click Here](https://discord.gg/pmQSbAd)'
+        server = '[Click Here](https://discord.gg/2B4UvKx)'
         website = '[selfbot-py.tk](http://selfbot-py.tk/)'
 
 

cogs/misc.py

@@ -338,37 +338,23 @@ async def dcolor(self, ctx, *, url):
         await ctx.send(file=discord.File(file, 'color.png'), embed=em)
 
     @commands.command(description='This command might get you banned')
-    async def annoy(self, ctx, *, member=None, times: int = None):
-        """Want to annoy a member with mentions?"""
-        channel = ctx.message.channel
-        author = ctx.message.author
-        message = ctx.message
-        usage = f'```Usage: {ctx.prefix}ultimate_annoying_spam_command [@member] [times]```'
-
-        if member or times is None:
-            await ctx.channel.send(usage)
-            return
-
-        if times > 100:
-            times = 35
-
-        if times is 0:
-            sorry = f'Someone, not saying who, *cough cough {author}* felt sorry about using this command.'
-            await ctx.channel.send(sorry)
-            return
-
-        if times < 0:
-            chicken = "Well, that's just not enough times to annoy anybody. Don't chicken out now!"
-            await ctx.channel.send(chicken)
-            return
-
-        await message.delete()
-
-        for i in range(0, times):
-            try:
-                await channel.send(f'{member.mention} LOL')
-            except Exception:
-                pass
+    async def annoy(self, ctx, member: discord.Member=None, number: int=5):
+        """ Usage: annoy @b1nzy#1337 50
+        NOTICE: If you get banned, don't come back crying! """
+        if number > 5:
+            number = 5
+        member = member or ctx.author
+        try:
+            await ctx.message.delete()
+        except discord.Forbidden:
+            pass
+        if member != None:
+            for x in range(number):
+                await ctx.channel.trigger_typing()
+                await ctx.send(member.mention)
+                await asyncio.sleep(8)
+        else:
+            return await ctx.send(f"{ctx.author.mention}, I don't know how to use commands. Help!")
 
     @commands.command()
     async def tinyurl(self, ctx, *, link: str):

cogs/mod.py

@@ -31,6 +31,7 @@
 import pip
 import os
 import io
+import json
 
 
 class Mod:
@@ -40,7 +41,7 @@ def __init__(self, bot):
 
     async def format_mod_embed(self, ctx, user, success, method, duration = None, location=None):
         '''Helper func to format an embed to prevent extra code'''
-        emb = discord.Embed()
+        emb = discord.Embed(timestamp=ctx.message.created_at)
         emb.set_author(name=method.title(), icon_url=user.avatar_url)
         emb.color = await ctx.get_dominant_color(user.avatar_url)
         emb.set_footer(text=f'User ID: {user.id}')
@@ -60,7 +61,19 @@ async def format_mod_embed(self, ctx, user, success, method, duration = None, lo
                 emb.description = f"You do not have the permissions to {method} `{location.name}`."
             else:
                 emb.description = f"You do not have the permissions to {method} {user.name}."
-
+        
+        with open('data/config.json') as f:
+            config = json.load(f)
+            modlog = os.environ.get('MODLOG') or config.get('MODLOG')
+        if modlog is None:
+            await ctx.send('You have not set `MODLOG` in your config vars.', delete_after=5)
+        else:
+            modlog = discord.utils.get(self.bot.get_all_channels(), id=int(modlog))
+            if modlog is None:
+                await ctx.send('Your `MODLOG` channel ID is invalid.', delete_after=5)
+            else:
+                await modlog.send(embed=emb)
+            
         return emb
 
     @commands.command()
@@ -108,9 +121,14 @@ async def unban(self, ctx, name_or_id, *, reason=None):
         await ctx.send(embed=emb)
 
     @commands.command(aliases=['del','p','prune'])
-    async def purge(self, ctx, limit : int):
+    async def purge(self, ctx, limit : int, member:discord.Member=None):
         '''Clean a number of messages'''
-        await ctx.purge(limit=limit+1) # TODO: add more functionality
+        if member is None:
+            await ctx.purge(limit=limit+1)
+        else:
+            async for message in ctx.channel.history(limit=limit+1):
+                if message.author is member:
+                    await message.delete()
 
     @commands.command()
     async def clean(self, ctx, limit : int=15):