diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-19 17:52:58 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-19 17:52:58 +0000 |
| commit | 420ccfc925bbdc4344e3f870b61dba2dd5069f6b (patch) | |
| tree | a705309ba66e2e60e3796c276bd2e2f3867e1956 /synapse/handlers/profile.py | |
| parent | Merge branch 'release-v0.6.0' (diff) | |
| parent | Mock ratelimiter to make tests pass. (diff) | |
| download | synapse-420ccfc925bbdc4344e3f870b61dba2dd5069f6b.tar.xz | |
Merge branch 'hotfixes-v0.6.0' v0.6.0a
Diffstat (limited to 'synapse/handlers/profile.py')
| -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) |