merge remote and local following when sync

This commit is contained in:
Your Name 2023-07-07 02:12:09 -04:00 committed by Henri Dickson
parent 68042edd04
commit 2c55d9209e

View file

@ -283,6 +283,9 @@ class User(AbstractUser):
or self.mastodon_acct in target.mastodon_followers
):
fl.append(target.pk)
for user in self.local_following.all():
if user.pk not in fl and not user.locked and not user.is_blocking(self):
fl.append(user.pk)
return fl
def is_blocking(self, target):