lain 
								
							 
						 
						
							
							
							
							
								
							
							
								064c4f86f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-09 09:36:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe1cb56fdc 
								
							 
						 
						
							
							
								
								transmogrifier: MIME.valid?/1 for mediaType  
							
							... 
							
							
							
							No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429 
is merged. 
							
						 
						
							2020-06-08 21:04:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b5282bef2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-08 11:19:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d66dd180a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-08 10:18:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2cdaac4330 
								
							 
						 
						
							
							
								
								SideEffects: Move streaming of chats to after the transaction.  
							
							
							
						 
						
							2020-06-07 14:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0365053c8d 
								
							 
						 
						
							
							
								
								AttachmentValidator: Check if the mime type is valid.  
							
							
							
						 
						
							2020-06-07 09:19:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ca0e6e702b 
								
							 
						 
						
							
							
								
								ChatMessageReference -> Chat.MessageReference  
							
							
							
						 
						
							2020-06-06 11:51:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								167812a3f2 
								
							 
						 
						
							
							
								
								Fix pagination  
							
							
							
						 
						
							2020-06-05 23:18:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b02df1803e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys  
							
							
							
						 
						
							2020-06-05 23:15:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f24d2f714f 
								
							 
						 
						
							
							
								
								Credo fixes  
							
							
							
						 
						
							2020-06-05 17:18:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8ca030d85 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-05 16:53:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d74985af23 
								
							 
						 
						
							
							
								
								Merge branch 'features/apc2s-pagination' into 'develop'  
							
							... 
							
							
							
							Fix AP C2S pagination
Closes  #866  and #751 
See merge request pleroma/pleroma!2491  
							
						 
						
							2020-06-05 14:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								54bae06b4f 
								
							 
						 
						
							
							
								
								Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})  
							
							... 
							
							
							
							Unifies all the similar functions to one and simplify some blocks with it. 
							
						 
						
							2020-06-05 14:48:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								115d08a754 
								
							 
						 
						
							
							
								
								Pipeline: Add a side effects step after the transaction finishes  
							
							... 
							
							
							
							This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously. 
							
						 
						
							2020-06-05 16:47:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								65689ba9bd 
								
							 
						 
						
							
							
								
								If Credo fixes is so good, why is there no Credo fixes 2?  
							
							
							
						 
						
							2020-06-05 13:10:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3ea6ee2c8 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-06-05 12:45:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0efa8aa0b9 
								
							 
						 
						
							
							
								
								Transmogrifier: For follows, create notifications last.  
							
							... 
							
							
							
							As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon. 
							
						 
						
							2020-06-05 12:26:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc8a7dc205 
								
							 
						 
						
							
							
								
								SideEffects / ChatView: Add an unread cache.  
							
							... 
							
							
							
							This is to prevent wrong values in the stream. 
							
						 
						
							2020-06-05 12:01:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61 
								
							 
						 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options  
							
							
							
						 
						
							2020-06-04 21:36:26 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56dfa0e0fb 
								
							 
						 
						
							
							
								
								Transmogrifier: Update notification after accepting.  
							
							
							
						 
						
							2020-06-04 19:22:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00748e9650 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Change seen -> unread  
							
							
							
						 
						
							2020-06-04 17:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c16315d055 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AdminAPI.ReportController  
							
							
							
						 
						
							2020-06-03 19:17:05 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb4ae9c720 
								
							 
						 
						
							
							
								
								Streamer, SideEffects: Stream out ChatMessageReferences  
							
							... 
							
							
							
							Saves us a few calles to fetch things from the DB that we already
have. 
							
						 
						
							2020-06-03 16:45:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7f5c5b11a5 
								
							 
						 
						
							
							
								
								Chats: Remove unread from the db, calculate from unseen messages.  
							
							
							
						 
						
							2020-06-03 14:26:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aa22fce8f4 
								
							 
						 
						
							
							
								
								ChatMessageReference: Introduce and switch in chat controller.  
							
							
							
						 
						
							2020-06-03 12:30:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								879304dcd9 
								
							 
						 
						
							
							
								
								Merge branch 'replies-domain-block' into 'develop'  
							
							... 
							
							
							
							Replies domain block
