hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some refactoring

Browse source
This commit is contained in:
Neil Alexander 2021-01-21 11:18:10 +00:00
parent 9b2b7a6e28
commit e254594453
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
7 changed files with 193 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

39
syncapi/routing/messages.go
View file

@ -190,29 +190,28 @@ func OnIncomingMessagesRequest(
switch visibility {
case "joined", "invited": // TODO: treat invites properly
membership, _, err := db.MostRecentMembership(req.Context(), roomID, device.UserID) // nolint:govet
if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("db.MostRecentMembership for history visibility failed")
return jsonerror.InternalServerError()
joinTypes := []string{"join"}
if visibility == "invited" {
joinTypes = []string{"invite", "join"}
}
if membership == nil {
return util.JSONResponse{
Code: http.StatusForbidden,
JSON: jsonerror.Forbidden("History visibility prevents non-members from seeing this room"),
var joinPDUPos, joinTopoPos types.StreamPosition
var leavePDUPos, leaveTopoPos types.StreamPosition
if _, joinPDUPos, joinTopoPos, err = db.MostRecentMembership(req.Context(), roomID, device.UserID, joinTypes); err == nil {
if backwardOrdering {
to.PDUPosition = joinPDUPos
to.Depth = joinTopoPos
} else {
from.PDUPosition = joinPDUPos
from.Depth = joinTopoPos
}
}
pos, err := db.EventPositionInTopology(req.Context(), membership.EventID())
if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("db.PositionInTopology for history visibility failed")
return jsonerror.InternalServerError()
}
if backwardOrdering {
if to.Depth < pos.Depth || to.PDUPosition < pos.PDUPosition {
to = pos
}
} else {
if from.Depth < pos.Depth || from.PDUPosition < pos.PDUPosition {
from = pos
if _, leavePDUPos, leaveTopoPos, err = db.MostRecentMembership(req.Context(), roomID, device.UserID, []string{"leave", "ban", "kick"}); err == nil {
if backwardOrdering {
from.PDUPosition = leavePDUPos
from.Depth = leaveTopoPos
} else {
to.PDUPosition = leavePDUPos
to.Depth = leaveTopoPos
}
}