From d8c171fe6fa77c9a05894a010831ce6cd475f518 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Sun, 2 Feb 2020 20:51:03 -0600
Subject: [PATCH] fix inbox for student kids

---
 app/controllers/LilaController.scala | 12 ++++++------
 modules/clas/src/main/ClasApi.scala  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala
index e56f1262d9..c41b7e4b28 100644
--- a/app/controllers/LilaController.scala
+++ b/app/controllers/LilaController.scala
@@ -474,23 +474,23 @@ abstract private[controllers] class LilaController(val env: Env)
     val nonce  = isPage option Nonce.random
     ctx.me.fold(fuccess(PageData.anon(ctx.req, nonce, blindMode(ctx)))) { me =>
       import lila.relation.actorApi.OnlineFriends
-      env.pref.api.getPref(me, ctx.req) zip {
+      env.pref.api.getPref(me, ctx.req) zip
+        (if (isGranted(_.Teacher, me)) fuccess(true) else env.clas.api.student.isStudent(me.id)) zip {
         if (isPage) {
           env.user.lightUserApi preloadUser me
           env.relation.online.friendsOf(me.id) zip
             env.team.api.nbRequests(me.id) zip
             env.challenge.api.countInFor.get(me.id) zip
             env.notifyM.api.unreadCount(Notifies(me.id)).dmap(_.value) zip
-            env.mod.inquiryApi.forMod(me) zip
-            (if (isGranted(_.Teacher, me)) fuccess(true) else env.clas.api.student.isStudent(me.id))
+            env.mod.inquiryApi.forMod(me)
         } else
           fuccess {
-            (((((OnlineFriends.empty, 0), 0), 0), none), false)
+            ((((OnlineFriends.empty, 0), 0), 0), none)
           }
       } map {
         case (
-            pref,
-            (onlineFriends ~ teamNbRequests ~ nbChallenges ~ nbNotifications ~ inquiry ~ hasClas)
+            (pref, hasClas),
+            (onlineFriends ~ teamNbRequests ~ nbChallenges ~ nbNotifications ~ inquiry)
             ) =>
           PageData(
             onlineFriends,
diff --git a/modules/clas/src/main/ClasApi.scala b/modules/clas/src/main/ClasApi.scala
index bf25cea4cc..1291fe6de7 100644
--- a/modules/clas/src/main/ClasApi.scala
+++ b/modules/clas/src/main/ClasApi.scala
@@ -221,7 +221,7 @@ final class ClasApi(
     def isStudent(userId: User.ID) = idsCache.getUnit.dmap(_ contains userId)
 
     private val idsCache = cacheApi.unit[Set[User.ID]] {
-      _.refreshAfterWrite(5 minutes)
+      _.refreshAfterWrite(601 seconds)
         .buildAsyncFuture { _ =>
           coll.distinctEasy[User.ID, Set]("userId", $empty)
         }