Fixed layout on admin request list
This commit is contained in:
parent
e5f8d513f1
commit
6e5aaa0266
14
.idea/Geeksbot.iml
generated
Normal file
14
.idea/Geeksbot.iml
generated
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="PYTHON_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$" />
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
<orderEntry type="library" name="R User Library" level="project" />
|
||||||
|
<orderEntry type="library" name="R Skeletons" level="application" />
|
||||||
|
</component>
|
||||||
|
<component name="TestRunnerService">
|
||||||
|
<option name="projectConfiguration" value="py.test" />
|
||||||
|
<option name="PROJECT_TEST_RUNNER" value="py.test" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
7
.idea/dictionaries/Dustin_Pianalto.xml
generated
Normal file
7
.idea/dictionaries/Dustin_Pianalto.xml
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<component name="ProjectDictionaryState">
|
||||||
|
<dictionary name="Dustin.Pianalto">
|
||||||
|
<words>
|
||||||
|
<w>rcon</w>
|
||||||
|
</words>
|
||||||
|
</dictionary>
|
||||||
|
</component>
|
||||||
7
.idea/misc.xml
generated
Normal file
7
.idea/misc.xml
generated
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="JavaScriptSettings">
|
||||||
|
<option name="languageLevel" value="ES6" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
|
||||||
|
</project>
|
||||||
8
.idea/modules.xml
generated
Normal file
8
.idea/modules.xml
generated
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/Geeksbot.iml" filepath="$PROJECT_DIR$/.idea/Geeksbot.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -336,7 +336,7 @@ class Rcon:
|
|||||||
rcon_connections[server],
|
rcon_connections[server],
|
||||||
steam_ids)
|
steam_ids)
|
||||||
except Exception as e:
|
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())
|
await msg.edit(content=success_msg.strip())
|
||||||
else:
|
else:
|
||||||
for message in messages:
|
for message in messages:
|
||||||
|
|||||||
@ -55,6 +55,7 @@ class Repl:
|
|||||||
except SyntaxError as e:
|
except SyntaxError as e:
|
||||||
return await ctx.send(self.get_syntax_error(e))
|
return await ctx.send(self.get_syntax_error(e))
|
||||||
func = env['func']
|
func = env['func']
|
||||||
|
# noinspection PyBroadException
|
||||||
try:
|
try:
|
||||||
with redirect_stdout(stdout):
|
with redirect_stdout(stdout):
|
||||||
ret = await func()
|
ret = await func()
|
||||||
@ -63,6 +64,7 @@ class Repl:
|
|||||||
await ctx.send('```py\n{}{}\n```'.format(value, traceback.format_exc()))
|
await ctx.send('```py\n{}{}\n```'.format(value, traceback.format_exc()))
|
||||||
else:
|
else:
|
||||||
value = stdout.getvalue()
|
value = stdout.getvalue()
|
||||||
|
# noinspection PyBroadException
|
||||||
try:
|
try:
|
||||||
await ctx.message.add_reaction('✅')
|
await ctx.message.add_reaction('✅')
|
||||||
except Exception:
|
except Exception:
|
||||||
@ -123,6 +125,7 @@ class Repl:
|
|||||||
variables['message'] = response
|
variables['message'] = response
|
||||||
fmt = None
|
fmt = None
|
||||||
stdout = io.StringIO()
|
stdout = io.StringIO()
|
||||||
|
# noinspection PyBroadException
|
||||||
try:
|
try:
|
||||||
with redirect_stdout(stdout):
|
with redirect_stdout(stdout):
|
||||||
result = executor(code, variables)
|
result = executor(code, variables)
|
||||||
|
|||||||
@ -257,10 +257,10 @@ class Utils:
|
|||||||
admin_roles.append(i[j])
|
admin_roles.append(i[j])
|
||||||
for role in admin_roles:
|
for role in admin_roles:
|
||||||
msg = '{0} {1}'.format(msg, discord.utils.get(ctx.guild.roles, id=role).mention)
|
msg = '{0} {1}'.format(msg, discord.utils.get(ctx.guild.roles, id=role).mention)
|
||||||
msg += f"""New Request ID: {request_id}
|
msg += f"New Request ID: {request_id} " \
|
||||||
{ctx.author.mention} has requested assistance:
|
f"{ctx.author.mention} has requested assistance: \n" \
|
||||||
```{request_msg}```
|
f"```{request_msg}``` \n" \
|
||||||
Requested on: {datetime.strftime(ctx.message.created_at, '%Y-%m-%d at %H:%M:%S')} GMT"""
|
f"Requested on: {datetime.strftime(ctx.message.created_at, '%Y-%m-%d at %H:%M:%S')} GMT"
|
||||||
await chan.send(msg)
|
await chan.send(msg)
|
||||||
await ctx.send('The Admin have received your request.')
|
await ctx.send('The Admin have received your request.')
|
||||||
else:
|
else:
|
||||||
@ -299,11 +299,9 @@ class Utils:
|
|||||||
{request[0]:^12}{member.display_name if member else 'None':^20}
|
{request[0]:^12}{member.display_name if member else 'None':^20}
|
||||||
{admin.display_name if admin else 'None':^20}"""
|
{admin.display_name if admin else 'None':^20}"""
|
||||||
em.add_field(name='',
|
em.add_field(name='',
|
||||||
value=f"""```{title}
|
value=f"```{title} \n\n"
|
||||||
|
f"{request[4]}\n\n"
|
||||||
{request[4]}
|
f"Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT```",
|
||||||
|
|
||||||
Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT```""",
|
|
||||||
inline=False)
|
inline=False)
|
||||||
else:
|
else:
|
||||||
em.add_field(name='There are no pending requests for this guild.', value='', inline=False)
|
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])
|
member = discord.utils.get(ctx.guild.members, id=request[1])
|
||||||
em.add_field(name=f"Request ID: {request[0]} Requested By:"
|
em.add_field(name=f"Request ID: {request[0]} Requested By:"
|
||||||
f"{member.display_name if member else 'None'}",
|
f"{member.display_name if member else 'None'}",
|
||||||
value=f"""{request[4]}
|
value=f"{request[4]} \n"
|
||||||
Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT
|
f"Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT\n"
|
||||||
""",
|
"",
|
||||||
inline=False)
|
inline=False)
|
||||||
else:
|
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='',
|
value='',
|
||||||
inline=False)
|
inline=False)
|
||||||
else:
|
else:
|
||||||
@ -339,9 +337,9 @@ class Utils:
|
|||||||
admin = discord.utils.get(ctx.guild.members, id=request[2])
|
admin = discord.utils.get(ctx.guild.members, id=request[2])
|
||||||
em.add_field(name=f"Request ID: {request[0]}"
|
em.add_field(name=f"Request ID: {request[0]}"
|
||||||
f"{' Assigned to: ' + admin.display_name if admin else ''}",
|
f"{' Assigned to: ' + admin.display_name if admin else ''}",
|
||||||
value=f"""{request[4]}
|
value=f"{request[4]}\n"
|
||||||
Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT
|
f"Requested on: {datetime.strftime(request[5], '%Y-%m-%d at %H:%M:%S')} GMT\n"
|
||||||
""",
|
"",
|
||||||
inline=False)
|
inline=False)
|
||||||
else:
|
else:
|
||||||
em.add_field(name='You have no pending Admin Help requests.',
|
em.add_field(name='You have no pending Admin Help requests.',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user