custom questions

bookwyrm/forms.py

@@ -1,4 +1,5 @@
 """ using django model forms """
+from dataclasses import field
 import datetime
 from collections import defaultdict
 from urllib.parse import urlparse
@@ -50,7 +51,7 @@ class LoginForm(CustomForm):
 class RegisterForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ["localname", "email", "password"]
+        fields = ["localname", "email", "password", "answer"]
         help_texts = {f: None for f in fields}
         widgets = {"password": PasswordInput()}
 
@@ -404,7 +405,7 @@ class InviteRequestForm(CustomForm):
 
     class Meta:
         model = models.InviteRequest
-        fields = ["email"]
+        fields = ["email", "answer"]
 
 
 class CreateInviteForm(CustomForm):

bookwyrm/migrations/0145_user_question.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-03-04 22:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0144_alter_announcement_display_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='question',
+            field=models.TextField(blank=True, max_length=500, verbose_name='question'),
+        ),
+    ]

bookwyrm/migrations/0146_alter_user_question.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-03-04 23:15
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0145_user_question'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='question',
+            field=bookwyrm.models.fields.TextField(blank=True, max_length=500, verbose_name='question'),
+        ),
+    ]

bookwyrm/migrations/0147_alter_user_question.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-03-04 23:19
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0146_alter_user_question'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='question',
+            field=bookwyrm.models.fields.TextField(blank=True, max_length=500),
+        ),
+    ]

bookwyrm/migrations/0148_rename_question_user_answer.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-03-05 11:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0147_alter_user_question'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='user',
+            old_name='question',
+            new_name='answer',
+        ),
+    ]

bookwyrm/migrations/0149_inviterequest_answer.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.12 on 2022-03-05 11:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0148_rename_question_user_answer'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='inviterequest',
+            name='answer',
+            field=models.TextField(default='yyyyy', max_length=512),
+            preserve_default=False,
+        ),
+    ]

bookwyrm/migrations/0150_alter_inviterequest_answer.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-03-05 12:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0149_inviterequest_answer'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='inviterequest',
+            name='answer',
+            field=models.TextField(max_length=50),
+        ),
+    ]

bookwyrm/models/site.py

@@ -48,8 +48,14 @@ class SiteSettings(models.Model):
     # registration
     allow_registration = models.BooleanField(default=False)
     allow_invite_requests = models.BooleanField(default=True)
+    invite_request_question = models.BooleanField(default=False)
     require_confirm_email = models.BooleanField(default=True)
 
+    invite_question_text = models.CharField(
+		max_length=255,
+		null=not(invite_request_question),
+        default="What is your favourite book?"
+	)
     # images
     logo = models.ImageField(upload_to="logos/", null=True, blank=True)
     logo_small = models.ImageField(upload_to="logos/", null=True, blank=True)
@@ -149,6 +155,7 @@ class InviteRequest(BookWyrmModel):
     invite = models.ForeignKey(
         SiteInvite, on_delete=models.SET_NULL, null=True, blank=True
     )
+    answer = models.TextField(max_length=50, unique=False, null=False)
     invite_sent = models.BooleanField(default=False)
     ignored = models.BooleanField(default=False)
 

bookwyrm/models/user.py

@@ -1,5 +1,6 @@
 """ database schema for user data """
 import re
+import string
 from urllib.parse import urlparse
 
 from django.apps import apps
@@ -52,6 +53,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     username = fields.UsernameField()
     email = models.EmailField(unique=True, null=True)
+    answer = fields.TextField(max_length=500, blank=True)
 
     key_pair = fields.OneToOneField(
         "KeyPair",

bookwyrm/templates/landing/layout.html

@@ -70,6 +70,14 @@
 
                             {% include 'snippets/form_errors.html' with errors_list=request_form.email.errors id="desc_request_email" %}
                         </div>
+						{% if site.invite_request_question %}
+							<div class="block">
+								<label for="id_answer_register" class="label">{{ site.invite_question_text }}</label>
+								<input type="answer" name="answer" maxlength="50" class="input" required="true" id="id_answer_register" aria-describedby="desc_answer_register">
+								{% include 'snippets/form_errors.html' with errors_list=request_form.answer.errors id="desc_answer_register" %}
+							</div>
+						{% endif %}
+
                         <button type="submit" class="button is-link">{% trans "Submit" %}</button>
                     </form>
                 {% endif %}

bookwyrm/templates/settings/invites/manage_invite_requests.html

@@ -40,6 +40,7 @@
                 {% include 'snippets/table-sort-header.html' with field="invite__invitees__created_date" sort=sort text=text %}
             </th>
             <th>{% trans "Email" %}</th>
+            <th>{% trans "Answer" %}</th>
             <th>
                 {% trans "Status" as text %}
                 {% include 'snippets/table-sort-header.html' with field="invite__times_used" sort=sort text=text %}
@@ -54,6 +55,7 @@
             <td>{{ req.created_date | naturaltime }}</td>
             <td>{{ req.invite.invitees.first.created_date | naturaltime }}</td>
             <td>{{ req.email }}</td>
+            <td>{{ req.answer }}</td>
             <td>
                 {% if req.invite.times_used %}
                 {% trans "Accepted" %}

bookwyrm/templates/settings/site.html

@@ -145,6 +145,18 @@
                     {% trans "Allow invite requests" %}
                 </label>
             </div>
+			<div class="field">
+                <label class="label" for="id_invite_requests_question">
+                    {{ site_form.invite_request_question }}
+                    {% trans "Set a question for invite requests" %}
+                </label>
+            </div>
+				<div class="field">
+					<label class="label" for="id_invite_question_text">
+						{% trans "Question:" %}
+						{{ site_form.invite_question_text }}
+					</label>
+				</div>
             <div class="field">
                 <label class="label mb-0" for="id_require_confirm_email">
                     {{ site_form.require_confirm_email }}

bookwyrm/views/admin/invite.py

@@ -96,6 +96,7 @@ class ManageInviteRequests(View):
             "created_date",
             "invite__times_used",
             "invite__invitees__created_date",
+			"answer"
         ]
         # pylint: disable=consider-using-f-string
         if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
@@ -143,6 +144,8 @@ class ManageInviteRequests(View):
         invite_request = get_object_or_404(
             models.InviteRequest, id=request.POST.get("invite-request")
         )
+
+		
         # only create a new invite if one doesn't exist already (resending)
         if not invite_request.invite:
             invite_request.invite = models.SiteInvite.objects.create(
@@ -169,10 +172,11 @@ class InviteRequest(View):
         if form.is_valid():
             received = True
             form.save()
+		#answer = 
 
         data = {
             "request_form": form,
-            "request_received": received,
+            "request_received": received
         }
         return TemplateResponse(request, "landing/landing.html", data)
 

bookwyrm/views/landing/register.py

@@ -56,6 +56,7 @@ class Register(View):
         localname = form.data["localname"].strip()
         email = form.data["email"]
         password = form.data["password"]
+        answer = form.data["answer"]
 
         # make sure the email isn't blocked as spam
         email_domain = email.split("@")[-1]
@@ -68,6 +69,7 @@ class Register(View):
             username,
             email,
             password,
+            answer=answer,
             localname=localname,
             local=True,
             deactivation_reason="pending" if settings.require_confirm_email else None,