From b8b44b8fd894251632576696e8ab4c4e3ea2d0ca Mon Sep 17 00:00:00 2001 From: Matthew Vernon Date: Thu, 8 Nov 2018 19:00:48 +0000 Subject: [PATCH] Adjust url-observation, per chiark.irc discussion Servus now describes URLs without adjective, as these were felt to be discouraging. Further, it won't mention a URL within 5 minutes of its previous mention. Time is now given as a timestamp, rather than the "about X minutes/hours ago" --- commands.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/commands.py b/commands.py index 488711a..3442dce 100755 --- a/commands.py +++ b/commands.py @@ -393,13 +393,18 @@ class UrlLog: self.nick=nick self.url=url self.first=time.time() + self.localfirst=time.localtime(self.first) self.count=1 self.lastseen=time.time() self.lastasked=time.time() def recenttime(self): return max(self.lastseen,self.lastasked) def firstmen(self): - return nicetime(time.time()-self.first) + n=time.localtime(time.time()) + s="%d:%d" % (self.localfirst.tm_hour,self.localfirst.tm_min) + if n.tm_yday != self.localfirst.tm_yday: + s+=time.strftime(" on %d %B", n) + return s def urltype(self): z=min(len(urlinfos)-1, self.count-1) return urlinfos[z] @@ -426,12 +431,12 @@ def urlq(bot, cmd, nick, conn, public,urldb): url=canonical_url(urlstring) if (url in urldb): T = urldb[url] - complaint="That's %s URL that was first mentioned %s by %s" % \ - (T.urltype(),T.firstmen(),T.nick) + comment="I saw that URL in scrool, first mentioned by %s at %s" % \ + (T.nick,T.firstmen()) if (public): - complaint=complaint+". Furthermore it defeats the point of this command to use it other than via /msg." + comment=comment+". Furthermore it defeats the point of this command to use it other than via /msg." T.count+=1 - bot.automsg(False,nick,complaint) + bot.automsg(False,nick,comment) T.lastasked=time.time() #URL suppressed, so mention in #urls if urlstring != cmd.split()[1]: #first argument to URL was not the url @@ -455,8 +460,8 @@ def dourl(bot,conn,nick,command,urldb): if urlstring in urldb: T=urldb[urlstring] - message="observes %s URL, first mentioned %s by %s" % \ - (T.urltype(),T.firstmen(),T.nick) + message="saw that URL in scrool, first mentioned by %s at %s" % \ + (T.nick,T.firstmen()) if shibboleth.search(command)==None and \ time.time() - T.lastseen > url_repeat_time: conn.action(bot.channel, message) -- 2.30.2