X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/2cc0aa8a5d5c3b84c59598092c289d39b0cc4d3c..6b394aaf645c46996908bb1d11b0755dc8ca4067:/forum/actions/user.py?ds=inline

diff --git a/forum/actions/user.py b/forum/actions/user.py
index e8f1035..ce277c3 100644
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,56 +1,144 @@
-from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext, ugettext as _
+from django.core.urlresolvers import reverse
 from django.db.models import F
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
+from django.contrib import messages
 from forum.models.action import ActionProxy
-from forum.models import Award, Badge, ValidationHash
-from forum import settings
+from forum.models import Award, Badge, ValidationHash, User
+from forum import settings, REQUEST_HOLDER
 from forum.settings import APP_SHORT_NAME
-from forum.utils.mail import send_email, send_template_email
+from forum.utils.mail import send_template_email
+
+from django.contrib import messages
 
 class UserJoinsAction(ActionProxy):
+    verb = _("joined")
+
     def repute_users(self):
         self.repute(self.user, int(settings.INITIAL_REP))
 
     def process_action(self):
         hash = ValidationHash.objects.create_new(self.user, 'email', [self.user.email])
-        send_template_email([self.user], "auth/email_validation.html", {'validation_code': hash})
+        send_template_email([self.user], "auth/welcome_email.html", {'validation_code': hash})
 
     def describe(self, viewer=None):
         return _("%(user)s %(have_has)s joined the %(app_name)s Q&A community") % {
-        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
         'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
         'app_name': APP_SHORT_NAME,
         }
 
+class UserLoginAction(ActionProxy):
+    verb = _("logged in")
+
+    def describe(self, viewer=None):
+        return _("%(user)s %(have_has)s logged in") % {
+            'user' : self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+            'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
+        }
+
+class EmailValidationAction(ActionProxy):
+    verb = _("validated e-mail")
+
+    def repute_users(self):
+        self.repute(self.user, int(settings.REP_GAIN_BY_EMAIL_VALIDATION))
+
+    def process_action(self):
+        self.user.email_isvalid = True
+        self.user.save()
+
+    def describe(self, viewer=None):
+        return _("%(user)s %(have_has)s validated the e-mail %(email)s") % {
+        'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+        'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
+        'email' : self.user.email if viewer.is_superuser or viewer.is_staff or viewer == self.user else ""
+        }
+
 class EditProfileAction(ActionProxy):
+    verb = _("edited profile")
+
     def describe(self, viewer=None):
         return _("%(user)s edited %(hes_or_your)s %(profile_link)s") % {
-        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
         'hes_or_your': self.viewer_or_user_verb(viewer, self.user, _('your'), _('his')),
-        'profile_link': self.hyperlink(self.user.get_profile_url(), _('profile')),
+        'profile_link': self.hyperlink(self.user.get_absolute_url(), _('profile')),
         }
 
 class BonusRepAction(ActionProxy):
-    def process_data(self, value):
+    verb = _("gave bonus")
+
+    def process_data(self, value, affected):
         self._value = value
+        self._affected = affected
+
 
     def repute_users(self):
-        self.repute(self.user, self._value)
-        self.user.message_set.create(
-                message=_("Congratulations, you have been awarded an extra %s reputation points.") % self._value +
-                '<br />%s' % self.extra.get('message', _('Thank you')))
+        self.repute(self._affected, self._value)
+
+        if self._value > 0:
+            self._affected.message_set.create(
+                    message=_("Congratulations, you have been awarded an extra %s reputation points.") % self._value +
+                    '<br />%s' % self.extra.get('message', _('Thank you')))
+        else:
+            messages.info(REQUEST_HOLDER.request, _("You have penalized %s in %s reputation points.") % (self._affected, self._value) +
+                    '<br />%s' % self.extra.get('message', ''))
 
     def describe(self, viewer=None):
         value = self.extra.get('value', _('unknown'))
         message = self.extra.get('message', '')
 
