Merge branch 'main' into import-limit

bookwyrm/views/__init__.py

@@ -10,6 +10,7 @@ from .admin.federation import Federation, FederatedServer
 from .admin.federation import AddFederatedServer, ImportServerBlocklist
 from .admin.federation import block_server, unblock_server, refresh_server
 from .admin.email_blocklist import EmailBlocklist
+from .admin.email_config import EmailConfig
 from .admin.imports import (
     ImportList,
     disable_imports,
@@ -28,7 +29,7 @@ from .admin.reports import (
     unsuspend_user,
     moderator_delete_user,
 )
-from .admin.site import Site
+from .admin.site import Site, Registration, RegistrationLimited
 from .admin.themes import Themes, delete_theme
 from .admin.user_admin import UserAdmin, UserAdminList
 
@@ -65,7 +66,7 @@ from .books.editions import Editions, switch_edition
 from .books.links import BookFileLinks, AddFileLink, delete_link
 
 # landing
-from .landing.about import about, privacy, conduct
+from .landing.about import about, privacy, conduct, impressum
 from .landing.landing import Home, Landing
 from .landing.login import Login, Logout
 from .landing.register import Register
@@ -142,7 +143,13 @@ from .setup import InstanceConfig, CreateAdmin
 from .status import CreateStatus, EditStatus, DeleteStatus, update_progress
 from .status import edit_readthrough
 from .updates import get_notification_count, get_unread_status_string
-from .user import User, hide_suggestions, user_redirect, toggle_guided_tour
+from .user import (
+    User,
+    UserReviewsComments,
+    hide_suggestions,
+    user_redirect,
+    toggle_guided_tour,
+)
 from .relationships import Relationships
 from .wellknown import *
 from .annual_summary import (

bookwyrm/views/admin/email_config.py

@@ -0,0 +1,65 @@
+""" is your email running? """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import emailing
+from bookwyrm import settings
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    name="dispatch",
+)
+class EmailConfig(View):
+    """View and test your emailing setup"""
+
+    def get(self, request):
+        """View email config"""
+        data = view_data()
+        # TODO: show email previews
+        return TemplateResponse(request, "settings/email_config.html", data)
+
+    def post(self, request):
+        """Send test email"""
+        data = view_data()
+        try:
+            emailing.test_email(request.user)
+            data["success"] = True
+        except Exception as err:  # pylint: disable=broad-except
+            data["error"] = err
+        return TemplateResponse(request, "settings/email_config.html", data)
+
+
+def view_data():
+    """helper to get data for view"""
+    return {
+        "email_backend": settings.EMAIL_BACKEND,
+        "email_host": settings.EMAIL_HOST,
+        "email_port": settings.EMAIL_PORT,
+        "Email_host_user": settings.EMAIL_HOST_USER,
+        "email_use_tls": settings.EMAIL_USE_TLS,
+        "email_use_ssl": settings.EMAIL_USE_SSL,
+        "email_sender": settings.EMAIL_SENDER,
+    }
+
+
+@login_required
+@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
+def email_preview(request):
+    """for development, renders and example email template"""
+    template = request.GET.get("email")
+    data = emailing.email_data()
+    data["subject_path"] = f"email/{template}/subject.html"
+    data["html_content_path"] = f"email/{template}/html_content.html"
+    data["text_content_path"] = f"email/{template}/text_content.html"
+    data["reset_link"] = "https://example.com/link"
+    data["invite_link"] = "https://example.com/link"
+    data["confirmation_link"] = "https://example.com/link"
+    data["confirmation_code"] = "AKJHKDGKJSDFG"
+    data["reporter"] = "ConcernedUser"
+    data["reportee"] = "UserName"
+    data["report_link"] = "https://example.com/link"
+    return TemplateResponse(request, "email/preview.html", data)

bookwyrm/views/admin/site.py

@@ -4,7 +4,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import emailing, forms, models
+from bookwyrm import forms, models
 
 
 # pylint: disable= no-self-use
@@ -35,20 +35,55 @@ class Site(View):
         return TemplateResponse(request, "settings/site.html", data)
 
 
-@login_required
-@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
-def email_preview(request):
-    """for development, renders and example email template"""
-    template = request.GET.get("email")
-    data = emailing.email_data()
-    data["subject_path"] = f"email/{template}/subject.html"
-    data["html_content_path"] = f"email/{template}/html_content.html"
-    data["text_content_path"] = f"email/{template}/text_content.html"
-    data["reset_link"] = "https://example.com/link"
-    data["invite_link"] = "https://example.com/link"
-    data["confirmation_link"] = "https://example.com/link"
-    data["confirmation_code"] = "AKJHKDGKJSDFG"
-    data["reporter"] = "ConcernedUser"
-    data["reportee"] = "UserName"
-    data["report_link"] = "https://example.com/link"
-    return TemplateResponse(request, "email/preview.html", data)
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    name="dispatch",
+)
+class RegistrationLimited(View):
+    """Things related to registering that non-admins owners can change"""
+
+    def get(self, request):
+        """edit form"""
+        site = models.SiteSettings.objects.get()
+        data = {"form": forms.RegistrationLimitedForm(instance=site)}
+        return TemplateResponse(request, "settings/registration_limited.html", data)
+
+    def post(self, request):
+        """edit the site settings"""
+        site = models.SiteSettings.objects.get()
+        form = forms.RegistrationLimitedForm(request.POST, request.FILES, instance=site)
+        if not form.is_valid():
+            data = {"form": form}
+            return TemplateResponse(request, "settings/registration_limited.html", data)
+        site = form.save(request)
+
+        data = {"form": forms.RegistrationLimitedForm(instance=site), "success": True}
+        return TemplateResponse(request, "settings/registration_limited.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.manage_registration", raise_exception=True),
+    name="dispatch",
+)
+class Registration(View):
+    """Control everything about registration"""
+
+    def get(self, request):
+        """edit form"""
+        site = models.SiteSettings.objects.get()
+        data = {"form": forms.RegistrationForm(instance=site)}
+        return TemplateResponse(request, "settings/registration.html", data)
+
+    def post(self, request):
+        """edit the site settings"""
+        site = models.SiteSettings.objects.get()
+        form = forms.RegistrationForm(request.POST, request.FILES, instance=site)
+        if not form.is_valid():
+            data = {"form": form}
+            return TemplateResponse(request, "settings/registration.html", data)
+        site = form.save(request)
+
+        data = {"form": forms.RegistrationForm(instance=site), "success": True}
+        return TemplateResponse(request, "settings/registration.html", data)

