lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								3f42806b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'develop'  
							
							 
							
							... 
							
							
							
							Dedupe uploads
See merge request pleroma/pleroma!115  
							
						 
						
							2018-06-12 08:26:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								564c73ab24 
								
							 
						 
						
							
							
								
								Merge branch 'feature/list-streaming' into 'develop'  
							
							 
							
							... 
							
							
							
							MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183  
							
						 
						
							2018-06-12 07:19:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								d96377f359 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5eed1ea181 
								
							 
						 
						
							
							
								
								run mix format  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4084889a2d 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: remove debug code  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								76f80ba8c2 
								
							 
						 
						
							
							
								
								activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f328de8eb7 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: send Rejects in the format Mastodon wants  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								876ad6aa38 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: send @context on accept activities  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								760eb72a38 
								
							 
						 
						
							
							
								
								add a bunch of stuff  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								9c88933422 
								
							 
						 
						
							
							
								
								implement tracking of follow requests  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:53 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6041380774 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: learn locked state in Update messages  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e5206752e1 
								
							 
						 
						
							
							
								
								activitypub: only send accept back automatically if the account is not locked  
							
							 
							
							
							
						 
						
							2018-06-11 22:15:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								7f79b467b1 
								
							 
						 
						
							
							
								
								Merge branch 'feature/domain-blocks' into 'develop'  
							
							 
							
							... 
							
							
							
							Domain blocks
See merge request pleroma/pleroma!190  
							
						 
						
							2018-06-11 11:19:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								45a935f0bd 
								
							 
						 
						
							
							
								
								Merge branch 'users' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix users lookup/return type
See merge request pleroma/pleroma!201  
							
						 
						
							2018-06-08 11:10:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								bb639a362e 
								
							 
						 
						
							
							
								
								Merge branch 'feature/rejectnonpublic' into 'develop'  
							
							 
							
							... 
							
							
							
							Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202  
							
						 
						
							2018-06-08 11:08:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Rachel H 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0c2727d8 
								
							 
						 
						
							
							
								
								Fix users lookup/return type  
							
							 
							
							... 
							
							
							
							* Allow viewing user in frontend by id on pageload 
							
						 
						
							2018-06-07 23:18:45 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2c4013c88 
								
							 
						 
						
							
							
								
								s/get_by_ap_id/get_cached_by_ap_id/  
							
							 
							
							
							
						 
						
							2018-06-07 22:33:50 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e7f91bf8f 
								
							 
						 
						
							
							
								
								final format  
							
							 
							
							
							
						 
						
							2018-06-07 22:14:39 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								82225dfc8d 
								
							 
						 
						
							
							
								
								even more formatting  
							
							 
							
							
							
						 
						
							2018-06-07 22:10:11 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c86823f724 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/locked-account-regression' into 'develop'  
							
							 
							
							... 
							
							
							
							security fix: locked account regression
