diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-21 11:47:45 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-21 11:47:45 +0000 |
| commit | 74ee4048c2b0cb2fa7fb1e80027de37979b5dd86 (patch) | |
| tree | acd6ec851f1b951f87f6c5360bbe6d2b358be64a /synapse | |
| parent | Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff) | |
| parent | Merge branch 'hotfixes-v0.6.0' (diff) | |
| download | synapse-74ee4048c2b0cb2fa7fb1e80027de37979b5dd86.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/profile.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 33a2c167ec..3f11e2dcf4 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -194,6 +194,8 @@ class ProfileHandler(BaseHandler): if not self.hs.is_mine(user): return + self.ratelimit(user.to_string()) + joins = yield self.store.get_rooms_for_user_where_membership_is( user.to_string(), [Membership.JOIN], @@ -214,5 +216,5 @@ class ProfileHandler(BaseHandler): "room_id": j.room_id, "state_key": j.state_key, "content": content, - "sender": j.state_key, - }) + "sender": j.state_key + }, ratelimit=False) |