Fix deprecation

EhPanda/DataFlow/AppRouteReducer.swift

@@ -146,8 +146,10 @@ struct AppRouteReducer: Reducer {
 
  case .fetchGallery(let url, let isGalleryImageURL):
  state.route = .hud
- return GalleryReverseRequest(url: url, isGalleryImageURL: isGalleryImageURL)
- .effect.map({ Action.fetchGalleryDone(url, $0) })
+ return .run { send in
+ let response = await GalleryReverseRequest(url: url, isGalleryImageURL: isGalleryImageURL).response()
+ await send(Action.fetchGalleryDone(url, response))
+ }
 
  case .fetchGalleryDone(let url, let result):
  state.route = nil

EhPanda/View/Detail/Archives/ArchivesReducer.swift

@@ -72,9 +72,11 @@ struct ArchivesReducer: Reducer {
  case .fetchArchive(let gid, let galleryURL, let archiveURL):
  guard state.loadingState != .loading else { return .none }
  state.loadingState = .loading
- return GalleryArchiveRequest(archiveURL: archiveURL)
- .effect.map({ Action.fetchArchiveDone(gid, galleryURL, $0) })
- .cancellable(id: CancelID.fetchArchive)
+ return .run { send in
+ let response = await GalleryArchiveRequest(archiveURL: archiveURL).response()
+ await send(Action.fetchArchiveDone(gid, galleryURL, response))
+ }
+ .cancellable(id: CancelID.fetchArchive)
 
  case .fetchArchiveDone(let gid, let galleryURL, let result):
  state.loadingState = .idle
@@ -99,8 +101,11 @@ struct ArchivesReducer: Reducer {
 
  case .fetchArchiveFunds(let gid, let galleryURL):
  guard let galleryURL = galleryURL.replaceHost(to: Defaults.URL.ehentai.host) else { return .none }
- return GalleryArchiveFundsRequest(gid: gid, galleryURL: galleryURL)
- .effect.map(Action.fetchArchiveFundsDone).cancellable(id: CancelID.fetchArchiveFunds)
+ return .run { send in
+ let response = await GalleryArchiveFundsRequest(gid: gid, galleryURL: galleryURL).response()
+ await send(Action.fetchArchiveFundsDone(response))
+ }
+ .cancellable(id: CancelID.fetchArchiveFunds)
 
  case .fetchArchiveFundsDone(let result):
  if case .success(let (galleryPoints, credits)) = result {
@@ -113,10 +118,14 @@ struct ArchivesReducer: Reducer {
  state.route != .communicatingHUD
  else { return .none }
  state.route = .communicatingHUD
- return SendDownloadCommandRequest(
- archiveURL: archiveURL, resolution: selectedArchive.resolution.parameter
- )
- .effect.map(Action.fetchDownloadResponseDone).cancellable(id: CancelID.fetchDownloadResponse)
+ return .run {send in
+ let response = await SendDownloadCommandRequest(
+ archiveURL: archiveURL,
+ resolution: selectedArchive.resolution.parameter
+ ).response()
+ await send(Action.fetchDownloadResponseDone(response))
+ }
+ .cancellable(id: CancelID.fetchDownloadResponse)
 
  case .fetchDownloadResponseDone(let result):
  state.route = .messageHUD

EhPanda/View/Detail/Comments/CommentsReducer.swift

@@ -188,32 +188,50 @@ struct CommentsReducer: Reducer {
  case .postComment(let galleryURL, let commentID):
  guard !state.commentContent.isEmpty else { return .none }
  if let commentID = commentID {
- return EditGalleryCommentRequest(
- commentID: commentID, content: state.commentContent, galleryURL: galleryURL
- )
- .effect.map(Action.performCommentActionDone).cancellable(id: CancelID.postComment)
+ return .run { [commentContent = state.commentContent] send in
+ let response = await EditGalleryCommentRequest(
+ commentID: commentID,
+ content: commentContent,
+ galleryURL: galleryURL
+ ).response()
+ await send(Action.performCommentActionDone(response))
+ }
+ .cancellable(id: CancelID.postComment)
  } else {
- return CommentGalleryRequest(content: state.commentContent, galleryURL: galleryURL)
- .effect.map(Action.performCommentActionDone).cancellable(id: CancelID.postComment)
+ return .run { [commentContent = state.commentContent] send in
+ let response = await CommentGalleryRequest(content: commentContent, galleryURL: galleryURL).response()
+ await send(Action.performCommentActionDone(response))
+ }
+ .cancellable(id: CancelID.postComment)
  }
 
  case .voteComment(let gid, let token, let apiKey, let commentID, let vote):
  guard let gid = Int(gid), let commentID = Int(commentID),
  let apiuid = Int(cookieClient.apiuid)
  else { return .none }
- return VoteGalleryCommentRequest(
- apiuid: apiuid, apikey: apiKey, gid: gid, token: token,
- commentID: commentID, commentVote: vote
- )
- .effect.map(Action.performCommentActionDone).cancellable(id: CancelID.voteComment)
+ return .run { send in
+ let response = await VoteGalleryCommentRequest(
+ apiuid: apiuid,
+ apikey: apiKey,
+ gid: gid,
+ token: token,
+ commentID: commentID,
+ commentVote: vote
+ ).response()
+ await send(Action.performCommentActionDone(response))
+ }
+ .cancellable(id: CancelID.voteComment)
 
  case .performCommentActionDone:
  return .none
 
  case .fetchGallery(let url, let isGalleryImageURL):
  state.route = .hud
- return GalleryReverseRequest(url: url, isGalleryImageURL: isGalleryImageURL)
- .effect.map({ Action.fetchGalleryDone(url, $0) }).cancellable(id: CancelID.fetchGallery)
+ return .run { send in
+ let response = await GalleryReverseRequest(url: url, isGalleryImageURL: isGalleryImageURL).response()
+ await send(Action.fetchGalleryDone(url, response))
+ }
+ .cancellable(id: CancelID.fetchGallery)
 
  case .fetchGalleryDone(let url, let result):
  state.route = nil

EhPanda/View/Detail/DetailReducer.swift

@@ -260,8 +260,8 @@ struct DetailReducer: Reducer {
  }
  return .merge(
  .send(.saveGalleryHistory),
- .run { [state] send in
- guard let dbState = await databaseClient.fetchGalleryState(gid: state.gallery.id) else { return }
+ .run { [galleryID = state.gallery.id] send in
+ guard let dbState = await databaseClient.fetchGalleryState(gid: galleryID) else { return }
  await send(.fetchDatabaseInfosDone(dbState))
  }
  .cancellable(id: CancelID.fetchDatabaseInfos)
@@ -278,8 +278,11 @@ struct DetailReducer: Reducer {
  let galleryURL = state.gallery.galleryURL
  else { return .none }
  state.loadingState = .loading
- return GalleryDetailRequest(gid: state.gallery.id, galleryURL: galleryURL)
- .effect.map(Action.fetchGalleryDetailDone).cancellable(id: CancelID.fetchGalleryDetail)
+ return .run { [galleryID = state.gallery.id] send in
+ let response = await GalleryDetailRequest(gid: galleryID, galleryURL: galleryURL).response()
+ await send(Action.fetchGalleryDetailDone(response))
+ }
+ .cancellable(id: CancelID.fetchGalleryDetail)
 
  case .fetchGalleryDetailDone(let result):
  state.loadingState = .idle
@@ -315,32 +318,58 @@ struct DetailReducer: Reducer {
  case .rateGallery:
  guard let apiuid = Int(cookieClient.apiuid), let gid = Int(state.gallery.id)
  else { return .none }
- return RateGalleryRequest(
- apiuid: apiuid, apikey: state.apiKey, gid: gid,
- token: state.gallery.token, rating: state.userRating
- )
- .effect.map(Action.anyGalleryOpsDone).cancellable(id: CancelID.rateGallery)
+ return .run { [state] send in
+ let response = await RateGalleryRequest(
+ apiuid: apiuid,
+ apikey: state.apiKey,
+ gid: gid,
+ token: state.gallery.token, 
+ rating: state.userRating
+ ).response()
+ await send(Action.anyGalleryOpsDone(response))
+ }.cancellable(id: CancelID.rateGallery)
 
  case .favorGallery(let favIndex):
- return FavorGalleryRequest(gid: state.gallery.id, token: state.gallery.token, favIndex: favIndex)
- .effect.map(Action.anyGalleryOpsDone).cancellable(id: CancelID.favorGallery)
+ return .run { [state] send in
+ let response = await FavorGalleryRequest(
+ gid: state.gallery.id,
+ token: state.gallery.token,
+ favIndex: favIndex
+ ).response()
+ await send(Action.anyGalleryOpsDone(response))
+ }
+ .cancellable(id: CancelID.favorGallery)
 
  case .unfavorGallery:
- return UnfavorGalleryRequest(gid: state.gallery.id).effect.map(Action.anyGalleryOpsDone)
- .cancellable(id: CancelID.unfavorGallery)
+ return .run { [galleryID = state.gallery.id] send in
+ let response = await UnfavorGalleryRequest(gid: galleryID).response()
+ await send(Action.anyGalleryOpsDone(response))
+ }
+ .cancellable(id: CancelID.unfavorGallery)
 
  case .postComment(let galleryURL):
  guard !state.commentContent.isEmpty else { return .none }
- return CommentGalleryRequest(content: state.commentContent, galleryURL: galleryURL)
- .effect.map(Action.anyGalleryOpsDone).cancellable(id: CancelID.postComment)
+ return .run { [commentContent = state.commentContent] send in
+ let response = await CommentGalleryRequest(content: commentContent, galleryURL: galleryURL).response()
+ await send(Action.anyGalleryOpsDone(response))
+ }
+ .cancellable(id: CancelID.postComment)
 
  case .voteTag(let tag, let vote):
  guard let apiuid = Int(cookieClient.apiuid), let gid = Int(state.gallery.id)
  else { return .none }
- return VoteGalleryTagRequest(
- apiuid: apiuid, apikey: state.apiKey, gid: gid, token: state.gallery.token, tag: tag, vote: vote
- )
- .effect.map(Action.anyGalleryOpsDone).cancellable(id: CancelID.voteTag)
+ return .run { [state] send in
+ let response = await VoteGalleryTagRequest(
+ apiuid: apiuid,
+ apikey: state.apiKey,
+ gid: gid,
+ token: state.gallery.token,
+ tag: tag,
+ vote: vote
+ ).response()
+ await send(Action.anyGalleryOpsDone(response))
+ }
+ .cancellable(id: CancelID.voteTag)
 
  case .anyGalleryOpsDone(let result):
  if case .success = result {

EhPanda/View/Detail/DetailSearch/DetailSearchReducer.swift

@@ -106,8 +106,11 @@ struct DetailSearchReducer: Reducer {
  state.loadingState = .loading
  state.pageNumber.resetPages()
  let filter = databaseClient.fetchFilterSynchronously(range: .search)
- return SearchGalleriesRequest(keyword: state.lastKeyword, filter: filter).effect
- .map(Action.fetchGalleriesDone).cancellable(id: CancelID.fetchGalleries)
+ return .run { [lastKeyword = state.lastKeyword] send in
+ let response = await SearchGalleriesRequest(keyword: lastKeyword, filter: filter).response()
+ await send(Action.fetchGalleriesDone(response))
+ }
+ .cancellable(id: CancelID.fetchGalleries)
 
  case .fetchGalleriesDone(let result):
  state.loadingState = .idle
@@ -136,9 +139,11 @@ struct DetailSearchReducer: Reducer {
  else { return .none }
  state.footerLoadingState = .loading
  let filter = databaseClient.fetchFilterSynchronously(range: .search)
- return MoreSearchGalleriesRequest(keyword: state.lastKeyword, filter: filter, lastID: lastID).effect
- .map(Action.fetchMoreGalleriesDone)
- .cancellable(id: CancelID.fetchMoreGalleries)
+ return .run { [lastKeyword = state.lastKeyword] send in
+ let response = await MoreSearchGalleriesRequest(keyword: lastKeyword, filter: filter, lastID: lastID).response()
+ await send(Action.fetchMoreGalleriesDone(response))
+ }
+ .cancellable(id: CancelID.fetchMoreGalleries)
 
  case .fetchMoreGalleriesDone(let result):
  state.footerLoadingState = .idle

EhPanda/View/Detail/Previews/PreviewsReducer.swift

@@ -111,8 +111,11 @@ struct PreviewsReducer: Reducer {
  else { return .none }
  state.loadingState = .loading
  let pageNum = state.previewConfig.pageNumber(index: index)
- return GalleryPreviewURLsRequest(galleryURL: galleryURL, pageNum: pageNum)
- .effect.map(Action.fetchPreviewURLsDone).cancellable(id: CancelID.fetchPreviewURLs)
+ return .run { send in
+ let response = await GalleryPreviewURLsRequest(galleryURL: galleryURL, pageNum: pageNum).response()
+ await send(Action.fetchPreviewURLsDone(response))
+ }
+ .cancellable(id: CancelID.fetchPreviewURLs)
 
  case .fetchPreviewURLsDone(let result):
  state.loadingState = .idle

EhPanda/View/Detail/Torrents/TorrentsReducer.swift

@@ -74,8 +74,11 @@ struct TorrentsReducer: Reducer {
  return .none
 
  case .fetchTorrent(let hash, let torrentURL):
- return DataRequest(url: torrentURL).effect.map({ Action.fetchTorrentDone(hash, $0) })
- .cancellable(id: CancelID.fetchTorrent)
+ return .run { send in
+ let response = await DataRequest(url: torrentURL).response()
+ await send(Action.fetchTorrentDone(hash, response))
+ }
+ .cancellable(id: CancelID.fetchTorrent)
 
  case .teardown:
  return .merge(CancelID.allCases.map(Effect.cancel(id:)))
@@ -89,8 +92,11 @@ struct TorrentsReducer: Reducer {
  case .fetchGalleryTorrents(let gid, let token):
  guard state.loadingState != .loading else { return .none }
  state.loadingState = .loading
- return GalleryTorrentsRequest(gid: gid, token: token)
- .effect.map(Action.fetchGalleryTorrentsDone).cancellable(id: CancelID.fetchGalleryTorrents)
+ return .run { send in
+ let response = await GalleryTorrentsRequest(gid: gid, token: token).response()
+ await send(Action.fetchGalleryTorrentsDone(response))
+ }
+ .cancellable(id: CancelID.fetchGalleryTorrents)
 
  case .fetchGalleryTorrentsDone(let result):
  state.loadingState = .idle

EhPanda/View/Favorites/FavoritesReducer.swift

@@ -113,10 +113,12 @@ struct FavoritesReducer: Reducer {
  } else {
  state.rawPageNumber[state.index]?.resetPages()
  }
- return FavoritesGalleriesRequest(
- favIndex: state.index, keyword: state.keyword, sortOrder: sortOrder
- )
- .effect.map { [index = state.index] result in Action.fetchGalleriesDone(index, result) }
+ return .run { [state] send in
+ let response = await FavoritesGalleriesRequest(
+ favIndex: state.index, keyword: state.keyword, sortOrder: sortOrder
+ ).response()
+ await send(Action.fetchGalleriesDone(state.index, response))
+ }
 
  case .fetchGalleriesDone(let targetFavIndex, let result):
  state.rawLoadingState[targetFavIndex] = .idle
@@ -146,13 +148,15 @@ struct FavoritesReducer: Reducer {
  let lastItemTimestamp = pageNumber.lastItemTimestamp
  else { return .none }
  state.rawFooterLoadingState[state.index] = .loading
- return MoreFavoritesGalleriesRequest(
- favIndex: state.index,
- lastID: lastID,
- lastTimestamp: lastItemTimestamp,
- keyword: state.keyword
- )
- .effect.map { [index = state.index] result in Action.fetchMoreGalleriesDone(index, result) }
+ return .run { [state] send in
+ let response = await MoreFavoritesGalleriesRequest(
+ favIndex: state.index,
+ lastID: lastID,
+ lastTimestamp: lastItemTimestamp,
+ keyword: state.keyword
+ ).response()
+ await send(Action.fetchMoreGalleriesDone(state.index, response))
+ }
 
  case .fetchMoreGalleriesDone(let targetFavIndex, let result):
  state.rawFooterLoadingState[targetFavIndex] = .idle