Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								d9fe2b2d9d 
								
							
								 
							
						 
						
							
							
								
								Replace some more comparisons with six  
							
							 
							
							... 
							
							
							
							plus a bonus b"" string I missed last time
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-05-19 17:56:31 +02:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								020a501354 
								
							
								 
							
						 
						
							
							
								
								de-lint, quote consistency  
							
							 
							
							
							
						 
						
							2018-04-06 16:02:06 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								db2fd801f7 
								
							
								 
							
						 
						
							
							
								
								Explicitly grab individual columns from group object  
							
							 
							
							
							
						 
						
							2018-04-06 15:57:25 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								7945435587 
								
							
								 
							
						 
						
							
							
								
								When exposing group state, return is_openly_joinable  
							
							 
							
							... 
							
							
							
							as opposed to join_policy, which is really only pertinent to the
synapse implementation of the group server.
By doing this we keep the group server concept extensible by
allowing arbitrarily complex rules for deciding whether a group
is openly joinable. 
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6bd1b7053e 
								
							
								 
							
						 
						
							
							
								
								By default, join policy is "invite"  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								b4478e586f 
								
							
								 
							
						 
						
							
							
								
								add_user -> _add_user  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								112c2253e2 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6850f8aea3 
								
							
								 
							
						 
						
							
							
								
								Get group_info from existing call to check_group_is_ours  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ae85c7804e 
								
							
								 
							
						 
						
							
							
								
								is_joinable -> join_rule  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								6eb3aa94b6 
								
							
								 
							
						 
						
							
							
								
								Factor out add_user from accept_invite and join_group  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b370fe61c0 
								
							
								 
							
						 
						
							
							
								
								Implement group join API  
							
							 
							
							
							
						 
						
							2018-04-06 15:43:27 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								eb8d8d6f57 
								
							
								 
							
						 
						
							
							
								
								Use join_policy API instead of joinable  
							
							 
							
							... 
							
							
							
							The API is now under
 /groups/$group_id/setting/m.join_policy
and expects a JSON blob of the shape
```json
{
  "m.join_policy": {
    "type": "invite"
  }
}
```
where "invite" could alternatively be "open". 
							
						 
						
							2018-04-03 16:16:40 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								79452edeee 
								
							
								 
							
						 
						
							
							
								
								Add joinability for groups  
							
							 
							
							... 
							
							
							
							Adds API to set the 'joinable' flag, and corresponding flag in the
table. 
							
						 
						
							2018-03-28 14:03:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								13735843c7 
								
							
								 
							
						 
						
							
							
								
								Namespace visibility options for groups  
							
							 
							
							
							
						 
						
							2017-11-09 15:27:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e8814410ef 
								
							
								 
							
						 
						
							
							
								
								Have an explicit API to update room config  
							
							 
							
							
							
						 
						
							2017-11-08 16:13:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								94ff2cda73 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Modify group room association API to allow modification of is_public"  
							
							 
							
							
							
						 
						
							2017-11-08 15:43:34 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								5561c09091 
								
							
								 
							
						 
						
							
							
								
								Return whether a user is an admin within a group  
							
							 
							
							
							
						 
						
							2017-11-07 11:18:45 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								a34c586a89 
								
							
								 
							
						 
						
							
							
								
								Make the get_rooms_in_group API more sane  
							
							 
							
							... 
							
							
							
							Return entries with is_public = True when they're public and is_public = False otherwise. 
							
						 
						
							2017-11-02 16:42:30 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								207fabbc6a 
								
							
								 
							
						 
						
							
							
								
								Update docs for updating room group association  
							
							 
							
							
							
						 
						
							2017-11-01 09:35:15 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								13b3d7b4a0 
								
							
								 
							
						 
						
							
							
								
								Flake8  
							
							 
							
							
							
						 
						
							2017-10-31 17:20:11 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								20fe347906 
								
							
								 
							
						 
						
							
							
								
								Modify group room association API to allow modification of is_public  
							
							 
							
							... 
							
							
							
							also includes renamings to make things more consistent. 
							
						 
						
							2017-10-31 17:04:28 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9bc17fc5fb 
								
							
								 
							
						 
						
							
							
								
								Fix wording on group creation error  
							
							 
							
							
							
						 
						
							2017-10-30 15:17:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d0abb4e8e6 
								
							
								 
							
						 
						
							
							
								
								Fix typo when checking if user is invited to group  
							
							 
							
							
							
						 
						
							2017-10-27 16:57:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								977078f06d 
								
							
								 
							
						 
						
							
							
								
								Fix bad merge  
							
							 
							
							
							
						 
						
							2017-10-27 15:10:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ab8abbc2b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2017-10-27 15:07:08 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								124314672f 
								
							
								 
							
						 
						
							
							
								
								group is dict  
							
							 
							
							
							
						 
						
							2017-10-27 11:08:19 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								c7d9f25d22 
								
							
								 
							
						 
						
							
							
								
								Fix create_group to pass requester_user_id  
							
							 
							
							
							
						 
						
							2017-10-27 10:57:20 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2ca46c7afc 
								
							
								 
							
						 
						
							
							
								
								Correct logic for checking private group membership  
							
							 
							
							
							
						 
						
							2017-10-27 10:48:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								585972b51a 
								
							
								 
							
						 
						
							
							
								
								Don't generate group attestations for local users  
							
							 
							
							
							
						 
						
							2017-10-27 09:46:56 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								69e8a05f35 
								
							
								 
							
						 
						
							
							
								
								Make it work  
							
							 
							
							
							
						 
						
							2017-10-26 17:55:58 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								595fe67f01 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							
							
						 
						
							2017-10-26 17:20:24 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								9b2feef9eb 
								
							
								 
							
						 
						
							
							
								
								Add is_public to groups table to allow for private groups  
							
							 
							
							... 
							
							
							
							Prevent group API access to non-members for private groups
