From 5f15826c2f851eba6c18abbb7f0a3e7064fcf3f1 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sat, 25 Jan 2020 18:15:39 +0530 Subject: [PATCH] Fix some build errors --- roomserver/api/canonical_alias.go | 4 +-- roomserver/canonical_alias/canonical_alias.go | 7 ++--- roomserver/roomserver.go | 1 + .../postgres/room_canonical_aliases_table.go | 4 +-- roomserver/storage/postgres/sql.go | 2 +- roomserver/storage/postgres/storage.go | 27 +++++++++++++++++++ 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/roomserver/api/canonical_alias.go b/roomserver/api/canonical_alias.go index c0f3b02e6..f71880c16 100644 --- a/roomserver/api/canonical_alias.go +++ b/roomserver/api/canonical_alias.go @@ -70,7 +70,7 @@ type GetCreatorIDForCanonicalAliasRequest struct { } // GetCreatorIDForCanonicalAliasResponse is a response to GetCreatorIDForCanonicalAlias -type GetCreatorIDForAliasResponse struct { +type GetCreatorIDForCanonicalAliasResponse struct { // The user ID of the canonical alias creator UserID string `json:"user_id"` } @@ -102,7 +102,7 @@ type RoomserverCanonicalAliasAPI interface { GetCreatorIDForCanonicalAlias( ctx context.Context, req *GetCreatorIDForCanonicalAliasRequest, - response *GetCreatorIDForCanonicalAliasAliasResponse, + response *GetCreatorIDForCanonicalAliasResponse, ) error } diff --git a/roomserver/canonical_alias/canonical_alias.go b/roomserver/canonical_alias/canonical_alias.go index 30b5c1a53..2cb1a4642 100644 --- a/roomserver/canonical_alias/canonical_alias.go +++ b/roomserver/canonical_alias/canonical_alias.go @@ -17,15 +17,12 @@ package canonical_alias import ( "context" "encoding/json" - "fmt" "net/http" - "time" appserviceAPI "github.com/matrix-org/dendrite/appservice/api" "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/common/config" roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" - "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) @@ -58,7 +55,7 @@ type RoomserverCanonicalAliasAPI struct { } // SetRoomCanonicalAlias implements alias.RoomserverCanonicalAliasAPI -func (r *RoomserverCanonicalAliasAPI) SetRoomAlias( +func (r *RoomserverCanonicalAliasAPI) SetRoomCanonicalAlias( ctx context.Context, request *roomserverAPI.SetRoomCanonicalAliasRequest, response *roomserverAPI.SetRoomCanonicalAliasResponse, @@ -66,7 +63,7 @@ func (r *RoomserverCanonicalAliasAPI) SetRoomAlias( // SPEC: Room with `m.room.canonical_alias` with empty alias field should be // treated same as room without a canonical alias. if request.CanonicalAlias == "" { - return r.db.RemoveCanonicalAlias(ctx, request.RoomID) + return r.DB.RemoveCanonicalAlias(ctx, request.RoomID) } roomID, err := r.DB.GetRoomIDForAlias(ctx, request.CanonicalAlias) diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index b5dc4e8e8..0adc19d93 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -22,6 +22,7 @@ import ( asQuery "github.com/matrix-org/dendrite/appservice/query" "github.com/matrix-org/dendrite/common/basecomponent" "github.com/matrix-org/dendrite/roomserver/alias" + "github.com/matrix-org/dendrite/roomserver/canonical_alias" "github.com/matrix-org/dendrite/roomserver/input" "github.com/matrix-org/dendrite/roomserver/query" "github.com/matrix-org/dendrite/roomserver/storage" diff --git a/roomserver/storage/postgres/room_canonical_aliases_table.go b/roomserver/storage/postgres/room_canonical_aliases_table.go index c4cf4c884..fe4712321 100644 --- a/roomserver/storage/postgres/room_canonical_aliases_table.go +++ b/roomserver/storage/postgres/room_canonical_aliases_table.go @@ -111,8 +111,8 @@ func (s *roomCanonicalAliasStatements) selectCreatorIDFromCanonicalAlias( } func (s *roomCanonicalAliasStatements) deleteRoomCanonicalAlias( - ctx context.Context, canonical_alias string, + ctx context.Context, roomID string, ) (err error) { - _, err = s.deleteRoomCanonicalAliasStmt.ExecContext(ctx, canonical_alias) + _, err = s.deleteRoomCanonicalAliasStmt.ExecContext(ctx, roomID) return } diff --git a/roomserver/storage/postgres/sql.go b/roomserver/storage/postgres/sql.go index b5b05d6d4..08accf91f 100644 --- a/roomserver/storage/postgres/sql.go +++ b/roomserver/storage/postgres/sql.go @@ -29,7 +29,7 @@ type statements struct { stateBlockStatements previousEventStatements roomAliasesStatements - roomCanonicalStatements + roomCanonicalAliasStatements inviteStatements membershipStatements transactionStatements diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go index 93450e5a5..ef0c161b8 100644 --- a/roomserver/storage/postgres/storage.go +++ b/roomserver/storage/postgres/storage.go @@ -468,6 +468,33 @@ func (d *Database) RemoveRoomAlias(ctx context.Context, alias string) error { return d.statements.deleteRoomAlias(ctx, alias) } +// SetRoomCanonicalAlias implements alias.RoomserverCanonicalAliasAPIDB +func (d *Database) SetRoomCanonicalAlias(ctx context.Context, canonical_alias string, roomID string, creatorUserID string) error { + return d.statements.insertRoomCanonicalAlias(ctx, canonical_alias, roomID, creatorUserID) +} + +// GetRoomIDForCanonicalAlias implements alias.RoomserverCanonicalAliasAPIDB +func (d *Database) GetRoomIDForCanonicalAlias(ctx context.Context, canonical_alias string) (string, error) { + return d.statements.selectRoomIDFromCanonicalAlias(ctx, canonical_alias) +} + +// GetCanonicalAliasForRoomID implements alias.RoomserverCanonicalAliasAPIDB +func (d *Database) GetCanonicalAliasForRoomID(ctx context.Context, roomID string) (string, error) { + return d.statements.selectCanonicalAliasFromRoomID(ctx, roomID) +} + +// GetCreatorIDForCanonicalAlias implements alias.RoomserverCanonicalAliasAPIDB +func (d *Database) GetCreatorIDForCanonicalAlias( + ctx context.Context, canonical_alias string, +) (string, error) { + return d.statements.selectCreatorIDFromCanonicalAlias(ctx, canonical_alias) +} + +// RemoveRoomCanonicalAlias implements alias.RoomserverCanonicalAliasAPIDB +func (d *Database) RemoveRoomCanonicalAlias(ctx context.Context, canonical_alias string) error { + return d.statements.deleteRoomCanonicalAlias(ctx, canonical_alias) +} + // StateEntriesForTuples implements state.RoomStateDatabase func (d *Database) StateEntriesForTuples( ctx context.Context,