diff --git a/src/api/handlers.py b/src/api/handlers.py index 843245c..0e4e0b7 100644 --- a/src/api/handlers.py +++ b/src/api/handlers.py @@ -1,43 +1,11 @@ from django.core.cache import cache -from django.db import IntegrityError -from django.core.exceptions import ObjectDoesNotExist -from django.contrib.auth.decorators import login_required from piston.utils import rc from piston.handler import BaseHandler from colab.deprecated import solrutils -from super_archives.models import Message, PageHit - - -class VoteHandler(BaseHandler): - allowed_methods = ('GET', 'POST', 'DELETE') - - def create(self, request, message_id): - if not request.user.is_authenticated(): - return rc.FORBIDDEN - - try: - Message.objects.get(id=message_id).vote(request.user) - except IntegrityError: - return rc.DUPLICATE_ENTRY - - return rc.CREATED - - def read(self, request, message_id): - return Message.objects.get(id=message_id).votes_count() - - def delete(self, request, message_id): - if not request.user.is_authenticated(): - return rc.FORBIDDEN - - try: - Message.objects.get(id=message_id).unvote(request.user) - except ObjectDoesNotExist: - return rc.NOT_HERE - - return rc.DELETED +from super_archives.models import PageHit class CountHandler(BaseHandler): diff --git a/src/api/urls.py b/src/api/urls.py index f430c4f..45ac54d 100644 --- a/src/api/urls.py +++ b/src/api/urls.py @@ -2,15 +2,15 @@ from django.conf.urls import patterns, include, url from piston.resource import Resource -from .handlers import VoteHandler, CountHandler, SearchHandler +from .handlers import CountHandler, SearchHandler +from .views import VoteView -vote_handler = Resource(VoteHandler) count_handler = Resource(CountHandler) search_handler = Resource(SearchHandler) urlpatterns = patterns('', - url(r'message/(?P\d+)/vote$', vote_handler), + url(r'message/(?P\d+)/vote$', VoteView.as_view()), url(r'hit/$', count_handler), url(r'search/$', search_handler), ) diff --git a/src/api/views.py b/src/api/views.py new file mode 100644 index 0000000..d92b4f8 --- /dev/null +++ b/src/api/views.py @@ -0,0 +1,45 @@ + +from django import http +from django.db import IntegrityError +from django.views.generic import View +from django.core.exceptions import ObjectDoesNotExist + + +from super_archives.models import Message + + +class VoteView(View): + + http_method_names = [u'get', u'put', u'delete', u'head'] + + def put(self, request, msg_id): + if not request.user.is_authenticated(): + return http.HttpResponseForbidden() + + try: + Message.objects.get(id=msg_id).vote(request.user) + except IntegrityError: + # 409 Conflict + # used for duplicated entries + return http.HttpResponse(status=409) + + # 201 Created + return http.HttpResponse(status=201) + + def get(self, request, msg_id): + votes = Message.objects.get(id=msg_id).votes_count() + return http.HttpResponse(votes, content_type='application/json') + + def delete(self, request, msg_id): + if not request.user.is_authenticated(): + return http.HttpResponseForbidden() + + try: + Message.objects.get(id=msg_id).unvote(request.user) + except ObjectDoesNotExist: + return http.HttpResponseGone() + + # 204 No Content + # empty body, as per RFC2616. + # object deleted + return http.HttpResponse(status=204) diff --git a/src/colab/deprecated/templates/base.html b/src/colab/deprecated/templates/base.html index 637fe67..59f6719 100644 --- a/src/colab/deprecated/templates/base.html +++ b/src/colab/deprecated/templates/base.html @@ -2,7 +2,7 @@ {% load i18n browserid conversejs gravatar %} - + @@ -14,6 +14,7 @@ + diff --git a/src/colab/static/css/screen.css b/src/colab/static/css/screen.css index b9d45d8..0e91354 100644 --- a/src/colab/static/css/screen.css +++ b/src/colab/static/css/screen.css @@ -250,33 +250,26 @@ ul.unstyled-list .glyphicon-chevron-right { margin-top: 1em; } -.plus { - border: 1px dotted #ddd; - margin: 0; +.email-message pre { + border: 0; + background-color: #fff; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; } -.plus span { +.email-message .user-fullname { vertical-align: middle; - height: 40px; - line-height: 40px; - font-size: 150%; - font-weight: bold; - color: #0a0; } -.plus img { - vertical-align: middle; - cursor: pointer; - margin-top: 8px; - margin-right: 20px; +.email-message .panel-heading img { + margin-right: 10px; } -.plus img:hover { - opacity: 0.8; +.email-message .panel-heading .date { + margin-right: 10px; } -.no-margin { - margin: 0; +.email-message .panel-heading { + padding: 10px 0; } .selected .glyphicon-remove { diff --git a/src/colab/static/js/base.js b/src/colab/static/js/base.js index 2743a8d..0deb2b3 100644 --- a/src/colab/static/js/base.js +++ b/src/colab/static/js/base.js @@ -1,63 +1,3 @@ - -function vote_callback(msg_id, step) { - return function() { - jQuery('#msg-' + msg_id + ' .plus span').text(function(self, count) { - return parseInt(count) + step; - }); - jQuery('#msg-' + msg_id + ' .minus').toggleClass('hide'); - jQuery('#vote-notification').addClass('hide'); - } -} - -function get_vote_ajax_dict(msg_id, type_) { - if (type_ === 'DELETE') { - step = -1; - } else if (type_ === 'POST') { - step = 1; - } else { - return {}; - } - - return { - url: "/api/message/" + msg_id + "/vote", - type: type_, - success: vote_callback(msg_id, step), - error: function (jqXHR, textStatus, errorThrown) { - - error_msg = 'Seu voto não foi computado.' - if (jqXHR.status === 401) { - error_msg += ' Você deve estar autenticado para votar.'; - } else { - error_msg += ' Erro desconhecido ao tentando votar.'; - } - - jQuery('#vote-notification').html(error_msg).removeClass('hide'); - scroll(0, 0); - } - } -} - -function vote(msg_id) { - jQuery.ajax(get_vote_ajax_dict(msg_id, 'POST')); -} - -function unvote(msg_id) { - jQuery.ajax(get_vote_ajax_dict(msg_id, 'DELETE')); -} - -jQuery(document).ready(function() { - jQuery('.email_message').each(function() { - var msg_id = this.getAttribute('id').split('-')[1]; - jQuery('.plus img', this).bind('click', function() { - vote(msg_id); - }); - jQuery('.minus a', this).bind('click', function() { - unvote(msg_id); - return false; - }); - }); -}); - function pagehit(path_info) { jQuery.ajax({ url: '/api/hit/', diff --git a/src/colab/static/third-party/jquery.cookie.js b/src/colab/static/third-party/jquery.cookie.js new file mode 100755 index 0000000..3fb201c --- /dev/null +++ b/src/colab/static/third-party/jquery.cookie.js @@ -0,0 +1,90 @@ +/*! + * jQuery Cookie Plugin v1.3.1 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2013 Klaus Hartl + * Released under the MIT license + */ +(function ($, document, undefined) { + + var pluses = /\+/g; + + function raw(s) { + return s; + } + + function decoded(s) { + return unRfc2068(decodeURIComponent(s.replace(pluses, ' '))); + } + + function unRfc2068(value) { + if (value.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape + value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + return value; + } + + function fromJSON(value) { + return config.json ? JSON.parse(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // write + if (value !== undefined) { + options = $.extend({}, config.defaults, options); + + if (value === null) { + options.expires = -1; + } + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + value = config.json ? JSON.stringify(value) : String(value); + + return (document.cookie = [ + encodeURIComponent(key), '=', config.raw ? value : encodeURIComponent(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // read + var decode = config.raw ? raw : decoded; + var cookies = document.cookie.split('; '); + var result = key ? null : {}; + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = decode(parts.join('=')); + + if (key && key === name) { + result = fromJSON(cookie); + break; + } + + if (!key) { + result[name] = fromJSON(cookie); + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) !== null) { + $.cookie(key, null, options); + return true; + } + return false; + }; + +})(jQuery, document); diff --git a/src/super_archives/models.py b/src/super_archives/models.py index f9bae6c..49821fc 100644 --- a/src/super_archives/models.py +++ b/src/super_archives/models.py @@ -26,21 +26,24 @@ class PageHit(models.Model): class EmailAddress(models.Model): - user = models.ForeignKey(User, null=True, related_name='emails') + user = models.ForeignKey(User, null=True, related_name='emails') address = models.EmailField(unique=True) real_name = models.CharField(max_length=64, blank=True, db_index=True) md5 = models.CharField(max_length=32, null=True) - + def save(self, *args, **kwargs): self.md5 = md5(self.address).hexdigest() super(EmailAddress, self).save(*args, **kwargs) - + def get_full_name(self): if self.user and self.user.get_full_name(): return self.user.get_full_name() elif self.real_name: return self.real_name + def get_full_name_or_anonymous(self): + return self.get_full_name() or _('Anonymous') + def __unicode__(self): return '"%s" <%s>' % (self.get_full_name(), self.address) @@ -65,21 +68,21 @@ class MailingListMembership(models.Model): class Thread(models.Model): - + subject_token = models.CharField(max_length=512) - mailinglist = models.ForeignKey(MailingList, - verbose_name=_(u"Mailing List"), + mailinglist = models.ForeignKey(MailingList, + verbose_name=_(u"Mailing List"), help_text=_(u"The Mailing List where is the thread")) - latest_message = models.OneToOneField('Message', null=True, - related_name='+', - verbose_name=_(u"Latest message"), + latest_message = models.OneToOneField('Message', null=True, + related_name='+', + verbose_name=_(u"Latest message"), help_text=_(u"Latest message posted")) score = models.IntegerField(default=0, verbose_name=_(u"Score"), help_text=_(u"Thread score")) spam = models.BooleanField(default=False) - + all_objects = models.Manager() objects = NotSpamManager() - + class Meta: verbose_name = _(u"Thread") verbose_name_plural = _(u"Threads") @@ -87,17 +90,17 @@ class Thread(models.Model): def __unicode__(self): return '%s - %s (%s)' % (self.id, - self.subject_token, + self.subject_token, self.message_set.count()) def update_score(self): """Update the relevance score for this thread. - + The score is calculated with the following variables: - * vote_weight: 100 - (minus) 1 for each 3 days since + * vote_weight: 100 - (minus) 1 for each 3 days since voted with minimum of 5. - * replies_weight: 300 - (minus) 1 for each 3 days since + * replies_weight: 300 - (minus) 1 for each 3 days since replied with minimum of 5. * page_view_weight: 10. @@ -111,8 +114,8 @@ class Thread(models.Model): """ if not self.subject_token: - return - + return + # Save this pseudo now to avoid calling the # function N times in the loops below now = timezone.now() @@ -130,8 +133,8 @@ class Thread(models.Model): for vote in msg.vote_set.all(): vote_score += get_score(100, vote.created) - # Calculate page_view_score - try: + # Calculate page_view_score + try: url = reverse('thread_view', args=[self.mailinglist.name, self.subject_token]) pagehit = PageHit.objects.get(url_path=url) @@ -157,18 +160,18 @@ class Vote(models.Model): class Message(models.Model): - + from_address = models.ForeignKey(EmailAddress, db_index=True) thread = models.ForeignKey(Thread, null=True, db_index=True) # RFC 2822 recommends to use 78 chars + CRLF (so 80 chars) for # the max_length of a subject but most of implementations # goes for 256. We use 512 just in case. - subject = models.CharField(max_length=512, db_index=True, - verbose_name=_(u"Subject"), + subject = models.CharField(max_length=512, db_index=True, + verbose_name=_(u"Subject"), help_text=_(u"Please enter a message subject")) subject_clean = models.CharField(max_length=512, db_index=True) - body = models.TextField(default='', - verbose_name=_(u"Message body"), + body = models.TextField(default='', + verbose_name=_(u"Message body"), help_text=_(u"Please enter a message body")) received_time = models.DateTimeField() message_id = models.CharField(max_length=512) @@ -176,39 +179,37 @@ class Message(models.Model): all_objects = models.Manager() objects = NotSpamManager() - + class Meta: verbose_name = _(u"Message") verbose_name_plural = _(u"Messages") unique_together = ('thread', 'message_id') - + def __unicode__(self): - return '(%s) %s: %s' % (self.id, - self.from_address.get_full_name(), + return '(%s) %s: %s' % (self.id, + self.from_address.get_full_name(), self.subject_clean) - + @property def mailinglist(self): if not self.thread or not self.thread.mailinglist: return None - + return self.thread.mailinglist - def vote_list(self): """Return a list of user that voted in this message.""" - - return [vote.user for vote in self.vote_set.all()] - + return [vote.user for vote in self.vote_set.iterator()] + def votes_count(self): return len(self.vote_list()) - + def vote(self, user): Vote.objects.create( message=self, user=user ) - + def unvote(self, user): Vote.objects.get( message=self, @@ -220,7 +221,7 @@ class Message(models.Model): """Shortcut to get thread url""" return reverse('thread_view', args=[self.mailinglist.name, self.thread.subject_token]) - + @property def Description(self): """Alias to self.body""" @@ -247,4 +248,4 @@ class MessageMetadata(models.Model): def __unicode__(self): return 'Email Message Id: %s - %s: %s' % (self.Message.id, self.name, self.value) - + diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html index d4a1cf6..bb5ca7d 100644 --- a/src/super_archives/templates/message-thread.html +++ b/src/super_archives/templates/message-thread.html @@ -1,81 +1,233 @@ {% extends "base.html" %} -{% load i18n %} -{% load append_to_get %} -{% load gravatar %} +{% load i18n append_to_get gravatar %} + +{% trans "Anonymous" as anonymous %} + +{% block head_js %} + + + +{% endblock %} + {% block main-content %}
-

{{ first_msg.subject_clean }}

-
+
+

{{ first_msg.subject_clean }}

+
+
-
+
+ +
+ + - - -- libgit2 0.21.2