From bf296802d8ddd8ce83c95ebcc23a95ceec47bee5 Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Wed, 10 Apr 2024 15:16:37 -0700
Subject: [PATCH] pass from_user through to convert() in a few more places

---
 activitypub.py | 4 ++--
 atproto.py     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activitypub.py b/activitypub.py
index 4c9736c..52e0e2c 100644
--- a/activitypub.py
+++ b/activitypub.py
@@ -226,8 +226,8 @@ class ActivityPub(User, Protocol):
             logger.info(f'Skipping sending to blocklisted {url}')
             return False
 
-        activity = to_cls.convert(obj, from_user=from_user,
-                                  orig_obj=to_cls.convert(orig_obj))
+        orig_obj = to_cls.convert(orig_obj, from_user=from_user)
+        activity = to_cls.convert(obj, from_user=from_user, orig_obj=orig_obj)
 
         return signed_post(url, data=activity, from_user=from_user).ok
 
diff --git a/atproto.py b/atproto.py
index 34ad665..e2723d8 100644
--- a/atproto.py
+++ b/atproto.py
@@ -244,7 +244,7 @@ class ATProto(User, Protocol):
         initial_writes = None
         if user.obj and user.obj.as1:
             # create user profile
-            profile = cls.convert(user.obj, fetch_blobs=True)
+            profile = cls.convert(user.obj, fetch_blobs=True, from_user=user)
             profile.setdefault('labels', {'$type': 'com.atproto.label.defs#selfLabels'})
             profile['labels'].setdefault('values', []).append({
                 'val' : f'bridged-from-bridgy-fed-{user.LABEL}',
@@ -303,7 +303,7 @@ class ATProto(User, Protocol):
 
         # convert to Bluesky record; short circuits on error
         try:
-            record = to_cls.convert(base_obj, fetch_blobs=True)
+            record = to_cls.convert(base_obj, fetch_blobs=True, from_user=from_user)
         except ValueError as e:
             logger.info(f'Skipping due to {e}')
             return False