conn.notice(nick, "syntax: units arg1 as arg2")
return
if args[1]=='?':
- sin,sout=os.popen2(["units","--verbose",args[0]],"r")
+ sin,sout=os.popen4(["units","--verbose","--",args[0]],"r")
else:
- sin,sout=os.popen2(["units","--verbose",args[0],args[1]],"r")
+ sin,sout=os.popen4(["units","--verbose","--",args[0],args[1]],"r")
sin.close()
res=sout.readlines()
#popen2 doesn't clean up the child properly. Do this by hand
bot.automsg(public,nick,
"Configuration can only be reloaded by my owner, by /msg.")
-# lose the game and/or install a new trigger word
-def gameq(bot, cmd, nick, conn, public, game):
- #only install a new trigger if it's not too short.
- if len(' '.join(cmd.split()[1:]))>2:
- game.trigger=' '.join(cmd.split()[1:])
- if (time.time()> game.grace):
- if not public:
- if irc_lower(nick) == irc_lower(bot.owner):
- conn.action(bot.channel,"loses the game!")
- else:
- conn.privmsg(bot.channel,nick+" just lost the game!")
- else:
- if not public:
- conn.notice(nick, "It's a grace period!")
- game.grace=time.time()+60*20 #20 minutes' grace
- game.losetime=time.time()+random.randrange(game.minlose,game.maxlose)
- conn.notice(bot.owner, str(game.losetime-time.time())+" "+game.trigger)
-
# quit irc
def quitq(bot, cmd, nick, conn, public):
if irc_lower(nick) == irc_lower(bot.owner):
return urlcomplaints[z]
#(?:) is a regexp that doesn't group
-urlre = re.compile("((?:(?:http)|(?:nsfw))s?://[^ ]+)( |$)")
+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 contemporary","an interesting","a fascinating","an overused","a vastly overused"]
### Deal with /msg bot url or ~url in channel
T=urldb[urlstring]
message="observes %s URL, first mentioned %s by %s" % \
(T.urltype(),T.firstmen(),T.nick)
- conn.action(bot.channel, message)
+ if shibboleth.search(command)==None:
+ conn.action(bot.channel, message)
T.lastseen=time.time()
T.count+=1
else:
urlstring.replace(middle,"/hi/")
return urlstring
+# automatically make nsfw urls for you and pass them on to url
+def nsfwq(bot,cmd,nick,conn,public,urldb):
+ if (not hturlre.search(cmd)):
+ bot.automsg(False,nick,"Please use 'nsfw' only with http or https URLs")
+ return
+ newcmd=hturlre.sub(nsfwify,cmd)
+ urlq(bot,newcmd,nick,conn,public,urldb)
+
+def nsfwify(match):
+ a,b,c=match.groups()
+ return 'nsfw'+b+c
#get tweet text
def twitterq(bot,cmd,nick,conn,public,twitapi):