From 97a3637a7ba6019c2f6a2e6bd22de12ec0c5206d Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Mon, 14 Oct 2024 02:21:29 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20-=20=EB=82=A8=EC=84=B1=ED=96=A5?= =?UTF-8?q?=EC=9D=B4=EB=A9=B4=20=EC=97=AC=EC=84=B1=20=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=97=90=EC=9D=B4=ED=84=B0,=20=EC=97=AC=EC=84=B1=ED=96=A5?= =?UTF-8?q?=EC=9D=B4=EB=A9=B4=20=EB=82=A8=EC=84=B1=20=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=97=90=EC=9D=B4=ED=84=B0=20=EC=9E=91=ED=92=88=EB=A7=8C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SodaLive/Sources/Content/ContentApi.swift | 8 +++++--- SodaLive/Sources/Content/ContentRepository.swift | 11 ++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/SodaLive/Sources/Content/ContentApi.swift b/SodaLive/Sources/Content/ContentApi.swift index 43f1de2..c46b17a 100644 --- a/SodaLive/Sources/Content/ContentApi.swift +++ b/SodaLive/Sources/Content/ContentApi.swift @@ -31,7 +31,7 @@ enum ContentApi { case modifyComment(request: ModifyCommentRequest) case getNewContentThemeList case getNewContentAllOfTheme(theme: String, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int) - case getAudioContentListByCurationId(curationId: Int, page: Int, size: Int, sort: ContentCurationViewModel.Sort) + case getAudioContentListByCurationId(curationId: Int, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int, sort: ContentCurationViewModel.Sort) case getContentRanking(page: Int, size: Int, sortType: String) case getContentRankingSortType case pinContent(contentId: Int) @@ -112,7 +112,7 @@ extension ContentApi: TargetType { case .getNewContentAllOfTheme: return "/audio-content/main/new/all" - case .getAudioContentListByCurationId(let curationId, _, _, _): + case .getAudioContentListByCurationId(let curationId, _, _, _, _, _): return "/audio-content/curation/\(curationId)" case .getContentRanking: @@ -250,8 +250,10 @@ extension ContentApi: TargetType { return .requestParameters(parameters: parameters, encoding: URLEncoding.queryString) - case .getAudioContentListByCurationId(_, let page, let size, let sort): + case .getAudioContentListByCurationId(_, let isAdultContentVisible, let contentType, let page, let size, let sort): let parameters = [ + "isAdultContentVisible": isAdultContentVisible, + "contentType": contentType, "page": page - 1, "size": size, "sort-type": sort diff --git a/SodaLive/Sources/Content/ContentRepository.swift b/SodaLive/Sources/Content/ContentRepository.swift index 2528af3..dd70e6c 100644 --- a/SodaLive/Sources/Content/ContentRepository.swift +++ b/SodaLive/Sources/Content/ContentRepository.swift @@ -124,7 +124,16 @@ final class ContentRepository { } func getAudioContentListByCurationId(curationId: Int, page: Int, size: Int, sort: ContentCurationViewModel.Sort) -> AnyPublisher { - return api.requestPublisher(.getAudioContentListByCurationId(curationId: curationId, page: page, size: size, sort: sort)) + return api.requestPublisher( + .getAudioContentListByCurationId( + curationId: curationId, + isAdultContentVisible: UserDefaults.isAdultContentVisible(), + contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL, + page: page, + size: size, + sort: sort + ) + ) } func getContentRankingSortType() -> AnyPublisher {