rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b6a7dfa8 
								
							 
						 
						
							
							
								
								Merge branch 'deactivated-user-posts' into 'develop'  
							
							... 
							
							
							
							Deactivated user posts
Closes  #2011 
See merge request pleroma/pleroma!2845  
							
						 
						
							2020-08-04 19:17:30 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91fbb5b21f 
								
							 
						 
						
							
							
								
								Fix ActivityExpirationPolicy  
							
							
							
						 
						
							2020-08-04 18:26:37 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a00713744 
								
							 
						 
						
							
							
								
								CommonValidations: Treat deactivated users as not present.  
							
							
							
						 
						
							2020-08-04 14:17:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56b5b9aa27 
								
							 
						 
						
							
							
								
								Merge branch 'follower-mrf-again' into 'develop'  
							
							... 
							
							
							
							Follower mrf again
See merge request pleroma/pleroma!2833  
							
						 
						
							2020-08-03 14:22:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								10c792110e 
								
							 
						 
						
							
							
								
								MRF Object Age Policy: Don't break on messages without cc/to  
							
							
							
						 
						
							2020-08-03 14:12:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b18a07392 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-1ac0969c' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2825  
							
						 
						
							2020-07-31 15:18:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								010d77ec85 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'mrf-silence-2' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !2820  
							
						 
						
							2020-07-31 15:17:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd162a5f7 
								
							 
						 
						
							
							
								
								SimplePolicy: Fix problem with DM leaks.  
							
							
							
						 
						
							2020-07-31 09:57:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								702f0fb822 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into mrf-silence  
							
							
							
						 
						
							2020-07-29 13:01:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								93638935d7 
								
							 
						 
						
							
							
								
								SimpleMRF: :silence --> :followers_only  
							
							
							
						 
						
							2020-07-29 12:58:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								edf8b6abfe 
								
							 
						 
						
							
							
								
								EnsureRePrepended: Don't break on chat messages.  
							
							
							
						 
						
							2020-07-29 10:53:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a99e7df8e 
								
							 
						 
						
							
							
								
								SimpleMRF silence: optimize, work okay with nil values in addressing  
							
							
							
						 
						
							2020-07-28 20:32:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c90f7f715 
								
							 
						 
						
							
							
								
								SimpleMRF: Let instances be silenced  
							
							
							
						 
						
							2020-07-28 19:06:42 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9e6f4694dd 
								
							 
						 
						
							
							
								
								Pipeline: Unify embedded_object / object_data, move to validator.  
							
							
							
						 
						
							2020-07-27 16:39:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								3d13fb05f8 
								
							 
						 
						
							
							
								
								Side Effects: On undoing, put information about the undone object.  
							
							
							
						 
						
							2020-07-24 14:40:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								91f3cf9bc6 
								
							 
						 
						
							
							
								
								Pipeline: Add embedded object federation.  
							
							
							
						 
						
							2020-07-24 14:06:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								76aa49a0c5 
								
							 
						 
						
							
							
								
								Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'  
							
							... 
							
							
							
							[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes  #1973 
See merge request pleroma/pleroma!2791  
							
						 
						
							2020-07-23 12:52:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea51a6de5 
								
							 
						 
						
							
							
								
								[ #2791 ] AccountView: renamed :force option to :skip_visibility_check.  
							
							
							
						 
						
							2020-07-23 15:08:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b2ba70eec4 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/mrf-reject-logging' into 'develop'  
							
							... 
							
							
							
							Fix  #783 : Make MRF reject log as info level instead of error
Closes  #783 
See merge request pleroma/pleroma!2758  
						
							2020-07-23 11:08:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6f5f7af607 
								
							 
						 
						
							
							
								
								[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.  
							
							... 
							
							
							
							Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting. 
							
						 
						
							2020-07-22 19:06:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0fe36b311c 
								
							 
						 
						
							
							
								
								Merge branch 'features/mrf-reasons' into 'develop'  
							
							... 
							
							
							
							Add rejection reason to our MRFs
See merge request pleroma/pleroma!2759  
							
						 
						
							2020-07-15 14:00:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1dd767b8c7 
								
							 
						 
						
							
							
								
								Include port in host for signatures  
							
							
							
						 
						
							2020-07-14 21:44:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								246f49d685 
								
							 
						 
						
							
							
								
								Merge branch '1916-transmogrifier-skipping-oddities-in-address-fields' into 'develop'  
							
							... 
							
							
							
							Transmogrifier: filtering weirdness in address fields
Closes  #1916 
See merge request pleroma/pleroma!2762  
							
						 
						
							2020-07-14 15:17:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								858d9fc7e8 
								
							 
						 
						
							
							
								
								MRF Policies: Return a {:reject, reason} instead of {:reject, nil}  
							
							
							
						 
						
							2020-07-14 11:04:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									= 
								
							 
						 
						
							
							
							
							
								
							
							
								b221b640a2 
								
							 
						 
						
							
							
								
								Transmogrifier: filtering weirdness in address fields  
							
							
							
						 
						
							2020-07-13 22:43:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce243b107f 
								
							 
						 
						
							
							
								
								Use Logger.info for {:reject, reason}  
							
							
							
						 
						
							2020-07-13 15:26:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2aac92e9e0 
								
							 
						 
						
							
							
								
								Transmogrifier.fix_in_reply_to/2: Use warn for non-fatal fail to get replied-to post  
							
							
							
						 
						
							2020-07-13 15:26:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								93e494ec21 
								
							 
						 
						
							
							
								
								ActivityPub: Don't rename a clashing nickname with the same ap id.  
							
							
							
						 
						
							2020-07-10 14:10:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b39eb6ecc5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information  
							
							
							
						 
						
							2020-07-10 12:26:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							
							
						 
						
							2020-07-09 10:53:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								68036f5a3b 
								
							 
						 
						
							
							
								
								Merge branch 'follow-pipeline' into 'develop'  
							
							... 
							
							
							
							Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734  
							
						 
						
							2020-07-09 10:32:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00e54f8fe7 
								
							 
						 
						
							
							
								
								ActivityPub: Remove follow and fix issues.  
							
							
							
						 
						
							2020-07-08 17:07:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9dda8b5427 
								
							 
						 
						
							
							
								
								CommonAPI: Switch to pipeline for following.  
							
							
							
						 
						
							2020-07-08 15:40:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								172f4aff8e 
								
							 
						 
						
							
							
								
								Transmogrifier: Move following to the pipeline.  
							
							
							
						 
						
							2020-07-08 14:30:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d0e2b3fdd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline  
							
							
							
						 
						
							2020-07-08 13:23:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cdc153db31 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880  
							
							
							
						 
						
							2020-07-08 13:21:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e341f81785 
								
							 
						 
						
							
							
								
								fixed delete Like activity in remove user  
							
							
							
						 
						
							2020-07-08 09:06:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9ad305209a 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/peertube-videos' into 'develop'  
							
							... 
							
							
							
							Fix getting videos from peertube
See merge request pleroma/pleroma!2728  
							
						 
						
							2020-07-07 09:14:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fbb9743a70 
								
							 
						 
						
							
							
								
								Fix getting videos from peertube  
							
							
							
						 
						
							2020-07-07 09:38:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a6a12b241f 
								
							 
						 
						
							
							
								
								FollowValidator: Add basic validation.  
							
							
							
						 
						
							2020-07-06 15:57:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								208baf157a 
								
							 
						 
						
							
							
								
								ActivityPub: Add new 'capabilities' to user.  
							
							
							
						 
						
							2020-07-06 11:38:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8277b29790 
								
							 
						 
						
							
							
								
								Restrict thread statuses that contain user's irreversible filters  
							
							
							
						 
						
							2020-07-06 09:30:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a8c26654e 
								
							 
						 
						
							
							
								
								Restrict statuses that contain user's irreversible filters  
							
							
							
						 
						
							2020-07-06 09:28:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4a7b89e372 
								
							 
						 
						
							
							
								
								ChatMessageValidator: Additional validation.  
							
							
							
						 
						
							2020-07-03 15:13:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5c0bf4c472 
								
							 
						 
						
							
							
								
								ActivityPub: Ingest information about chat acceptance.  
							
							
							
						 
						
							2020-07-03 13:58:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26a7cc3f00 
								
							 
						 
						
							
							
								
								UserView: Add acceptsChatMessages field  
							
							
							
						 
						
							2020-07-03 13:38:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c044f6225 
								
							 
						 
						
							
							
								
								Merge branch 'fetcher-fixes' into 'develop'  
							
							... 
							
							
							
							Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711  
							
						 
						
							2020-07-02 10:17:51 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bad08f34ca 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-07-02 09:57:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								61fe94d698 
								
							 
						 
						
							
							
								
								SideEffects: Refactor.  
							
							
							
						 
						
							2020-07-02 09:33:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fedfe8f7d6 
								
							 
						 
						
							
							
								
								ActivityPub: Handle clashing nicknames for the same ap id  
							
							... 
							
							
							
							If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way. 
							
						 
						
							2020-07-01 12:26:07 +02:00