don't require twitter

API.md

@@ -59,4 +59,3 @@ that's broken, [file a bug][new_issue].
 [eg_latest_week]: https://nkd.su/api/week/
 [eg_week]: https://nkd.su/api/week/2013-01-05/
 [eg_search]: https://nkd.su/api/search/?q=character%20song
-[pester]: https://twitter.com/intent/tweet?text=%40mftb

PRIVACY.md

@@ -61,6 +61,7 @@ This can include:
 - a [hashed][django-password-storage] password
 - a screen name and a display name
 - an avatar
+- an email address
 
 [django-password-storage]: https://docs.djangoproject.com/en/3.2/topics/auth/passwords/#how-django-stores-passwords "how Django stores passwords"
 
@@ -71,7 +72,9 @@ These will be used to:
 
 You can change your names or avatar at any time. Please contact an admin if you
 would like to have this information modified or deleted in a way that the
-website doesn't give you controls for.
+website doesn't give you controls for. Early in the migration away from
+Twitter, less of this will be user-modifiable than we would like, but we'll be
+working to sort that quickly.
 
 ### sessions
 

README.md

@@ -4,37 +4,31 @@
 radio show currently broadcast on [The Cat].
 
 [nkd.su]: https://nkd.su
-[The Cat]: https://thisisthecat.com
+[The Cat]: https://thecat1079.co.uk
 [Neko Desu]: https://nekodesu.radio
 
 ### How do I make a request?
 
 If there are any tracks on the front page you would like to request, click on
-the ‘+’ next to the current requests and send the generated tweet. If nothing
-on the front page strikes your fancy, feel free to use the search box to find
-something more your style. Once you've found something, click the + button. If
-you can't find what you're looking for, fill out the [request an addition]
-form.
+the ‘+’ next to the existing requests. If you're signed in, you'll be taken to
+a page where you can see what you're requesting and, if you like, add an
+optional accompanying message.
 
-You can personalise your request with a message that will appear when people
-hover over your user icon. All text that is not either a valid track URL or the
-[@nkdsu] mention at the start of the tweet will be displayed.
+If you're _not_ signed in, you'll have to follow the instructions on the login
+page to set up an appropriate account before you can make requests. Sorry that
+the login page is so busy; if you're new here, you can just head straight for
+the 'new nkd.su visitors' form.
 
-If you have javascript enabled, you can select tracks so that you can request
-several at once by clicking anywhere in a track box that is not a link.
+If nothing on the front page strikes your fancy, feel free to use the search
+box to find something more your style. Once you've found something, click the +
+button. If you can't find what you're looking for and would like to get it
+added to the library, you can fill out the [request an addition] form.
 
-None of your Twitter followers will see your request in their timelines unless
-they're also following [@nkdsu].
+If you have javascript enabled, you can select multiple tracks to request them
+at the same time. You can do this by clicking anywhere in a track box that is
+not a link.
 
 [request an addition]: https://nkd.su/request
-[@nkdsu]: https://twitter.com/nkdsu
-
-### All this is well and good but I don't like Twitter.
-
-Yeah, I get it. In that case, just send Peter an [email] or a text or
-something.
-
-[email]: mailto:[email protected]
 
 ## How does it work?
 

TWITTER.md

@@ -0,0 +1,18 @@
+It's no longer possible for nkd.su to require the use of Twitter, so we're
+migrating to a local account system for making requests.
+
+**If you're an existing nkd.su requester**, you should register using your
+Twitter account to inherit your existing request history. You'll be able to
+create a password for logging in and disassociate your Twitter account; we just
+want to provide continuity.
+
+**If you're new here**, you can make a local-only account from scratch.
+
+Either way, there are some things you should know:
+
+- Newly-created accounts can not use usernames that match the handle of any
+  Twitter user who has requested things in the past.
+- The [privacy policy] is still worth reading.
+
+[@nkdsu]: https://twitter.com/nkdsu/status/744237593164980224
+[privacy policy]: https://nkd.su/info/privacy/

nkdsu/__init__.py

@@ -0,0 +1,3 @@
+from .monkey import patch
+
+patch()

nkdsu/apps/vote/admin.py

@@ -40,8 +40,8 @@ class DiscardShortlistAdmin(admin.ModelAdmin):
 
 
 class RequestAdmin(admin.ModelAdmin):
-    list_display = ('created', 'successful')
-    list_filter = ('successful',)
+    list_display = ('created', 'filled_by', 'claimant', 'submitted_by')
+    list_filter = ('filled_by', 'claimant', 'submitted_by')
 
 
 class NoteAdmin(admin.ModelAdmin):

nkdsu/apps/vote/apps.py

@@ -0,0 +1,12 @@
+from django.apps import AppConfig
+from django.db.models.signals import post_migrate, post_save
+
+
+class VoteConfig(AppConfig):
+    name = 'nkdsu.apps.vote'
+
+    def ready(self) -> None:
+        from . import signals
+
+        post_save.connect(signals.create_profile_on_user_creation)
+        post_migrate.connect(signals.make_elfs)

nkdsu/apps/vote/elfs.py

@@ -0,0 +1,10 @@
+from django.contrib.auth.models import AnonymousUser, User
+
+
+ELFS_NAME = "Elfs"
+
+
+def is_elf(user: User | AnonymousUser) -> bool:
+    return user.is_authenticated and (
+        user.is_staff or user.groups.filter(name=ELFS_NAME).exists()
+    )

