From 8a66d522285941e58b3f532dbd16d7f511e2012f Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@humbughq.com>
Date: Fri, 26 Oct 2012 10:42:03 -0400
Subject: [PATCH] Expose get_old_messages to API

(imported from commit d3b86a049440c54b52d96c27f8925a73496eaffe)
---
 humbug/urls.py  |  1 +
 zephyr/views.py | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/humbug/urls.py b/humbug/urls.py
index 287c662b26..e5b5f7b324 100644
--- a/humbug/urls.py
+++ b/humbug/urls.py
@@ -29,6 +29,7 @@ urlpatterns = patterns('',
     # These are json format views used by the API.  They require an API key.
     url(r'^api/v1/get_profile$', 'zephyr.views.api_get_profile', name='api_get_profile'),
     url(r'^api/v1/get_messages$', 'zephyr.views.api_get_messages', name='api_get_messages'),
+    url(r'^api/v1/get_old_messages$', 'zephyr.views.api_get_old_messages', name='api_get_old_messages'),
     url(r'^api/v1/get_public_streams$', 'zephyr.views.api_get_public_streams', name='api_get_public_streams'),
     url(r'^api/v1/get_subscriptions$', 'zephyr.views.api_get_subscriptions', name='api_get_subscriptions'),
     url(r'^api/v1/subscribe$', 'zephyr.views.api_subscribe', name='api_subscribe'),
diff --git a/zephyr/views.py b/zephyr/views.py
index b92e5c2de8..7795237f93 100644
--- a/zephyr/views.py
+++ b/zephyr/views.py
@@ -237,6 +237,17 @@ def update_pointer_backend(request, user_profile):
 
 @login_required_json_view
 def json_get_old_messages(request):
+    user_profile = UserProfile.objects.get(user=request.user)
+    return get_old_messages_backend(request, user_profile=user_profile,
+                                    apply_markdown=True)
+
+@login_required_api_view
+def api_get_old_messages(request, user_profile, handler):
+    return get_old_messages_backend(request, user_profile=user_profile,
+                                    apply_markdown=(request.POST.get("apply_markdown") is not None))
+
+def get_old_messages_backend(request, user_profile=None,
+                             apply_markdown=True):
     if not ('start' in request.POST):
         return json_error("Missing 'start' parameter")
     if not ('which in request.post'):
@@ -248,13 +259,6 @@ def json_get_old_messages(request):
     which = request.POST.get("which")
     number = int(request.POST.get("number"))
 
-    user_profile = UserProfile.objects.get(user=request.user)
-
-    return json_success(get_old_messages_backend(start, which, number, user_profile,
-                                                 apply_markdown=True))
-
-def get_old_messages_backend(start, which, number, user_profile,
-                             apply_markdown=True):
     query = Message.objects.select_related().filter(usermessage__user_profile = user_profile).order_by('id')
 
     if which == "older":
@@ -275,7 +279,7 @@ def get_old_messages_backend(start, which, number, user_profile,
            "result": "success",
            "msg": "",
            'server_generation': SERVER_GENERATION}
-    return ret
+    return json_success(ret)
 
 @asynchronous
 @login_required_json_view