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

Some commit to fix old broken stuff

Browse source
This commit is contained in:
Andrew Morgan 2018-06-15 11:08:48 +01:00
parent 8f0b773fca
commit 62ebd00b0a
2 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/github.com/matrix-org/dendrite/appservice/appservice.go
View file

@ -114,34 +114,6 @@ func SetupAppServiceAPIComponent(
return &appserviceQueryAPI
}
// generateAppServiceAccounts creates a dummy account based off the
// `sender_localpart` field of each application service if it doesn't
// exist already
func generateAppServiceAccount(
accountsDB *accounts.Database,
deviceDB *devices.Database,
as config.ApplicationService,
) error {
ctx := context.Background()
// Create an account for the application service
acc, err := accountsDB.CreateAccount(ctx, as.SenderLocalpart, "", as.ID)
if err != nil {
return err
} else if acc == nil {
// This account already exists
return nil
}
// Create a dummy device with a dummy token for the application service
_, err = deviceDB.CreateDevice(ctx, as.SenderLocalpart, nil, as.ASToken, &as.SenderLocalpart)
if err != nil {
return err
}
return nil
}
// generateAppServiceAccounts creates a dummy account based off the
// `sender_localpart` field of each application service if it doesn't
// exist already

4
src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
View file

@ -21,6 +21,7 @@ import (
"github.com/matrix-org/dendrite/common/keydb"
"github.com/matrix-org/dendrite/common/transactions"
"github.com/matrix-org/dendrite/appservice"
"github.com/matrix-org/dendrite/clientapi"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/common/basecomponent"
@ -65,10 +66,7 @@ func main() {
mediaapi.SetupMediaAPIComponent(base, deviceDB)
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, query)
<<<<<<< HEAD
=======
appservice.SetupAppServiceAPIComponent(base, accountDB, deviceDB, federation, alias, query, transactions.New())
>>>>>>> c65838c9... Generate sender_localpart user for each AS on startup
httpHandler := common.WrapHandlerInCORS(base.APIMux)