Oneric 
								
							 
						 
						
							
							
							
							
								
							
							
								e99e2407f3 
								
							 
						 
						
							
							
								
								Add background_removal to SimplePolicy MRF  
							
							 
							
							
							
						 
						
							2024-02-16 16:36:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Oneric 
								
							 
						 
						
							
							
							
							
								
							
							
								e47c50666d 
								
							 
						 
						
							
							
								
								Fix obfuscation of short domains  
							
							 
							
							... 
							
							
							
							Fixes https://akkoma.dev/AkkomaGang/akkoma/issues/645  
							
						 
						
							2024-02-02 14:50:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								68894089e8 
								
							 
						 
						
							
							
								
								Do not fetch anything from blocked instances  
							
							 
							
							
							
						 
						
							2022-12-10 00:09:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								6f83ae27aa 
								
							 
						 
						
							
							
								
								extend reject MRF to check if originating instance is blocked  
							
							 
							
							
							
						 
						
							2022-12-09 19:57:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ilja 
								
							 
						 
						
							
							
							
							
								
							
							
								1f863f0a36 
								
							 
						 
						
							
							
								
								Fix MRF policies to also work with Update  
							
							 
							
							... 
							
							
							
							Objects who got updated would just pass through several of the MRF policies, undoing moderation in some situations.
In the relevant cases we now check not only for Create activities, but also Update activities.
I checked which ones checked explicitly on type Create using `grep '"type" => "Create"' lib/pleroma/web/activity_pub/mrf/*`.
The following from that list have not been changed:
* lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
    * Not relevant for moderation
* lib/pleroma/web/activity_pub/mrf/keyword_policy.ex
    * Already had a test for Update
* lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
    * In practice only relevant when fetching old objects (e.g. through Like or Announce). These are always wrapped in a Create.
* lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
    * We don't allow changing scope with Update, so not relevant here 
							
						 
						
							2022-12-08 23:22:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								85137f591f 
								
							 
						 
						
							
							
								
								Add ability to obfuscate domains in MRF transparency  
							
							 
							
							
							
						 
						
							2022-08-27 11:57:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ad09bdb376 
								
							 
						 
						
							
							
								
								Improve readability  
							
							 
							
							
							
						 
						
							2021-08-06 07:59:54 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4028c908c 
								
							 
						 
						
							
							
								
								Add key- and valuePlaceholders for quarantined_instances and mrf_simple  
							
							 
							
							... 
							
							
							
							* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility) 
							
						 
						
							2021-08-06 07:59:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								47fc57bbcc 
								
							 
						 
						
							
							
								
								Change what nodeinfo returns without breaking backwards compatibility  
							
							 
							
							... 
							
							
							
							* Only for SimplePolicy for now
