From c5b7a17272815a382f020b592312a08bff81860a Mon Sep 17 00:00:00 2001 From: Prateek Sachan <42961174+prateek2211@users.noreply.github.com> Date: Sat, 21 Mar 2020 03:10:24 +0530 Subject: [PATCH 1/2] Added special case for m.room.member event in appservice component (#874) * Added special case for m.room.member event in appservice component * fix review changes Co-authored-by: Kegsay --- appservice/consumers/roomserver.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index 3e47dee56..9180d9ef0 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -193,6 +193,12 @@ func (s *OutputRoomEventConsumer) appserviceIsInterestedInEvent(ctx context.Cont 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 queryReq := api.GetAliasesForRoomIDRequest{RoomID: event.RoomID()} var queryRes api.GetAliasesForRoomIDResponse From 5a1a1ded1b5d8387f89e3d586729d175c1f1a1d0 Mon Sep 17 00:00:00 2001 From: Alex Chen Date: Mon, 23 Mar 2020 19:16:17 +0800 Subject: [PATCH 2/2] Fix dendrite config file location in docker guide (#934) --- docker/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/README.md b/docker/README.md index ff88c0818..ee4f0f96f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -11,10 +11,10 @@ and start working on dendrite. ### Configuration -Copy the `dendrite-docker.yaml` file to the root of the project and rename it to -`dendrite.yaml`. It already contains the defaults used in `docker-compose` for -networking so you will only have to change things like the `server_name` or to -toggle `naffka`. +Create a directory named `cfg` in the root of the project. Copy the +`dendrite-docker.yaml` file into that directory and rename it to `dendrite.yaml`. +It already contains the defaults used in `docker-compose` for networking so you will +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 specifying the `docker-compose` file