hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-28 16:08:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

correctly refactor perform_peek

Browse source
This commit is contained in:
Matthew Hodgson 2020-09-03 23:18:39 +01:00
parent 3c5e079b87
commit c775643c50
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roomserver/internal/api.go
View file

@ -22,6 +22,7 @@ type RoomserverInternalAPI struct {
*query.Queryer *query.Queryer
*perform.Inviter *perform.Inviter
*perform.Joiner *perform.Joiner
*perform.Peeker
*perform.Leaver *perform.Leaver
*perform.Publisher *perform.Publisher
*perform.Backfiller *perform.Backfiller
@ -81,6 +82,13 @@ func (r *RoomserverInternalAPI) SetFederationSenderAPI(fsAPI fsAPI.FederationSen
FSAPI: r.fsAPI, FSAPI: r.fsAPI,
Inputer: r.Inputer, Inputer: r.Inputer,
} }
r.Peeker = &perform.Peeker{
ServerName: r.Cfg.Matrix.ServerName,
Cfg: r.Cfg,
DB: r.DB,
FSAPI: r.fsAPI,
Inputer: r.Inputer,
}
r.Leaver = &perform.Leaver{ r.Leaver = &perform.Leaver{
Cfg: r.Cfg, Cfg: r.Cfg,
DB: r.DB, DB: r.DB,

25
roomserver/internal/perform/perform_peek.go
View file

@ -20,15 +20,28 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/matrix-org/dendrite/internal/config"
fsAPI "github.com/matrix-org/dendrite/federationsender/api" fsAPI "github.com/matrix-org/dendrite/federationsender/api"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/roomserver/internal/input"
"github.com/matrix-org/dendrite/roomserver/storage"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
type Peeker struct {
ServerName gomatrixserverlib.ServerName
Cfg *config.RoomServer
FSAPI fsAPI.FederationSenderInternalAPI
DB storage.Database
Inputer *input.Inputer
}
// PerformPeek handles peeking into matrix rooms, including over federation by talking to the federationsender. // PerformPeek handles peeking into matrix rooms, including over federation by talking to the federationsender.
func (r *RoomserverInternalAPI) PerformPeek( func (r *Peeker) PerformPeek(
ctx context.Context, ctx context.Context,
req *api.PerformPeekRequest, req *api.PerformPeekRequest,
res *api.PerformPeekResponse, res *api.PerformPeekResponse,
@ -47,7 +60,7 @@ func (r *RoomserverInternalAPI) PerformPeek(
res.RoomID = roomID res.RoomID = roomID
} }
func (r *RoomserverInternalAPI) performPeek( func (r *Peeker) performPeek(
ctx context.Context, ctx context.Context,
req *api.PerformPeekRequest, req *api.PerformPeekRequest,
) (string, error) { ) (string, error) {
@ -77,7 +90,7 @@ func (r *RoomserverInternalAPI) performPeek(
} }
} }
func (r *RoomserverInternalAPI) performPeekRoomByAlias( func (r *Peeker) performPeekRoomByAlias(
ctx context.Context, ctx context.Context,
req *api.PerformPeekRequest, req *api.PerformPeekRequest,
) (string, error) { ) (string, error) {
@ -99,7 +112,7 @@ func (r *RoomserverInternalAPI) performPeekRoomByAlias(
ServerName: domain, // the server to ask ServerName: domain, // the server to ask
} }
dirRes := fsAPI.PerformDirectoryLookupResponse{} dirRes := fsAPI.PerformDirectoryLookupResponse{}
err = r.fsAPI.PerformDirectoryLookup(ctx, &dirReq, &dirRes) err = r.FSAPI.PerformDirectoryLookup(ctx, &dirReq, &dirRes)
if err != nil { if err != nil {
logrus.WithError(err).Errorf("error looking up alias %q", req.RoomIDOrAlias) logrus.WithError(err).Errorf("error looking up alias %q", req.RoomIDOrAlias)
return "", fmt.Errorf("Looking up alias %q over federation failed: %w", req.RoomIDOrAlias, err) return "", fmt.Errorf("Looking up alias %q over federation failed: %w", req.RoomIDOrAlias, err)
@ -124,7 +137,7 @@ func (r *RoomserverInternalAPI) performPeekRoomByAlias(
return r.performPeekRoomByID(ctx, req) return r.performPeekRoomByID(ctx, req)
} }
func (r *RoomserverInternalAPI) performPeekRoomByID( func (r *Peeker) performPeekRoomByID(
ctx context.Context, ctx context.Context,
req *api.PerformPeekRequest, req *api.PerformPeekRequest,
) (roomID string, err error) { ) (roomID string, err error) {
@ -172,7 +185,7 @@ func (r *RoomserverInternalAPI) performPeekRoomByID(
// TODO: handle federated peeks // TODO: handle federated peeks
err = r.WriteOutputEvents(roomID, []api.OutputEvent{ err = r.Inputer.WriteOutputEvents(roomID, []api.OutputEvent{
{ {
Type: api.OutputTypeNewPeek, Type: api.OutputTypeNewPeek,
NewPeek: &api.OutputNewPeek{ NewPeek: &api.OutputNewPeek{