aboutsummaryrefslogtreecommitdiff
path: root/cogs
diff options
context:
space:
mode:
authorAnInternetTroll <lucafulger@gmail.com>2020-06-02 07:29:45 +0000
committerAnInternetTroll <lucafulger@gmail.com>2020-06-02 07:29:45 +0000
commit29921b0d9a5a5a719669c4772dcafa4ab3c786e1 (patch)
tree2621ffc4d3fc9659ce22fbf873c4cf463f6b872c /cogs
parentd7d868a43adb2bd3f89b4400288a397960e85769 (diff)
downloadsteve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.tar
steve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.tar.gz
steve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.tar.bz2
steve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.tar.lz
steve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.tar.xz
steve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.tar.zst
steve-bot-29921b0d9a5a5a719669c4772dcafa4ab3c786e1.zip
modified: .gitignore
modified: .vscode/settings.json modified: bot.py modified: cogs/admin.py modified: cogs/general.py modified: cogs/help.py modified: cogs/player.py modified: cogs/src.py modified: cogs/trans.py modified: cogs/utils.py modified: custom_commands.json modified: main.py
Diffstat (limited to 'cogs')
-rwxr-xr-x[-rw-r--r--]cogs/admin.py2
-rwxr-xr-x[-rw-r--r--]cogs/general.py130
-rwxr-xr-x[-rw-r--r--]cogs/help.py0
-rwxr-xr-x[-rw-r--r--]cogs/player.py286
-rwxr-xr-x[-rw-r--r--]cogs/src.py0
-rwxr-xr-x[-rw-r--r--]cogs/trans.py9
-rwxr-xr-x[-rw-r--r--]cogs/utils.py8
7 files changed, 232 insertions, 203 deletions
diff --git a/cogs/admin.py b/cogs/admin.py
index f252944..0613b5d 100644..100755
--- a/cogs/admin.py
+++ b/cogs/admin.py
@@ -86,6 +86,7 @@ class Admin(commands.Cog):
await ctx.send(f'Some unknown error happened while trying to reload extension {ext} (check logs)')
self.bot.logger.exception(f'Failed to reload extension {ext}:')
+ """
@commands.command()
@commands.check(is_mod)
async def connect(self, ctx):
@@ -97,6 +98,7 @@ class Admin(commands.Cog):
async def disconnect(self, ctx):
await ctx.voice_client.disconnect()
await ctx.send(f"Left channel {ctx.author.voice.channel.name}")
+ """
@commands.command()
@commands.check(is_mod)
diff --git a/cogs/general.py b/cogs/general.py
index 091c325..ff60bb7 100644..100755
--- a/cogs/general.py
+++ b/cogs/general.py
@@ -1,57 +1,73 @@
-from discord.ext import commands
-import discord
-import datetime
-
-def dump(obj):
- output = ""
- for attr in dir(obj):
- output += "\nobj.%s = %r" % (attr, getattr(obj, attr))
- print("obj.%s = %r" % (attr, getattr(obj, attr)))
- return output
-
-
-class General(commands.Cog):
- def __init__(self, bot):
- self.bot = bot
-
- @commands.command()
- async def userinfo(self, ctx, user: discord.Member=None):
- #await ctx.send(f"```py\n{dump(user)}```")
-
- if not user:
- user = ctx.message.author
- elif type(user)=="str":
- user = self.bot.get_user(int(user))
-
- # Very very shit
- """
- await ctx.send(str(user.avatar_url))
- request.urlretrieve(str(user.avatar_url), "temp.webp")
- #filename = wget.download(user.avatar_url, out="temp.webp")
- image = Image.open("temp.webp").convert("RGB")
- image.save("temp.png", "PNG")
-
- f = discord.File("temp.png", filename="temp.png")
- #await messagable.send(file=f, embed=e)
- """
- output = ""
- for i in user.roles:
- output += i.mention
-
-
- embed=discord.Embed(title=user.name, description=user.mention, color=user.color, timestamp=ctx.message.created_at)
- #embed.set_thumbnail(url="attachment://temp.webp")
- embed.set_thumbnail(url=user.avatar_url)
- embed.set_image(url="attachment://temp.png")
- embed.add_field(name="Nickname", value=user.display_name, inline=False)
- embed.add_field(name="Joined on", value=user.joined_at.date(), inline=True)
- embed.add_field(name="Status", value=user.status, inline=True)
- embed.add_field(name="Created account on", value=user.created_at.date(), inline=True)
- embed.add_field(name="Roles", value=output, inline=True)
- embed.set_footer(text=f"ID: {user.id}")
- await ctx.send(embed=embed)
- #os.remove("temp.webp")
- #os.remove("temp.png")
-
-def setup(bot):
- bot.add_cog(General(bot))
+from discord.ext import commands
+import discord
+import datetime
+
+def dump(obj):
+ output = ""
+ for attr in dir(obj):
+ output += "\nobj.%s = %r" % (attr, getattr(obj, attr))
+ print("obj.%s = %r" % (attr, getattr(obj, attr)))
+ return output
+
+
+class General(commands.Cog):
+ def __init__(self, bot):
+ self.bot = bot
+
+ @commands.command()
+ async def userinfo(self, ctx, user: discord.Member=None):
+ #await ctx.send(f"```py\n{dump(user)}```")
+
+ if not user:
+ user = ctx.message.author
+ elif type(user)=="str":
+ user = self.bot.get_user(int(user))
+
+ # Very very shit
+ """
+ await ctx.send(str(user.avatar_url))
+ request.urlretrieve(str(user.avatar_url), "temp.webp")
+ #filename = wget.download(user.avatar_url, out="temp.webp")
+ image = Image.open("temp.webp").convert("RGB")
+ image.save("temp.png", "PNG")
+
+ f = discord.File("temp.png", filename="temp.png")
+ #await messagable.send(file=f, embed=e)
+ """
+ output = ""
+ for i in user.roles:
+ output += i.mention
+
+
+ embed=discord.Embed(title=user.name, description=user.mention, color=user.color, timestamp=ctx.message.created_at)
+ #embed.set_thumbnail(url="attachment://temp.webp")
+ embed.set_thumbnail(url=user.avatar_url)
+ embed.set_image(url="attachment://temp.png")
+ embed.add_field(name="Nickname", value=user.display_name, inline=False)
+ embed.add_field(name="Joined on", value=user.joined_at.date(), inline=True)
+ embed.add_field(name="Status", value=user.status, inline=True)
+ embed.add_field(name="Created account on", value=user.created_at.date(), inline=True)
+ embed.add_field(name="Roles", value=output, inline=True)
+ embed.set_footer(text=f"ID: {user.id}")
+ await ctx.send(embed=embed)
+ #os.remove("temp.webp")
+ #os.remove("temp.png")
+
+ @commands.command()
+ async def coop(self, ctx, user: discord.Member=None):
+ if not user:
+ user = ctx.message.author
+ elif type(user)=="str":
+ user = self.bot.get_user(int(user))
+
+ coop_role = ctx.guild.get_role(694261282861219952)
+
+ if coop_role in user.roles:
+ await user.remove_roles(coop_role)
+ await ctx.send('You have left coop gang')
+ else:
+ await user.add_roles(coop_role)
+ await ctx.send("You are now in the coop gang")
+
+def setup(bot):
+ bot.add_cog(General(bot))
diff --git a/cogs/help.py b/cogs/help.py
index 91c9c45..91c9c45 100644..100755
--- a/cogs/help.py
+++ b/cogs/help.py
diff --git a/cogs/player.py b/cogs/player.py
index d7d2302..6a91318 100644..100755
--- a/cogs/player.py
+++ b/cogs/player.py
@@ -1,144 +1,144 @@
-import asyncio
-import discord
-import youtube_dl
-from discord.ext import commands
-from discord.ext import tasks
-from pathlib import Path
-
-# Straight up copied from
-# https://github.com/Rapptz/discord.py/blob/master/examples/basic_voice.py
-
-# Suppress noise about console usage from errors
-youtube_dl.utils.bug_reports_message = lambda: ''
-
-
-ytdl_format_options = {
- 'format': 'bestaudio/best',
- 'outtmpl': '%(extractor)s-%(id)s-%(title)s.%(ext)s',
- 'restrictfilenames': True,
- 'noplaylist': True,
- 'nocheckcertificate': True,
- 'ignoreerrors': False,
- 'logtostderr': False,
- 'quiet': True,
- 'no_warnings': True,
- 'default_search': 'auto',
- 'source_address': '0.0.0.0' # bind to ipv4 since ipv6 addresses cause issues sometimes
-}
-
-ffmpeg_options = {
- 'options': '-vn'
-}
-
-ytdl = youtube_dl.YoutubeDL(ytdl_format_options)
-
-
-class YTDLSource(discord.PCMVolumeTransformer):
- def __init__(self, source, *, data, volume=0.5):
- super().__init__(source, volume)
-
- self.data = data
-
- self.title = data.get('title')
- self.url = data.get('url')
-
- @classmethod
- async def from_url(cls, url, *, loop=None, stream=False):
- loop = loop or asyncio.get_event_loop()
- data = await loop.run_in_executor(None, lambda: ytdl.extract_info(url, download=not stream))
-
- if 'entries' in data:
- # take first item from a playlist
- data = data['entries'][0]
-
- filename = data['url'] if stream else ytdl.prepare_filename(data)
- return cls(discord.FFmpegPCMAudio(filename, **ffmpeg_options), data=data)
-
-
-class Player(commands.Cog):
- def __init__(self, bot):
- self.bot = bot
- self.cleanup.start()
-
- async def is_in_vc(ctx):
- try:
- return ctx.author.voice.channel
- except AttributeError:
- return False
-
- @commands.check(is_in_vc)
- @commands.command()
- async def join(self, ctx, *, channel: discord.VoiceChannel):
- """Joins a voice channel"""
-
- if ctx.voice_client is not None:
- return await ctx.voice_client.move_to(channel)
-
- await channel.connect()
- @commands.command()
- async def play(self, ctx, *, query):
- """Plays a file from the local filesystem"""
-
- source = discord.PCMVolumeTransformer(discord.FFmpegPCMAudio(query))
- ctx.voice_client.play(source, after=lambda e: print('Player error: %s' % e) if e else None)
-
- await ctx.send('Now playing: {}'.format(query))
- @commands.command()
- async def yt(self, ctx, *, url):
- """Plays from a url (almost anything youtube_dl supports)"""
-
- async with ctx.typing():
- player = await YTDLSource.from_url(url, loop=self.bot.loop)
- ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None)
-
- await ctx.send('Now playing: {}'.format(player.title))
-
- @commands.command()
- async def stream(self, ctx, *, url):
- """Streams from a url (same as yt, but doesn't predownload)"""
-
- async with ctx.typing():
- player = await YTDLSource.from_url(url, loop=self.bot.loop, stream=True)
- ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None)
-
- await ctx.send('Now playing: {}'.format(player.title))
-
- @commands.check(is_in_vc)
- @commands.command()
- async def volume(self, ctx, volume: int):
- """Changes the player's volume"""
-
- if ctx.voice_client is None:
- return await ctx.send("Not connected to a voice channel.")
-
- ctx.voice_client.source.volume = volume / 100
- await ctx.send("Changed volume to {}%".format(volume))
-
- @commands.check(is_in_vc)
- @commands.command()
- async def stop(self, ctx):
- """Stops and disconnects the bot from voice"""
-
- await ctx.voice_client.disconnect()
-
- @play.before_invoke
- @yt.before_invoke
- @stream.before_invoke
- async def ensure_voice(self, ctx):
- if ctx.voice_client is None:
- if ctx.author.voice:
- await ctx.author.voice.channel.connect()
- else:
- await ctx.send("You are not connected to a voice channel.")
- raise commands.CommandError("Author not connected to a voice channel.")
- elif ctx.voice_client.is_playing():
- ctx.voice_client.stop()
-
- @tasks.loop(hours=10.0)
- async def cleanup(self):
- for p in Path(".").glob("youtube*"):
- p.unlink()
-
-
-def setup(bot):
+import asyncio
+import discord
+import youtube_dl
+from discord.ext import commands
+from discord.ext import tasks
+from pathlib import Path
+
+# Straight up copied from
+# https://github.com/Rapptz/discord.py/blob/master/examples/basic_voice.py
+
+# Suppress noise about console usage from errors
+youtube_dl.utils.bug_reports_message = lambda: ''
+
+
+ytdl_format_options = {
+ 'format': 'bestaudio/best',
+ 'outtmpl': '%(extractor)s-%(id)s-%(title)s.%(ext)s',
+ 'restrictfilenames': True,
+ 'noplaylist': True,
+ 'nocheckcertificate': True,
+ 'ignoreerrors': False,
+ 'logtostderr': False,
+ 'quiet': True,
+ 'no_warnings': True,
+ 'default_search': 'auto',
+ 'source_address': '0.0.0.0' # bind to ipv4 since ipv6 addresses cause issues sometimes
+}
+
+ffmpeg_options = {
+ 'options': '-vn'
+}
+
+ytdl = youtube_dl.YoutubeDL(ytdl_format_options)
+
+
+class YTDLSource(discord.PCMVolumeTransformer):
+ def __init__(self, source, *, data, volume=0.5):
+ super().__init__(source, volume)
+
+ self.data = data
+
+ self.title = data.get('title')
+ self.url = data.get('url')
+
+ @classmethod
+ async def from_url(cls, url, *, loop=None, stream=False):
+ loop = loop or asyncio.get_event_loop()
+ data = await loop.run_in_executor(None, lambda: ytdl.extract_info(url, download=not stream))
+
+ if 'entries' in data:
+ # take first item from a playlist
+ data = data['entries'][0]
+
+ filename = data['url'] if stream else ytdl.prepare_filename(data)
+ return cls(discord.FFmpegPCMAudio(filename, **ffmpeg_options), data=data)
+
+
+class Player(commands.Cog):
+ def __init__(self, bot):
+ self.bot = bot
+ self.cleanup.start()
+
+ async def is_in_vc(ctx):
+ try:
+ return ctx.author.voice.channel
+ except AttributeError:
+ return False
+
+ @commands.check(is_in_vc)
+ @commands.command()
+ async def join(self, ctx, *, channel: discord.VoiceChannel):
+ """Joins a voice channel"""
+
+ if ctx.voice_client is not None:
+ return await ctx.voice_client.move_to(channel)
+
+ await channel.connect()
+ @commands.command()
+ async def play(self, ctx, *, query):
+ """Plays a file from the local filesystem"""
+
+ source = discord.PCMVolumeTransformer(discord.FFmpegPCMAudio(query))
+ ctx.voice_client.play(source, after=lambda e: print('Player error: %s' % e) if e else None)
+
+ await ctx.send('Now playing: {}'.format(query))
+ @commands.command()
+ async def yt(self, ctx, *, url):
+ """Plays from a url (almost anything youtube_dl supports)"""
+
+ async with ctx.typing():
+ player = await YTDLSource.from_url(url, loop=self.bot.loop)
+ ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None)
+
+ await ctx.send('Now playing: {}'.format(player.title))
+
+ @commands.command()
+ async def stream(self, ctx, *, url):
+ """Streams from a url (same as yt, but doesn't predownload)"""
+
+ async with ctx.typing():
+ player = await YTDLSource.from_url(url, loop=self.bot.loop, stream=True)
+ ctx.voice_client.play(player, after=lambda e: print('Player error: %s' % e) if e else None)
+
+ await ctx.send('Now playing: {}'.format(player.title))
+
+ @commands.check(is_in_vc)
+ @commands.command()
+ async def volume(self, ctx, volume: int):
+ """Changes the player's volume"""
+
+ if ctx.voice_client is None:
+ return await ctx.send("Not connected to a voice channel.")
+
+ ctx.voice_client.source.volume = volume / 100
+ await ctx.send("Changed volume to {}%".format(volume))
+
+ @commands.check(is_in_vc)
+ @commands.command()
+ async def stop(self, ctx):
+ """Stops and disconnects the bot from voice"""
+
+ await ctx.voice_client.disconnect()
+
+ @play.before_invoke
+ @yt.before_invoke
+ @stream.before_invoke
+ async def ensure_voice(self, ctx):
+ if ctx.voice_client is None:
+ if ctx.author.voice:
+ await ctx.author.voice.channel.connect()
+ else:
+ await ctx.send("You are not connected to a voice channel.")
+ raise commands.CommandError("Author not connected to a voice channel.")
+ elif ctx.voice_client.is_playing():
+ ctx.voice_client.stop()
+
+ @tasks.loop(hours=10.0)
+ async def cleanup(self):
+ for p in Path(".").glob("youtube*"):
+ p.unlink()
+
+
+def setup(bot):
bot.add_cog(Player(bot)) \ No newline at end of file
diff --git a/cogs/src.py b/cogs/src.py
index 96bf53c..96bf53c 100644..100755
--- a/cogs/src.py
+++ b/cogs/src.py
diff --git a/cogs/trans.py b/cogs/trans.py
index a34a7bf..2c6ed71 100644..100755
--- a/cogs/trans.py
+++ b/cogs/trans.py
@@ -1,17 +1,26 @@
from discord.ext import commands
import discord
from google.cloud import translate_v2 as translate
+import six
translate_client = translate.Client()
async def translateMsg(text, target="en"):
# Text can also be a sequence of strings, in which case this method
# will return a sequence of results for each text.
+ if isinstance(text, six.binary_type):
+ text = text.decode('utf-8')
result = translate_client.translate(
text, target_language=target)
print(u'Text: {}'.format(result['input']))
print(u'Translation: {}'.format(result['translatedText']))
print(u'Detected source language: {}'.format(
result['detectedSourceLanguage']))
+ result['translatedText'] = result['translatedText'].replace("&lt;", "<")
+ result['translatedText'] = result['translatedText'].replace("&gt;", ">")
+ result['translatedText'] = result['translatedText'].replace("&#39;", "'")
+ result['translatedText'] = result['translatedText'].replace("&quot;", '"')
+ result['translatedText'] = result['translatedText'].replace("<@! ", "<@!")
+ result['translatedText'] = result['translatedText'].replace("<# ", "<#")
return result;
class Trans(commands.Cog):
diff --git a/cogs/utils.py b/cogs/utils.py
index b7bc9f3..7a1d79c 100644..100755
--- a/cogs/utils.py
+++ b/cogs/utils.py
@@ -21,12 +21,12 @@ async def reportStuff(self, ctx, message):
channel = self.bot.get_channel(715549209998262322)
embed = discord.Embed(
- title=f"Report from {ctx.message.author.name}",
+ title=f"Report from {ctx.message.author}",
description=f"{message}",
color=ctx.message.author.color, timestamp=ctx.message.created_at)
await channel.send(embed=embed)
- await ctx.send("Report has been submitted")
+ await ctx.author.send("Report has been submitted")
class Utils(commands.Cog):
@@ -134,8 +134,10 @@ class Utils(commands.Cog):
@commands.cooldown(1, 60, commands.BucketType.member)
@commands.command()
async def report(self, ctx, *, message=None):
+ if ctx.message.guild != None:
+ await ctx.message.delete()
if message == None:
- await ctx.send("Please type a report to report (hehe, sounds funny)")
+ await ctx.message.author.send("Please type a report to report (hehe, sounds funny)")
else:
await reportStuff(self, ctx, message)