Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0ec1abb3b6 
								
							 
						 
						
							
							
								
								Add federated blocks  
							
							 
							
							
							
						 
						
							2018-05-18 18:09:56 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								6604bea9d0 
								
							 
						 
						
							
							
								
								actually rvert those changes  
							
							 
							
							
							
						 
						
							2018-05-17 23:56:47 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								8d11bae0d5 
								
							 
						 
						
							
							
								
								Revert "Undo formatting in user.ex"  
							
							 
							
							... 
							
							
							
							This reverts commit e6dc15b96c . 
							
						 
						
							2018-05-17 23:55:00 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								e6dc15b96c 
								
							 
						 
						
							
							
								
								Undo formatting in user.ex  
							
							 
							
							
							
						 
						
							2018-05-17 23:53:34 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								d8c842a771 
								
							 
						 
						
							
							
								
								Add support for incoming remote unfollows  
							
							 
							
							
							
						 
						
							2018-05-17 22:15:57 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4bbec6b3 
								
							 
						 
						
							
							
								
								Fix User search.  
							
							 
							
							... 
							
							
							
							Now uses a trigram based search. This is a lot faster and gives better
results. Closes  #185 . 
							
						 
						
							2018-05-16 17:55:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c7a85de35c 
								
							 
						 
						
							
							
								
								Revert "Remove 'unlisted' handling for now."  
							
							 
							
							... 
							
							
							
							This reverts commit 1027d1f696 . 
							
						 
						
							2018-05-13 12:38:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1027d1f696 
								
							 
						 
						
							
							
								
								Remove 'unlisted' handling for now.  
							
							 
							
							... 
							
							
							
							It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it. 
							
						 
						
							2018-05-13 12:07:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a5c9dd0a2a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop  
							
							 
							
							
							
						 
						
							2018-05-13 11:59:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3c3933e40b 
								
							 
						 
						
							
							
								
								Unlisted fetching: Reverse logic  
							
							 
							
							... 
							
							
							
							Generates a faster query. 
							
						 
						
							2018-05-13 11:58:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aeff2d6474 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'  
							
							 
							
							... 
							
							
							
							Add unrepeats
Closes  #69 
See merge request pleroma/pleroma!113  
							
						 
						
							2018-05-13 09:32:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ec531ca281 
								
							 
						 
						
							
							
								
								Add test.  
							
							 
							
							
							
						 
						
							2018-05-13 11:18:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29376fcc13 
								
							 
						 
						
							
							
								
								Format.  
							
							 
							
							
							
						 
						
							2018-05-13 10:56:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76722ea9c8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses  
							
							 
							
							
							
						 
						
							2018-05-13 10:56:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad5e72012 
								
							 
						 
						
							
							
								
								Merge branch 'feature/chain-policies' into 'develop'  
							
							 
							
							... 
							
							
							
							chain policies
See merge request pleroma/pleroma!150  
							
						 
						
							2018-05-13 08:24:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								54ccbd8479 
								
							 
						 
						
							
							
								
								Use original status id instead of announce id  
							
							 
							
							
							
						 
						
							2018-05-13 03:42:31 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4d88747561 
								
							 
						 
						
							
							
								
								Revert "Log error when handling unrepeats"  
							
							 
							
							... 
							
							
							
							This reverts commit c17c55e989 . 
							
						 
						
							2018-05-11 15:34:46 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								c17c55e989 
								
							 
						 
						
							
							
								
								Log error when handling unrepeats  
							
							 
							
							
							
						 
						
							2018-05-11 15:29:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								271fb5ccb1 
								
							 
						 
						
							
							
								
								Probably better way of handling non-follow undos in ostatus  
							
							 
							
							
							
						 
						
							2018-05-11 11:59:53 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4151cbe6b2 
								
							 
						 
						
							
							
								
								Revert "Do not send non-follow undos over ostatus for now"  
							
							 
							
							... 
							
							
							
							This reverts commit 07fdc07238 . 
							
						 
						
							2018-05-11 11:53:28 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0b527b5528 
								
							 
						 
						
							
							
								
								Revert "Use [] instead of nil"  
							
							 
							
							... 
							
							
							
							This reverts commit 42268b0981 . 
							
						 
						
							2018-05-11 11:53:06 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Pierrick Brun 
								
							 
						 
						
							
							
							
							
								
							
							
								89603eda9e 
								
							 
						 
						
							
							
								
								do not create notification for yourself  
							
							 
							
							
							
						 
						
							2018-05-11 11:31:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								42268b0981 
								
							 
						 
						
							
							
								
								Use [] instead of nil  
							
							 
							
							
							
						 
						
							2018-05-11 01:48:56 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								07fdc07238 
								
							 
						 
						
							
							
								
								Do not send non-follow undos over ostatus for now  
							
							 
							
							
							
						 
						
							2018-05-11 01:45:10 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c220a6db43 
								
							 
						 
						
							
							
								
								format & made get_policies/1 private  
							
							 
							
							
							
						 
						
							2018-05-10 18:51:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9e6f37bda 
								
							 
						 
						
							
							
								
								Chain policies  
							
							 
							
							... 
							
							
							
							- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies 
							
						 
						
							2018-05-10 18:41:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								900c735467 
								
							 
						 
						
							
							
								
								Match proper number of values from unannounce  
							
							 
							
							
							
						 
						
							2018-05-09 00:04:14 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								54f6628590 
								
							 
						 
						
							
							
								
								Change argument order and call correct # of args  
							
							 
							
							
							
						 
						
							2018-05-08 23:59:36 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								e55f69a676 
								
							 
						 
						
							
							
								
								Handle Undo activites containing an Announce  
							
							 
							
							
							
						 
						
							2018-05-08 23:50:19 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5ec883b7 
								
							 
						 
						
							
							
								
								Federate correct activity  
							
							 
							
							
							
						 
						
							2018-05-08 21:52:21 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ffe028cd73 
								
							 
						 
						
							
							
								
								More warning fixes.  
							
							 
							
							
							
						 
						
							2018-05-07 18:11:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								6c2903d9a1 
								
							 
						 
						
							
							
								
								Merge branch 'feld-warnings' into 'develop'  
							
							 
							
							... 
							
							
							
							Clean up warnings
