Try this fix

nylonee · Dec 15, 2023 · c20dfe4 · c20dfe4
1 parent 92767e3
commit c20dfe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/scala/plex/PlexUtils.scala b/src/main/scala/plex/PlexUtils.scala
@@ -136,8 +136,8 @@ trait PlexUtils {
  for {
  responseJson <- EitherT(client.httpRequest(Method.POST, url, Some(token), Some(query.asJson)))
  watchlist <- EitherT.fromEither[IO](responseJson.as[TokenWatchlistFriend]).leftMap(new Throwable(_))
- extraContent <- if (watchlist.data.user.watchlist.pageInfo.hasNextPage)
- getWatchlistIdsForUser(config, client)(user, Some(watchlist.data.user.watchlist.pageInfo.endCursor))
+ extraContent <- if (watchlist.data.user.watchlist.pageInfo.hasNextPage && watchlist.data.user.watchlist.pageInfo.endCursor.nonEmpty)
+ getWatchlistIdsForUser(config, client)(user, watchlist.data.user.watchlist.pageInfo.endCursor)
  else
  EitherT.pure[IO, Throwable](Set.empty[TokenWatchlistItem])
  } yield watchlist.data.user.watchlist.nodes.map(_.toTokenWatchlistItem).toSet ++ extraContent

diff --git a/src/main/scala/plex/TokenWatchlistFriend.scala b/src/main/scala/plex/TokenWatchlistFriend.scala
@@ -8,7 +8,7 @@ private[plex] case class WatchlistUserData(watchlist: WatchlistNodes)
 
 private[plex] case class WatchlistNodes(nodes: List[WatchlistNode], pageInfo: PageInfo)
 
-private[plex] case class PageInfo(hasNextPage: Boolean, endCursor: String)
+private[plex] case class PageInfo(hasNextPage: Boolean, endCursor: Option[String])
 
 private[plex] case class WatchlistNode(id: String, title: String, `type`: String) {
  def toTokenWatchlistItem: TokenWatchlistItem =