From: Vincent Le Gallic Date: Sun, 18 Jun 2017 13:34:31 +0000 (+0200) Subject: Merge zamok:/home/beauseigneur/salesman X-Git-Url: http://gitweb.pimeys.fr/?p=bots%2Fsalesman.git;a=commitdiff_plain;h=e0b0ab6ab3a2e98dd023dce0483285151294f524;hp=17572485a4d4bc0e09f12af766f29baf204e2397 Merge zamok:/home/beauseigneur/salesman --- diff --git a/config.py b/config.py index 6e4905a..89e1a46 100644 --- a/config.py +++ b/config.py @@ -6,7 +6,7 @@ pseudo="salesman" chanlist=["#bot","#flood"] play_channels=["#flood"] stay_channels=["#flood","#bot"] -overops=["[20-100]","[20-100]_"] +overops=["[20-100]"] ops=["PEB","Petite-Peste"] report_bugs_to = ["[20-100]"] @@ -47,9 +47,9 @@ leave_messages=[u"On continuera à jouer plus tard ;)"] # temps au bout duquel, si personne n'a parlé, on se tait idle_time=20*60 # liste des bots, qui ne sont pas considérés comme de l'activité -idle_bots=["deconnaisseur","Basile","historien","hung","salesman","Shadobot","Wen","___","Sanctuary","Saturnin","Flo"] +idle_bots=["deconnaisseur","Basile","historien","hung","salesman","Shadobot","Wen","___","Sanctuary","Saturnin","Flo","marcel"] idle_messages=["^(pan|bang|bim)$"] #: bad guys -blacklisted_masks = [("*!leger@zamok.crans.org", None), ("*!*@alpha.jben.info", None)] +blacklisted_masks = [("*!leger@zamok.crans.org", None), ("*!*@alpha.jben.info", None), ("BC!*@*", None)] diff --git a/salesman.py b/salesman.py index d7e0044..12394a5 100755 --- a/salesman.py +++ b/salesman.py @@ -129,9 +129,9 @@ class Salesman(ircbot.SingleServerIRCBot): def start_enigme(self,serv,channel,token=None): # On reste silencieux si lechan n'est pas actif - if not self.is_active(channel): - serv.execute_delayed(config.ttrig*5,self.start_enigme,(serv,channel,token)) - return + #if not self.is_active(channel): + # serv.execute_delayed(config.ttrig*5,self.start_enigme,(serv,channel,token)) + # return if self.play_status[channel][0]==0 and channel in self.play_channels: ok="skip" if token==self.play_status[channel][-1]: