These are no longer complaints.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Conflicts:
commands.py
def firstmen(self):
return nicetime(time.time()-self.first)
def urltype(self):
def firstmen(self):
return nicetime(time.time()-self.first)
def urltype(self):
- z=min(len(urlcomplaints)-1, self.count-1)
- return urlcomplaints[z]
+ z=min(len(urlinfos)-1, self.count-1)
+ return urlinfos[z]
#(?:) is a regexp that doesn't group
urlre = re.compile(r"((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
hturlre= re.compile(r"(http)(s?://[^ ]+)( |$)")
#matches \bre\:?\s+ before a regexp; (?i)==case insensitive match
shibboleth = re.compile(r"(?i)\bre\:?\s+((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
#(?:) is a regexp that doesn't group
urlre = re.compile(r"((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
hturlre= re.compile(r"(http)(s?://[^ ]+)( |$)")
#matches \bre\:?\s+ before a regexp; (?i)==case insensitive match
shibboleth = re.compile(r"(?i)\bre\:?\s+((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
-urlcomplaints = ["a new",
- "a fascinating",
- "an interesting",
- "a popular"]
+urlinfos = ["a new",
+ "a fascinating",
+ "an interesting",
+ "a popular"]
### Deal with /msg bot url or ~url in channel
def urlq(bot, cmd, nick, conn, public,urldb):
### Deal with /msg bot url or ~url in channel
def urlq(bot, cmd, nick, conn, public,urldb):