diff --git a/nardco.py b/nardco.py
index 32469c56eb6e7735e7e47397fed9ae19adf6b814..2ce3b21cbc76a8a4ef82a19e348c56d13e80d381 100755
--- a/nardco.py
+++ b/nardco.py
@@ -165,120 +165,122 @@ class Boooob(ircbot.SingleServerIRCBot):
originalMessage = message
message = message.lower() # Passe le message en minuscules
split = message.split(" ")
- if "op pls" in message or "op plz" in message:
- serv.mode(canal, "+o "+personne)
- if config.nick in split[0] and ' ou ' in message:
- splt = split[1:]
- idx = splt.index("ou")
- choice = random.randint(0, 1)
- if choice == 0:
- res = splt[:idx]
- else:
- if '?' in splt[-1]:
- res = splt[idx+1:-1]
+
+ if not isCommande(message):
+ if "op pls" in message or "op plz" in message:
+ serv.mode(canal, "+o "+personne)
+ if config.nick in split[0] and ' ou ' in message:
+ splt = split[1:]
+ idx = splt.index("ou")
+ choice = random.randint(0, 1)
+ if choice == 0:
+ res = splt[:idx]
else:
- res = splt[idx+1:]
- serv.privmsg(canal, ' '.join(res) + "!")
-
- # lol of legends
- if " aram " in message:
- people = ["Jara", "Nami"]
- if personne in people:
- if "Jara" in personne:
- serv.privmsg(canal, "TOURBILOL DEBILE MOUHAHAHA")
- if "Nami" in personne:
- serv.privmsg(canal, "Non Nami, ton main n'est pas op ! <3")
- else:
- serv.privmsg(canal, "A l'evidence," + aram() + "est totalement op.")
-
- # les lignes suivantes sont pour le lol
- if "Titch" in personne and "tg" in message:
- #serv.privmsg(canal, "Oui maitre...")
- suple = -1
-
- if "Titch" in personne and "openbar" in message:
- serv.privmsg(canal, "OPEN BAAAAAAR")
- suple = 1
- if "souple" in message and suple == 1:
- serv.privmsg(canal, "et fruité")
- if "fruité" in message and suple == 1:
- serv.privmsg(canal, "et gouleyant")
- if "gouleyant" in message and suple == 1:
- serv.privmsg(canal, "et souple")
-
- if suple == 1 and ("dur" in message or "long" in message or "court" in message or "molle" in message):
- serv.privmsg(canal, "Comme ta bite " + personne + "! ")
- if suple == 1:
- if "aucun lien" in message:
- serv.privmsg(canal, "Je suis fils unique...")
-
- # fonctions de deplacement dans les chann
-
- if "Saltitch" in personne and "goto" in message and config.nick in message:
- f = 0
- for f in range(len(message) - 4):
- if message[f:f + 4] == "goto":
- serv.join("#" + message[f + 5:])
- break
- if "Saltitch" in personne and "leave" in message and config.nick in message:
- serv.part(canal)
-
- if reponse is not None:
- if fuzz.ratio(message, reponse) > 60 and personne not in a_repondu:
- serv.privmsg(canal, personne +
- " a trouvé la reponse : {0} ! Bien joué !".format(reponse))
- reponse = None
- a_repondu = []
- pas_reponse = []
- tour += 1
- if personne in scores.keys():
- scores[personne] += 1
+ if '?' in splt[-1]:
+ res = splt[idx+1:-1]
+ else:
+ res = splt[idx+1:]
+ serv.privmsg(canal, ' '.join(res) + "!")
+
+ # lol of legends
+ if " aram " in message:
+ people = ["Jara", "Nami"]
+ if personne in people:
+ if "Jara" in personne:
+ serv.privmsg(canal, "TOURBILOL DEBILE MOUHAHAHA")
+ if "Nami" in personne:
+ serv.privmsg(canal, "Non Nami, ton main n'est pas op ! <3")
else:
- scores[personne] = 1
-
- if tour == total:
- maxScore = 0
- gagnant = ''
-
- for pseudo in scores.keys():
- if scores[pseudo] > maxScore:
- maxScore = scores[pseudo]
- gagnant = pseudo
- serv.privmsg(
- canal, "{0} a gagné avec un score de {1}".format(gagnant, maxScore))
- scores = {}
- tour = 0
- total = 0
+ serv.privmsg(canal, "A l'evidence," + aram() + "est totalement op.")
+
+ # les lignes suivantes sont pour le lol
+ if "Titch" in personne and "tg" in message:
+ #serv.privmsg(canal, "Oui maitre...")
+ suple = -1
+
+ if "Titch" in personne and "openbar" in message:
+ serv.privmsg(canal, "OPEN BAAAAAAR")
+ suple = 1
+ if "souple" in message and suple == 1:
+ serv.privmsg(canal, "et fruité")
+ if "fruité" in message and suple == 1:
+ serv.privmsg(canal, "et gouleyant")
+ if "gouleyant" in message and suple == 1:
+ serv.privmsg(canal, "et souple")
+
+ if suple == 1 and ("dur" in message or "long" in message or "court" in message or "molle" in message):
+ serv.privmsg(canal, "Comme ta bite " + personne + "! ")
+ if suple == 1:
+ if "aucun lien" in message:
+ serv.privmsg(canal, "Je suis fils unique...")
+
+ # fonctions de deplacement dans les chann
+
+ if "Saltitch" in personne and "goto" in message and config.nick in message:
+ f = 0
+ for f in range(len(message) - 4):
+ if message[f:f + 4] == "goto":
+ serv.join("#" + message[f + 5:])
+ break
+ if "Saltitch" in personne and "leave" in message and config.nick in message:
+ serv.part(canal)
+
+ if reponse is not None:
+ if fuzz.ratio(message, reponse) > 60 and personne not in a_repondu:
+ serv.privmsg(canal, personne +
+ " a trouvé la reponse : {0} ! Bien joué !".format(reponse))
+ reponse = None
+ a_repondu = []
+ pas_reponse = []
+ tour += 1
+ if personne in scores.keys():
+ scores[personne] += 1
+ else:
+ scores[personne] = 1
+
+ if tour == total:
+ maxScore = 0
+ gagnant = ''
+
+ for pseudo in scores.keys():
+ if scores[pseudo] > maxScore:
+ maxScore = scores[pseudo]
+ gagnant = pseudo
+ serv.privmsg(
+ canal, "{0} a gagné avec un score de {1}".format(gagnant, maxScore))
+ scores = {}
+ tour = 0
+ total = 0
+ else:
+ datas = quizz()
+ reponse = datas['reponse'].lower()
+ choix = datas['choix']
+ question = datas['question']
+ pas_reponse = datas['pas_reponse']
+ serv.privmsg(canal, "Question : {0}".format(question.format('utf8')))
+ serv.privmsg(canal, "Choix: {0}".format(', '.join(choix).format('utf8')))
else:
- datas = quizz()
- reponse = datas['reponse'].lower()
- choix = datas['choix']
- question = datas['question']
- pas_reponse = datas['pas_reponse']
- serv.privmsg(canal, "Question : {0}".format(question.format('utf8')))
- serv.privmsg(canal, "Choix: {0}".format(', '.join(choix).format('utf8')))
- else:
- for mot in pas_reponse:
- if mot.lower() in message and not (personne in a_repondu):
- serv.privmsg(canal, "WRONG, {0}".format(personne))
- a_repondu.append(personne)
-
- if not is_l_heure_de_manger() and should_ban(message):
- serv.privmsg(canal, "PUTAIN ON A DIT NON")
-
- if "di" in message :
- splt = message.split('di')
- messages = []
- if len(splt) > 1 :
- for f in range(len(splt[1:])) :
- messages.append('di'.join(splt[f+1:]))
-
- for f in messages :
- serv.privmsg(canal, f)
- time.sleep(100)
+ for mot in pas_reponse:
+ if mot.lower() in message and not (personne in a_repondu):
+ serv.privmsg(canal, "WRONG, {0}".format(personne))
+ a_repondu.append(personne)
+
+ if not is_l_heure_de_manger() and should_ban(message):
+ serv.privmsg(canal, "PUTAIN ON A DIT NON")
+
+ if "di" in message :
+ splt = message.split('di')
+ messages = []
+ if len(splt) > 1 :
+ for f in range(len(splt[1:])) :
+ messages.append('di'.join(splt[f+1:]))
+
+ for f in messages :
+ serv.privmsg(canal, f)
+ time.sleep(100)
# REDDIT // A COMPLETER
- if isCommande(message):
+ elif isCommande(message):
serv.privmsg("Titch", "{0} : {1}".format(personne, message))
args = message[1:].split(" ")
originalArgs = originalMessage[1:].split(" ")