Added broadcast subscription list

Author: Carbrex

app/controllers/RelayTour.scala

@@ -39,6 +39,15 @@ final class RelayTour(env: Env, apiC: => Api) extends LilaController(env):
           .map:
             html.relay.tour.byOwner(_, owner)
 
+  def subscribed(page: Int) = Auth { ctx ?=> me ?=>
+    Reasonable(page, config.Max(20)):
+      env.relay.pager
+        .subscribedBy(me.userId, page)
+        .flatMap: pager =>
+          Ok.pageAsync:
+            html.relay.tour.subscribed(pager)
+  }
+
   private def page(key: String, menu: String) = Open:
     pageHit
     FoundPage(env.api.cmsRender(lila.cms.CmsPage.Key(key))): p =>

app/views/relay/tour.scala

@@ -84,6 +84,23 @@ object tour:
         )
       )
 
+  def subscribed(pager: Paginator[RelayTour | WithLastRound])(using PageContext) =
+    views.html.base.layout(
+      title = liveBroadcasts.txt(),
+      moreCss = cssTag("relay.index"),
+      moreJs = infiniteScrollTag
+    ):
+      main(cls := "relay-index page-menu")(
+        pageMenu("subscribed"),
+        div(cls := "page-menu__content box box-pad")(
+          boxTop:
+            h1(liveBroadcasts())
+          ,
+          standardFlash,
+          renderPager(pager)
+        )
+      )
+
   def showEmpty(t: RelayTour, owner: Option[LightUser], markup: Option[Html])(using PageContext) =
     views.html.base.layout(
       title = t.name,
@@ -134,6 +151,9 @@ object tour:
             " ",
             trans.broadcast.broadcasts()
           ),
+      a(href := routes.RelayTour.subscribed(), cls := menu.activeO("subscribed"))(
+        trans.broadcast.subscribedBroadcasts()
+      ),
       a(href := routes.RelayTour.form, cls := menu.activeO("new"))(trans.broadcast.newBroadcast()),
       a(href := routes.RelayTour.calendar, cls := menu.activeO("calendar"))(trans.tournamentCalendar()),
       a(href := routes.RelayTour.help, cls := menu.activeO("help"))(trans.broadcast.aboutBroadcasts())

conf/routes

@@ -247,6 +247,7 @@ POST  /broadcast/new                          controllers.RelayTour.create
 GET   /broadcast/calendar                     controllers.RelayTour.calendar
 GET   /broadcast/help                         controllers.RelayTour.help
 GET   /broadcast/by/:user                     controllers.RelayTour.by(user, page: Int ?= 1)
+GET   /broadcast/subscribed               controllers.RelayTour.subscribed(page: Int ?= 1)
 GET   /broadcast/:ts/$anyId<\w{8}>            controllers.RelayTour.show(ts, anyId)
 GET   /api/broadcast/$tourId<\w{8}>.pgn       controllers.RelayTour.pgn(tourId)
 GET   /broadcast/$tourId<\w{8}>/edit          controllers.RelayTour.edit(tourId)

modules/i18n/src/main/I18nKeys.scala

@@ -1584,6 +1584,7 @@ object I18nKeys:
     val `myBroadcasts` = I18nKey("broadcast:myBroadcasts")
     val `liveBroadcasts` = I18nKey("broadcast:liveBroadcasts")
     val `newBroadcast` = I18nKey("broadcast:newBroadcast")
+    val `subscribedBroadcasts` = I18nKey("broadcast:subscribedBroadcasts")
     val `aboutBroadcasts` = I18nKey("broadcast:aboutBroadcasts")
     val `noRoundsYet` = I18nKey("broadcast:noRoundsYet")
     val `howToUseLichessBroadcasts` = I18nKey("broadcast:howToUseLichessBroadcasts")

modules/relay/src/main/RelayPager.scala

@@ -33,6 +33,25 @@ final class RelayPager(tourRepo: RelayTourRepo, roundRepo: RelayRoundRepo, cache
     maxPerPage = maxPerPage
   )
 
+  def subscribedBy(userId: UserId, page: Int): Fu[Paginator[RelayTour | WithLastRound]] = Paginator(
+    adapter = new:
+      def nbResults: Fu[Int] = tourRepo.countBySubscriberId(userId)
+      def slice(offset: Int, length: Int): Fu[List[WithLastRound]] =
+        tourRepo.coll
+          .aggregateList(length, _.sec): framework =>
+            import framework.*
+            Match(tourRepo.selectors.subscriberId(userId)) -> {
+              List(Sort(Descending("createdAt"))) ::: aggregateRoundAndUnwind(framework) ::: List(
+                Skip(offset),
+                Limit(length)
+              )
+            }
+          .map(readToursWithRound)
+    ,
+    currentPage = page,
+    maxPerPage = maxPerPage
+  )
+
   object inactive:
 
     private def slice(offset: Int, length: Int): Fu[List[WithLastRound]] =

modules/relay/src/main/RelayTourRepo.scala

@@ -26,6 +26,9 @@ final private class RelayTourRepo(val coll: Coll)(using Executor):
   def isSubscribed(tid: RelayTour.Id, uid: UserId): Fu[Boolean] =
     coll.exists($doc($id(tid), "subscribers" -> uid))
 
+  def countBySubscriberId(uid: UserId): Fu[Int] =
+    coll.countSel(selectors.subscriberId(uid))
+
   def hasNotified(rt: RelayRound.WithTour): Fu[Boolean] =
     coll.exists($doc($id(rt.tour.id), "notified" -> rt.round.id))
 
@@ -36,9 +39,10 @@ final private class RelayTourRepo(val coll: Coll)(using Executor):
     coll.delete.one($id(tour.id)).void
 
   private[relay] object selectors:
-    val official           = $doc("tier" $exists true)
-    val active             = $doc("active" -> true)
-    val inactive           = $doc("active" -> false)
-    def ownerId(u: UserId) = $doc("ownerId" -> u)
-    val officialActive     = official ++ active
-    val officialInactive   = official ++ inactive
+    val official                = $doc("tier" $exists true)
+    val active                  = $doc("active" -> true)
+    val inactive                = $doc("active" -> false)
+    def ownerId(u: UserId)      = $doc("ownerId" -> u)
+    def subscriberId(u: UserId) = $doc("subscribers" -> u)
+    val officialActive          = official ++ active
+    val officialInactive        = official ++ inactive

translation/source/broadcast.xml

@@ -8,6 +8,7 @@
   </plurals>
   <string name="liveBroadcasts">Live tournament broadcasts</string>
   <string name="newBroadcast">New live broadcast</string>
+  <string name="subscribedBroadcasts">Subscribed Broadcasts</string>
   <string name="aboutBroadcasts">About broadcasts</string>
   <string name="noRoundsYet">No rounds yet.</string>
   <string name="howToUseLichessBroadcasts">How to use Lichess Broadcasts.</string>