wayfinderak/Geeksbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust gti

Browse Source
This commit is contained in:
Dusty.P 2018-06-02 23:11:21 -08:00
parent 70535d0399
commit cc9a934fe6
2 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exts/imports/utils.py
View File

@ -4,6 +4,7 @@ import asyncio
import discord import discord
from discord.ext.commands.formatter import Paginator from discord.ext.commands.formatter import Paginator
from . import checks from . import checks
import re
class Capturing(list): class Capturing(list):
@ -64,6 +65,11 @@ def to_list_of_str(items, out: list=list(), level=1, recurse=0):
return out return out
def replace_text_ignorecase(in_str: str, old: str, new: str='') -> str:
re_replace = re.compile(re.escape(old), re.IGNORECASE)
return re_replace.sub(f'{new}', in_str)
def paginate(text, maxlen=1990): def paginate(text, maxlen=1990):
paginator = Paginator(prefix='```py', max_size=maxlen+10) paginator = Paginator(prefix='```py', max_size=maxlen+10)
if type(text) == list: if type(text) == list:

48
exts/utils.py
View File

@ -7,7 +7,7 @@ import psutil
from datetime import datetime, timedelta from datetime import datetime, timedelta
import asyncio import asyncio
import async_timeout import async_timeout
from .imports import checks from .imports import checks, utils
import pytz import pytz
import gspread import gspread
from oauth2client.service_account import ServiceAccountCredentials from oauth2client.service_account import ServiceAccountCredentials
@ -31,6 +31,7 @@ invite_match = '(https?://)?(www.)?discord(app.com/(invite|oauth2)|.gg|.io)/[\w\
utils_log = logging.getLogger('utils') utils_log = logging.getLogger('utils')
clock_emojis = ['🕛', '🕐', '🕑', '🕒', '🕓', '🕔', '🕕', '🕖', '🕗', '🕘', '🕙', '🕚'] clock_emojis = ['🕛', '🕐', '🕑', '🕒', '🕓', '🕔', '🕕', '🕖', '🕗', '🕘', '🕙', '🕚']
replace_tzs = {'MST': 'US/Mountain', 'HST': 'US/Hawaii', 'EST': 'US/Eastern'}
class Utils: class Utils:
@ -471,8 +472,12 @@ class Utils:
try: try:
orig_time = copy(time) orig_time = copy(time)
for tz in pytz.all_timezones: for tz in pytz.all_timezones:
if tz.lower() in time.lower(): if any([t.replace(' ', '_') in tz.lower()
time = time.replace(tz, '') or t.replace(' ', '-') in tz.lower()
for t in time.lower().split()]):
time = utils.replace_text_ignorecase(time, old=tz, new='')
if tz in replace_tzs:
tz = replace_tzs['tz']
parsed_tz = pytz.timezone(tz) parsed_tz = pytz.timezone(tz)
break break
else: else:
@ -487,26 +492,25 @@ class Utils:
f'Examples of valid time strings are in my help documentation.\n' \ f'Examples of valid time strings are in my help documentation.\n' \
f'Please try again.' f'Please try again.'
em.colour = discord.Colour.red() em.colour = discord.Colour.red()
try:
out_tz = pytz.timezone(timezone)
except pytz.exceptions.UnknownTimeZoneError:
for tz in pytz.all_timezones:
if timezone.lower() in tz.lower():
out_tz = pytz.timezone(tz)
break
else: else:
try: out_tz = None
out_tz = pytz.timezone(timezone) em.title = 'Unknown Timezone.'
except pytz.exceptions.UnknownTimeZoneError: em.colour = discord.Colour.red()
for tz in pytz.all_timezones: finally:
if timezone.lower() in tz.lower(): if out_tz:
out_tz = pytz.timezone(tz) out_time = in_time.astimezone(out_tz)
break em.add_field(name=f'{clock_emojis[(in_time.hour % 12)]} {in_time.strftime("%c")}',
else: value='input', inline=False)
out_tz = None em.add_field(name=f'{clock_emojis[(out_time.hour % 12)]} {out_time.strftime("%c")}',
em.title = 'Unknown Timezone.' value='output', inline=False)
em.colour = discord.Colour.red() em.colour = self.bot.embed_color
finally:
if out_tz:
out_time = in_time.astimezone(out_tz)
em.add_field(name=f'{clock_emojis[(in_time.hour % 12)]} {in_time.strftime("%c")}',
value='input', inline=False)
em.add_field(name=f'{clock_emojis[(out_time.hour % 12)]} {out_time.strftime("%c")}',
value='output', inline=False)
em.colour = self.bot.embed_color
await ctx.send(embed=em) await ctx.send(embed=em)
@commands.command(name='purge', aliases=['clean', 'erase']) @commands.command(name='purge', aliases=['clean', 'erase'])