From 18f53df9f87cdaf7a59bcce38fcfb346c7a0f48c Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 9 Feb 2024 03:42:18 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=83=88=EB=A1=9C?= =?UTF-8?q?=EC=9A=B4=20=EC=BD=98=ED=85=90=EC=B8=A0=20-=20=EC=B0=A8?= =?UTF-8?q?=EB=8B=A8=ED=95=9C=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EC=9D=98=20=EC=BD=98=ED=85=90=EC=B8=A0=EB=A5=BC=20?= =?UTF-8?q?=EC=B0=A8=EB=8B=A8=20=EB=8B=B9=ED=95=9C=20=EC=9C=A0=EC=A0=80?= =?UTF-8?q?=EC=97=90=EA=B2=8C=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/content/main/AudioContentMainService.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt index 1df8343..1b78b64 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/main/AudioContentMainService.kt @@ -56,6 +56,9 @@ class AudioContentMainService( offset = pageable.offset, limit = pageable.pageSize.toLong() ) + .asSequence() + .filter { !blockMemberRepository.isBlocked(blockedMemberId = member.id!!, memberId = it.creatorId) } + .toList() return GetNewContentAllResponse(totalCount, items) } From 537cdbb3074c11911c28bf09eac20f45be886d79 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 12 Feb 2024 16:08:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=BB=A4=EB=AE=A4=EB=8B=88=ED=8B=B0=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=8B=9C=EA=B0=84=20-=201?= =?UTF-8?q?=EA=B0=9C=EC=9B=94=20->=201=EB=B6=84=20=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/creatorCommunity/CreatorCommunityService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt index b44dc0c..07c1ad1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/profile/creatorCommunity/CreatorCommunityService.kt @@ -272,7 +272,7 @@ class CreatorCommunityService( duration.toMinutes() < 60 -> "${duration.toMinutes()}분전" duration.toHours() < 24 -> "${duration.toHours()}시간전" duration.toDays() < 30 -> "${duration.toDays()}일전" - duration.toDays() < 365 -> "${duration.toDays() / 30}분전" + duration.toDays() < 365 -> "${duration.toDays() / 30}개월" else -> "${duration.toDays() / 365}년전" } }