diff --git a/.idea/Geeksbot.iml b/.idea/Geeksbot.iml
new file mode 100644
index 0000000..8bdd4a0
--- /dev/null
+++ b/.idea/Geeksbot.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dictionaries/Dustin_Pianalto.xml b/.idea/dictionaries/Dustin_Pianalto.xml
new file mode 100644
index 0000000..60e61e1
--- /dev/null
+++ b/.idea/dictionaries/Dustin_Pianalto.xml
@@ -0,0 +1,7 @@
+
+
+
+ rcon
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..3999087
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..6fc5404
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/exts/rcon.py b/exts/rcon.py
index f254733..f1af0d5 100644
--- a/exts/rcon.py
+++ b/exts/rcon.py
@@ -336,7 +336,7 @@ class Rcon:
rcon_connections[server],
steam_ids)
except Exception as e:
- success_msg = '{0}\n{1}'.format(success_msg, e.strip())
+ success_msg = '{0}\n{1}'.format(success_msg, e)
await msg.edit(content=success_msg.strip())
else:
for message in messages:
diff --git a/exts/repl.py b/exts/repl.py
index 8156c38..e64c3b5 100644
--- a/exts/repl.py
+++ b/exts/repl.py
@@ -55,6 +55,7 @@ class Repl:
except SyntaxError as e:
return await ctx.send(self.get_syntax_error(e))
func = env['func']
+ # noinspection PyBroadException
try:
with redirect_stdout(stdout):
ret = await func()
@@ -63,6 +64,7 @@ class Repl:
await ctx.send('```py\n{}{}\n```'.format(value, traceback.format_exc()))
else:
value = stdout.getvalue()
+ # noinspection PyBroadException
try:
await ctx.message.add_reaction('✅')
except Exception:
@@ -123,6 +125,7 @@ class Repl:
variables['message'] = response
fmt = None
stdout = io.StringIO()
+ # noinspection PyBroadException
try:
with redirect_stdout(stdout):
result = executor(code, variables)
diff --git a/exts/utils.py b/exts/utils.py
index 38525c5..d665be1 100644
--- a/exts/utils.py
+++ b/exts/utils.py
@@ -257,10 +257,10 @@ class Utils:
admin_roles.append(i[j])
for role in admin_roles:
msg = '{0} {1}'.format(msg, discord.utils.get(ctx.guild.roles, id=role).mention)
- msg += f"""New Request ID: {request_id}
- {ctx.author.mention} has requested assistance:
- ```{request_msg}```
- Requested on: {datetime.strftime(ctx.message.created_at, '%Y-%m-%d at %H:%M:%S')} GMT"""
+ msg += f"New Request ID: {request_id} " \
+ f"{ctx.author.mention} has requested assistance: \n" \
+ f"```{request_msg}``` \n" \
+ f"Requested on: {datetime.strftime(ctx.message.created_at, '%Y-%m-%d at %H:%M:%S')} GMT"
await chan.send(msg)
await ctx.send('The Admin have received your request.')
else:
@@ -299,11 +299,9 @@ class Utils:
{request[0]:^12}{member.display_name if member else 'None':^20}
{admin.display_name if admin else 'None':^20}"""
em.add_field(name='',
- value=f"""```{title}
-
- {request[4]}
-
- Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT```""",
+ value=f"```{title} \n\n"
+ f"{request[4]}\n\n"
+ f"Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT```",
inline=False)
else:
em.add_field(name='There are no pending requests for this guild.', value='', inline=False)
@@ -319,12 +317,12 @@ class Utils:
member = discord.utils.get(ctx.guild.members, id=request[1])
em.add_field(name=f"Request ID: {request[0]} Requested By:"
f"{member.display_name if member else 'None'}",
- value=f"""{request[4]}
- Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT
- """,
+ value=f"{request[4]} \n"
+ f"Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT\n"
+ "",
inline=False)
else:
- em.add_field(name=f'There are no pending requests for {assigned_to.display_name} this guild.',
+ em.add_field(name=f'There are no pending requests for {assigned_to.display_name} on this guild.',
value='',
inline=False)
else:
@@ -339,9 +337,9 @@ class Utils:
admin = discord.utils.get(ctx.guild.members, id=request[2])
em.add_field(name=f"Request ID: {request[0]}"
f"{' Assigned to: ' + admin.display_name if admin else ''}",
- value=f"""{request[4]}
- Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT
- """,
+ value=f"{request[4]}\n"
+ f"Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT\n"
+ "",
inline=False)
else:
em.add_field(name='You have no pending Admin Help requests.',