1.1 --- a/actions/PostMessage.py Sun Jun 02 01:34:19 2013 +0200
1.2 +++ b/actions/PostMessage.py Sun Jun 02 16:17:37 2013 +0200
1.3 @@ -8,11 +8,9 @@
1.4
1.5 from MoinMoin.Page import Page
1.6 from MoinMoin.PageEditor import PageEditor
1.7 -from MoinMoin import wikiutil
1.8 from MoinSupport import getMetadata, writeHeaders
1.9 -from MoinMessage import Message, is_collection, to_replace, to_store
1.10 +from MoinMessage import is_collection, to_replace, to_store
1.11 from MoinMessageSupport import MoinMessageAction
1.12 -import time
1.13
1.14 Dependencies = ['pages']
1.15
1.16 @@ -20,38 +18,12 @@
1.17
1.18 "A posted message handler."
1.19
1.20 - def handle_message_content(self, content):
1.21 + def handle_message_object(self, message):
1.22
1.23 - "Handle the given message 'content'."
1.24 + "Handle the given 'message' object."
1.25
1.26 request = self.request
1.27
1.28 - # Interpret the content as one or more updates.
1.29 -
1.30 - message = Message()
1.31 - message.handle_message(content)
1.32 -
1.33 - # Test any date against the page or message store.
1.34 -
1.35 - if message.date:
1.36 - store_date = time.gmtime(self.store.mtime())
1.37 - page_date = time.gmtime(wikiutil.version2timestamp(self.page.mtime_usecs()))
1.38 - last_date = max(store_date, page_date)
1.39 -
1.40 - # Reject messages older than the page date.
1.41 -
1.42 - if message.date < last_date:
1.43 - writeHeaders(request, "text/plain", getMetadata(self.page), "403 Forbidden")
1.44 - request.write("The message is too old: %s versus %s." % (message.date, last_date))
1.45 - return
1.46 -
1.47 - # Reject messages without dates if so configured.
1.48 -
1.49 - elif getattr(request.cfg, "moinmessage_reject_messages_without_dates", True):
1.50 - writeHeaders(request, "text/plain", getMetadata(self.page), "403 Forbidden")
1.51 - request.write("The message has no date information.")
1.52 - return
1.53 -
1.54 # Handle each update.
1.55
1.56 for update in message.updates: