Chewing_Bever
/
didier
mirror of https://github.com/stijndcl/didier
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug in poke current, fix bug in whois

pull/10/head
Stijn De Clercq 2020-11-22 00:30:26 +01:00
parent cd4dcbaeb5
commit 0085882148
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogs/modCommands.py
View File

@ -170,7 +170,7 @@ class ModCommands(commands.Cog):
created_local = timeFormatters.epochToDate(user.created_at.timestamp()) created_local = timeFormatters.epochToDate(user.created_at.timestamp())
embed.add_field(name="Account Aangemaakt", value="{}\n({} Geleden)".format( embed.add_field(name="Account Aangemaakt", value="{}\n({} geleden)".format(
created_local["date"], timeFormatters.diffYearBasisString(round(created_local["dateDT"].timestamp())) created_local["date"], timeFormatters.diffYearBasisString(round(created_local["dateDT"].timestamp()))
), inline=False) ), inline=False)

2
cogs/poke.py
View File

@ -58,7 +58,7 @@ class Poke(commands.Cog):
@poke.command(name="Current") @poke.command(name="Current")
async def current(self, ctx): async def current(self, ctx):
p = poke.get() p = poke.get()
pokedTimeStamp = datetime.datetime.fromtimestamp(int(p[1])) pokedTimeStamp = timeFormatters.epochToDate(int(p[1]))["dateDT"]
timeString = timeFormatters.diffDayBasisString(pokedTimeStamp) timeString = timeFormatters.diffDayBasisString(pokedTimeStamp)
await ctx.send("Het is al **{}** aan **{}**.".format(timeString, self.utilsCog.getDisplayName(ctx, p[0]))) await ctx.send("Het is al **{}** aan **{}**.".format(timeString, self.utilsCog.getDisplayName(ctx, p[0])))

9
functions/timeFormatters.py
View File

@ -82,7 +82,6 @@ def diffYearBasisString(timestamp):
timestamp = epochToDate(timestamp)["dateDT"] timestamp = epochToDate(timestamp)["dateDT"]
now = dateTimeNow() now = dateTimeNow()
diff = dateutil.relativedelta.relativedelta(now, timestamp) diff = dateutil.relativedelta.relativedelta(now, timestamp)
timeList = [] timeList = []
# Don't add obsolete info such as "0 days", ... # Don't add obsolete info such as "0 days", ...
@ -98,10 +97,18 @@ def diffYearBasisString(timestamp):
if diff.days != 0: if diff.days != 0:
timeList.append("{} {}".format(diff.days, getPlural(diff.days, "days"))) timeList.append("{} {}".format(diff.days, getPlural(diff.days, "days")))
timeString = ""
if not timeList:
return "Minder dan een dag"
if len(timeList) > 1:
timeString = ", ".join(timeList[:-1]) timeString = ", ".join(timeList[:-1])
if len(timeString) > 0: if len(timeString) > 0:
timeString += " en " timeString += " en "
timeString += timeList[-1] timeString += timeList[-1]
return timeString return timeString