Show number of voters in poll and small enhancement for sub page.

ISS/forms.py

@@ -62,7 +62,7 @@ def clean(self, value):
         posters = []
         unfound = []
 
-        for username in value.split(','):
+        for username in value.split('; '):
             if not username: continue
 
             norm = Poster.iss_normalize_username(username)
@@ -79,6 +79,12 @@ def clean(self, value):
             else:
                 posters.append(user)
 
+        for poster in posters:
+            if posters.count(poster) > 1:
+                raise ValidationError(
+                    'Duplicate users found.',
+                    code='DUPLICATE_USERS')
+
         if unfound:
             raise ValidationError(unfound)
         else:
@@ -88,7 +94,7 @@ def widget_attrs(self, widget):
         attrs = super(PosterSelectField, self).widget_attrs(widget)
 
         attrs['data-auto-suggest'] = 'true'
-        attrs['data-auto-suggest-delimiter'] = ','
+        attrs['data-auto-suggest-delimiter'] = '; '
 
         return attrs
 
@@ -540,6 +546,10 @@ def clean_username(self):
             raise ValidationError('You may not register that username.',
                                   code='FORBIDDEN_USERNAME')
 
+        if ";" in norm_username:
+            raise ValidationError('You may not register that username.',
+                                  code='FORBIDDEN_USERNAME')
+
         if len(norm_username) < 1:
             raise ValidationError('Invalid username', code='INVALID_GENERAL')
 

ISS/models/core_models.py

@@ -14,6 +14,7 @@
 from ISS import utils
 from ISS.utils import HomoglyphNormalizer
 from .polls import Poll
+from .polls import PollVote
 from .auth_package import AuthPackage, AccessControlList
 from .admin_models import Ban
 
@@ -221,13 +222,27 @@ def can_auto_anonymize(self):
     @transaction.atomic
     def merge_into(self, other):
         """
-        Reassigns all the records that tie to this user to another one and
+        Reassigns all (<-- lies) the records that tie to this user to another one and
         disables this user afterwards.
         """
 
         Thread.objects.filter(author=self).update(author=other)
+
+        Post.objects.filter(author=self).update(posted_from='127.0.0.1')
         Post.objects.filter(author=self).update(author=other)
 
+        PostSnapshot.objects.filter(obsolesced_by=self).update(obsolescing_ip='127.0.0.1')
+        PostSnapshot.objects.filter(obsolesced_by=self).update(obsolesced_by=other)
+
+        for post in Post.objects.all():
+            post.content = post.content.replace("author=\"" + self.username + "\"", "author=\"" + str(other) + "\"")
+            post.save()
+
+        PrivateMessage.objects.filter(receiver=self).delete()
+        PrivateMessage.objects.filter(sender=self).delete()
+
+        PollVote.objects.filter(voter=self).update(voter=other)
+
         for thanks in self.thanks_given.all():
             try:
                 with transaction.atomic():

ISS/templates/thread.html

@@ -64,6 +64,7 @@ <h3 class="poll-prompt">
                 <ul class="voter-list">
                   {% for vote in opt.votes.all %}
                     <li>
+                      Votes: {{ opt.votes.count }} -
                       <a href="{{ vote.voter.get_url }}">{{ vote.voter.username }}</a>
                       {% if not forloop.last %},{% endif %}
                     </li>

ISS/views/forum.py

@@ -444,8 +444,7 @@ def usercp(request):
     threads = (Thread.objects.all()
         .filter(
             threadflag__poster_id=request.user.id,
-            threadflag__subscribed=True,
-            last_update__gt=F('threadflag__last_read_date'))
+            threadflag__subscribed=True)
         .order_by('-last_update'))
 
     threads_per_page = utils.get_config('threads_per_forum_page')