From cbc4c8de773e5f784536d862d31bdd64884d5aea Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 5 Jul 2024 22:01:04 -0400
Subject: [PATCH] fix bluesky login display

---
 mastodon/models/bluesky.py | 8 +++++---
 mastodon/models/common.py  | 5 +----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mastodon/models/bluesky.py b/mastodon/models/bluesky.py
index 713a9938..5e22fd0d 100644
--- a/mastodon/models/bluesky.py
+++ b/mastodon/models/bluesky.py
@@ -158,9 +158,11 @@ class BlueskyAccount(SocialAccount):
             logger.warning("Bluesky: client not logged in.")  # this should not happen
             return False
         if self.handle != profile.handle:
-            logger.warning(
-                f"ATProto refresh: handle mismatch {self.handle} from did doc -> {profile.handle} from PDS"
-            )
+            if self.handle:
+                logger.warning(
+                    f"ATProto refresh: handle mismatch {self.handle} from did doc -> {profile.handle} from PDS"
+                )
+            self.handle = profile.handle
         self.account_data = {
             k: v for k, v in profile.__dict__.items() if isinstance(v, (int, str))
         }
diff --git a/mastodon/models/common.py b/mastodon/models/common.py
index a946b684..8d85cbf8 100644
--- a/mastodon/models/common.py
+++ b/mastodon/models/common.py
@@ -82,15 +82,12 @@ class SocialAccount(TypedModel):
             for k, v in self.__dict__.items()
             if k
             not in [
-                "_state",
-                "_client",
-                "_profile",
-                "api_domain",
                 "created",
                 "modified",
                 "last_refresh",
                 "last_reachable",
             ]
+            and not k.startswith("_")
         }
         return d