bookwyrm/views/admin/themes.py

@@ -12,7 +12,7 @@ from bookwyrm import forms, models
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    permission_required("bookwyrm.system_administration", raise_exception=True),
     name="dispatch",
 )
 class Themes(View):
@@ -46,7 +46,7 @@ def get_view_data():
 
 
 @require_POST
-@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
+@permission_required("bookwyrm.system_administration", raise_exception=True)
 # pylint: disable=unused-argument
 def delete_theme(request, theme_id):
     """Remove a theme"""

bookwyrm/views/books/editions.py

@@ -49,6 +49,8 @@ class Editions(View):
                 "isbn_13",
                 "oclc_number",
                 "asin",
+                "aasin",
+                "isfdb",
             ]
             search_filter_entries = [
                 {f"{f}__icontains": query} for f in searchable_fields

bookwyrm/views/landing/about.py

@@ -1,5 +1,6 @@
 """ non-interactive pages """
 from dateutil.relativedelta import relativedelta
+from django.http import Http404
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.views.decorators.http import require_GET
@@ -36,3 +37,12 @@ def conduct(request):
 def privacy(request):
     """more information about the instance"""
     return TemplateResponse(request, "about/privacy.html")
+
+
+@require_GET
+def impressum(request):
+    """more information about the instance"""
+    site = models.SiteSettings.objects.get()
+    if not site.show_impressum:
+        raise Http404()
+    return TemplateResponse(request, "about/impressum.html")

bookwyrm/views/landing/register.py

@@ -1,4 +1,5 @@
 """ class views for login/register views """
+import pytz
 from django.contrib.auth import login
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
@@ -55,6 +56,10 @@ class Register(View):
         localname = form.data["localname"].strip()
         email = form.data["email"]
         password = form.data["password"]
+        try:
+            preferred_timezone = pytz.timezone(form.data.get("preferred_timezone"))
+        except pytz.exceptions.UnknownTimeZoneError:
+            preferred_timezone = pytz.utc
 
         # make sure the email isn't blocked as spam
         email_domain = email.split("@")[-1]
@@ -71,6 +76,7 @@ class Register(View):
             local=True,
             deactivation_reason="pending" if settings.require_confirm_email else None,
             is_active=not settings.require_confirm_email,
+            preferred_timezone=preferred_timezone,
         )
         if invite:
             invite.times_used += 1
@@ -105,9 +111,7 @@ class ConfirmEmailCode(View):
                 request, "confirm_email/confirm_email.html", {"valid": False}
             )
         # update the user
-        user.is_active = True
-        user.deactivation_reason = None
-        user.save(broadcast=False, update_fields=["is_active", "deactivation_reason"])
+        user.reactivate()
         # direct the user to log in
         return redirect("login", confirmed="confirmed")
 

bookwyrm/views/user.py

@@ -1,6 +1,7 @@
 """ The user profile """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
+from django.db.models import Q
 from django.http import Http404
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
@@ -100,6 +101,49 @@ class User(View):
         return TemplateResponse(request, "user/user.html", data)
 
 
+class UserReviewsComments(View):
+    """user's activity filtered by reviews and comments"""
+
+    def get(self, request, username):
+        """user's activity filtered by reviews and comments"""
+        user = get_user_from_username(request.user, username)
+        is_self = request.user.id == user.id
+
+        activities = (
+            models.Status.privacy_filter(
+                request.user,
+            )
+            .filter(
+                Q(review__isnull=False) | Q(comment__isnull=False),
+                user=user,
+            )
+            .exclude(
+                privacy="direct",
+            )
+            .select_related(
+                "user",
+                "reply_parent",
+                "review__book",
+                "comment__book",
+                "quotation__book",
+            )
+            .prefetch_related(
+                "mention_books",
+                "mention_users",
+                "attachments",
+            )
+        )
+
+        paginated = Paginator(activities, PAGE_LENGTH)
+
+        data = {
+            "user": user,
+            "is_self": is_self,
+            "activities": paginated.get_page(request.GET.get("page", 1)),
+        }
+        return TemplateResponse(request, "user/reviews_comments.html", data)
+
+
 @require_POST
 @login_required
 def hide_suggestions(request):