See merge request pleroma/pleroma!144  
							
						 
						
							2018-05-06 18:42:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								bfad57c7c9 
								
							 
						 
						
							
							
								
								Get rid of unsafe variables.  
							
							 
							
							
							
						 
						
							2018-05-06 09:58:59 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9810153aeb 
								
							 
						 
						
							
							
								
								Streamer: Don't send out stream events for blocked users.  
							
							 
							
							
							
						 
						
							2018-05-05 13:40:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								96add86b50 
								
							 
						 
						
							
							
								
								Unify wss uri generation.  
							
							 
							
							
							
						 
						
							2018-05-05 13:40:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c464355d1a 
								
							 
						 
						
							
							
								
								Idempotency: Use special cache, keep for 6 hours.  
							
							 
							
							
							
						 
						
							2018-05-05 11:15:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7a884d70d8 
								
							 
						 
						
							
							
								
								Group def renders here as well  
							
							 
							
							
							
						 
						
							2018-05-04 22:31:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								31ea9cbcd8 
								
							 
						 
						
							
							
								
								Group def renders together to fix warning  
							
							 
							
							
							
						 
						
							2018-05-04 22:28:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								14c0c6d16b 
								
							 
						 
						
							
							
								
								Fix formatting  
							
							 
							
							
							
						 
						
							2018-05-04 22:03:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2a402fb395 
								
							 
						 
						
							
							
								
								Group response declarations together  
							
							 
							
							
							
						 
						
							2018-05-04 21:59:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a24eed0f57 
								
							 
						 
						
							
							
								
								That last change was stupid. Multiline comments in Elixir don't really exist.  
							
							 
							
							... 
							
							
							
							Instead we'll just pad with # intstead of playing stupid games with the compiler. 
							
						 
						
							2018-05-04 21:53:52 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								79d41aa12e 
								
							 
						 
						
							
							
								
								Dirty hack to remove the warning  
							
							 
							
							... 
							
							
							
							warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
  lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2018-05-04 21:48:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								aaacebd906 
								
							 
						 
						
							
							
								
								Fix unused variables, imports, and aliases  
							
							 
							
							
							
						 
						
							2018-05-04 21:42:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								42f1a098aa 
								
							 
						 
						
							
							
								
								Fix build. Too eager with the fixing of unused variables.  
							
							 
							
							... 
							
							
							
							== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
    (stdlib) lists.erl:1338: :lists.foreach/2
    (stdlib) erl_eval.erl:670: :erl_eval.do_apply/6 
							
						 
						
							2018-05-04 21:26:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							 
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								943820ae29 
								
							 
						 
						
							
							
								
								More unused variables  
							
							 
							
							
							
						 
						
							2018-05-04 21:16:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ab4aa5720a 
								
							 
						 
						
							
							
								
								Fix a bunch of unused variable warnings  
							
							 
							
							
							
						 
						
							2018-05-04 20:59:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								11a1241d41 
								
							 
						 
						
							
							
								
								Merge branch 'feature/nodeinfo' into 'develop'  
							
							 
							
							... 
							
							
							
							Implements the nodeinfo endpoints
See merge request pleroma/pleroma!140  
							
						 
						
							2018-05-04 19:17:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								90c4bed0af 
								
							 
						 
						
							
							
								
								Don't expire idempotency cache for five minutes.  
							
							 
							
							
							
						 
						
							2018-05-04 21:15:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fcd3eca167 
								
							 
						 
						
							
							
								
								MastodonAPI: Support idempotency key.  
							
							 
							
							
							
						 
						
							2018-05-04 20:30:29 +02:00