feedaa37fa
Merge branch 'develop' into daniel/roomcleanupincremental
...
Conflicts:
synapse/handlers/room.py
2016-02-16 11:34:48 +00:00
4bfb32f685
Branch off member and non member sends
...
Unclean, needs tidy-up, but works
2016-02-15 18:21:30 +00:00
1a2197d7bf
Simplify room creation code
2016-02-15 18:19:01 +00:00
e560045cfd
Simplify room creation code
2016-02-15 18:18:39 +00:00
8168341e9b
Use update_membership for profile updates
2016-02-15 17:14:34 +00:00
1bbb67c452
Use update_membership to kick guests
2016-02-15 16:40:22 +00:00
150fcde0dc
Reuse update_membership from /join
2016-02-15 16:16:03 +00:00
73e616df2a
Inline _do_local_membership_update
2016-02-15 16:02:22 +00:00
f318d4f2a4
Inline _do_join as it now only has one caller
...
Also, consistently apply rate limiting.
Again, ugly, but a step in the right direction.
2016-02-15 15:57:10 +00:00
e71095801f
Merge implementation of /join by alias or ID
...
This code is kind of rough (passing the remote servers down a long
chain), but is a step towards improvement.
2016-02-15 15:39:16 +00:00
dbeed36dec
Merge some room joining codepaths
...
Force joining by alias to go through the send_membership_event checks,
rather than bypassing them straight into _do_join. This is the first of
many stages of cleanup.
2016-02-15 14:38:27 +00:00
4de08a4672
Revert "Merge two of the room join codepaths"
...
This reverts commit cf81375b94
2016-02-12 16:17:24 +00:00
cf81375b94
Merge two of the room join codepaths
...
There's at least one more to merge in.
Side-effects:
* Stop reporting None as displayname and avatar_url in some cases
* Joining a room by alias populates guest-ness in join event
* Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
been called on matrix.org according to logs
* Stop recording access_token_id on /join/room_id - currently we don't
record it on /join/room_alias; I can try to thread it through at some
point.
2016-02-12 15:11:49 +00:00
0eff740523
Return events in correct order for /events
2016-02-11 10:07:27 +00:00
2c1fbea531
Fix up logcontexts
2016-02-08 14:26:45 +00:00
9cd80a7b5c
PEP8
2016-02-03 11:52:57 +00:00
772b45c745
Remove unused method
2016-02-03 11:43:26 +00:00
6f52e90065
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
2016-02-03 11:06:29 +00:00
d83d004ccd
Fix flake8 warnings for new flake8
2016-02-02 17:18:50 +00:00
8a391e33ae
s/get_room_changes_for_user/get_membership_changes_for_user/
2016-02-02 16:12:10 +00:00
65e92eca49
Change the way we do public room list fetching
2016-02-02 15:21:10 +00:00
b023995538
WARN if we get a topo token instead of stream.
2016-02-02 14:11:14 +00:00
89b40b225c
Order things correctly
2016-02-01 16:32:46 +00:00
4bf448be25
Switch over /events to use per room caches
2016-02-01 16:26:51 +00:00
da417aa56d
Allow non-guests to peek on rooms using /events
2016-01-20 15:34:07 +00:00
ac5a4477ad
Require unbanning before other membership changes
2016-01-15 16:27:26 +00:00
b5ce4f0427
Remove unused parameters
2016-01-15 13:54:03 +00:00
2978053d16
Merge branch 'release-v0.12.1' into develop
2016-01-14 15:04:08 +00:00
49f33f6438
Add 'event' result to 'context' endpoint
...
... because the context isn't much use without the event.
2016-01-13 16:42:14 +00:00
93afb40cd4
Skip, rather than erroring, invalid guest requests
...
Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour.
2016-01-13 16:41:42 +00:00
2ef6de928d
Skip, rather than erroring, invalid guest requests
...
Erroring causes problems when people make illegal requests, because they
don't know what limit parameter they should pass.
This is definitely buggy. It leaks message counts for rooms people don't
have permission to see, via tokens. But apparently we already
consciously decided to allow that as a team, so this preserves that
behaviour.
2016-01-05 18:12:37 +00:00
cfd07aafff
Allow guests to upgrade their accounts
2016-01-05 18:01:18 +00:00
c3ea36304b
Use named args
2016-01-05 12:57:45 +00:00
1b5642604b
Support inviting 3pids in /createRoom
2016-01-05 11:56:21 +00:00
7f3148865c
Return room avatar URLs in /publicRooms
...
Spec: https://github.com/matrix-org/matrix-doc/pull/244
Tests: https://github.com/matrix-org/sytest/pull/121
2015-12-21 19:38:04 +00:00
0311612ce9
Give the IS a bunch more 3pid invite context
...
This allows it to form richer emails
2015-12-16 13:05:32 +00:00
7d6b313312
Add caches for whether a room has been forgotten by a user
2015-12-10 17:49:34 +00:00
c30cdb0d68
Add comments
2015-12-02 10:49:35 +00:00
2a0ec3b89d
Merge branch 'develop' into markjh/edu_frequency
...
Conflicts:
synapse/handlers/federation.py
synapse/handlers/room.py
2015-12-02 10:40:22 +00:00
a9526831a4
Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what
2015-12-01 20:53:04 +00:00
3d3da2b460
Only fire user_joined_room on the distributor if the user has actually joined the room
2015-12-01 16:03:08 +00:00
ba26eb3d5d
Allow users to forget rooms
2015-11-17 17:17:30 -05:00
c0b3554401
Fix missing profile data in federation joins
...
There was a regression where we stopped including profile data in
initial joins for rooms joined over federation.
2015-11-12 16:19:55 +00:00
e93d550b79
Allow guests to access room context API
2015-11-11 17:49:44 +00:00
38d82edf0e
Allow guest users to join and message rooms
2015-11-10 16:57:13 +00:00
0d63dc3ec9
Get display name from identity server, not client
2015-11-09 17:26:43 +00:00
2cebe53545
Exchange 3pid invites for m.room.member invites
2015-11-05 16:43:19 +00:00
ca2f90742d
Open up /events to anonymous users for room events only
...
Squash-merge of PR #345 from daniel/anonymousevents
2015-11-05 14:32:26 +00:00
771ca56c88
Remove more unused parameters
2015-11-02 15:31:57 +00:00
56dbcd1524
Docs
2015-10-28 14:05:50 +00:00
5cb298c934
Add room context api
2015-10-28 13:45:56 +00:00
137fafce4e
Allow rejecting invites
...
This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave.
2015-10-20 11:58:58 +01:00
b8dd5b1a2d
Verify third party ID server certificates
2015-10-16 14:54:54 +01:00
6ffbcf45c6
Use non-placeholder name for endpoint
2015-10-15 13:12:52 +01:00
643b5fcdc8
Look for keys on the right objects
2015-10-15 13:10:30 +01:00
14edea1aff
Move logic into handler
2015-10-13 17:47:58 +01:00
17dffef5ec
Move event contents into third_party_layout field
2015-10-13 15:48:12 +01:00
58e6a58eb7
Merge branch 'develop' into daniel/3pidinvites
2015-10-05 10:33:41 -05:00
40017a9a11
Add 'trusted_private_chat' to room creation presets
2015-10-02 11:22:56 +01:00
d5e081c7ae
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
2015-10-02 10:33:49 +01:00
5b3e9713dd
Implement third party identifier invites
2015-10-01 17:49:52 +01:00
0ec78b360c
Merge pull request #287 from matrix-org/erikj/canonical_alias
...
Set m.room.canonical_alias on room creation.
2015-09-30 17:14:55 +01:00
ecd0c0dfc5
Remove double indentation
2015-09-30 16:46:24 +01:00
301141515a
Merge pull request #288 from matrix-org/markjh/unused_definitions
...
Remove some of the unused definitions from synapse
2015-09-28 14:22:44 +01:00
57338a9768
synapse/handlers/room.py:_should_invite_join was unused
2015-09-23 10:26:45 +01:00
257fa1c53e
Set m.room.canonical_alias on room creation.
2015-09-23 10:07:31 +01:00
dc6094b908
Merge pull request #271 from matrix-org/erikj/default_history
...
Change default history visibility for private rooms
2015-09-23 09:21:00 +01:00
3c166a24c5
Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API
2015-09-09 16:05:09 +01:00
bc8b25eb56
Allow users that have left the room to view the member list from the point they left
2015-09-09 15:42:16 +01:00
e530208e68
Change default history visibility for private rooms
2015-09-09 09:57:49 +01:00
a88e16152f
Add flag which disables federation of the room
2015-09-01 15:47:30 +01:00
9b63def388
Add m.room.avatar to default power levels. Change default required power levels of such events to 50
2015-08-20 14:35:40 +01:00
cbd053bb8f
Merge pull request #233 from matrix-org/erikj/canonical_alias
...
Add server side support for canonical aliases
2015-08-20 11:26:09 +01:00
daa01842f8
Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
2015-08-19 13:46:03 +01:00
d7272f8d9d
Add canonical alias to the default power levels
2015-08-19 12:03:09 +01:00
c456d17daf
Implement specifying custom initial state for /createRoom
2015-07-16 15:25:29 +01:00
002a44ac1a
s/everyone_ops/original_invitees_have_ops/
2015-07-14 10:37:42 +01:00
b49a30a972
Capitalize contants
2015-07-14 10:20:31 +01:00
d5cc794598
Implement presets at room creation
2015-07-13 16:56:08 +01:00
1a3255b507
Add m.room.history_visibility to newly created rooms' m.room.power_levels
2015-07-06 13:25:35 +01:00
4429e720ae
Merge branch 'master' of github.com:matrix-org/synapse into develop
2015-05-22 10:33:00 +01:00
53447e9cd3
Add caches for things requested by the pushers
2015-05-21 16:41:39 +01:00
0c894e1ebd
Throw error when creating room if alias contains whitespace #SYN-335
2015-05-14 13:11:28 +01:00
a6fb2aa2a5
Merge pull request #144 from matrix-org/erikj/logging_context
...
Preserving logging contexts
2015-05-12 15:23:50 +01:00
95dedb866f
Unwrap defer.gatherResults failures
2015-05-12 13:14:29 +01:00
4df11b5039
Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'
2015-05-12 10:28:10 +01:00
da4ed08739
One too many lens
2015-05-01 13:29:38 +01:00
9060dc6b59
Change public room list to use defer.gatherResults
2015-05-01 13:28:36 +01:00
327ca883ec
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-28 13:39:42 +01:00
6f8e2d517e
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-27 14:41:40 +01:00
48b6ee2b67
Create an 'invite' powerlevel when making new rooms
2015-04-21 21:07:35 +01:00
24d21887ed
SYN-350: Don't ratelimit the individual events generated during room creation
2015-04-21 14:14:19 +01:00
9a7f496298
Sanitize RoomMemberStore
2015-03-23 15:29:04 +00:00
8e28db5cc9
Change room handlers get_rooms_for_user to get_joined_rooms_for_user. This uses the a storage api that is cached.
2015-03-09 16:43:09 +00:00
dcec7175dc
Finish impl to get new events for AS. ASes should now be able to poll /events
2015-02-26 16:23:01 +00:00
2d20466f9a
Add stub functions and work out execution flow to implement AS event stream polling.
2015-02-25 15:00:59 +00:00
ed877d6585
Remove debug logging
2015-02-11 16:50:46 +00:00
ddb816cf60
Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict
2015-02-11 15:44:28 +00:00
e1515c3e91
Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts
2015-02-05 13:44:42 +00:00
7f6f3f9d62
Pass the current time to serialize event, rather than passing an
...
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
2015-01-26 16:11:28 +00:00
1c06c48ce2
Replace hs.parse_roomid with RoomID.from_string
2015-01-23 11:55:12 +00:00
5759bec43c
Replace hs.parse_userid with UserID.from_string
2015-01-23 11:47:15 +00:00
333836ff92
PEP8 and pyflakes warnings
2015-01-07 16:18:12 +00:00
4c68460392
SYN-154: Tweak how the m.room.create check is done.
...
Don't perform the check in auth.is_host_in_room but instead do it in _do_join
and also assert that there are no m.room.members in the room before doing so.
2015-01-07 16:09:00 +00:00
9cb4f75d53
SYN-154: Better error messages when joining an unknown room by ID.
...
The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all.
2015-01-07 15:21:48 +00:00
5e23a19204
Merge pull request #28 from matrix-org/erikj-perf
...
Database performance improvements.
2015-01-06 13:33:40 +00:00
adb04b1e57
Update copyright notices
2015-01-06 13:21:39 +00:00
f0128f9600
Add RoomMemberStore.get_users_in_room, so that we can get the list of joined users without having to retrieve the full events
2015-01-06 10:55:43 +00:00
efd27ff01b
Set a state_key for the topic and room name, otherwise they won't be treated as room state
2014-12-19 15:31:27 +00:00
1e7f83b91d
Set display name when joining via alias
2014-12-19 12:31:46 +00:00
5739e6c606
s/user_id/sender/
2014-12-19 11:43:46 +00:00
3c77d13aa5
Kill off synapse.api.events.*
2014-12-16 11:29:05 +00:00
cf6e5f1dbf
Rename MessageHandler.handle_event. Add a few comments.
2014-12-15 17:01:12 +00:00
65cdf4e724
Get current member state from current_state snapshot. Fix leave test.
2014-12-15 15:03:27 +00:00
57e0e619f3
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
...
Conflicts:
tests/handlers/test_room.py
2014-12-15 14:45:59 +00:00
f25764943c
Add a 'user_left_room' distributor signal analogous to 'user_joined_room'
2014-12-11 18:27:01 +00:00
4c682143c8
.from_string() no longer takes a HS
2014-12-10 18:00:49 +00:00
95aa903ffa
Try and figure out how and why signatures are being changed.
2014-12-10 11:37:47 +00:00
008303b245
PEP8
2014-12-09 14:49:11 +00:00
5eca288d28
Fix joining from an invite
2014-12-09 14:47:27 +00:00
609c31e8df
More bug fixes
2014-12-08 17:50:56 +00:00
ee3df06183
More bug fixes
2014-12-08 14:50:48 +00:00
e8323b9e34
More bug fixes
2014-12-08 10:16:18 +00:00
c31dba86ec
Convert rest and handlers to use new event structure
2014-12-04 15:50:01 +00:00
5d7c9ab789
Begin converting things to use the new Event structure
2014-12-04 11:27:59 +00:00
6941a19715
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
2014-12-03 11:56:49 +00:00
307f94dcbe
Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place
2014-12-02 20:51:12 +00:00
9d53228158
Change DomainSpecificString so that it doesn't use a HomeServer object
2014-12-02 10:42:28 +00:00
db9ce032a4
Fix pep8 codestyle warnings
2014-11-20 17:26:36 +00:00
32090aee16
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
2014-11-20 16:24:00 +00:00
415ddf59bb
Don't add a 'prev' key to m.room.member messages
2014-11-19 17:59:51 +00:00
b01dd76be1
SYN-149: Enable auth for events added during room creation since they should pass auth checks
2014-11-18 15:42:53 +00:00
ae9c2ab165
SYN-149: Send join event immediately after the room create event
2014-11-18 15:29:48 +00:00
a5b88c489e
Split out sending the room alias events from creating the alias so that we can do them in the right point when creating a room
2014-11-18 15:03:13 +00:00
cf45e57d9c
SYN-148: Add the alias after creating the room
2014-11-17 16:37:33 +00:00
6fea478d2e
Fix bugs with invites/joins across federatiom.
...
Both in terms of auth and not trying to fetch missing PDUs for invites,
joins etc.
2014-11-12 11:24:11 +00:00
d2fb2b8095
Implement invite part of invite join dance
2014-11-07 13:41:00 +00:00
351c64e99e
Amalgamate all power levels.
...
Remove concept of reqired power levels, something similiar can be done
using the new power level event.
2014-11-06 16:59:13 +00:00
4317c8e583
Implement new replace_state and changed prev_state
...
`prev_state` is now a list of previous state ids, similiar to
prev_events. `replace_state` now points to what we think was replaced.
2014-11-06 15:10:55 +00:00
dfb3d21a6d
Fix room handler tests
2014-11-04 17:12:39 +00:00
ef9c4476a0
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
2014-10-30 11:18:28 +00:00
d6bcffa929
Construct a source-specific 'SourcePaginationConfig' to pass into get_pagination_rows; meaning each source doesn't have to care about its own name any more
2014-10-29 16:16:01 +00:00
4841b6d4ba
Remove duplicate join_event from create_room
2014-10-27 16:55:51 +00:00
e7bc1291a0
Begin making auth use event.old_state_events
2014-10-15 16:06:59 +01:00
37bfe44046
Merge branch 'deletions' of github.com:matrix-org/synapse into develop
2014-09-25 17:02:53 +01:00
72eb360f2d
Don't set the room name to be the room alias on room creation if the client didn't supply a name
2014-09-24 16:59:57 +01:00
70899d3ab2
Rename deletions to redactions
2014-09-24 15:27:59 +01:00
bc250a6afa
SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops levels event
...
SYN-12 # comment Auth has been added.
2014-09-23 17:36:24 +01:00
5bd9369a62
Correctly handle the 'age' key in events and pdus
2014-09-15 13:26:11 +01:00
76fe7d4eba
Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.
2014-09-08 12:15:29 -07:00
Daniel Wagner-Hall