Merge branch 'master' into flipped-chapter-edit-orientation

johndoknjas · Nov 8, 2024 · 486b329 · 486b329
2 parents 7069222 + 29b0acc
commit 486b329
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/app/controllers/TeamApi.scala b/app/controllers/TeamApi.scala
@@ -72,14 +72,15 @@ final class TeamApi(env: Env, apiC: => Api) extends LilaController(env):
           yield leads
 
   def teamsOf(username: UserStr) = AnonOrScoped(): ctx ?=>
-    import env.team.jsonView.given
-    JsonOk:
-      for
-        ids   <- api.joinedTeamIdsOfUserAsSeenBy(username)
-        teams <- api.teamsByIds(ids)
-        teams <- env.team.memberRepo.addPublicLeaderIds(teams)
-        _     <- env.user.lightUserApi.preloadMany(teams.flatMap(_.publicLeaders))
-      yield teams
+    Found(meOrFetch(username)): user =>
+      import env.team.jsonView.given
+      JsonOk:
+        for
+          ids   <- api.joinedTeamIdsOfUserAsSeenBy(user)
+          teams <- api.teamsByIds(ids)
+          teams <- env.team.memberRepo.addPublicLeaderIds(teams)
+          _     <- env.user.lightUserApi.preloadMany(teams.flatMap(_.publicLeaders))
+        yield teams
 
   def requests(teamId: TeamId) = Scoped(_.Team.Read) { ctx ?=> me ?=>
     WithOwnedTeamEnabled(teamId, _.Request): team =>

diff --git a/modules/team/src/main/Cached.scala b/modules/team/src/main/Cached.scala
@@ -78,7 +78,7 @@ final class Cached(
           nbReqs      <- requestRepo.countPendingForTeams(leaderTeams)
         yield nbReqs
 
-  private[team] val forumAccess = cacheApi[TeamId, Access](1_024, "team.forum.access"):
+  private[team] val forumAccess = cacheApi[TeamId, Access](256, "team.forum.access"):
     _.expireAfterWrite(5 minutes).buildAsyncFuture(id => teamRepo.forumAccess(id).dmap(_ | Access.None))
 
   val unsubs = cacheApi[TeamId, Int](512, "team.unsubs"):

diff --git a/modules/team/src/main/Team.scala b/modules/team/src/main/Team.scala
@@ -65,15 +65,15 @@ object Team:
       v.key -> LightTeam(nameToId(name), name, none)
   }.toMap
 
-  val maxLeaders     = 10
-  val maxJoinCeiling = 50
+  val maxLeaders      = Max(10)
+  val maxJoin         = Max(50)
+  val verifiedMaxJoin = Max(150)
 
-  def maxJoin(u: User) =
-    if u.isVerified then maxJoinCeiling * 2
+  def maxJoin(u: User): Max =
+    if u.isVerified then verifiedMaxJoin
     else
-      {
-        15 + daysBetween(u.createdAt, nowInstant) / 7
-      }.atMost(maxJoinCeiling)
+      maxJoin.map:
+        _.atMost(15 + daysBetween(u.createdAt, nowInstant) / 7)
 
   case class IdsStr(value: String) extends AnyVal:
 

diff --git a/modules/team/src/main/TeamApi.scala b/modules/team/src/main/TeamApi.scala
@@ -95,16 +95,16 @@ final class TeamApi(
     cached.teamIds(me).dmap(_.size)
 
   def hasJoinedTooManyTeams(using me: Me) =
-    countTeamsOf(me).dmap(_ > Team.maxJoin(me))
+    countTeamsOf(me).dmap(Team.maxJoin(me) < _)
 
   def hasTeams(me: User): Fu[Boolean] = cached.teamIds(me.id).map(_.value.nonEmpty)
 
-  def joinedTeamIdsOfUserAsSeenBy[U: UserIdOf](member: U)(using viewer: Option[Me]): Fu[List[TeamId]] =
+  def joinedTeamIdsOfUserAsSeenBy(of: User)(using viewer: Option[Me]): Fu[List[TeamId]] =
     cached
-      .teamIdsList(member.id)
-      .map(_.take(lila.team.Team.maxJoinCeiling))
-      .flatMap { allIds =>
-        if viewer.exists(_.is(member)) || Granter.opt(_.UserModView) then fuccess(allIds)
+      .teamIdsList(of.id)
+      .map(_.take(Team.maxJoin(of).value))
+      .flatMap: allIds =>
+        if viewer.exists(_.is(of)) || Granter.opt(_.UserModView) then fuccess(allIds)
         else
           allIds.nonEmpty.so:
             teamRepo.filterHideMembers(allIds).flatMap { hiddenIds =>
@@ -115,7 +115,6 @@ final class TeamApi(
                     !hiddenIds(id) || viewerTeamIds.contains(id)
                 }
             }
-      }
 
   def countCreatedRecently(me: User): Fu[Int] =
     teamRepo.countCreatedSince(me.id, Period.ofWeeks(1))

diff --git a/modules/team/src/main/TeamSecurity.scala b/modules/team/src/main/TeamSecurity.scala
@@ -61,7 +61,7 @@ final class TeamSecurity(memberRepo: TeamMemberRepo, userApi: lila.core.user.Use
         "name" -> lila.common.Form.username.historicalField
           .verifying(
             s"No more than ${Team.maxLeaders} leaders, please",
-            _ => t.leaders.sizeIs < Team.maxLeaders
+            _ => t.leaders.sizeIs < Team.maxLeaders.value
           )
           .verifying(
             "You can't make Lichess a leader",
@@ -103,7 +103,7 @@ final class TeamSecurity(memberRepo: TeamMemberRepo, userApi: lila.core.user.Use
         )
         .verifying(
           s"No more than ${Team.maxLeaders} leaders, please",
-          _.sizeIs <= Team.maxLeaders
+          _.sizeIs <= Team.maxLeaders.value
         )
         .verifying(
           "Duplicated leader name",

diff --git a/modules/team/src/main/ui/TeamUi.scala b/modules/team/src/main/ui/TeamUi.scala
@@ -121,7 +121,7 @@ final class TeamUi(helpers: Helpers)(using Executor):
           div(cls := "page-menu__content box")(
             h1(cls := "box__top")(trt.myTeams()),
             standardFlash.map(div(cls := "box__pad")(_)),
-            ctx.me.filter(me => teams.size > Team.maxJoin(me)).map { me =>
+            ctx.me.filter(me => Team.maxJoin(me) < teams.size).map { me =>
               flashMessage("failure"):
                 s"You have joined ${teams.size} out of ${Team.maxJoin(me)} teams. Leave some teams before you can join others."
             },

diff --git a/ui/.build/src/monitor.ts b/ui/.build/src/monitor.ts
@@ -34,7 +34,7 @@ export async function monitor(pkgs: string[]): Promise<void> {
     clearTimeout(tscTimeout);
     tscTimeout = setTimeout(() => {
       if (packageTimeout) return;
-      esbuild(tsc());
+      tsc().then(esbuild);
     }, 2000);
   };
   const packageChange = async () => {