fix is_visible logic

app/backend/src/couchers/servicers/blocking.py

@@ -13,12 +13,17 @@
 
 def is_not_visible(session: Session, user1_id: int | None, user2_id: int | None) -> bool:
     """
-    Check if users are not visible to each other (due to block or because either account is deleted/banned).
+    Check if users are not visible to each other (due to block or because either account is deleted/banned/shadowed).
     """
     hidden_users = select(User.id).where(or_(User.id == user1_id, User.id == user2_id)).where(not_(User.is_visible))
+    shadowed_target = select(User.id).where(User.id == user2_id).where(User.shadowed_at.is_not(None))
+    if user1_id is not None:
+        shadowed_target = shadowed_target.where(User.id != user1_id)
     # if either user_id is empty, just check if either user is hidden (as they can't block each other)
     if not user1_id or not user2_id:
-        return session.execute(select(union(hidden_users).subquery()).limit(1)).one_or_none() is not None
+        return (
+            session.execute(select(union(hidden_users, shadowed_target).subquery()).limit(1)).one_or_none() is not None
+        )
     else:
         blocked_users = (
             select(UserBlock.blocked_user_id)
@@ -32,7 +37,7 @@ def is_not_visible(session: Session, user1_id: int | None, user2_id: int | None)
         )
         return (
             session.execute(
-                select(union(blocked_users, blocking_users, hidden_users).subquery()).limit(1)
+                select(union(blocked_users, blocking_users, hidden_users, shadowed_target).subquery()).limit(1)
             ).one_or_none()
             is not None
         )

app/backend/src/tests/test_blocking.py

@@ -191,6 +191,10 @@ def test_is_not_visible(db):
     mixed_deleted, _ = generate_user()
     mixed_banned, _ = generate_user()
 
+    # Users for shadow tests
+    shadowed_user, _ = generate_user()
+    visible_for_shadowed, _ = generate_user()
+
     with session_scope() as session:
         # Test 1: Two normal visible users - should be visible to each other
         assert not is_not_visible(session, normal_user1.id, normal_user2.id)
@@ -286,3 +290,15 @@ def test_is_not_visible(db):
         # Additional edge case: Check that normal users are still visible to each other after all the above
         assert not is_not_visible(session, normal_user1.id, normal_user2.id)
         assert not is_not_visible(session, normal_user1.id, extra_user1.id)
+
+        # Test 15: Shadowed target is hidden from other users and from anonymous viewers,
+        # but visible to themselves
+        shadowed_user_db = session.get_one(User, shadowed_user.id)
+        shadowed_user_db.shadowed_at = now()
+        session.commit()
+        assert is_not_visible(session, visible_for_shadowed.id, shadowed_user.id)
+        assert is_not_visible(session, None, shadowed_user.id)
+        assert not is_not_visible(session, shadowed_user.id, shadowed_user.id)
+        # Shadowed viewer can still see other (visible) users
+        assert not is_not_visible(session, shadowed_user.id, visible_for_shadowed.id)
+        assert not is_not_visible(session, shadowed_user.id, None)