diff options
| author | devonh <devon.dmytro@gmail.com> | 2023-05-19 16:27:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 16:27:01 +0000 |
| commit | 2eae8dc489f056df5aec0ee4ace1b8ba8260e18e (patch) | |
| tree | b820c15eec6d80812661f5f0df6d0e0db7dfd630 /roomserver | |
| parent | 027a9b8ce0a7e2d577e2c41f9de7a6fe42ace655 (diff) | |
Move SendJoin logic to GMSL (#3084)
Moves the core matrix logic for handling the send_join endpoint over to
gmsl.
Diffstat (limited to 'roomserver')
| -rw-r--r-- | roomserver/api/api.go | 1 | ||||
| -rw-r--r-- | roomserver/internal/query/query.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roomserver/api/api.go b/roomserver/api/api.go index f2e2bf84..213e16e5 100644 --- a/roomserver/api/api.go +++ b/roomserver/api/api.go @@ -202,6 +202,7 @@ type FederationRoomserverAPI interface { QueryBulkStateContentAPI // QueryServerBannedFromRoom returns whether a server is banned from a room by server ACLs. QueryServerBannedFromRoom(ctx context.Context, req *QueryServerBannedFromRoomRequest, res *QueryServerBannedFromRoomResponse) error + QueryMembershipForUser(ctx context.Context, req *QueryMembershipForUserRequest, res *QueryMembershipForUserResponse) error QueryMembershipsForRoom(ctx context.Context, req *QueryMembershipsForRoomRequest, res *QueryMembershipsForRoomResponse) error QueryRoomVersionForRoom(ctx context.Context, roomID string) (gomatrixserverlib.RoomVersion, error) GetRoomIDForAlias(ctx context.Context, req *GetRoomIDForAliasRequest, res *GetRoomIDForAliasResponse) error diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 35cafd0e..effcc90d 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -868,7 +868,7 @@ func (r *Queryer) QueryRoomInfo(ctx context.Context, roomID spec.RoomID) (*types } func (r *Queryer) CurrentStateEvent(ctx context.Context, roomID spec.RoomID, eventType string, stateKey string) (gomatrixserverlib.PDU, error) { - res, err := r.DB.GetStateEvent(ctx, roomID.String(), string(eventType), "") + res, err := r.DB.GetStateEvent(ctx, roomID.String(), eventType, "") if res == nil { return nil, err } |