Closes  #1650 
See merge request pleroma/pleroma!2622  
							
						 
						
							2020-06-02 14:14:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								904295d53b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-02 14:28:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								805ab86933 
								
							 
						 
						
							
							
								
								Notifications: Make notifications save their type.  
							
							
							
						 
						
							2020-06-02 13:24:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								165a4b2a69 
								
							 
						 
						
							
							
								
								Do not include activities of invisible users unless explicitly requested  
							
							... 
							
							
							
							Closes  #1833  
						
							2020-06-02 13:34:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19f468c5bc 
								
							 
						 
						
							
							
								
								replies filtering for blocked domains  
							
							
							
						 
						
							2020-06-02 09:00:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e6ec778d9 
								
							 
						 
						
							
							
								
								exclude replies on blocked domains  
							
							
							
						 
						
							2020-06-01 21:17:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6ff079ca9f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-30 12:31:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2c9465cc51 
								
							 
						 
						
							
							
								
								SafeText: Let through basic html.  
							
							
							
						 
						
							2020-05-30 12:17:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a43b435c0a 
								
							 
						 
						
							
							
								
								AP C2S: allow limit & order on outbox & read_inbox  
							
							
							
						 
						
							2020-05-29 16:14:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b3b367b894 
								
							 
						 
						
							
							
								
								Bugfix: Reuse Controller.Helper pagination for APC2S  
							
							
							
						 
						
							2020-05-29 16:14:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3898dd69a6 
								
							 
						 
						
							
							
								
								SideEffects: Ensure a chat is present before streaming something out.  
							
							
							
						 
						
							2020-05-29 16:05:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								863c02b25d 
								
							 
						 
						
							
							
								
								SideEffects: Stream out chat messages.  
							
							
							
						 
						
							2020-05-29 15:44:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9848978109 
								
							 
						 
						
							
							
								
								Merge branch 'fix-relay-repeat-notification' into 'develop'  
							
							... 
							
							
							
							Fix relay repeat notification
See merge request pleroma/pleroma!2590  
							
						 
						
							2020-05-29 10:42:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								af6d01ec93 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-29 12:36:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								228ff3760e 
								
							 
						 
						
							
							
								
								Use User.is_internal_user? instead  
							
							
							
						 
						
							2020-05-29 19:07:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9df5b1e6ae 
								
							 
						 
						
							
							
								
								Don't make relay announce notification  
							
							
							
						 
						
							2020-05-29 19:06:38 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kPherox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								48fd9be65a 
								
							 
						 
						
							
							
								
								Exclude post actor from to of relay announce  
							
							
							
						 
						
							2020-05-27 23:51:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d35be02e70 
								
							 
						 
						
							
							
								
								Merge branch 'refactor-add-mention-step-one' into 'develop'  
							
							... 
							
							
							
							Fix ObjectView calling into strange functions
Closes  #1807 
See merge request pleroma/pleroma!2580  
							
						 
						
							2020-05-27 14:17:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7e13200869 
								
							 
						 
						
							
							
								
								ActivityPub: Change ordering to nulls last in favorites query  
							
							... 
							
							
							
							This makes it use our existing index and speeds up the query. 
							
						 
						
							2020-05-27 09:46:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d7a57004ef 
								
							 
						 
						
							
							
								
								[ #1501 ] Made user feed contain public and unlisted activities.  
							
							
							
						 
						
							2020-05-25 23:27:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6bd7070b00 
								
							 
						 
						
							
							
								
								Transmogrifier: Use a simpler way to get mentions.  
							
							
							
						 
						
							2020-05-25 15:08:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee35bb5ac2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-05-25 13:57:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								355aa3bdc7 
								
							 
						 
						
							
							
								
								ActivityPubController: Add Mastodon activity compat route.  
							
							
							
						 
						
							2020-05-22 17:06:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ca755f9a73 
								
							 
						 
						
							
							
								
								ActivityPubController: Add Mastodon compatibility route.  
							
							
							
						 
						
							2020-05-22 16:15:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								7b02bfca51 
								
							 
						 
						
							
							
								
								Merge branch 'announce-validator' into 'develop'  
							
							... 
							
							
							
							Announce validator
See merge request pleroma/pleroma!2567  
							
						 
						
							2020-05-22 05:47:53 +00:00