From 52f7033f7ac82155fc927f4b0a3f4f9e8ae11114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 4 Aug 2024 16:02:44 +0200
Subject: StreamerView: Do not leak follows count if hidden
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 lib/pleroma/web/views/streamer_view.ex | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/views/streamer_view.ex b/lib/pleroma/web/views/streamer_view.ex
index f97570b0a..6016d821b 100644
--- a/lib/pleroma/web/views/streamer_view.ex
+++ b/lib/pleroma/web/views/streamer_view.ex
@@ -109,7 +109,11 @@ defmodule Pleroma.Web.StreamerView do
     |> Jason.encode!()
   end
 
-  def render("follow_relationships_update.json", item, topic) do
+  def render(
+        "follow_relationships_update.json",
+        %{follower: follower, following: following} = item,
+        topic
+      ) do
     %{
       stream: render("stream.json", %{topic: topic}),
       event: "pleroma:follow_relationships_update",
@@ -117,14 +121,22 @@ defmodule Pleroma.Web.StreamerView do
         %{
           state: item.state,
           follower: %{
-            id: item.follower.id,
-            follower_count: item.follower.follower_count,
-            following_count: item.follower.following_count
+            id: follower.id,
+            follower_count: follower.follower_count,
+            following_count: follower.following_count
           },
           following: %{
-            id: item.following.id,
-            follower_count: item.following.follower_count,
-            following_count: item.following.following_count
+            id: following.id,
+            follower_count:
+              if(!following.hide_followers_count or !following.hide_followers,
+                do: following.follower_count,
+                else: 0
+              ),
+            following_count:
+              if(!following.hide_follows_count or !following.hide_follows,
+                do: following.following_count,
+                else: 0
+              )
           }
         }
         |> Jason.encode!()
-- 
cgit v1.2.3


From c284c4e3e697dda5c5965588667317090a51bfca Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 09:19:33 -0400
Subject: Extract the logic from the map

---
 lib/pleroma/web/views/streamer_view.ex | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/views/streamer_view.ex b/lib/pleroma/web/views/streamer_view.ex
index 6016d821b..8e5a9f2a4 100644
--- a/lib/pleroma/web/views/streamer_view.ex
+++ b/lib/pleroma/web/views/streamer_view.ex
@@ -114,6 +114,20 @@ defmodule Pleroma.Web.StreamerView do
         %{follower: follower, following: following} = item,
         topic
       ) do
+    follower_count =
+      if Enum.any?([following.hide_followers_count, following.hide_followers]) do
+        0
+      else
+        following.follower_count
+      end
+
+    following_count =
+      if Enum.any?([following.hide_follows_count, following.hide_follows]) do
+        0
+      else
+        following.following_count
+      end
+
     %{
       stream: render("stream.json", %{topic: topic}),
       event: "pleroma:follow_relationships_update",
@@ -127,16 +141,8 @@ defmodule Pleroma.Web.StreamerView do
           },
           following: %{
             id: following.id,
-            follower_count:
-              if(!following.hide_followers_count or !following.hide_followers,
-                do: following.follower_count,
-                else: 0
-              ),
-            following_count:
-              if(!following.hide_follows_count or !following.hide_follows,
-                do: following.following_count,
-                else: 0
-              )
+            follower_count: follower_count,
+            following_count: following_count
           }
         }
         |> Jason.encode!()
-- 
cgit v1.2.3


From 7d33b53908242bf420d9f84550cabb5f86bc4738 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 7 Aug 2024 11:47:43 -0400
Subject: Improve the variable naming

---
 lib/pleroma/web/views/streamer_view.ex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/views/streamer_view.ex b/lib/pleroma/web/views/streamer_view.ex
index 8e5a9f2a4..079a37351 100644
--- a/lib/pleroma/web/views/streamer_view.ex
+++ b/lib/pleroma/web/views/streamer_view.ex
@@ -114,14 +114,14 @@ defmodule Pleroma.Web.StreamerView do
         %{follower: follower, following: following} = item,
         topic
       ) do
-    follower_count =
+    following_follower_count =
       if Enum.any?([following.hide_followers_count, following.hide_followers]) do
         0
       else
         following.follower_count
       end
 
-    following_count =
+    following_following_count =
       if Enum.any?([following.hide_follows_count, following.hide_follows]) do
         0
       else
@@ -141,8 +141,8 @@ defmodule Pleroma.Web.StreamerView do
           },
           following: %{
             id: following.id,
-            follower_count: follower_count,
-            following_count: following_count
+            follower_count: following_follower_count,
+            following_count: following_following_count
           }
         }
         |> Jason.encode!()
-- 
cgit v1.2.3