From c84a9bc473f3ad0c04565360afd4b8fcb24f570d Mon Sep 17 00:00:00 2001
From: Klaus <klaus@vividnext.co.kr>
Date: Mon, 14 Aug 2023 22:49:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20-=20=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/live/room/LiveRoomService.kt        | 16 +++++-----------
 .../live/room/info/GetRoomInfoResponse.kt        | 10 ++++------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
index 77c0255..c4c1c4b 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt
@@ -630,11 +630,7 @@ class LiveRoomService(
             expireTimestamp.toInt()
         )
 
-        val tags = room.tags.asSequence().filter { it.tag.isActive }.map { it.tag.tag }.toList()
-        val isRadioMode = tags.contains("라디오") or tags.contains("콘서트")
-        val isAvailableDonation = room.member!!.id!! != member.id!! &&
-            room.member!!.role == MemberRole.CREATOR
-        val isFollowingManager = explorerQueryRepository
+        val isFollowing = explorerQueryRepository
             .getNotificationUserIds(room.member!!.id!!)
             .contains(member.id)
 
@@ -668,22 +664,20 @@ class LiveRoomService(
             channelName = room.channelName!!,
             rtcToken = rtcToken,
             rtmToken = rtmToken,
-            managerId = room.member!!.id!!,
-            managerNickname = room.member!!.nickname,
-            managerProfileUrl = if (room.member!!.profileImage != null) {
+            creatorId = room.member!!.id!!,
+            creatorNickname = room.member!!.nickname,
+            creatorProfileUrl = if (room.member!!.profileImage != null) {
                 "$cloudFrontHost/${room.member!!.profileImage}"
             } else {
                 "$cloudFrontHost/profile/default-profile.png"
             },
-            isFollowingManager = isFollowingManager,
+            isFollowing = isFollowing,
             participantsCount = roomInfo.listenerCount + roomInfo.speakerCount + roomInfo.managerCount,
             totalAvailableParticipantsCount = room.numberOfPeople,
             speakerList = roomInfo.speakerList,
             listenerList = roomInfo.listenerList,
             managerList = roomInfo.managerList,
             donationRankingTop3UserIds = donationRankingTop3UserIds,
-            isRadioMode = isRadioMode,
-            isAvailableDonation = isAvailableDonation,
             isPrivateRoom = room.type == LiveRoomType.PRIVATE,
             password = room.password
         )
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt
index 0bede8c..69ad47d 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt
@@ -8,18 +8,16 @@ data class GetRoomInfoResponse(
     val channelName: String,
     val rtcToken: String,
     val rtmToken: String,
-    val managerId: Long,
-    val managerNickname: String,
-    val managerProfileUrl: String,
-    val isFollowingManager: Boolean,
+    val creatorId: Long,
+    val creatorNickname: String,
+    val creatorProfileUrl: String,
+    val isFollowing: Boolean,
     val participantsCount: Int,
     val totalAvailableParticipantsCount: Int,
     val speakerList: List<LiveRoomMember>,
     val listenerList: List<LiveRoomMember>,
     val managerList: List<LiveRoomMember>,
     val donationRankingTop3UserIds: List<Long>,
-    val isRadioMode: Boolean = false,
-    val isAvailableDonation: Boolean = false,
     val isPrivateRoom: Boolean = false,
     val password: String? = null
 )