-        return _("%(user)s %(was_were)s awarded %(value)s reputation points: %(message)s") % {
-        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-        'was_were': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
-        'value': value, 'message': message
-        }
+        try:
+            if int(value) > 0:
+                return _("%(user)s awarded an extra %(value)s reputation points to %(users)s: %(message)s") % {
+                'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer), 'message': message
+                }
+            else:
+                return _("%(user)s penalised %(users)s in %(value)s reputation points: %(message)s") % {
+                'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer), 'message': message
+                }
+        except Exception, e:
+            return ''
+
+class AwardPointsAction(ActionProxy):
+    verb = _("gave reputation points")
+
+    def process_data(self, value, affected):
+        self._value = value
+        self._affected = affected
+
+
+    def repute_users(self):
+        self.repute(self._affected, self._value)
+        self.repute(self.user, -self._value)
+
+        self._affected.message_set.create(
+                message=_("Congratulations, you have been awarded an extra %(points)s reputation %(points_label)s on <a href=\"%(answer_url)s\">this</a> answer.") % {
+                        'points': self._value,
+                        'points_label': ungettext('point', 'points', self._value),
+                        'answer_url': self.node.get_absolute_url()
+                    })
+
+    def describe(self, viewer=None):
+        value = self.extra.get('value', _('unknown'))
+
+        try:
+            if int(value) > 0:
+                return _("%(user)s awarded an extra %(value)s reputation points to %(users)s") % {
+                'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer),
+                }
+            else:
+                return _("%(user)s penalised %(users)s in %(value)s reputation points") % {
+                'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer),
+                }
+        except Exception, e:
+            return ''
 
 class AwardAction(ActionProxy):
+    verb = _("was awarded")
+
     def process_data(self, badge, trigger):
         self.__dict__['_badge'] = badge
         self.__dict__['_trigger'] = trigger
@@ -77,9 +165,10 @@ class AwardAction(ActionProxy):
         self.user.save()
 
         self.user.message_set.create(message=_(
-                """Congratulations, you have received a badge '%(badge_name)s'. Check out <a href=\"%(profile_url)s\">your profile</a>."""
-                ) %
-        dict(badge_name=award.badge.name, profile_url=self.user.get_profile_url()))
+                """Congratulations, you have received a badge '%(badge_name)s'. <a href="%(badge_url)s">Find out who has it, too</a>."""
+        ) % dict(
+            badge_name=award.badge.name,
+            badge_url=award.badge.get_absolute_url()))
 
     def cancel_action(self):
         award = self.award
@@ -95,29 +184,65 @@ class AwardAction(ActionProxy):
                 return Award.objects.get(user=user, badge=badge).action
             else:
                 return Award.objects.get(user=user, node=node, badge=badge).action
-        except ObjectDoesNotExist:
+        except:
             return None
 
     def describe(self, viewer=None):
         return _("%(user)s %(were_was)s awarded the %(badge_name)s badge") % {
-        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
         'were_was': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
         'badge_name': self.award.badge.name,
         }
 
+
+class ReportAction(ActionProxy):
+    verb = _("suspended")
+
+    def process_data(self, **kwargs):
+        self.extra = kwargs
+        # message here?
+
+
+    def process_action(self):
+
+        all_superusers = User.objects.filter(is_superuser=True)
+
+
+        send_template_email(all_superusers, "notifications/user_reported.html", {
+            'reported': self.extra['reported'],
+            'user':self.user,
+            'message': self.extra['publicmsg']
+            }
+            )
+
+    def describe(self, viewer=None):
+
+        return _("%(user)s reported %(reported) : %(msg)s") % {
+            'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+            'reporter': self.extra.get('reported').username,
+            'msg': self.extra.get('publicmsg', _('N/A'))
+        }
+
 class SuspendAction(ActionProxy):
+    verb = _("suspended")
+
     def process_data(self, **kwargs):
+        self._suspended = kwargs.pop('suspended')
         self.extra = kwargs
 
+    def repute_users(self):
+        self.repute(self._suspended, 0)
+
     def process_action(self):
-        self.user.is_active = False
-        self.user.save()
+        self._suspended.is_active = False
+        self._suspended.save()
 
     def cancel_action(self):
-        self.user.is_active = True
-        self.user._pop_suspension_cache()
-        self.user.save()
-        self.user.message_set.create(message=_("Your suspension has been removed."))
+        for u in User.objects.filter(reputes__action=self).distinct():
+            u.is_active = True
+            u._pop_suspension_cache()
+            u.save()
+            u.message_set.create(message=_("Your suspension has been removed."))
 
     def describe(self, viewer=None):
         if self.extra.get('bantype', 'indefinitely') == 'forxdays' and self.extra.get('forxdays', None):
@@ -125,8 +250,7 @@ class SuspendAction(ActionProxy):
         else:
             suspension = _("indefinetely")
 
-        return _("%(user)s %(were_was)s suspended %(suspension)s: %(msg)s") % {
-        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-        'were_was': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
-        'suspension': suspension, 'msg': self.extra.get('publicmsg', _('Bad behaviour'))
-        }
\ No newline at end of file
+        return _("%(user)s suspended %(users)s %(suspension)s: %(msg)s") % {
+        'user': self.hyperlink(self.user.get_absolute_url(), self.friendly_username(viewer, self.user)),
+        'users': self.affected_links(viewer), 'suspension': suspension, 'msg': self.extra.get('publicmsg', _('Bad behaviour'))
+        }