This commit is contained in:
Matthew Hodgson 2020-09-23 00:08:23 +01:00
parent 20e2cb4b7e
commit 3202c7e76f
13 changed files with 106 additions and 109 deletions

View file

@ -100,4 +100,3 @@ func Peek(
JSON: respPeek, JSON: respPeek,
} }
} }

View file

@ -304,7 +304,7 @@ func (r *FederationSenderInternalAPI) performOutboundPeekUsingServer(
renewing := false renewing := false
if outboundPeek != nil { if outboundPeek != nil {
nowMilli := time.Now().UnixNano() / int64(time.Millisecond) nowMilli := time.Now().UnixNano() / int64(time.Millisecond)
if nowMilli > outboundPeek.RenewedTimestamp + outboundPeek.RenewalInterval { if nowMilli > outboundPeek.RenewedTimestamp+outboundPeek.RenewalInterval {
logrus.Infof("stale outbound peek to %s for %s already exists; renewing", serverName, roomID) logrus.Infof("stale outbound peek to %s for %s already exists; renewing", serverName, roomID)
renewing = true renewing = true
} else { } else {

View file

@ -142,4 +142,3 @@ func (r *RoomserverInternalAPI) PerformLeave(
} }
return r.WriteOutputEvents(req.RoomID, outputEvents) return r.WriteOutputEvents(req.RoomID, outputEvents)
} }

View file

@ -19,8 +19,8 @@ import (
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/roomserver/internal/helpers" "github.com/matrix-org/dendrite/roomserver/internal/helpers"
"github.com/matrix-org/dendrite/roomserver/internal/query"
"github.com/matrix-org/dendrite/roomserver/internal/input" "github.com/matrix-org/dendrite/roomserver/internal/input"
"github.com/matrix-org/dendrite/roomserver/internal/query"
"github.com/matrix-org/dendrite/roomserver/state" "github.com/matrix-org/dendrite/roomserver/state"
"github.com/matrix-org/dendrite/roomserver/storage" "github.com/matrix-org/dendrite/roomserver/storage"
"github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/roomserver/types"
@ -65,7 +65,7 @@ func (r *InboundPeeker) PerformInboundPeek(
return err return err
} }
// XXX: is this actually the latest of the latest events? // XXX: is this actually the latest of the latest events?
latestEvents, err := r.DB.EventsFromIDs(ctx, []string{ latestEventRefs[0].EventID }) latestEvents, err := r.DB.EventsFromIDs(ctx, []string{latestEventRefs[0].EventID})
if err != nil { if err != nil {
return err return err
} }
@ -124,4 +124,3 @@ func (r *InboundPeeker) PerformInboundPeek(
}) })
return err return err
} }