See merge request pleroma/pleroma!200  
							
						 
						
							2018-06-08 05:10:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								990cde7439 
								
							 
						 
						
							
							
								
								more formatting  
							
							 
							
							
							
						 
						
							2018-06-07 22:03:24 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b9e1f228a 
								
							 
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2018-06-07 21:55:58 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f69d38e455 
								
							 
						 
						
							
							
								
								add mrf for dropping follower-only and direct posts  
							
							 
							
							
							
						 
						
							2018-06-07 21:00:57 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47c7e259c4 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: fix locked account state from being clobbered  
							
							 
							
							
							
						 
						
							2018-06-08 02:52:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a003bdc30a 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: learn locked state in Update messages  
							
							 
							
							
							
						 
						
							2018-06-08 02:52:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								09604182d0 
								
							 
						 
						
							
							
								
								add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.  
							
							 
							
							
							
						 
						
							2018-06-07 14:38:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sir_Boops 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3f0440ac3c 
								
							 
						 
						
							
							
								
								Dedupe uploads  
							
							 
							
							
							
						 
						
							2018-06-06 13:25:44 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								29c9c8d93b 
								
							 
						 
						
							
							
								
								Extract host from ap_id, add index  
							
							 
							
							
							
						 
						
							2018-06-06 21:13:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								9075b6d25b 
								
							 
						 
						
							
							
								
								ActivityPub.ex: filter domain blocked activities.  
							
							 
							
							
							
						 
						
							2018-06-03 23:33:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								06439f64d0 
								
							 
						 
						
							
							
								
								Better error handling for ActivityPubController  
							
							 
							
							
							
						 
						
							2018-06-03 19:58:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5e76adb07e 
								
							 
						 
						
							
							
								
								Fix url guessing attacks.  
							
							 
							
							
							
						 
						
							2018-05-30 20:00:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								5d3fdbc082 
								
							 
						 
						
							
							
								
								MastoAPI: Add streaming for lists.  
							
							 
							
							
							
						 
						
							2018-05-30 16:48:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								841ee8e3e4 
								
							 
						 
						
							
							
								
								Simplify DM query.  
							
							 
							
							... 
							
							
							
							Should also use indexes better. 
							
						 
						
							2018-05-26 16:25:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3ec53514 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api  
							
							 
							
							
							
						 
						
							2018-05-26 16:00:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								745072b2cc 
								
							 
						 
						
							
							
								
								Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop  
							
							 
							
							
							
						 
						
							2018-05-26 15:15:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0a6c897c94 
								
							 
						 
						
							
							
								
								Formatting.  
							
							 
							
							
							
						 
						
							2018-05-26 15:11:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bfce29866f 
								
							 
						 
						
							
							
								
								Make Mastodon follow hack more explicit.  
							
							 
							
							
							
						 
						
							2018-05-26 15:07:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3839a11ef5 
								
							 
						 
						
							
							
								
								Don't treat remote accepts/rejects as local.  
							
							 
							
							... 
							
							
							
							Also, use specialized functions to get safe data. 
							
						 
						
							2018-05-26 14:07:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dd9bb37893 
								
							 
						 
						
							
							
								
								Rename id helper method.  
							
							 
							
							
							
						 
						
							2018-05-26 13:57:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7e873756e7 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: use fetch_latest_follow to verify a follow object exists  
							
							 
							
							
							
						 
						
							2018-05-26 11:20:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1c926c7b60 
								
							 
						 
						
							
							
								
								activitypub: allow mastodon S2S block extension support to be disabled  
							
							 
							
							
							
						 
						
							2018-05-26 08:30:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7cf3cf77cf 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: cleanups and tests for incoming accepts/rejects  
							
							 
							
							
							
						 
						
							2018-05-25 12:53:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								f35e6bf75b 
								
							 
						 
						
							
							
								
								activitypub transmogrifier: clean up accept/reject handling a bit  
							
							 
							
							
							
						 
						
							2018-05-25 09:40:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								62c95e8d4d 
								
							 
						 
						
							
							
								
								run mix format  
							
							 
							
							
							
						 
						
							2018-05-25 09:39:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								502ba33d01 
								
							 
						 
						
							
							
								
								activitypub: fix up accept/reject semantics for following  
							
							 
							
							... 
							
							
							
							fixes  #175  
							
						 
						
							2018-05-25 06:14:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c0ca9f82b9 
								
							 
						 
						
							
							
								
								mastodon api: properly track if an account is locked or not  
							
							 
							
							
							
						 
						
							2018-05-25 06:14:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47dc52a758 
								
							 
						 
						
							
							
								
								activitypub utils: optimize block and follow activity lookup  
							
							 
							
							... 
							
							
							
							multi-field @> comparison is very expensive, so only use @> for the field where it matters
this makes the query take only a few usec to execute verses many msec on a busy instance 
							
						 
						
							2018-05-25 05:23:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c2dcd767cf 
								
							 
						 
						
							
							
								
								Merge branch 'feature/incoming-remote-unfollow' into 'develop'  
							
							 
							
							... 
							
							
							
							Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158  
							
						 
						
							2018-05-24 19:52:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								1197ec10a8 
								
							 
						 
						
							
							
								
								Rewrite block fetch query  
							
							 
							
							
							
						 
						
							2018-05-24 13:26:59 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1cd6194dee 
								
							 
						 
						
							
							
								
								More efficient queries.  
							
							 
							
							
							
						 
						
							2018-05-24 12:44:26 +02:00