* I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info 
							
						 
						
							2021-08-06 07:59:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fdc3cde06 
								
							 
						 
						
							
							
								
								Return maps in node_info  
							
							 
							
							... 
							
							
							
							It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances. 
							
						 
						
							2021-08-06 07:59:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dfeb3862da 
								
							 
						 
						
							
							
								
								config :mrf, :transparency_exclusions works with tumples now  
							
							 
							
							
							
						 
						
							2021-08-06 07:59:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27fe7b0274 
								
							 
						 
						
							
							
								
								Make quarentine work with list of tuples instead of strings  
							
							 
							
							
							
						 
						
							2021-08-06 07:59:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ilja 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ba0beb60c 
								
							 
						 
						
							
							
								
								Make mrfSimple work with tuples  
							
							 
							
							... 
							
							
							
							* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected 
							
						 
						
							2021-08-06 07:58:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe4c4a7178 
								
							 
						 
						
							
							
								
								MRF: create MRF.Policy behaviour separate from MRF module  
							
							 
							
							... 
							
							
							
							Speeds up recompilation by reducing compile-time deps 
							
						 
						
							2021-06-07 14:22:08 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								926a233cc4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak  
							
							 
							
							
							
						 
						
							2021-04-30 14:21:17 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c16c7fdb87 
								
							 
						 
						
							
							
								
								SimplePolicy: filter string Objects  
							
							 
							
							
							
						 
						
							2021-04-30 14:20:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d742c3c1a 
								
							 
						 
						
							
							
								
								SimplePolicy: filter nested objects  
							
							 
							
							
							
						 
						
							2021-04-30 14:20:37 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271 
								
							 
						 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy  
							
							 
							
							
							
						 
						
							2021-02-27 21:26:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e350898828 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-01-13 22:11:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							 
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								3966add048 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'features/hashtag-column' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !2824  
							
						 
						
							2020-12-28 12:02:16 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								18b536c176 
								
							 
						 
						
							
							
								
								Pleroma.Object/1: take %Object{} as argument instead  
							
							 
							
							
							
						 
						
							2020-12-28 11:05:24 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87b13c5430 
								
							 
						 
						
							
							
								
								Create Object.hashtags/1 wrapper  
							
							 
							
							
							
						 
						
							2020-12-22 05:15:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acb03d591b 
								
							 
						 
						
							
							
								
								Insert text representation of hashtags into object["hashtags"]  
							
							 
							
							... 
							
							
							
							Includes a new mix task: pleroma.database fill_old_hashtags 
							
						 
						
							2020-12-22 05:15:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ee221277b0 
								
							 
						 
						
							
							
								
								Encapsulation of tags / hashtags fetching from objects.  
							
							 
							
							
							
						 
						
							2020-12-21 22:54:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								485697d96c 
								
							 
						 
						
							
							
								
								config descriptions for custom MRF policies  
							
							 
							
							
							
						 
						
							2020-11-10 19:20:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								c0b36621f1 
								
							 
						 
						
							
							
								
								Ensure we only apply NSFW Simple policy on parsable objects  
							
							 
							
							
							
						 
						
							2020-09-11 23:22:14 -05: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								93638935d7 
								
							 
						 
						
							
							
								
								SimpleMRF: :silence --> :followers_only  
							
							 
							
							
							
						 
						
							2020-07-29 12:58:08 -05: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								858d9fc7e8 
								
							 
						 
						
							
							
								
								MRF Policies: Return a {:reject, reason} instead of {:reject, nil}  
							
							 
							
							
							
						 
						
							2020-07-14 11:04:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							 
							
							
							
						 
						
							2020-07-09 10:53:51 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3 
								
							 
						 
						
							
							
								
								moving mrf settings from instance to separate group  
							
							 
							
							
							
						 
						
							2020-06-16 18:32:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-20 10:11:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a3c74b244 
								
							 
						 
						
							
							
								
								Always accept deletions through SimplePolicy  
							
							 
							
							
							
						 
						
							2020-04-12 20:26:35 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							 
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a  --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 
						
							2020-03-02 06:08:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								478619782b 
								
							 
						 
						
							
							
								
								Standardize @behaviour usage in MRFs  
							
							 
							
							
							
						 
						
							2020-02-14 11:02:24 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58aeabd020 
								
							 
						 
						
							
							
								
								mrf/simple_policy: check actor against accept/reject  
							
							 
							
							
							
						 
						
							2019-10-07 03:49:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4244e17de0 
								
							 
						 
						
							
							
								
								fix credo  
							
							 
							
							
							
						 
						
							2019-08-13 22:36:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								c574b7a1fc 
								
							 
						 
						
							
							
								
								MRF: add describe() to all modules, add base MRF configuration to base describe()  
							
							 
							
							
							
						 
						
							2019-08-13 22:08:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b93498eb52 
								
							 
						 
						
							
							
								
								constants: add as_public constant and use it everywhere  
							
							 
							
							
							
						 
						
							2019-07-29 02:43:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								b70e659304 
								
							 
						 
						
							
							
								
								Feature/1087 wildcard option for blocks  
							
							 
							
							
							
						 
						
							2019-07-22 14:33:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								79503ce90f 
								
							 
						 
						
							
							
								
								mrf: simple policy: fix matching imported activitypub and ostatus statuses  
							
							 
							
							
							
						 
						
							2019-05-26 02:01:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								baf72d6c58 
								
							 
						 
						
							
							
								
								mrf: simple policy: add the ability to strip avatars and banners from user profiles  
							
							 
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								75b6c4b004 
								
							 
						 
						
							
							
								
								mrf: defang policy modules for filtering user profile objects  
							
							 
							
							
							
						 
						
							2019-05-22 18:53:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								2375e9a95b 
								
							 
						 
						
							
							
								
								Add report filtering to MRF.SimplePolicy  
							
							 
							
							
							
						 
						
							2019-05-20 06:02:50 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								78588dbd80 
								
							 
						 
						
							
							
								
								mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw  
							
							 
							
							
							
						 
						
							2019-05-17 18:49:10 +00:00