From 4c03e404d59ce1ec36b5af0b4b7c3ae46be2e598 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Mon, 2 Dec 2024 15:18:56 +0100
Subject: [PATCH] fix: Don't crash when toggling an account's "Show boosts"
 option (#1149)

Previous code would crash because toggling show boosts would treat this
as a new follow, and try and insert a follower relationship in to the
database where one already existed.

Fix this by providing explicit actions for show/hiding reblogs that
don't disturb the follower relationship.
---
 .../pachli/components/account/AccountViewModel.kt   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/app/pachli/components/account/AccountViewModel.kt b/app/src/main/java/app/pachli/components/account/AccountViewModel.kt
index bd8b6b7c6..2b2ff71ae 100644
--- a/app/src/main/java/app/pachli/components/account/AccountViewModel.kt
+++ b/app/src/main/java/app/pachli/components/account/AccountViewModel.kt
@@ -182,9 +182,9 @@ class AccountViewModel @AssistedInject constructor(
 
     fun changeShowReblogsState() {
         if (relationshipData.value?.data?.showingReblogs == true) {
-            changeRelationship(RelationShipAction.FOLLOW, false)
+            changeRelationship(RelationShipAction.HIDE_REBLOGS)
         } else {
-            changeRelationship(RelationShipAction.FOLLOW, true)
+            changeRelationship(RelationShipAction.SHOW_REBLOGS)
         }
     }
 
@@ -230,6 +230,9 @@ class AccountViewModel @AssistedInject constructor(
                         relation.copy(subscribing = false)
                     }
                 }
+
+                RelationShipAction.SHOW_REBLOGS -> relation.copy(showingReblogs = true)
+                RelationShipAction.HIDE_REBLOGS -> relation.copy(showingReblogs = false)
             }
             relationshipData.postValue(Loading(newRelation))
         }
@@ -237,7 +240,7 @@ class AccountViewModel @AssistedInject constructor(
         val relationshipCall = when (relationshipAction) {
             RelationShipAction.FOLLOW -> mastodonApi.followAccount(
                 accountId,
-                showReblogs = parameter ?: true,
+                showReblogs = true,
             )
             RelationShipAction.UNFOLLOW -> mastodonApi.unfollowAccount(accountId)
             RelationShipAction.BLOCK -> mastodonApi.blockAccount(accountId)
@@ -262,6 +265,8 @@ class AccountViewModel @AssistedInject constructor(
                     mastodonApi.unsubscribeAccount(accountId)
                 }
             }
+            RelationShipAction.SHOW_REBLOGS -> mastodonApi.followAccount(accountId, showReblogs = true)
+            RelationShipAction.HIDE_REBLOGS -> mastodonApi.followAccount(accountId, showReblogs = false)
         }
 
         relationshipCall
@@ -333,6 +338,8 @@ class AccountViewModel @AssistedInject constructor(
         UNMUTE,
         SUBSCRIBE,
         UNSUBSCRIBE,
+        SHOW_REBLOGS,
+        HIDE_REBLOGS,
     }
 
     @AssistedFactory