Merge pull request #335 from CTPUG/bugs/issue-235-twitter-handle-fixes

Bugs/issue 235 twitter handle fixes
CTPUG · Jan 25, 2017 · 85e7886 · 85e7886
2 parents 7338047 + 0903ab7
commit 85e7886
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/wafer/users/forms.py b/wafer/users/forms.py
@@ -37,9 +37,9 @@ def __init__(self, *args, **kwargs):
         username = kwargs['instance'].user.username
         self.helper.form_action = reverse('wafer_user_edit_profile',
                                           args=(username,))
-        self.helper['twitter_handle'].wrap(PrependedText, 'twitter_handle',
+        self.helper['twitter_handle'].wrap(PrependedText,
                                            '@', placeholder=_('handle'))
-        self.helper['github_username'].wrap(PrependedText, 'github_username',
+        self.helper['github_username'].wrap(PrependedText,
                                             '@', placeholder=_('username'))
         self.helper.add_input(Submit('submit', _('Save')))
 

diff --git a/wafer/users/models.py b/wafer/users/models.py
@@ -4,6 +4,7 @@
 from django.db.models import Q
 from django.db.models.signals import post_save
 from django.utils.encoding import python_2_unicode_compatible
+from django.core.validators import RegexValidator
 
 from libravatar import libravatar_url
 try:
@@ -16,6 +17,13 @@
                                 PROVISIONAL, CANCELLED)
 
 
+# validate format of twitter handle
+# Max 15 characters, alphanumeric and _ only
+# Specification taken from https://support.twitter.com/articles/101299
+TwitterValidator = RegexValidator('^[A-Za-z0-9_]{1,15}$',
+                                  'Incorrectly formatted twitter handle')
+
+
 @python_2_unicode_compatible
 class UserProfile(models.Model):
 
@@ -30,7 +38,8 @@ class Meta:
     homepage = models.CharField(max_length=256, null=True, blank=True)
     # We should probably do social auth instead
     # And care about other code hosting sites...
-    twitter_handle = models.CharField(max_length=15, null=True, blank=True)
+    twitter_handle = models.CharField(max_length=15, null=True, blank=True,
+                                      validators=[TwitterValidator])
     github_username = models.CharField(max_length=32, null=True, blank=True)
 
     def __str__(self):