From 9939981daead91d02af4fab5838231fd8c2c16c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9munaire?= <nemunaire@pomail.fr>
Date: Thu, 23 Aug 2012 03:09:42 +0200
Subject: [PATCH] Convert birthday module to V3.2 and fix some bugs

---
 modules/birthday.py  | 47 ++++++++++++++++++++++----------------------
 modules/birthday.xml |  5 ++++-
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/modules/birthday.py b/modules/birthday.py
index c4f3e6b..2cc38a0 100644
--- a/modules/birthday.py
+++ b/modules/birthday.py
@@ -5,11 +5,11 @@ import sys
 from datetime import datetime
 from datetime import date
 
-from module_state import ModuleState
+from xmlparser.node import ModuleState
 
-nemubotversion = 3.0
+nemubotversion = 3.2
 
-def load():
+def load(context):
   global DATAS
   DATAS.setIndex("name", "birthday")
 
@@ -40,47 +40,46 @@ def findName(msg):
   return (matches, name)
 
 
-def parseanswer(msg):
-  if msg.cmd[0] == "anniv":
+def cmd_anniv(msg):
     (matches, name) = findName(msg)
     if len(matches) == 1:
-      name = matches[0]
-      tyd = DATAS.index[name].getDate("born")
-      tyd = datetime(date.today().year, tyd.month, tyd.day)
+        name = matches[0]
+        tyd = DATAS.index[name].getDate("born")
+        tyd = datetime(date.today().year, tyd.month, tyd.day)
 
-      if tyd.day == datetime.today().day and tyd.month == datetime.today().month:
-        msg.send_chn (msg.countdown_format (DATAS.index[name].getDate("born"), "", "C'est aujourd'hui l'anniversaire de %s ! Il a%s. Joyeux anniversaire :)" % (name, "%s")))
-      else:
-        if tyd < datetime.today():
-          tyd = datetime(date.today().year + 1, tyd.month, tyd.day)
+        if tyd.day == datetime.today().day and tyd.month == datetime.today().month:
+            msg.send_chn (msg.countdown_format (DATAS.index[name].getDate("born"), "", "C'est aujourd'hui l'anniversaire de %s ! Il a%s. Joyeux anniversaire :)" % (name, "%s")))
+        else:
+            if tyd < datetime.today():
+                tyd = datetime(date.today().year + 1, tyd.month, tyd.day)
 
-        msg.send_chn (msg.countdown_format (tyd, "Il reste %s avant l'anniversaire de %s !" % ("%s", name), ""))
+            msg.send_chn (msg.countdown_format (tyd, "Il reste %s avant l'anniversaire de %s !" % ("%s", name), ""))
     else:
-      msg.send_chn ("%s: désolé, je ne connais pas la date d'anniversaire de %s. Quand est-il né ?"%(msg.nick, name))
+        msg.send_chn ("%s: désolé, je ne connais pas la date d'anniversaire de %s. Quand est-il né ?"%(msg.nick, name))
     return True
-  elif msg.cmd[0] == "age":
+
+def cmd_age(msg):
     (matches, name) = findName(msg)
     if len(matches) == 1:
-      name = matches[0]
-      d = DATAS.index[name].getDate("born")
+        name = matches[0]
+        d = DATAS.index[name].getDate("born")
 
-      msg.send_chn (msg.countdown_format (d, "", "%s a %s." % (n, "%s")))
+        msg.send_chn (msg.countdown_format (d, "%s va naître dans %s." % (name, "%s"),
+                                               "%s a %s." % (name, "%s")))
     else:
-      msg.send_chn ("%s: désolé, je ne connais pas l'âge de %s. Quand est-il né ?"%(msg.nick, name))
+        msg.send_chn ("%s: désolé, je ne connais pas l'âge de %s. Quand est-il né ?"%(msg.nick, name))
     return True
-  else:
-    return False
 
 def parseask(msg):
   msgl = msg.content.lower ()
   if re.match("^.*(date de naissance|birthday|geburtstag|née? |nee? le|born on).*$", msgl) is not None:
     try:
       extDate = msg.extractDate ()
-      if extDate is None:
+      if extDate is None or extDate.year() > datetime.now().year():
         msg.send_chn ("%s: ta date de naissance ne paraît pas valide..." % (msg.nick))
       else:
         if msg.nick.lower() in DATAS.index:
-          DATAS.index[msg.nick.lower()] = extDate
+          DATAS.index[msg.nick.lower()]["born"] = extDate
         else:
           ms = ModuleState("birthday")
           ms.setAttribute("name", msg.nick.lower())
diff --git a/modules/birthday.xml b/modules/birthday.xml
index ab105ac..e03a15b 100644
--- a/modules/birthday.xml
+++ b/modules/birthday.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0" ?>
-<nemubotmodule name="birthday" />
\ No newline at end of file
+<nemubotmodule name="birthday">
+  <message type="cmd" name="anniv" call="cmd_anniv" />
+  <message type="cmd" name="age" call="cmd_age" />
+</nemubotmodule>