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

Merge branch 'master' of github.com:ornicar/lila

Browse source 
* 'master' of github.com:ornicar/lila:
  Fix a bug for study icon in friend list
This commit is contained in:
Thibault Duplessis 2017-02-14 22:31:53 +01:00
parent 960d564637 29d5d47fea
commit d6aa1f8a8c
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/relation/src/main/Env.scala
View file

@ -50,7 +50,8 @@ final class Env(
val currentlyStudying: ID => Option[String] = onlineStudying.getIfPresent
private val onlineStudyingAll = new lila.memo.ExpireSetMemo(20 minutes) // people with write or read access in public and private studies
private val onlineStudyingAll: Cache[ID, String] /* userId, studyId */ =
Scaffeine().expireAfterAccess(20 minutes).build[ID, String] // people with write or read access in public and private studies
private[relation] val actor = system.actorOf(Props(new RelationActor(
getOnlineUserIds = getOnlineUserIds,

15
modules/relation/src/main/RelationActor.scala
View file

@ -18,7 +18,7 @@ private[relation] final class RelationActor(
api: RelationApi,
onlinePlayings: ExpireSetMemo,
onlineStudying: OnlineStudyingCache,
onlineStudyingAll: lila.memo.ExpireSetMemo
onlineStudyingAll: OnlineStudyingCache
) extends Actor {
private val bus = context.system.lilaBus
@ -72,7 +72,7 @@ private[relation] final class RelationActor(
notifyFollowersGameStateChanged(usersPlaying, "following_playing")
case lila.hub.actorApi.study.StudyDoor(userId, studyId, contributor, public, true) =>
onlineStudyingAll.put(userId)
onlineStudyingAll.put(userId, studyId)
if (contributor && public) {
val wasAlreadyInStudy = onlineStudying.getIfPresent(userId).isDefined
onlineStudying.put(userId, studyId)
@ -80,14 +80,14 @@ private[relation] final class RelationActor(
}
case lila.hub.actorApi.study.StudyDoor(userId, studyId, contributor, public, false) =>
onlineStudyingAll remove userId
onlineStudyingAll invalidate userId
if (contributor && public) {
onlineStudying invalidate userId
notifyFollowersFriendInStudyStateChanged(userId, studyId, "following_left_study")
}
case lila.hub.actorApi.study.StudyBecamePrivate(studyId, contributors) =>
val found = onlineStudying getAllPresent contributors
val found = onlineStudying.getAllPresent(contributors).filter(_._2 == studyId)
val contributorsInStudy = contributors filter found.contains
for (c <- contributorsInStudy) {
onlineStudying invalidate c
@ -95,20 +95,21 @@ private[relation] final class RelationActor(
}
case lila.hub.actorApi.study.StudyBecamePublic(studyId, contributors) =>
val contributorsInStudy = onlineStudyingAll intersect contributors
val found = onlineStudyingAll.getAllPresent(contributors).filter(_._2 == studyId)
val contributorsInStudy = contributors filter found.contains
for (c <- contributorsInStudy) {
onlineStudying.put(c, studyId)
notifyFollowersFriendInStudyStateChanged(c, studyId, "following_joined_study")
}
case lila.hub.actorApi.study.StudyMemberGotWriteAccess(userId, studyId) =>
if (onlineStudyingAll.get(userId)) {
if (onlineStudyingAll.getIfPresent(userId) == Some(studyId)) {
onlineStudying.put(userId, studyId)
notifyFollowersFriendInStudyStateChanged(userId, studyId, "following_joined_study")
}
case lila.hub.actorApi.study.StudyMemberLostWriteAccess(userId, studyId) =>
if (onlineStudying.getIfPresent(userId).isDefined) {
if (onlineStudying.getIfPresent(userId) == Some(studyId)) {
onlineStudying invalidate userId
notifyFollowersFriendInStudyStateChanged(userId, studyId, "following_left_study")
}