mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-18 04:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some build errors

Browse source
This commit is contained in:
Abhishek Kumar 2020-01-25 18:15:39 +05:30
parent cebef9bf09
commit 5f15826c2f
6 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/api/canonical_alias.go
View file

@ -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
}

7
roomserver/canonical_alias/canonical_alias.go
View file

@ -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)

1
roomserver/roomserver.go
View file

@ -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"

4
roomserver/storage/postgres/room_canonical_aliases_table.go
View file

@ -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
}

2
roomserver/storage/postgres/sql.go
View file

@ -29,7 +29,7 @@ type statements struct {
stateBlockStatements
previousEventStatements
roomAliasesStatements
roomCanonicalStatements
roomCanonicalAliasStatements
inviteStatements
membershipStatements
transactionStatements

27
roomserver/storage/postgres/storage.go
View file

@ -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,