Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7efc074ead 
								
							 
						 
						
							
							
								
								Permit fetching individual reports with notes preloaded  
							
							 
							
							
							
						 
						
							2020-11-02 13:06:59 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								eb5ff715f7 
								
							 
						 
						
							
							
								
								pin/unpin for activities with expires_at option  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								de4c935071 
								
							 
						 
						
							
							
								
								don't expire pinned posts  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								9bf1065a06 
								
							 
						 
						
							
							
								
								schedule activity expiration in Oban  
							
							 
							
							
							
						 
						
							2020-09-10 21:50:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ab83f837e 
								
							 
						 
						
							
							
								
								don't load pinned activities in due_expirations  
							
							 
							
							
							
						 
						
							2020-08-12 19:46:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								271ea5068f 
								
							 
						 
						
							
							
								
								Merge branch '1851-favorites-pagination' into 'develop'  
							
							 
							
							... 
							
							
							
							StatusController: Correctly paginate favorites.
Closes  #1851 
See merge request pleroma/pleroma!2636  
							
						 
						
							2020-06-13 17:20:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								063e6b9841 
								
							 
						 
						
							
							
								
								StatusController: Correctly paginate favorites.  
							
							 
							
							... 
							
							
							
							Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this. 
							
						 
						
							2020-06-09 10:53:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								37542a9dfa 
								
							 
						 
						
							
							
								
								Activity: Remove notifications-related functions.  
							
							 
							
							
							
						 
						
							2020-06-02 14:22:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								ac672a9d6b 
								
							 
						 
						
							
							
								
								[ #1559 ] Addressed code review requests.  
							
							 
							
							
							
						 
						
							2020-04-09 15:13:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a4875adfa 
								
							 
						 
						
							
							
								
								[ #1559 ] Support for "follow_request" notifications (configurable).  
							
							 
							
							... 
							
							
							
							(Not currently supported by PleromaFE, thus disabled by default). 
							
						 
						
							2020-04-07 21:52:32 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								3fa3d45dbe 
								
							 
						 
						
							
							
								
								[ #1364 ] Minor improvements / comments.  
							
							 
							
							... 
							
							
							
							Further fixes of incorrect usage of "relations" as a short form of "relationships". 
							
						 
						
							2020-03-25 13:05:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7c8003c3fc 
								
							 
						 
						
							
							
								
								[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.  
							
							 
							
							
							
						 
						
							2020-03-15 21:00:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cc98d010ed 
								
							 
						 
						
							
							
								
								relay list shows hosts without accepted follow  
							
							 
							
							
							
						 
						
							2020-03-02 09:27:20 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								22018adae6 
								
							 
						 
						
							
							
								
								Fix Dialyzer warnings  
							
							 
							
							
							
						 
						
							2020-02-25 18:34:56 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							 
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								615b72238e 
								
							 
						 
						
							
							
								
								Notifications: Add emoji reaction notifications  
							
							 
							
							
							
						 
						
							2020-01-22 20:06:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6e88a7e591 
								
							 
						 
						
							
							
								
								exclude blocked user posts from search results  
							
							 
							
							
							
						 
						
							2020-01-21 07:40:13 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								3ecf131511 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/report-notes  
							
							 
							
							
							
						 
						
							2019-12-12 02:16:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								9f99640cfc 
								
							 
						 
						
							
							
								
								ActivityPub: Fix deletes being exempt from MRF  
							
							 
							
							... 
							
							
							
							Closes  #1461  
							
						 
						
							2019-12-05 21:45:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								4b60d41db9 
								
							 
						 
						
							
							
								
								Add report notes  
							
							 
							
							
							
						 
						
							2019-12-04 00:26:37 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							 
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1fc28a4b44 
								
							 
						 
						
							
							
								
								Add a view for the move notification  
							
							 
							
							
							
						 
						
							2019-11-27 17:52:02 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80ededc04f 
								
							 
						 
						
							
							
								
								Add direct_conversation_id to web push payload  
							
							 
							
							
							
						 
						
							2019-11-26 19:53:43 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								31343e4321 
								
							 
						 
						
							
							
								
								Code style fixes  
							
							 
							
							
							
						 
						
							2019-11-11 19:06:09 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								aa7fd616c7 
								
							 
						 
						
							
							
								
								Line is too long!  
							
							 
							
							
							
						 
						
							2019-10-07 16:03:23 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								7aceaa517b 
								
							 
						 
						
							
							
								
								Admin API: Reports, grouped by status  
							
							 
							
							
							
						 
						
							2019-10-07 15:39:07 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3d722dc200 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex  
							
							 
							
							
							
						 
						
							2019-09-26 16:16:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b5dfe83433 
								
							 
						 
						
							
							
								
								Replace Pleroma.FlakeId with flake_id hex package  
							
							 
							
							
							
						 
						
							2019-09-25 17:14:31 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								179fa32dd5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex  
							
							 
							
							
							
						 
						
							2019-09-23 21:41:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								39dc9b470c 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils  
							
							 
							
							
							
						 
						
							2019-09-13 12:44:59 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d8a178274b 
								
							 
						 
						
							
							
								
								fix Activity.get_by_id  
							
							 
							
							
							
						 
						
							2019-09-13 07:12:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b40b10b53d 
								
							 
						 
						
							
							
								
								Add an endpoint to get multiple statuses by IDs  
							
							 
							
							
							
						 
						
							2019-09-10 13:39:45 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							 
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								40a61532ca 
								
							 
						 
						
							
							
								
								activity: when restricting deactivated users, precalculate the user list  
							
							 
							
							... 
							
							
							
							the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make.  while we plan to simplify these queries through
unification of activities and objects, we are not yet there.  it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.
accordingly, drop the subquery and precalc the user list instead. 
							
						 
						
							2019-09-06 23:14:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc6c0b4ba6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration  
							
							 
							
							
							
						 
						
							2019-08-24 15:48:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a3e3becd 
								
							 
						 
						
							
							
								
								Hide muted theads from home/public timelines unless with_muted is set  
							
							 
							
							
							
						 
						
							2019-08-15 17:37:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c1b6952d2a 
								
							 
						 
						
							
							
								
								Mastodon API: Preloading and normalization optimizations  
							
							 
							
							... 
							
							
							
							- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present
This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?) 
							
						 
						
							2019-08-13 20:34:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Verdone 
								
							 
						 
						
							
							
							
							
								
							
							
								666514194a 
								
							 
						 
						
							
							
								
								Add activity expirations table  
							
							 
							
							... 
							
							
							
							Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted. 
							
						 
						
							2019-07-24 13:14:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugenij 
								
							 
						 
						
							
							
							
							
								
							
							
								4198c3ac39 
								
							 
						 
						
							
							
								
								Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel  
							
							 
							
							
							
						 
						
							2019-07-11 13:55:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								93397fce3d 
								
							 
						 
						
							
							
								
								Contain search for unauthenticated users  
							
							 
							
							
							
						 
						
							2019-06-05 16:37:43 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								eb02edcad9 
								
							 
						 
						
							
							
								
								Add virtual :thread_muted? field  
							
							 
							
							... 
							
							
							
							that may be set when fetching activities 
							
						 
						
							2019-05-21 00:35:46 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b3a27204 
								
							 
						 
						
							
							
								
								Add Reports to Admin API  
							
							 
							
							
							
						 
						
							2019-05-16 19:09:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								793f1834d2 
								
							 
						 
						
							
							
								
								Use named binding to conditionally join object  
							
							 
							
							
							
						 
						
							2019-05-16 06:25:14 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5e2b491276 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account  
							
							 
							
							
							
						 
						
							2019-05-14 18:15:56 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								bfeb33e951 
								
							 
						 
						
							
							
								
								Merge develop  
							
							 
							
							... 
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 
						
							2019-05-08 14:34:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5125dedc 
								
							 
						 
						
							
							
								
								Remove bookmarks assoc and add a fake bookmark assoc instead  
							
							 
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								be067ec2ab 
								
							 
						 
						
							
							
								
								Use with_preloaded_bookmark in create_by_object_ap_id_with_object  
							
							 
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3a7c14645e 
								
							 
						 
						
							
							
								
								- Actually use preloaded bookmarks in views  
							
							 
							
							... 
							
							
							
							- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests 
							
						 
						
							2019-05-07 19:33:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f841eb7cdb 
								
							 
						 
						
							
							
								
								Preload bookmarks wherever the object is preloaded  
							
							 
							
							
							
						 
						
							2019-05-07 19:33:22 +00:00