From 2203d52ca156e5b01a4534a1e1a99a0d5dc80968 Mon Sep 17 00:00:00 2001 From: nemesis Date: Wed, 11 Jul 2018 21:42:32 +0200 Subject: [PATCH] verif body --- asmodee.py | 81 +++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/asmodee.py b/asmodee.py index e506928..9cb15d4 100755 --- a/asmodee.py +++ b/asmodee.py @@ -776,48 +776,49 @@ def statistiques(room,event): usrstats1 = 0 usrstats2 = 0 - try: - usrstats1 = stats[room.room_id,user] - except: - usrstats1 = Userstats(room.room_id,user,nick) - try: - usrstats2 = stats[room.room_id,nick] - except: - usrstats2 = Userstats(room.room_id,user,nick) - - # date de la phrase - date = datetime.now() - usrstats1.date = date - usrstats2.date = date - - # recup nb phrases +1, 1 sinon - if (usrstats1.mess >= usrstats2.mess): - usrstats2.mess = usrstats1.mess + 1 - usrstats1.mess = usrstats2.mess - else: - usrstats1.mess = usrstats2.mess + 1 - usrstats2.mess = usrstats1.mess + if ('body' in event['content']): + try: + usrstats1 = stats[room.room_id,user] + except: + usrstats1 = Userstats(room.room_id,user,nick) + try: + usrstats2 = stats[room.room_id,nick] + except: + usrstats2 = Userstats(room.room_id,user,nick) - # recup nb lettres +lettres phrase, lettres phrases sinon - if (usrstats1.char >= usrstats2.char): - usrstats2.char = usrstats1.char + len(event['content']['body']) - usrstats1.char = usrstats2.char - else: - usrstats1.char = usrstats2.char + len(event['content']['body']) - usrstats2.char = usrstats1.char - - # si kapoue, recup nb kapoue +1, 1 sinon - if (re.match(".*KAPOUE|.*[Kk]apoue", event['content']['body'])): - if (usrstats1.kapoue >= usrstats2.kapoue): - usrstats2.kapoue = usrstats1.kapoue + 1 - usrstats1.kapoue = usrstats2.kapoue + # date de la phrase + date = datetime.now() + usrstats1.date = date + usrstats2.date = date + + # recup nb phrases +1, 1 sinon + if (usrstats1.mess >= usrstats2.mess): + usrstats2.mess = usrstats1.mess + 1 + usrstats1.mess = usrstats2.mess else: - usrstats1.kapoue = usrstats2.kapoue + 1 - usrstats2.kapoue = usrstats1.kapoue - - # insertion des objets - stats[room.room_id,user] = usrstats1 - stats[room.room_id,nick] = usrstats2 + usrstats1.mess = usrstats2.mess + 1 + usrstats2.mess = usrstats1.mess + + # recup nb lettres +lettres phrase, lettres phrases sinon + if (usrstats1.char >= usrstats2.char): + usrstats2.char = usrstats1.char + len(event['content']['body']) + usrstats1.char = usrstats2.char + else: + usrstats1.char = usrstats2.char + len(event['content']['body']) + usrstats2.char = usrstats1.char + + # si kapoue, recup nb kapoue +1, 1 sinon + if (re.match(".*KAPOUE|.*[Kk]apoue", event['content']['body'])): + if (usrstats1.kapoue >= usrstats2.kapoue): + usrstats2.kapoue = usrstats1.kapoue + 1 + usrstats1.kapoue = usrstats2.kapoue + else: + usrstats1.kapoue = usrstats2.kapoue + 1 + usrstats2.kapoue = usrstats1.kapoue + + # insertion des objets + stats[room.room_id,user] = usrstats1 + stats[room.room_id,nick] = usrstats2 def last(room,event): global stats