From 6e79527bb5743481148f492274b7a19da057366c Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Sat, 19 Nov 2022 13:38:25 -0700 Subject: A few more fixes from going live --- users/models/identity.py | 2 + users/views/settings.py | 193 --------------------------------------- users/views/settings/__init__.py | 140 ++++++++++++++++++++++++++++ users/views/settings/profile.py | 63 +++++++++++++ 4 files changed, 205 insertions(+), 193 deletions(-) delete mode 100644 users/views/settings.py create mode 100644 users/views/settings/__init__.py create mode 100644 users/views/settings/profile.py (limited to 'users') diff --git a/users/models/identity.py b/users/models/identity.py index 21912ac..53b6f80 100644 --- a/users/models/identity.py +++ b/users/models/identity.py @@ -162,6 +162,8 @@ class Identity(StatorModel): actor_uri, handle = async_to_sync(cls.fetch_webfinger)( f"{username}@{domain}" ) + if handle is None: + return None username, domain = handle.split("@") domain = Domain.get_remote_domain(domain) return cls.objects.create( diff --git a/users/views/settings.py b/users/views/settings.py deleted file mode 100644 index 1403821..0000000 --- a/users/views/settings.py +++ /dev/null @@ -1,193 +0,0 @@ -from functools import partial -from typing import ClassVar, Dict, List - -from django import forms -from django.core.files import File -from django.shortcuts import redirect -from django.utils.decorators import method_decorator -from django.views.generic import FormView, RedirectView -from PIL import Image, ImageOps - -from core.models.config import Config, UploadedImage -from users.decorators import identity_required - - -@method_decorator(identity_required, name="dispatch") -class SettingsRoot(RedirectView): - pattern_name = "settings_profile" - - -@method_decorator(identity_required, name="dispatch") -class SettingsPage(FormView): - """ - Shows a settings page dynamically created from our settings layout - at the bottom of the page. Don't add this to a URL directly - subclass! - """ - - options_class = Config.IdentityOptions - template_name = "settings/settings.html" - section: ClassVar[str] - options: Dict[str, Dict[str, str]] - layout: Dict[str, List[str]] - - def get_form_class(self): - # Create the fields dict from the config object - fields = {} - for key, details in self.options.items(): - config_field = self.options_class.__fields__[key] - if config_field.type_ is bool: - form_field = partial( - forms.BooleanField, - widget=forms.Select( - choices=[(True, "Enabled"), (False, "Disabled")] - ), - ) - elif config_field.type_ is UploadedImage: - form_field = forms.ImageField - elif config_field.type_ is str: - if details.get("display") == "textarea": - form_field = partial( - forms.CharField, - widget=forms.Textarea, - ) - else: - form_field = forms.CharField - elif config_field.type_ is int: - form_field = forms.IntegerField - else: - raise ValueError(f"Cannot render settings type {config_field.type_}") - fields[key] = form_field( - label=details["title"], - help_text=details.get("help_text", ""), - required=details.get("required", False), - ) - # Create a form class dynamically (yeah, right?) and return that - return type("SettingsForm", (forms.Form,), fields) - - def load_config(self): - return Config.load_identity(self.request.identity) - - def save_config(self, key, value): - Config.set_identity(self.request.identity, key, value) - - def get_initial(self): - config = self.load_config() - initial = {} - for key in self.options.keys(): - initial[key] = getattr(config, key) - return initial - - def get_context_data(self): - context = super().get_context_data() - context["section"] = self.section - # Gather fields into fieldsets - context["fieldsets"] = {} - for title, fields in self.layout.items(): - context["fieldsets"][title] = [context["form"][field] for field in fields] - return context - - def form_valid(self, form): - # Save each key - for field in form: - if field.field.__class__.__name__ == "ImageField": - # These can be cleared with an extra checkbox - if self.request.POST.get(f"{field.name}__clear"): - self.save_config(field.name, None) - continue - # We shove the preview values in initial_data, so only save file - # fields if they have a File object. - if not isinstance(form.cleaned_data[field.name], File): - continue - self.save_config( - field.name, - form.cleaned_data[field.name], - ) - return redirect(".") - - -class InterfacePage(SettingsPage): - - section = "interface" - - options = { - "toot_mode": { - "title": "I Will Toot As I Please", - "help_text": "Changes all 'Post' buttons to 'Toot!'", - } - } - - layout = {"Posting": ["toot_mode"]} - - -@method_decorator(identity_required, name="dispatch") -class ProfilePage(FormView): - """ - Lets the identity's profile be edited - """ - - template_name = "settings/profile.html" - extra_context = {"section": "profile"} - - class form_class(forms.Form): - name = forms.CharField(max_length=500) - summary = forms.CharField( - widget=forms.Textarea, - required=False, - help_text="Describe you and your interests", - label="Bio", - ) - icon = forms.ImageField( - required=False, help_text="Shown next to all your posts and activities" - ) - image = forms.ImageField( - required=False, help_text="Shown at the top of your profile" - ) - - def get_initial(self): - return { - "name": self.request.identity.name, - "summary": self.request.identity.summary, - "icon": self.request.identity.icon and self.request.identity.icon.url, - "image": self.request.identity.image and self.request.identity.image.url, - } - - def form_valid(self, form): - # Update identity name and summary - self.request.identity.name = form.cleaned_data["name"] - self.request.identity.summary = form.cleaned_data["summary"] - # Resize images - icon = form.cleaned_data.get("icon") - image = form.cleaned_data.get("image") - if isinstance(icon, File): - resized_image = ImageOps.fit(Image.open(icon), (400, 400)) - icon.open() - resized_image.save(icon) - self.request.identity.icon = icon - if isinstance(image, File): - resized_image = ImageOps.fit(Image.open(image), (1500, 500)) - image.open() - resized_image.save(image) - self.request.identity.image = image - self.request.identity.save() - return redirect(".") - - -@method_decorator(identity_required, name="dispatch") -class SecurityPage(FormView): - """ - Lets the identity's profile be edited - """ - - template_name = "settings/login_security.html" - extra_context = {"section": "security"} - - class form_class(forms.Form): - email = forms.EmailField( - disabled=True, - help_text="Your email address cannot be changed yet.", - ) - - def get_initial(self): - return {"email": self.request.user.email} - - template_name = "settings/login_security.html" diff --git a/users/views/settings/__init__.py b/users/views/settings/__init__.py new file mode 100644 index 0000000..65be1c5 --- /dev/null +++ b/users/views/settings/__init__.py @@ -0,0 +1,140 @@ +from functools import partial +from typing import ClassVar, Dict, List + +from django import forms +from django.core.files import File +from django.shortcuts import redirect +from django.utils.decorators import method_decorator +from django.views.generic import FormView, RedirectView + +from core.models.config import Config, UploadedImage +from users.decorators import identity_required +from users.views.settings.profile import ProfilePage # noqa + + +@method_decorator(identity_required, name="dispatch") +class SettingsRoot(RedirectView): + pattern_name = "settings_profile" + + +@method_decorator(identity_required, name="dispatch") +class SettingsPage(FormView): + """ + Shows a settings page dynamically created from our settings layout + at the bottom of the page. Don't add this to a URL directly - subclass! + """ + + options_class = Config.IdentityOptions + template_name = "settings/settings.html" + section: ClassVar[str] + options: Dict[str, Dict[str, str]] + layout: Dict[str, List[str]] + + def get_form_class(self): + # Create the fields dict from the config object + fields = {} + for key, details in self.options.items(): + config_field = self.options_class.__fields__[key] + if config_field.type_ is bool: + form_field = partial( + forms.BooleanField, + widget=forms.Select( + choices=[(True, "Enabled"), (False, "Disabled")] + ), + ) + elif config_field.type_ is UploadedImage: + form_field = forms.ImageField + elif config_field.type_ is str: + if details.get("display") == "textarea": + form_field = partial( + forms.CharField, + widget=forms.Textarea, + ) + else: + form_field = forms.CharField + elif config_field.type_ is int: + form_field = forms.IntegerField + else: + raise ValueError(f"Cannot render settings type {config_field.type_}") + fields[key] = form_field( + label=details["title"], + help_text=details.get("help_text", ""), + required=details.get("required", False), + ) + # Create a form class dynamically (yeah, right?) and return that + return type("SettingsForm", (forms.Form,), fields) + + def load_config(self): + return Config.load_identity(self.request.identity) + + def save_config(self, key, value): + Config.set_identity(self.request.identity, key, value) + + def get_initial(self): + config = self.load_config() + initial = {} + for key in self.options.keys(): + initial[key] = getattr(config, key) + return initial + + def get_context_data(self): + context = super().get_context_data() + context["section"] = self.section + # Gather fields into fieldsets + context["fieldsets"] = {} + for title, fields in self.layout.items(): + context["fieldsets"][title] = [context["form"][field] for field in fields] + return context + + def form_valid(self, form): + # Save each key + for field in form: + if field.field.__class__.__name__ == "ImageField": + # These can be cleared with an extra checkbox + if self.request.POST.get(f"{field.name}__clear"): + self.save_config(field.name, None) + continue + # We shove the preview values in initial_data, so only save file + # fields if they have a File object. + if not isinstance(form.cleaned_data[field.name], File): + continue + self.save_config( + field.name, + form.cleaned_data[field.name], + ) + return redirect(".") + + +class InterfacePage(SettingsPage): + + section = "interface" + + options = { + "toot_mode": { + "title": "I Will Toot As I Please", + "help_text": "Changes all 'Post' buttons to 'Toot!'", + } + } + + layout = {"Posting": ["toot_mode"]} + + +@method_decorator(identity_required, name="dispatch") +class SecurityPage(FormView): + """ + Lets the identity's profile be edited + """ + + template_name = "settings/login_security.html" + extra_context = {"section": "security"} + + class form_class(forms.Form): + email = forms.EmailField( + disabled=True, + help_text="Your email address cannot be changed yet.", + ) + + def get_initial(self): + return {"email": self.request.user.email} + + template_name = "settings/login_security.html" diff --git a/users/views/settings/profile.py b/users/views/settings/profile.py new file mode 100644 index 0000000..3b16d69 --- /dev/null +++ b/users/views/settings/profile.py @@ -0,0 +1,63 @@ +import io + +from django import forms +from django.core.files import File +from django.shortcuts import redirect +from django.utils.decorators import method_decorator +from django.views.generic import FormView +from PIL import Image, ImageOps + +from users.decorators import identity_required + + +@method_decorator(identity_required, name="dispatch") +class ProfilePage(FormView): + """ + Lets the identity's profile be edited + """ + + template_name = "settings/profile.html" + extra_context = {"section": "profile"} + + class form_class(forms.Form): + name = forms.CharField(max_length=500) + summary = forms.CharField( + widget=forms.Textarea, + required=False, + help_text="Describe you and your interests", + label="Bio", + ) + icon = forms.ImageField( + required=False, help_text="Shown next to all your posts and activities" + ) + image = forms.ImageField( + required=False, help_text="Shown at the top of your profile" + ) + + def get_initial(self): + return { + "name": self.request.identity.name, + "summary": self.request.identity.summary, + "icon": self.request.identity.icon and self.request.identity.icon.url, + "image": self.request.identity.image and self.request.identity.image.url, + } + + def form_valid(self, form): + # Update identity name and summary + self.request.identity.name = form.cleaned_data["name"] + self.request.identity.summary = form.cleaned_data["summary"] + # Resize images + icon = form.cleaned_data.get("icon") + image = form.cleaned_data.get("image") + if isinstance(icon, File): + resized_image = ImageOps.fit(Image.open(icon), (400, 400)) + new_icon_bytes = io.BytesIO() + resized_image.save(new_icon_bytes, format=icon.format) + self.request.identity.icon.save(icon.name, File(new_icon_bytes)) + if isinstance(image, File): + resized_image = ImageOps.fit(Image.open(image), (400, 400)) + new_image_bytes = io.BytesIO() + resized_image.save(new_image_bytes, format=image.format) + self.request.identity.image.save(image.name, File(new_image_bytes)) + self.request.identity.save() + return redirect(".") -- cgit v1.2.3