nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

extractDate function is now in a separate Python module

Browse source
This commit is contained in:
nemunaire 2014-09-08 02:25:26 +02:00
commit ee14682c4f
4 changed files with 59 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/birthday.py
View file

@ -9,6 +9,7 @@ from datetime import date
from hooks import hook
from tools.countdown import countdown_format
from tools.date import extractDate
from xmlparser.node import ModuleState
nemubotversion = 3.4
@ -88,7 +89,7 @@ def parseask(msg):
res = re.match(r"^(\S+)\s*('s|suis|est|is|was|were)?\s+(birthday|geburtstag|née? |nee? le|born on).*$", msg.text, re.I)
if res is not None:
try:
extDate = msg.extractDate()
extDate = extractDate(msg.text)
if extDate is None or extDate.year > datetime.now().year:
return Response(msg.sender,
"la date de naissance ne paraît pas valide...",

3
modules/events.py
View file

@ -15,6 +15,7 @@ nemubotversion = 3.4
from event import ModuleEvent
from hooks import Hook, hook
from tools.date import extractDate
from tools.countdown import countdown_format, countdown
def help_full ():
@ -198,7 +199,7 @@ def parseask(msg):
texts = re.match("^[^\"]*(avant|après|apres|before|after)?[^\"]*\"([^\"]+)\"[^\"]*((avant|après|apres|before|after)?.*\"([^\"]+)\".*)?$", msg.text, re.I)
if texts is not None and texts.group(3) is not None:
extDate = msg.extractDate()
extDate = extractDate(msg.text)
if extDate is None or extDate == "":
raise IRCException("la date de l'événement est invalide !")