X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3d835e01926aeec21f78df2012567cdd2f2f7f07..3f82e8df4bea579909d98a76ce22d2e94c6f59da:/forum/models/user.py?ds=sidebyside diff --git a/forum/models/user.py b/forum/models/user.py index f3a0389..e736538 100644 --- a/forum/models/user.py +++ b/forum/models/user.py @@ -4,10 +4,8 @@ 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 -try: - from hashlib import md5 -except: - from md5 import new as md5 + +from forum.settings import TRUNCATE_LONG_USERNAMES, TRUNCATE_USERNAMES_LONGER_THAN import string from random import Random @@ -15,13 +13,9 @@ from random import Random from django.utils.translation import ugettext as _ import logging -QUESTIONS_PER_PAGE_CHOICES = ( -(10, u'10'), -(30, u'30'), -(50, u'50'), -) - class AnonymousUser(DjangoAnonymousUser): + reputation = 0 + def get_visible_answers(self, question): return question.answers.filter_state(deleted=False) @@ -33,6 +27,9 @@ class AnonymousUser(DjangoAnonymousUser): def can_vote_down(self): return False + + def can_vote_count_today(self): + return 0 def can_flag_offensive(self, post=None): return False @@ -54,6 +51,12 @@ class AnonymousUser(DjangoAnonymousUser): def can_convert_to_comment(self, answer): return False + + def can_convert_to_question(self, answer): + return False + + def can_convert_comment_to_answer(self, comment): + return False def can_accept_answer(self, answer): return False @@ -85,6 +88,9 @@ class AnonymousUser(DjangoAnonymousUser): def can_upload_files(self): return False + def is_a_super_user_or_staff(self): + return False + 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) @@ -142,19 +148,31 @@ class User(BaseModel, DjangoUser): @property def decorated_name(self): + username = self.username + + if len(username) > TRUNCATE_USERNAMES_LONGER_THAN and TRUNCATE_LONG_USERNAMES: + username = '%s...' % username[:TRUNCATE_USERNAMES_LONGER_THAN-3] + if settings.SHOW_STATUS_DIAMONDS: if self.is_superuser: - return u"%s \u2666\u2666" % self.username + return u"%s \u2666\u2666" % username if self.is_staff: - return u"%s \u2666" % self.username + return u"%s \u2666" % username return self.username @property - def gravatar(self): - return md5(self.email).hexdigest() + def last_activity(self): + try: + return self.actions.order_by('-action_date')[0].action_date + except: + return self.last_seen + @property + def gravatar(self): + return md5(self.email.lower()).hexdigest() + def save(self, *args, **kwargs): if self.reputation < 0: self.reputation = 0 @@ -167,9 +185,6 @@ class User(BaseModel, DjangoUser): sub_settings = SubscriptionSettings(user=self) sub_settings.save() - def get_absolute_url(self): - return self.get_profile_url() - def get_messages(self): messages = [] for m in self.message_set.all(): @@ -222,7 +237,15 @@ class User(BaseModel, DjangoUser): today = datetime.date.today() return self.actions.filter(canceled=False, action_type="flag", action_date__gte=(today - datetime.timedelta(days=1))).count() - + + def can_vote_count_today(self): + votes_today = settings.MAX_VOTES_PER_DAY + + if settings.USER_REPUTATION_TO_MAX_VOTES: + votes_today = votes_today + int(self.reputation) + + return votes_today + @true_if_is_super_or_staff def can_view_deleted_post(self, post): return post.author == self @@ -266,13 +289,21 @@ class User(BaseModel, DjangoUser): def can_delete_comment(self, comment): return self == comment.author or self.reputation >= int(settings.REP_TO_DELETE_COMMENTS) + def can_convert_comment_to_answer(self, comment): + return (comment.parent.node_type in ('question', 'answer')) and (self.is_superuser or self.is_staff or ( + self == comment.author) or (self.reputation >= int(settings.REP_TO_CONVERT_COMMENTS_TO_ANSWERS))) + 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)) + + def can_convert_to_question(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_QUESTION)) @true_if_is_super_or_staff def can_accept_answer(self, answer): - return self == answer.question.author + return self == answer.question.author and (settings.USERS_CAN_ACCEPT_OWN or answer.author != answer.question.author) @true_if_is_super_or_staff def can_create_tags(self): @@ -303,7 +334,7 @@ class User(BaseModel, DjangoUser): @true_if_is_super_or_staff def can_reopen_question(self, question): - return self == question.author and self.reputation >= settings.REP_TO_REOPEN_OWN + return self == question.author and self.reputation >= int(settings.REP_TO_REOPEN_OWN) @true_if_is_super_or_staff def can_delete_post(self, post): @@ -311,12 +342,16 @@ class User(BaseModel, DjangoUser): 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__id=self.id).count())) @true_if_is_super_or_staff def can_upload_files(self): return self.reputation >= int(settings.REP_TO_UPLOAD) + @true_if_is_super_or_staff + def is_a_super_user_or_staff(self): + return False + def email_valid_and_can_ask(self): return 'ask' not in settings.REQUIRE_EMAIL_VALIDATION_TO or self.email_isvalid @@ -331,13 +366,13 @@ class User(BaseModel, DjangoUser): def suspension(self): if self.__dict__.get('_suspension_dencache_', False) != None: try: - self.__dict__['_suspension_dencache_'] = self.actions.get(action_type="suspend", canceled=False) + self.__dict__['_suspension_dencache_'] = self.reputes.get(action__action_type="suspend", action__canceled=False).action 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] + self.__dict__['_suspension_dencache_'] = self.reputes.filter(action__action_type="suspend", action__canceled=False + ).order_by('-action__action_date')[0] return self.__dict__['_suspension_dencache_'] @@ -360,7 +395,7 @@ class User(BaseModel, DjangoUser): class Meta: app_label = 'forum' -class UserProperty(models.Model): +class UserProperty(BaseModel): user = models.ForeignKey(User, related_name='properties') key = models.CharField(max_length=16) value = PickledObjectField() @@ -369,6 +404,16 @@ class UserProperty(models.Model): app_label = 'forum' unique_together = ('user', 'key') + def cache_key(self): + return self._generate_cache_key("%s:%s" % (self.user.id, self.key)) + + @classmethod + def infer_cache_key(cls, querydict): + if 'user' in querydict and 'key' in querydict: + return cls._generate_cache_key("%s:%s" % (querydict['user'].id, querydict['key'])) + + return None + class UserPropertyDict(object): def __init__(self, user): self.__dict__['_user'] = user @@ -404,7 +449,7 @@ class UserPropertyDict(object): if current: current.value = value self.__dict__[name] = value - current.save() + current.save(full_save=True) else: user = self.__dict__['_user'] prop = UserProperty(user=user, value=value, key=name) @@ -419,7 +464,7 @@ class UserPropertyDict(object): class SubscriptionSettings(models.Model): - user = models.OneToOneField(User, related_name='subscription_settings') + user = models.OneToOneField(User, related_name='subscription_settings', editable=False) enable_notifications = models.BooleanField(default=True) @@ -432,9 +477,6 @@ class SubscriptionSettings(models.Model): #auto_subscribe_to all_questions = models.BooleanField(default=False) all_questions_watched_tags = models.BooleanField(default=False) - questions_asked = models.BooleanField(default=True) - questions_answered = models.BooleanField(default=True) - questions_commented = models.BooleanField(default=False) questions_viewed = models.BooleanField(default=False) #notify activity on subscribed