X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/bc6579a5a090016d4f7ade2d2e47ebc2177b9c41..174c53e97bcf1e5412c141829d152aa5a2b8684c:/forum/models/user.py?ds=inline
diff --git a/forum/models/user.py b/forum/models/user.py
index f027ffa..8837ef3 100644
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -1,4 +1,5 @@
from base import *
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import User as DjangoUser, AnonymousUser as DjangoAnonymousUser
from django.db.models import Q
@@ -11,13 +12,12 @@ import string
from random import Random
from django.utils.translation import ugettext as _
-import django.dispatch
-
+import logging
QUESTIONS_PER_PAGE_CHOICES = (
- (10, u'10'),
- (30, u'30'),
- (50, u'50'),
+(10, u'10'),
+(30, u'30'),
+(50, u'50'),
)
class UserManager(CachedManager):
@@ -91,6 +91,7 @@ class AnonymousUser(DjangoAnonymousUser):
def true_if_is_super_or_staff(fn):
def decorated(self, *args, **kwargs):
return self.is_superuser or self.is_staff or fn(self, *args, **kwargs)
+
return decorated
class User(BaseModel, DjangoUser):
@@ -101,7 +102,7 @@ class User(BaseModel, DjangoUser):
gold = models.PositiveIntegerField(default=0)
silver = models.PositiveIntegerField(default=0)
bronze = models.PositiveIntegerField(default=0)
-
+
last_seen = models.DateTimeField(default=datetime.datetime.now)
real_name = models.CharField(max_length=100, blank=True)
website = models.URLField(max_length=200, blank=True)
@@ -113,7 +114,7 @@ class User(BaseModel, DjangoUser):
vote_up_count = DenormalizedField("actions", canceled=False, action_type="voteup")
vote_down_count = DenormalizedField("actions", canceled=False, action_type="votedown")
-
+
objects = UserManager()
def __unicode__(self):
@@ -155,7 +156,7 @@ class User(BaseModel, DjangoUser):
return self.get_profile_url()
def get_profile_link(self):
- profile_link = u'%s' % (self.get_profile_url(),self.username)
+ profile_link = u'%s' % (self.get_profile_url(), self.username)
return mark_safe(profile_link)
def get_visible_answers(self, question):
@@ -164,11 +165,12 @@ class User(BaseModel, DjangoUser):
def get_vote_count_today(self):
today = datetime.date.today()
return self.actions.filter(canceled=False, action_type__in=("voteup", "votedown"),
- action_date__gte=(today - datetime.timedelta(days=1))).count()
+ action_date__gte=(today - datetime.timedelta(days=1))).count()
def get_reputation_by_upvoted_today(self):
today = datetime.datetime.now()
- sum = self.reputes.filter(reputed_at__range=(today - datetime.timedelta(days=1), today)).aggregate(models.Sum('value'))
+ sum = self.reputes.filter(reputed_at__range=(today - datetime.timedelta(days=1), today)).aggregate(
+ models.Sum('value'))
#todo: redo this, maybe transform in the daily cap
#if sum.get('value__sum', None) is not None: return sum['value__sum']
return 0
@@ -176,7 +178,7 @@ class User(BaseModel, DjangoUser):
def get_flagged_items_count_today(self):
today = datetime.date.today()
return self.actions.filter(canceled=False, action_type="flag",
- action_date__gte=(today - datetime.timedelta(days=1))).count()
+ action_date__gte=(today - datetime.timedelta(days=1))).count()
@true_if_is_super_or_staff
def can_view_deleted_post(self, post):
@@ -204,7 +206,7 @@ class User(BaseModel, DjangoUser):
@true_if_is_super_or_staff
def can_comment(self, post):
return self == post.author or self.reputation >= int(settings.REP_TO_COMMENT
- ) or (post.__class__.__name__ == "Answer" and self == post.question.author)
+ ) or (post.__class__.__name__ == "Answer" and self == post.question.author)
@true_if_is_super_or_staff
def can_like_comment(self, comment):
@@ -220,7 +222,8 @@ class User(BaseModel, DjangoUser):
return self == comment.author or self.reputation >= int(settings.REP_TO_DELETE_COMMENTS)
def can_convert_to_comment(self, answer):
- return (not answer.marked) and (self.is_superuser or self.is_staff or answer.author == self or self.reputation >= int(settings.REP_TO_CONVERT_TO_COMMENT))
+ return (not answer.marked) and (self.is_superuser or self.is_staff or answer.author == self or self.reputation >= int
+ (settings.REP_TO_CONVERT_TO_COMMENT))
@true_if_is_super_or_staff
def can_accept_answer(self, answer):
@@ -233,7 +236,8 @@ class User(BaseModel, DjangoUser):
@true_if_is_super_or_staff
def can_edit_post(self, post):
return self == post.author or self.reputation >= int(settings.REP_TO_EDIT_OTHERS
- ) or (post.nis.wiki and self.reputation >= int(settings.REP_TO_EDIT_WIKI))
+ ) or (post.nis.wiki and self.reputation >= int(
+ settings.REP_TO_EDIT_WIKI))
@true_if_is_super_or_staff
def can_wikify(self, post):
@@ -260,9 +264,9 @@ class User(BaseModel, DjangoUser):
def can_delete_post(self, post):
if post.node_type == "comment":
return self.can_delete_comment(post)
-
+
return (self == post.author and (post.__class__.__name__ == "Answer" or
- not post.answers.exclude(author=self).count()))
+ not post.answers.exclude(author=self).count()))
@true_if_is_super_or_staff
def can_upload_files(self):
@@ -272,6 +276,35 @@ class User(BaseModel, DjangoUser):
self.__dict__.update(self.__class__.objects.filter(id=self.id).values('password')[0])
return DjangoUser.check_password(self, old_passwd)
+ @property
+ def suspension(self):
+ if self.__dict__.get('_suspension_dencache_', False) != None:
+ try:
+ self.__dict__['_suspension_dencache_'] = self.actions.get(action_type="suspend", canceled=False)
+ except ObjectDoesNotExist:
+ self.__dict__['_suspension_dencache_'] = None
+ except MultipleObjectsReturned:
+ logging.error("Multiple suspension actions found for user %s (%s)" % (self.username, self.id))
+ self.__dict__['_suspension_dencache_'] = self.actions.filter(action_type="suspend", canceled=False
+ ).order_by('-action_date')[0]
+
+ return self.__dict__['_suspension_dencache_']
+
+ def _pop_suspension_cache(self):
+ self.__dict__.pop('_suspension_dencache_', None)
+
+ def is_suspended(self):
+ if not self.is_active:
+ suspension = self.suspension
+
+ if suspension and suspension.extra.get('bantype', None) == 'forxdays' and (
+ datetime.datetime.now() > suspension.action_date + datetime.timedelta(
+ days=int(suspension.extra.get('forxdays', 365)))):
+ suspension.cancel()
+ else:
+ return True
+
+ return False
class Meta:
app_label = 'forum'
@@ -286,7 +319,7 @@ class SubscriptionSettings(models.Model):
new_question = models.CharField(max_length=1, default='d')
new_question_watched_tags = models.CharField(max_length=1, default='i')
subscribed_questions = models.CharField(max_length=1, default='i')
-
+
#auto_subscribe_to
all_questions = models.BooleanField(default=False)
all_questions_watched_tags = models.BooleanField(default=False)
@@ -324,7 +357,7 @@ class ValidationHashManager(models.Manager):
obj.save()
except:
return None
-
+
return obj
def validate(self, hash, user, type, hash_data=[]):
@@ -352,7 +385,7 @@ class ValidationHashManager(models.Manager):
return False
class ValidationHash(models.Model):
- hash_code = models.CharField(max_length=255,unique=True)
+ hash_code = models.CharField(max_length=255, unique=True)
seed = models.CharField(max_length=12)
expiration = models.DateTimeField(default=one_day_from_now)
type = models.CharField(max_length=12)
@@ -368,7 +401,7 @@ class ValidationHash(models.Model):
return self.hash_code
class AuthKeyUserAssociation(models.Model):
- key = models.CharField(max_length=255,null=False,unique=True)
+ key = models.CharField(max_length=255, null=False, unique=True)
provider = models.CharField(max_length=64)
user = models.ForeignKey(User, related_name="auth_keys")
added_at = models.DateTimeField(default=datetime.datetime.now)