From a77f7e385a637829bf48a93cbe91c42476cd0cf9 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Fri, 12 May 2023 10:43:01 -0600 Subject: [PATCH] Rename Membership to UserJoinedToRoom --- federationapi/routing/join.go | 4 ++-- go.mod | 2 +- go.sum | 2 ++ roomserver/api/api.go | 2 +- roomserver/internal/query/query.go | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index 934b384d9..fc0f9eb0b 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -73,8 +73,8 @@ func (rq *JoinRoomQuerier) ServerInRoom(ctx context.Context, server spec.ServerN return &joinedResponse, nil } -func (rq *JoinRoomQuerier) Membership(ctx context.Context, roomNID int64, userID spec.UserID) (bool, error) { - return rq.roomserver.IsInRoom(ctx, types.RoomNID(roomNID), userID) +func (rq *JoinRoomQuerier) UserJoinedToRoom(ctx context.Context, roomNID int64, userID spec.UserID) (bool, error) { + return rq.roomserver.UserJoinedToRoom(ctx, types.RoomNID(roomNID), userID) } func (rq *JoinRoomQuerier) GetJoinedUsers(ctx context.Context, roomVersion gomatrixserverlib.RoomVersion, roomNID int64) ([]gomatrixserverlib.PDU, error) { diff --git a/go.mod b/go.mod index 68c240955..c9b39275b 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91 github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 - github.com/matrix-org/gomatrixserverlib v0.0.0-20230512162258-bdb2e94f6b1f + github.com/matrix-org/gomatrixserverlib v0.0.0-20230512163742-2313af9fcc17 github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 github.com/mattn/go-sqlite3 v1.14.16 diff --git a/go.sum b/go.sum index a4a9a59c8..977942fad 100644 --- a/go.sum +++ b/go.sum @@ -325,6 +325,8 @@ github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 h1:kHKxCOLcHH8 github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= github.com/matrix-org/gomatrixserverlib v0.0.0-20230512162258-bdb2e94f6b1f h1:IUoNmx4LOnLA7iHmD4JFfPlcPqH6DM/oQOL3bmbSaBs= github.com/matrix-org/gomatrixserverlib v0.0.0-20230512162258-bdb2e94f6b1f/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20230512163742-2313af9fcc17 h1:2QpV8ZfvPKgT2mks8vWnu1z3bjU2jT7ya0E4j67/xc4= +github.com/matrix-org/gomatrixserverlib v0.0.0-20230512163742-2313af9fcc17/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a h1:awrPDf9LEFySxTLKYBMCiObelNx/cBuv/wzllvCCH3A= github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a/go.mod h1:HchJX9oKMXaT2xYFs0Ha/6Zs06mxLU8k6F1ODnrGkeQ= github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 h1:6z4KxomXSIGWqhHcfzExgkH3Z3UkIXry4ibJS4Aqz2Y= diff --git a/roomserver/api/api.go b/roomserver/api/api.go index 26cfaed4b..8979ba7f3 100644 --- a/roomserver/api/api.go +++ b/roomserver/api/api.go @@ -229,7 +229,7 @@ type FederationRoomserverAPI interface { IsInvitePending(ctx context.Context, roomID spec.RoomID, userID spec.UserID) (bool, error) QueryRoomInfo(ctx context.Context, roomID spec.RoomID) (*types.RoomInfo, error) GetStateEvent(ctx context.Context, roomID spec.RoomID, eventType spec.MatrixEventType, stateKey string) (gomatrixserverlib.PDU, error) - IsInRoom(ctx context.Context, roomID types.RoomNID, userID spec.UserID) (bool, error) + UserJoinedToRoom(ctx context.Context, roomID types.RoomNID, userID spec.UserID) (bool, error) GetLocallyJoinedUsers(ctx context.Context, roomVersion gomatrixserverlib.RoomVersion, roomNID types.RoomNID) ([]gomatrixserverlib.PDU, error) } diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 937a6a34b..226a9490f 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -871,7 +871,7 @@ func (r *Queryer) GetStateEvent(ctx context.Context, roomID spec.RoomID, eventTy return r.DB.GetStateEvent(ctx, roomID.String(), string(eventType), "") } -func (r *Queryer) IsInRoom(ctx context.Context, roomNID types.RoomNID, userID spec.UserID) (bool, error) { +func (r *Queryer) UserJoinedToRoom(ctx context.Context, roomNID types.RoomNID, userID spec.UserID) (bool, error) { _, isIn, _, err := r.DB.GetMembership(ctx, roomNID, userID.String()) return isIn, err }