deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

fix inbox for student kids

Browse source
This commit is contained in:
Thibault Duplessis 2020-02-02 20:51:03 -06:00
parent 503a7c8b93
commit d8c171fe6f
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/LilaController.scala
View file

@ -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,

2
modules/clas/src/main/ClasApi.scala
View file

@ -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)
}