LimnoriaPlugins/TripSit
6
0
Fork 0
Code Issues 5 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: LimnoriaPlugins:f53ddf450c1b1531e62ea97b7834d5a9c195d0d7
Branches Tags
LimnoriaPlugins:master
LimnoriaPlugins:feat/web
LimnoriaPlugins:enhance/listdose_formatting
LimnoriaPlugins:cleanup
LimnoriaPlugins:timeformatting
..
compare: LimnoriaPlugins:816ce22eca20ce1b152c09bab302801aa2264874
Branches Tags
LimnoriaPlugins:feat/web
LimnoriaPlugins:master
LimnoriaPlugins:enhance/listdose_formatting
LimnoriaPlugins:cleanup
LimnoriaPlugins:timeformatting

No commits in common. "f53ddf450c1b1531e62ea97b7834d5a9c195d0d7" and "816ce22eca20ce1b152c09bab302801aa2264874" have entirely different histories.
f53ddf450c ... 816ce22eca

1 changed files with 13 additions and 28 deletions
Show Stats Expand all files Collapse all files

41
plugin.py
View File

@ -260,33 +260,23 @@ class Tripsit(callbacks.Plugin):
else: else:
irc.error(f'No doses saved for {nick}') irc.error(f'No doses saved for {nick}')
@wrap([getopts({'drug': 'something'}), 'positiveInt']) @wrap(['positiveInt'])
def listdose(self, irc, msg, args, opts, history): def listdose(self, irc, msg, args, history):
"""[--drug <drug>] <n> """<n>
retrieves your <n> last logged doses
Retrieves your <n> last logged doses, optionally filtered by drug.
""" """
if history > 20: if history > 20:
irc.error("You can't retrieve more than 20 doses.") irc.error("you can't retrieve more than 20 doses")
return return
opts = dict(opts)
drug_filter = opts.get('drug')
nick = msg.nick nick = msg.nick
if nick in self.db: if nick in self.db:
doses = self.db[nick]['doses']
if drug_filter:
doses = [dose for dose in doses if dose['drug'].lower() == drug_filter.lower()]
if len(doses) == 0:
irc.error(f"No doses found for drug '{drug_filter}'.")
return
try: try:
irc.reply(f"Your last {history} dose(s) are:", private=True) rangecheck = self.db[nick]['doses'][-int(history)]
for number in range(history, 0, -1): irc.reply(f"Your last {history} doses logged are:", private=True)
lastdose = doses[-number] for number in range(history,0,-1):
lastdose = self.db[nick]['doses'][-int(number)]
dose = lastdose['dose'] dose = lastdose['dose']
drug = lastdose['drug'] drug = lastdose['drug']
method = lastdose['method'] method = lastdose['method']
@ -296,22 +286,17 @@ class Tripsit(callbacks.Plugin):
time = datetime.datetime.now(tz=tz) time = datetime.datetime.now(tz=tz)
since_dose = time - dose_time since_dose = time - dose_time
since_dose_seconds = since_dose.total_seconds() since_dose_seconds = since_dose.total_seconds()
if number == 1: if number == 1:
number = "The" number = "The"
else: else:
number = num2words(number, to='ordinal') number = num2words(number, to='ordinal')
re = utils.str.format("::> %i last dose: Amount: %s of \x02%s\x0F via %s | datetime: %s %s | timedelta %T ", number, dose, drug, method, dose_time.strftime("%c"), timezone, since_dose_seconds)
re = utils.str.format(
"::> %s last dose: Amount: %s of \x02%s\x0F via %s | datetime: %s %s | timedelta %T",
number, dose, drug, method, dose_time.strftime("%c"), timezone, since_dose_seconds
)
irc.reply(re, private=True) irc.reply(re, private=True)
except IndexError: except IndexError:
irc.error("You haven't logged that many doses.") irc.error("You haven't logged that many doses")
return return
else: else:
irc.error(f"No doses saved for {nick}.") irc.error(f'No doses saved for {nick}')
@wrap(["something"]) @wrap(["something"])
def grepdose(self, irc, msg, args, drug): def grepdose(self, irc, msg, args, drug):