nkdsu/apps/vote/fixtures/vote.json

@@ -348,7 +348,6 @@
   "pk": 1,
   "model": "vote.request",
   "fields": {
-    "successful": true,
     "blob": "{\"trivia\": \"borderlands\", \"trivia_question\": \"We have always treaded ____\", \"details\": \"Should be \\\"THE iDOLM@STER\\\" - there is no \\\"the\\\" at the moment.\", \"contact\": \"\"}",
     "created": "2014-01-05T23:30:04.751Z"
   }
@@ -392,5 +391,19 @@
     "public": true,
     "show": 79
   }
+},
+{
+  "pk": 43,
+  "model": "auth.user",
+  "fields": {
+    "username": "someone"
+  }
+},
+{
+  "pk": 45,
+  "model": "vote.profile",
+  "fields": {
+    "user": 43
+  }
 }
 ]

nkdsu/apps/vote/forms.py

@@ -3,12 +3,9 @@
 from typing import Any, Optional
 
 from django import forms
-from django.core.validators import validate_email
 from django.utils.safestring import mark_safe
-import tweepy
 
-from .models import Note, Request
-from .utils import reading_tw_api
+from .models import Note, Track, Vote
 from ..vote import trivia
 
 _disable_autocorrect = {
@@ -22,24 +19,15 @@
 )
 
 
-def email_or_twitter(address: str) -> None:
-    try:
-        validate_email(address)
-    except forms.ValidationError:
-        try:
-            reading_tw_api.get_user(screen_name=address.lstrip('@'))
-        except tweepy.TweepError:
-            raise forms.ValidationError(
-                'Enter a valid email address or twitter username'
-            )
-
+class ClearableFileInput(forms.widgets.ClearableFileInput):
+    """
+    The stock clearable file widget generates HTML that cannot be easily laid
+    out in a reasonable way with CSS. In particular, the way the 'clear'
+    checkbox is not put in any kind of elements makes intentional layout
+    basically impossible. Here, we aim to fix that.
+    """
 
-class EmailOrTwitterField(forms.EmailField):
-    widget = forms.TextInput(attrs=dict(_disable_autocorrect, autocapitalize="off"))
-    default_error_messages = {
-        'invalid': u'Enter a valid email address or Twitter username',
-    }
-    default_validators = [email_or_twitter]
+    template_name = 'widgets/clearable_file_input.html'
 
 
 class SearchForm(forms.Form):
@@ -53,7 +41,6 @@ class TriviaForm(forms.Form):
 
     trivia_question = forms.CharField(widget=forms.HiddenInput)
     trivia = forms.CharField(required=False)
-    track = None
 
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
@@ -75,13 +62,6 @@ def clean_trivia(self):
                 re.I,
             )
 
-        request = Request()
-        request.successful = bool(human)
-        if self.track:
-            request.track_id = self.track.pk
-        request.serialise(self.cleaned_data)
-        request.save()
-
         if not human:
             hint = (
                 "That's not right, sorry. There are hints <a href='https://"
@@ -97,18 +77,22 @@ def clean_trivia(self):
         return self.cleaned_data['trivia']
 
 
-class BadMetadataForm(TriviaForm):
+class BadMetadataForm(forms.Form):
     details = forms.CharField(
         widget=forms.Textarea, label="What needs fixing?", required=False
     )
-    contact = EmailOrTwitterField(label="Email/Twitter (not required)", required=False)
+    track: Track
 
-    def __init__(self, *args, **kwargs) -> None:
-        self.track = kwargs.pop('track')
+    def __init__(self, *args, track: Track, **kwargs) -> None:
+        self.track = track
         super().__init__(*args, **kwargs)
 
 
-class RequestForm(TriviaForm):
+class RequestForm(forms.Form):
+    """
+    A form for requesting that a track be added to the library.
+    """
+
     title = forms.CharField(widget=_proper_noun_textinput, required=False)
     artist = forms.CharField(widget=_proper_noun_textinput, required=False)
     show = forms.CharField(
@@ -120,29 +104,35 @@ class RequestForm(TriviaForm):
         label="Additional Details",
         required=False,
     )
-    contact = EmailOrTwitterField(label="Email Address/Twitter name", required=True)
 
     def clean(self) -> Optional[dict[str, Any]]:
         cleaned_data = super().clean()
         if cleaned_data is None:
             return None
 
-        compulsory = Request.METADATA_KEYS
-
-        filled = [
-            cleaned_data[f]
-            for f in cleaned_data
-            if f not in compulsory and cleaned_data[f]
-        ]
+        filled = [cleaned_data[f] for f in cleaned_data if cleaned_data[f]]
 
-        if len(filled) < 2:
+        if len(filled) < 1:
             raise forms.ValidationError(
-                "I'm sure you can give us more information than that."
+                'please provide at least some information to work with'
             )
 
         return cleaned_data
 
 
+class VoteForm(forms.ModelForm):
+    """
+    A form for creating a :class:`.models.Vote`.
+    """
+
+    class Meta:
+        model = Vote
+        fields = ['text']
+        widgets = {
+            'text': forms.TextInput(),
+        }
+
+
 class CheckMetadataForm(forms.Form):
     id3_title = forms.CharField(required=False, widget=forms.Textarea())
     id3_artist = forms.CharField(required=False, widget=forms.Textarea())