profile: Profile.of(user) instead of user_profile

Author: kra-mo

openemail/app/profile.py

@@ -3,15 +3,15 @@
 # SPDX-FileContributor: kramo
 
 from collections.abc import Iterator
-from typing import Any
+from typing import Any, Self
 
 from gi.repository import Gdk, GdkPixbuf, Gio, GLib, GObject
 
 from openemail import app
 from openemail.core import client, model
 from openemail.core.client import WriteError, user
 from openemail.core.crypto import KeyPair
-from openemail.core.model import Address
+from openemail.core.model import Address, User
 
 from . import Notifier
 
@@ -149,6 +149,8 @@ class Profile(GObject.Object):
     _name: str | None = None
     _image: Gdk.Paintable | None = None
 
+    _user: Self | None = None
+
     def set_from_profile(self, profile: model.Profile | None) -> None:
         """Set the properties of `self` from `profile`."""
         self._profile = profile
@@ -215,13 +217,26 @@ def image(self, image: Gdk.Paintable | None) -> None:
         self._image = image
         self.has_image = bool(image)
 
-    @staticmethod
-    def of(address: Address) -> "Profile":
-        """Get the profile associated with `address`."""
-        from .store import profiles  # noqa: PLC0415
+    @classmethod
+    def of(cls, user: Address | User, /) -> "Profile":
+        """Get the profile associated with `user`.
+
+        If `user` is a User object instead of an Address,
+        returns a `Profile` object that always represents the data of
+        the currently logged in user, even after a relogin.
+        """
+        match user:
+            case Address():
+                from .store import profiles  # noqa: PLC0415
+
+                (profile := profiles[user]).address = str(user)
+                return profile
 
-        (profile := profiles[address]).address = str(address)
-        return profile
+            case User():
+                if not cls._user:
+                    cls._user = cls()
+
+                return cls._user
 
     def value_of(self, ident: str) -> Any:
         """Get the value of the field identified by `ident` in `self`."""
@@ -244,10 +259,10 @@ def set_receives_broadcasts(self, value: bool) -> None:
 
 async def refresh() -> None:
     """Update the profile of the user by fetching new data remotely."""
-    from .store import user_profile  # noqa: PLC0415
-
-    user_profile.updating = True
-    user_profile.set_from_profile(profile := await client.fetch_profile(user.address))
+    Profile.of(client.user).updating = True
+    Profile.of(client.user).set_from_profile(
+        profile := await client.fetch_profile(user.address)
+    )
 
     if profile:
         user.signing_keys = KeyPair(
@@ -262,15 +277,15 @@ async def refresh() -> None:
             )
 
     try:
-        user_profile.image = Gdk.Texture.new_from_bytes(
+        Profile.of(client.user).image = Gdk.Texture.new_from_bytes(
             GLib.Bytes.new(await client.fetch_profile_image(user.address))
         )
     except GLib.Error:
-        user_profile.image = None
+        Profile.of(client.user).image = None
 
-    Profile.of(user.address).image = user_profile.image
+    Profile.of(user.address).image = Profile.of(client.user).image
     Profile.of(user.address).set_from_profile(profile)
-    user_profile.updating = False
+    Profile.of(client.user).updating = False
 
 
 async def update(values: dict[str, str]) -> None:

openemail/app/store.py

@@ -230,7 +230,6 @@ async def _update(self) -> None:
 profiles: defaultdict[Address, Profile] = defaultdict(Profile)
 address_book = _AddressBook()
 contact_requests = _ContactRequests()
-user_profile = Profile()
 
 
 class MessageStore(DictStore[str, Message]):

openemail/widgets/content.py

@@ -7,7 +7,9 @@
 
 from gi.repository import Adw, Gdk, GObject, Gtk
 
-from openemail.app import APP_ID, PREFIX, Notifier, store
+from openemail.app import APP_ID, PREFIX, Notifier
+from openemail.app.profile import Profile
+from openemail.core import client
 
 from .compose_sheet import ComposeSheet
 from .contacts import Contacts  # noqa: F401
@@ -64,7 +66,7 @@ def __init__(self, **kwargs: Any) -> None:
             GObject.BindingFlags.SYNC_CREATE,
         )
 
-        store.user_profile.bind_property(
+        Profile.of(client.user).bind_property(
             "image",
             self,
             "profile-image",

openemail/widgets/profile_settings.py

@@ -9,8 +9,9 @@
 from gi.repository import Adw, Gdk, GdkPixbuf, Gio, GLib, GObject, Gtk
 
 from openemail import app
-from openemail.app import PREFIX, profile, store
+from openemail.app import PREFIX, profile
 from openemail.app.profile import Profile, ProfileField
+from openemail.core import client
 from openemail.core.client import WriteError
 
 from .form import Form
@@ -113,7 +114,7 @@ def __init__(self, **kwargs: Any) -> None:
             "about": self.about.get_text,
         }
 
-        store.user_profile.connect(
+        Profile.of(client.user).connect(
             "notify::updating",
             lambda p, _: self.set_property("profile", None if p.updating else p),  # pyright: ignore[reportUnknownArgumentType, reportUnknownMemberType]
         )