From 04a0975f272ba0ae92707e39f749afc2ee06830e Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Mon, 11 Dec 2023 11:41:56 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9F=E3=81=A8=E3=81=8D=E3=83=96=E3=83=AD?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=95=E3=82=8C=E3=81=9Factor=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=81=97=E3=81=9F?=
 =?UTF-8?q?actor=E3=81=B8=E3=81=AE=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=82=92=E8=A7=A3=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/model/relationship/RelationshipRepositoryImpl.kt | 4 ++--
 .../core/service/relationship/RelationshipServiceImpl.kt    | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt
index a8bfd6de..c7e6986d 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipRepositoryImpl.kt
@@ -23,7 +23,7 @@ class RelationshipRepositoryImpl : RelationshipRepository {
                 it[targetUserId] = relationship.targetUserId
                 it[following] = relationship.following
                 it[blocking] = relationship.blocking
-                it[muting] = relationship.blocking
+                it[muting] = relationship.muting
                 it[followRequest] = relationship.followRequest
                 it[ignoreFollowRequestFromTarget] = relationship.ignoreFollowRequestFromTarget
             }
@@ -35,7 +35,7 @@ class RelationshipRepositoryImpl : RelationshipRepository {
                 }) {
                     it[following] = relationship.following
                     it[blocking] = relationship.blocking
-                    it[muting] = relationship.blocking
+                    it[muting] = relationship.muting
                     it[followRequest] = relationship.followRequest
                     it[ignoreFollowRequestFromTarget] = relationship.ignoreFollowRequestFromTarget
                 }
diff --git a/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt
index 08e0ac9f..c056a381 100644
--- a/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/core/service/relationship/RelationshipServiceImpl.kt
@@ -98,7 +98,13 @@ class RelationshipServiceImpl(
             ignoreFollowRequestFromTarget = false
         )
 
+        val inverseRelationship = relationshipRepository.findByUserIdAndTargetUserId(targetId, userId)
+            ?.copy(followRequest = false, following = false)
+
         relationshipRepository.save(relationship)
+        if (inverseRelationship != null) {
+            relationshipRepository.save(inverseRelationship)
+        }
 
         val remoteUser = isRemoteUser(targetId)