summaryrefslogtreecommitdiffstats
path: root/hyperkitty/views
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-02-12 13:29:32 +0100
committerAurélien Bompard <aurelien@bompard.org>2013-02-12 13:29:32 +0100
commitccafc51ade9536046aeb096b04b069f17874fab4 (patch)
treee93564b45884debca14d561552a96a980819943d /hyperkitty/views
parent0b0395fe000957b336d0ece6b23af0083a0853ab (diff)
downloadhyperkitty-ccafc51ade9536046aeb096b04b069f17874fab4.tar.gz
hyperkitty-ccafc51ade9536046aeb096b04b069f17874fab4.tar.xz
hyperkitty-ccafc51ade9536046aeb096b04b069f17874fab4.zip
Add a "Create new thread" button
Diffstat (limited to 'hyperkitty/views')
-rw-r--r--hyperkitty/views/forms.py4
-rw-r--r--hyperkitty/views/list.py9
-rw-r--r--hyperkitty/views/message.py75
-rw-r--r--hyperkitty/views/thread.py10
4 files changed, 77 insertions, 21 deletions
diff --git a/hyperkitty/views/forms.py b/hyperkitty/views/forms.py
index 90c288f..3fe6e7e 100644
--- a/hyperkitty/views/forms.py
+++ b/hyperkitty/views/forms.py
@@ -103,3 +103,7 @@ class SearchForm(forms.Form):
class ReplyForm(forms.Form):
message = forms.CharField(widget=forms.Textarea, label="")
+
+class PostForm(forms.Form):
+ subject = forms.CharField()
+ message = forms.CharField(widget=forms.Textarea)
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 6efd0b3..c8439ef 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -52,6 +52,10 @@ if settings.USE_MOCKUPS:
from hyperkitty.lib.mockup import generate_top_author, generate_thread_per_category
+FLASH_MESSAGES = {
+ "sent-ok": "The message has been sent successfully.",
+}
+
def archives(request, mlist_fqdn, year=None, month=None, day=None):
if year is None and month is None:
@@ -132,6 +136,10 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr
# If page is out of range (e.g. 9999), deliver last page of results.
threads = paginator.page(paginator.num_pages)
+ flash_msg = request.GET.get("msg")
+ if flash_msg:
+ flash_msg = FLASH_MESSAGES[flash_msg]
+
context = {
'mlist' : mlist,
'current_page': page_num,
@@ -139,6 +147,7 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr
'threads': threads,
'participants': len(participants),
'months_list': get_months(store, mlist.name),
+ 'flash_msg': flash_msg,
'use_mockups': settings.USE_MOCKUPS,
}
context.update(extra_context)
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index e64ac5f..de2da05 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -23,15 +23,17 @@
import re
import os
import urllib
+import datetime
import django.utils.simplejson as simplejson
from django.http import HttpResponse, HttpResponseRedirect, Http404
-from django.shortcuts import redirect, render
+from django.shortcuts import redirect, render, render_to_response
from django.template import RequestContext, loader
from django.conf import settings
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage
from django.core.urlresolvers import reverse
from django.core.mail import EmailMessage
+from django.core.exceptions import SuspiciousOperation
from django.contrib.auth.decorators import (login_required,
permission_required,
user_passes_test)
@@ -142,26 +144,69 @@ def reply(request, mlist_fqdn, message_id_hash):
TODO: unit tests
"""
if request.method != 'POST':
- return HttpResponse("Something went wrong", content_type="text/plain", status=500)
+ raise SuspiciousOperation
form = ReplyForm(request.POST)
if not form.is_valid():
- return HttpResponse(form.errors.as_text(), content_type="text/plain", status=400)
+ return HttpResponse(form.errors.as_text(),
+ content_type="text/plain", status=400)
store = get_store(request)
- message = store.get_message_by_hash_from_list(mlist_fqdn, message_id_hash)
+ mlist = store.get_list(mlist_fqdn)
+ message = store.get_message_by_hash_from_list(mlist.name, message_id_hash)
subject = message.subject
if not message.subject.lower().startswith("re:"):
subject = "Re: %s" % subject
- reply = EmailMessage(
- subject=subject,
- body=form.cleaned_data["message"],
- from_email='"%s %s" <%s>' %
- (request.user.first_name, request.user.last_name,
- request.user.email),
- to=[mlist_fqdn],
- cc=['aurelien@bompard.org'],
- headers={
+ _send_email(request, mlist, subject, form.cleaned_data["message"], {
"In-Reply-To": "<%s>" % message.message_id,
"References": "<%s>" % message.message_id,
})
- reply.send()
- return HttpResponse("The reply has been sent successfully.", mimetype="text/plain")
+ return HttpResponse("The reply has been sent successfully.",
+ mimetype="text/plain")
+
+
+@login_required
+def new_message(request, mlist_fqdn):
+ """ Sends a new thread-starting message to the list.
+ TODO: unit tests
+ """
+ store = get_store(request)
+ mlist = store.get_list(mlist_fqdn)
+ if request.method == 'POST':
+ form = PostForm(request.POST)
+ if form.is_valid():
+ _send_email(request, mlist, form.cleaned_data['subject'],
+ form.cleaned_data["message"])
+ today = datetime.date.today()
+ redirect_url = reverse(
+ 'archives_with_month', kwargs={
+ "mlist_fqdn": mlist_fqdn,
+ 'year': today.year,
+ 'month': today.month})
+ redirect_url += "?msg=sent-ok"
+ return HttpResponseRedirect(redirect_url)
+ else:
+ form = PostForm()
+ context = {
+ "mlist": mlist,
+ "post_form": form,
+ 'months_list': get_months(store, mlist.name),
+ 'use_mockups': settings.USE_MOCKUPS,
+ }
+ return render_to_response("message_new.html", context,
+ context_instance=RequestContext(request))
+
+
+def _send_email(request, mlist, subject, message, headers={}):
+ if not mlist:
+ # Make sure the list exists to avoid posting to any email addess
+ raise SuspiciousOperation("I don't know this mailing-list")
+ headers["User-Agent"] = "HyperKitty on %s" % request.build_absolute_uri("/")
+ msg = EmailMessage(
+ subject=subject,
+ body=message,
+ from_email='"%s %s" <%s>' %
+ (request.user.first_name, request.user.last_name,
+ request.user.email),
+ to=[mlist.name],
+ headers=headers,
+ )
+ msg.send()
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index c819792..5375bea 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -29,6 +29,7 @@ from django.template import RequestContext, loader
from django.conf import settings
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, InvalidPage
from django.core.urlresolvers import reverse
+from django.core.exceptions import SuspiciousOperation
from django.utils.datastructures import SortedDict
from django.contrib.auth.decorators import (login_required,
permission_required,
@@ -136,8 +137,7 @@ def add_tag(request, mlist_fqdn, threadid):
content_type="text/plain", status=403)
if request.method != 'POST':
- return HttpResponse("Something went wrong here",
- content_type="text/plain", status=500)
+ raise SuspiciousOperation
form = AddTagForm(request.POST)
if not form.is_valid():
@@ -171,8 +171,7 @@ def favorite(request, mlist_fqdn, threadid):
content_type="text/plain", status=403)
if request.method != 'POST':
- return HttpResponse("Something went wrong here",
- content_type="text/plain", status=500)
+ raise SuspiciousOperation
props = dict(list_address=mlist_fqdn, threadid=threadid, user=request.user)
if request.POST["action"] == "add":
@@ -189,7 +188,6 @@ def favorite(request, mlist_fqdn, threadid):
else:
fav.delete()
else:
- return HttpResponse("Something went wrong here",
- content_type="text/plain", status=500)
+ raise SuspiciousOperation
return HttpResponse("success", mimetype='text/plain')