aboutsummaryrefslogtreecommitdiff
path: root/cogs
diff options
context:
space:
mode:
authorAnInternetTroll <lucafulger@gmail.com>2020-06-11 19:22:49 +0000
committerAnInternetTroll <lucafulger@gmail.com>2020-06-11 19:22:49 +0000
commitb889beaa39fb60adb81c422fc9ccc30b3ebd8293 (patch)
tree8ff8e57fbadd068cafecca38879bf7bc126d9d42 /cogs
parentc13e9c3846b8653deadb5fe6bb8ae8701c52e5fe (diff)
downloadsteve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.tar
steve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.tar.gz
steve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.tar.bz2
steve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.tar.lz
steve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.tar.xz
steve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.tar.zst
steve-bot-b889beaa39fb60adb81c422fc9ccc30b3ebd8293.zip
minor fixes and !serverinfo
Diffstat (limited to 'cogs')
-rw-r--r--[-rwxr-xr-x]cogs/admin.py0
-rw-r--r--[-rwxr-xr-x]cogs/general.py38
-rw-r--r--[-rwxr-xr-x]cogs/help.py0
-rw-r--r--[-rwxr-xr-x]cogs/logs.py6
-rw-r--r--[-rwxr-xr-x]cogs/player.py0
-rw-r--r--[-rwxr-xr-x]cogs/src.py0
-rw-r--r--[-rwxr-xr-x]cogs/trans.py0
-rw-r--r--[-rwxr-xr-x]cogs/utils.py10
8 files changed, 44 insertions, 10 deletions
diff --git a/cogs/admin.py b/cogs/admin.py
index 3cb7ff8..3cb7ff8 100755..100644
--- a/cogs/admin.py
+++ b/cogs/admin.py
diff --git a/cogs/general.py b/cogs/general.py
index ff60bb7..ccc4b28 100755..100644
--- a/cogs/general.py
+++ b/cogs/general.py
@@ -20,8 +20,6 @@ class General(commands.Cog):
if not user:
user = ctx.message.author
- elif type(user)=="str":
- user = self.bot.get_user(int(user))
# Very very shit
"""
@@ -38,8 +36,12 @@ class General(commands.Cog):
for i in user.roles:
output += i.mention
+ if user.color.value == 0:
+ color = 16777210
+ else:
+ color = user.color
- embed=discord.Embed(title=user.name, description=user.mention, color=user.color, timestamp=ctx.message.created_at)
+ embed=discord.Embed(title=user.name, description=user.mention, color=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")
@@ -54,7 +56,7 @@ class General(commands.Cog):
#os.remove("temp.png")
@commands.command()
- async def coop(self, ctx, user: discord.Member=None):
+ async def coop(self, ctx, *, user: discord.Member=None):
if not user:
user = ctx.message.author
elif type(user)=="str":
@@ -69,5 +71,33 @@ class General(commands.Cog):
await user.add_roles(coop_role)
await ctx.send("You are now in the coop gang")
+ @commands.command()
+ async def serverinfo(self, ctx, guild=None):
+ if not guild:
+ guild = ctx.message.guild
+ else:
+ print(type(guild))
+ guild = self.bot.get_guild(int(guild))
+
+ if guild.owner.color.value == 0:
+ color = 16777210
+ else:
+ color = guild.owner.color
+
+ emojiList = " "
+ for i in guild.emojis:
+ emojiList += str(i) + " "
+
+ embed=discord.Embed(title=guild.name, description=guild.description, color=color, timestamp=ctx.message.created_at)
+ #embed.set_thumbnail(url="attachment://temp.webp")
+ embed.set_thumbnail(url=guild.icon_url)
+ embed.set_image(url=guild.splash_url)
+ embed.add_field(name="Created on", value=guild.created_at.date(), inline=True)
+ embed.add_field(name="Members", value=guild.member_count, inline=True)
+ embed.add_field(name="Emojis", value=emojiList, inline=True)
+ embed.add_field(name="Owner", value=guild.owner.mention, inline=True)
+ embed.set_footer(text=f"ID: {guild.id}")
+ await ctx.send(embed=embed)
+
def setup(bot):
bot.add_cog(General(bot))
diff --git a/cogs/help.py b/cogs/help.py
index 91c9c45..91c9c45 100755..100644
--- a/cogs/help.py
+++ b/cogs/help.py
diff --git a/cogs/logs.py b/cogs/logs.py
index ea3870a..c6f18b5 100755..100644
--- a/cogs/logs.py
+++ b/cogs/logs.py
@@ -10,10 +10,14 @@ class Logs(commands.Cog):
async def on_message_delete(self, message):
if message.guild.id != 574267523869179904:
return
+ if message.author.color.value == 0:
+ color = 16777210
+ else:
+ color = message.author.color
channel = self.bot.get_channel(718187032869994686)
embed = discord.Embed(
title='Deleted Message',
- color=message.author.color,
+ color=message,
timestamp=message.created_at
)
embed.add_field(
diff --git a/cogs/player.py b/cogs/player.py
index 5c046a7..5c046a7 100755..100644
--- a/cogs/player.py
+++ b/cogs/player.py
diff --git a/cogs/src.py b/cogs/src.py
index 96bf53c..96bf53c 100755..100644
--- a/cogs/src.py
+++ b/cogs/src.py
diff --git a/cogs/trans.py b/cogs/trans.py
index 2c6ed71..2c6ed71 100755..100644
--- a/cogs/trans.py
+++ b/cogs/trans.py
diff --git a/cogs/utils.py b/cogs/utils.py
index 5492c14..c708e54 100755..100644
--- a/cogs/utils.py
+++ b/cogs/utils.py
@@ -67,8 +67,8 @@ class Utils(commands.Cog):
randomness = randint(1, 10)
if randomness <= 1:
totalEyes += 1
-
- await ctx.send(f"{ctx.message.author.display_name} -> your seed is a {totalEyes} eye")
+ discname = ctx.message.author.name.replace("@", "@ ")
+ await ctx.send(f"{discname} -> your seed is a {totalEyes} eye")
@findseed.error
async def findseed_handler(self,ctx,error):
@@ -98,11 +98,11 @@ class Utils(commands.Cog):
"waaakeee uuuppp!",
"are they dead or asleep? I can't tell.",
"wake up, muffin head",
- "psst... coffeeee \:D"
+ "psst... coffeeee \\:D"
]
# Set up initial message
- msg = f"{ctx.message.author.display_name} -> "
+ msg = f"{ctx.message.author.name} -> "
# Optional TODO: Create non-normal distribution
sleepHrs = randint(0, 24)
@@ -115,7 +115,7 @@ class Utils(commands.Cog):
# Add extra comment based on number of sleepHrs
if sleepHrs == 0:
- msg += "- nice try \:D"
+ msg += "- nice try \\:D"
elif sleepHrs <= 5:
msg += f"- {lessSleepMsg[randint(0, len(lessSleepMsg) - 1)]}"
elif sleepHrs >= 10: