Various improvements in module functionality, and a couple of migrations to fix some...

[osqa.git] / forum / actions / user.py

diff --git a/forum/actions/user.py b/forum/actions/user.py
index 74771a6463fca174b7087a0155127edb814d9340..50d1a7357a035edb94ea39a79c5fe3e24624fae2 100644 (file)
--- a/forum/actions/user.py
+++ b/forum/actions/user.py
@@ -1,29 +1,79 @@
 from django.utils.translation import ugettext as _
 from django.db.models import F
 from forum.models.action import ActionProxy
 from django.utils.translation import ugettext as _
 from django.db.models import F
 from forum.models.action import ActionProxy

-from forum.models import Award
+from forum.models import Award, Badge, ValidationHash, User

 from forum import settings
 from forum.settings import APP_SHORT_NAME
 from forum import settings
 from forum.settings import APP_SHORT_NAME

+from forum.utils.mail import send_template_email

 
 class UserJoinsAction(ActionProxy):
 
 class UserJoinsAction(ActionProxy):

+    verb = _("joined")
+

     def repute_users(self):
         self.repute(self.user, int(settings.INITIAL_REP))
 
     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/welcome_email.html", {'validation_code': hash})
+

     def describe(self, viewer=None):
     def describe(self, viewer=None):

-        return _("%(user)s as joined the %(app_name)s Q&A community") % {
-            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'app_name': APP_SHORT_NAME,
+        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)),
+        'have_has': self.viewer_or_user_verb(viewer, self.user, _('have'), _('has')),
+        'app_name': APP_SHORT_NAME,

         }
 
 class EditProfileAction(ActionProxy):
         }
 
 class EditProfileAction(ActionProxy):

+    verb = _("edited profile")
+

     def describe(self, viewer=None):
         return _("%(user)s edited %(hes_or_your)s %(profile_link)s") % {
     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)),
-            'hes_or_your': self.viewer_or_user_verb(viewer, self.user, _('your'), _('hes')),
-            'profile_link': self.hyperlink(self.user.get_profile_url(), _('profile')),
+        'user': self.hyperlink(self.user.get_profile_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')),

         }
 
         }
 

+class BonusRepAction(ActionProxy):
+    verb = _("gave bonus")
+
+    def process_data(self, value, affected):
+        self._value = value
+        self._affected = affected
+
+
+    def repute_users(self):
+        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:
+            self._affected.message_set.create(
+                    message=_("You have been penalized in %s reputation points.") % self._value +
+                    '<br />%s' % self.extra.get('message', ''))
+
+    def describe(self, viewer=None):
+        value = self.extra.get('value', _('unknown'))
+        message = self.extra.get('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_profile_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_profile_url(), self.friendly_username(viewer, self.user)),
+                'value': value, 'users':self.affected_links(viewer), 'message': message
+                }
+        except Exception, e:
+            return ''
+

 class AwardAction(ActionProxy):
 class AwardAction(ActionProxy):

+    verb = _("was awarded")
+

     def process_data(self, badge, trigger):
         self.__dict__['_badge'] = badge
         self.__dict__['_trigger'] = trigger
     def process_data(self, badge, trigger):
         self.__dict__['_badge'] = badge
         self.__dict__['_trigger'] = trigger


@@ -39,9 +89,20 @@ class AwardAction(ActionProxy):
         award.save()
         award.badge.awarded_count = F('awarded_count') + 1
         award.badge.save()
         award.save()
         award.badge.awarded_count = F('awarded_count') + 1
         award.badge.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()))
+
+        if award.badge.type == Badge.GOLD:
+            self.user.gold += 1
+        if award.badge.type == Badge.SILVER:
+            self.user.silver += 1
+        if award.badge.type == Badge.BRONZE:
+            self.user.bronze += 1
+
+        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()))

 
     def cancel_action(self):
         award = self.award
 
     def cancel_action(self):
         award = self.award


@@ -62,7 +123,39 @@ class AwardAction(ActionProxy):
 
     def describe(self, viewer=None):
         return _("%(user)s %(were_was)s awarded the %(badge_name)s badge") % {
 
     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)),
-            'were_was': self.viewer_or_user_verb(viewer, self.user, _('were'), _('was')),
-            'badge_name': self.award.badge.name,
+        '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')),
+        'badge_name': self.award.badge.name,
+        }
+
+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._suspended.is_active = False
+        self._suspended.save()
+
+    def cancel_action(self):
+        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):
+            suspension = _("for %s days") % self.extra['forxdays']
+        else:
+            suspension = _("indefinetely")
+
+        return _("%(user)s suspended %(users)s %(suspension)s: %(msg)s") % {
+        'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+        'users': self.affected_links(viewer), 'suspension': suspension, 'msg': self.extra.get('publicmsg', _('Bad behaviour'))

         }
\ No newline at end of file
         }
\ No newline at end of file