Also make all the group code paths consistent with `requester_user_id` always being the User ID of the requesting user. 
							
						 
						
							2017-10-26 16:51:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1135193dfd 
								
							
								 
							
						 
						
							
							
								
								Validate group ids when parsing  
							
							 
							
							... 
							
							
							
							May as well do it whenever we parse a Group ID. We check the sigil and basic
structure here so it makes sense to check the grammar in the same place. 
							
						 
						
							2017-10-21 00:30:39 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								29812c628b 
								
							
								 
							
						 
						
							
							
								
								Allow = in mxids and groupids  
							
							 
							
							... 
							
							
							
							... because the spec says we should. 
							
						 
						
							2017-10-20 23:42:53 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								58fbbe0f1d 
								
							
								 
							
						 
						
							
							
								
								Disallow capital letters in userids  
							
							 
							
							... 
							
							
							
							Factor out a common function for checking user ids and group ids, which forbids
capitals. 
							
						 
						
							2017-10-20 23:37:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c7d46510d7 
								
							
								 
							
						 
						
							
							
								
								Flake8  
							
							 
							
							
							
						 
						
							2017-10-19 13:36:06 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								29bafe2f7e 
								
							
								 
							
						 
						
							
							
								
								Add config to enable group creation  
							
							 
							
							
							
						 
						
							2017-10-19 12:13:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								513c23bfd9 
								
							
								 
							
						 
						
							
							
								
								Enforce sensible group IDs  
							
							 
							
							
							
						 
						
							2017-10-19 12:01:01 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								85f5674e44 
								
							
								 
							
						 
						
							
							
								
								Delint  
							
							 
							
							
							
						 
						
							2017-10-16 15:52:17 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								c43e8a9736 
								
							
								 
							
						 
						
							
							
								
								Make it work. Warn about lack of user profile  
							
							 
							
							
							
						 
						
							2017-10-16 15:50:39 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								2c5972f87f 
								
							
								 
							
						 
						
							
							
								
								Implement GET /groups/$groupId/invited_users  
							
							 
							
							
							
						 
						
							2017-10-16 15:31:11 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								27e727a146 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2017-10-11 14:32:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ec954f47fb 
								
							
								 
							
						 
						
							
							
								
								Validate room ids  
							
							 
							
							
							
						 
						
							2017-10-11 13:15:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eaaa837e00 
								
							
								 
							
						 
						
							
							
								
								Don't corrupt cache  
							
							 
							
							
							
						 
						
							2017-10-05 11:43:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								17b8e2bd02 
								
							
								 
							
						 
						
							
							
								
								Add remove room API  
							
							 
							
							
							
						 
						
							2017-09-26 15:52:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a8e2a3df32 
								
							
								 
							
						 
						
							
							
								
								Add unique index to group_rooms table  
							
							 
							
							
							
						 
						
							2017-09-26 15:39:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bb746a9de1 
								
							
								 
							
						 
						
							
							
								
								Revert: Keep room_id's in group summary  
							
							 
							
							
							
						 
						
							2017-09-21 15:57:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae8d4bb0f0 
								
							
								 
							
						 
						
							
							
								
								Keep room_id's in group summary  
							
							 
							
							
							
						 
						
							2017-09-21 15:55:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4a9b1cf253 
								
							
								 
							
						 
						
							
							
								
								Add user profiles to summary from group server  
							
							 
							
							
							
						 
						
							2017-08-25 16:23:58 +01:00