deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

fix study members events WIP

study-members-event
Thibault Duplessis 2020-09-25 07:38:37 +02:00
parent 3a2ace67f8
commit 07ee32f342
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/study/src/main/StudyApi.scala
View File

@ -379,10 +379,14 @@ final class StudyApi(
def isContributor = studyRepo.isContributor _
def isMember = studyRepo.isMember _
private def onMembersChange(study: Study, to: Option[StudyMembers] = none) = {
(fuccess(to) orElse studyRepo.membersById(study.id)) foreach {
private def onMembersChange(
study: Study,
sendTo: Seq[User.ID] = none,
members: Option[StudyMembers] = none
) = {
(fuccess(members) orElse studyRepo.membersById(study.id)) foreach {
_ foreach { members =>
sendTo(study.id)(_.reloadMembers(members))
sendTo(study.id)(_.reloadMembers(members, sendTo))
}
}
indexStudy(study)

7
modules/study/src/main/StudySocket.scala
View File

@ -314,10 +314,9 @@ final private class StudySocket(
"w" -> who
)
)
def reloadMembers(members: StudyMembers)(studyId: Study.Id) = {
version("members", members)
send(RP.Out.tellRoomUsers(studyId, members.ids, makeMessage("reload")))
}
def reloadMembers(members: StudyMembers, sendTo: Seq[User.ID])(studyId: Study.Id) =
send(RP.Out.tellRoomUsers(studyId, sendTo, makeMessage("members", members)))
def setComment(pos: Position.Ref, comment: Comment, who: Who) =
version(
"setComment",