mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kegan/backfill-fix

Browse source
This commit is contained in:
Kegsay 2020-03-24 12:19:57 +00:00 committed by GitHub
parent 45e781dbf6 5a1a1ded1b
commit fc66327f8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
appservice/consumers/roomserver.go
View file

@ -193,6 +193,12 @@ func (s *OutputRoomEventConsumer) appserviceIsInterestedInEvent(ctx context.Cont
return true return true
} }
if event.Type() == gomatrixserverlib.MRoomMember && event.StateKey() != nil {
if appservice.IsInterestedInUserID(*event.StateKey()) {
return true
}
}
// Check all known room aliases of the room the event came from // Check all known room aliases of the room the event came from
queryReq := api.GetAliasesForRoomIDRequest{RoomID: event.RoomID()} queryReq := api.GetAliasesForRoomIDRequest{RoomID: event.RoomID()}
var queryRes api.GetAliasesForRoomIDResponse var queryRes api.GetAliasesForRoomIDResponse

8
docker/README.md
View file

@ -11,10 +11,10 @@ and start working on dendrite.
### Configuration ### Configuration
Copy the `dendrite-docker.yaml` file to the root of the project and rename it to Create a directory named `cfg` in the root of the project. Copy the
`dendrite.yaml`. It already contains the defaults used in `docker-compose` for `dendrite-docker.yaml` file into that directory and rename it to `dendrite.yaml`.
networking so you will only have to change things like the `server_name` or to It already contains the defaults used in `docker-compose` for networking so you will
toggle `naffka`. only have to change things like the `server_name` or to toggle `naffka`.
You can run the following `docker-compose` commands either from the top directory You can run the following `docker-compose` commands either from the top directory
specifying the `docker-compose` file specifying the `docker-compose` file