From bccb08532f92a8175993a23a08b0ac41687b945d Mon Sep 17 00:00:00 2001 From: klaus Date: Thu, 8 Oct 2026 22:04:15 +0900 Subject: [PATCH] =?UTF-8?q?fix(gift):=20=ED=81=AC=EB=A6=AC=EC=97=90?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B1=84=EB=84=90=20=EC=84=A0=EB=AC=BC=20?= =?UTF-8?q?=EC=A7=84=EC=9E=85=EC=9D=84=20=EC=A0=9C=ED=95=9C=ED=95=9C?= =?UTF-8?q?=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creator/channel/CreatorChannelActivity.kt | 27 +++++++- .../CreatorChannelGiftEligibilityTest.kt | 62 +++++++++++++++++-- 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt index dbdcce53..022638b7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelActivity.kt @@ -47,6 +47,7 @@ import kr.co.vividnext.sodalive.live.LiveViewModel import kr.co.vividnext.sodalive.live.room.create.LiveRoomCreateActivity import kr.co.vividnext.sodalive.live.room.donation.LiveRoomDonationDialog import kr.co.vividnext.sodalive.report.UserReportDialog +import kr.co.vividnext.sodalive.settings.language.LanguageManager import kr.co.vividnext.sodalive.v2.access.AccessRequirement import kr.co.vividnext.sodalive.v2.access.ensureV2Access import kr.co.vividnext.sodalive.v2.chat.action.ChatActionCommand @@ -80,6 +81,7 @@ import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelScrollSta import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelTab import kr.co.vividnext.sodalive.v2.creator.channel.model.CreatorChannelTitleBarState import kr.co.vividnext.sodalive.v2.creator.channel.series.CreatorChannelSeriesFragment +import kr.co.vividnext.sodalive.v2.gift.GiftInboxEntryPolicy import kr.co.vividnext.sodalive.v2.gift.GiftSendRequestActivity import kr.co.vividnext.sodalive.v2.live.action.LiveActionCoordinator import kr.co.vividnext.sodalive.v2.live.action.LiveCreationResult @@ -261,7 +263,16 @@ class CreatorChannelActivity : } binding.tvGiftSendButton.setOnClickListener { val header = currentHeader ?: return@setOnClickListener - if (!canSendCreatorGift(header.isOwner, header.isDmAvailable)) return@setOnClickListener + if ( + !canSendCreatorGift( + isOwner = header.isOwner, + isDmAvailable = header.isDmAvailable, + countryCode = SharedPreferenceManager.countryCode, + languageCode = LanguageManager.getEffectiveLanguage(this) + ) + ) { + return@setOnClickListener + } startActivity( GiftSendRequestActivity.newIntent( context = this, @@ -295,7 +306,12 @@ class CreatorChannelActivity : updateActionButtonLayout( isChatVisible = !header.isOwner && header.isAiChatAvailable && header.characterId != null, isDmVisible = header.isOwner || header.isDmAvailable, - isGiftVisible = canSendCreatorGift(header.isOwner, header.isDmAvailable) + isGiftVisible = canSendCreatorGift( + isOwner = header.isOwner, + isDmAvailable = header.isDmAvailable, + countryCode = SharedPreferenceManager.countryCode, + languageCode = LanguageManager.getEffectiveLanguage(this) + ) ) binding.tvDmButton.setText( if (header.isOwner) R.string.creator_channel_dm_check_button else R.string.creator_channel_dm_button @@ -1352,4 +1368,9 @@ internal fun calculateCreatorChannelRemainingScroll( scrollY: Int ): Int = contentHeight - viewportHeight - scrollY -internal fun canSendCreatorGift(isOwner: Boolean, isDmAvailable: Boolean): Boolean = !isOwner && isDmAvailable +internal fun canSendCreatorGift( + isOwner: Boolean, + isDmAvailable: Boolean, + countryCode: String, + languageCode: String +): Boolean = !isOwner && isDmAvailable && GiftInboxEntryPolicy.shouldShow(countryCode, languageCode) diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt index f6b7b18e..66c9f38f 100644 --- a/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/creator/channel/CreatorChannelGiftEligibilityTest.kt @@ -7,22 +7,74 @@ import org.junit.Test class CreatorChannelGiftEligibilityTest { @Test - fun `비소유자이고 DM 가능이면 선물 보내기 버튼을 표시한다`() { - assertTrue(canSendCreatorGift(isOwner = false, isDmAvailable = true)) + fun `비소유자이고 DM 가능이며 한국 접속과 한국어이면 선물 보내기 버튼을 표시한다`() { + assertTrue( + canSendCreatorGift( + isOwner = false, + isDmAvailable = true, + countryCode = "KR", + languageCode = "ko" + ) + ) } @Test fun `비소유자라도 DM 불가이면 선물 보내기 버튼을 숨긴다`() { - assertFalse(canSendCreatorGift(isOwner = false, isDmAvailable = false)) + assertFalse( + canSendCreatorGift( + isOwner = false, + isDmAvailable = false, + countryCode = "KR", + languageCode = "ko" + ) + ) } @Test fun `소유자는 DM 가능 상태여도 선물 보내기 버튼을 숨긴다`() { - assertFalse(canSendCreatorGift(isOwner = true, isDmAvailable = true)) + assertFalse( + canSendCreatorGift( + isOwner = true, + isDmAvailable = true, + countryCode = "KR", + languageCode = "ko" + ) + ) } @Test fun `소유자이고 DM 불가이면 선물 보내기 버튼을 숨긴다`() { - assertFalse(canSendCreatorGift(isOwner = true, isDmAvailable = false)) + assertFalse( + canSendCreatorGift( + isOwner = true, + isDmAvailable = false, + countryCode = "KR", + languageCode = "ko" + ) + ) + } + + @Test + fun `한국 접속이라도 유효 언어가 한국어가 아니면 선물 보내기 버튼을 숨긴다`() { + assertFalse( + canSendCreatorGift( + isOwner = false, + isDmAvailable = true, + countryCode = "KR", + languageCode = "en" + ) + ) + } + + @Test + fun `유효 언어가 한국어라도 한국 접속이 아니면 선물 보내기 버튼을 숨긴다`() { + assertFalse( + canSendCreatorGift( + isOwner = false, + isDmAvailable = true, + countryCode = "JP", + languageCode = "ko" + ) + ) } }