Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								fb058410f6 
								
							 
						 
						
							
							
								
								fix pgroona note.text query  
							
							
							
						 
						
							2025-02-12 11:01:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								feb80ee992 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							
							
						 
						
							2025-02-11 10:52:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								363111f5de 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/misskey-js/src/autogen/endpoint.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-10 23:34:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								5276d6024d 
								
							 
						 
						
							
							
								
								merge: Cleanup and bulk fixes to Mastodon API ( resolves   #495 ,  #509 ,  #707 ,   #714 ,  #721 ,  #804 ,  #811 ,  #865 , and partially  #492 ) ( !879 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/879 
Closes  #495 , #509 , #707 , #714 , #721 , #804 , #811 , #865 , and #492 
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 
						
							2025-02-10 16:28:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								2f84d151f5 
								
							 
						 
						
							
							
								
								merge: Allow user-initiated object lookups (/ap/show endpoint) to follow cross-domain redirects ( resolves   #820 ) ( !878 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/878 
Closes  #820 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-10 16:22:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								1da9245ca5 
								
							 
						 
						
							
							
								
								merge: hide note preview if it's already quoted -  fixes   #888  ( !894 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/894 
Closes  #888 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-10 16:20:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								c1d609bf00 
								
							 
						 
						
							
							
								
								merge: make the listen address configurable -  fixes   #927  ( !892 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/892 
Closes  #927 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-10 16:19:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								816ce293fb 
								
							 
						 
						
							
							
								
								merge: search-by-tags returns "home" notes -  fixes   #933  ( !891 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/891 
Closes  #933 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-10 16:18:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								b7f06f2877 
								
							 
						 
						
							
							
								
								prevent a ReferenceError  
							
							... 
							
							
							
							before, we got:
> ReferenceError: can't access lexical declaration 'followRequestDone'
> before initialization
(of course in non-dev mode, `followRequestDone` had a different name) 
							
						 
						
							2025-02-10 11:59:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								f66e534f26 
								
							 
						 
						
							
							
								
								fix the defaults  
							
							
							
						 
						
							2025-02-10 11:54:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								c6eb1ffde3 
								
							 
						 
						
							
							
								
								hide note preview if it's already quoted -  fixes   #888  
							
							... 
							
							
							
							I do not particularly _love_ this solution, but it is simple and
effective
I can't find another reliable way to determine if a link goes to a
local note of the given id, apart from fetching the link 
							
						 
						
							2025-02-10 11:42:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								670b1171fb 
								
							 
						 
						
							
							
								
								merge: Add ability to generate vapid keys on frontend ( !888 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/888 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 
						
							2025-02-10 10:47:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								427d09e643 
								
							 
						 
						
							
							
								
								make the listen address configurable -  fixes   #927  
							
							... 
							
							
							
							sadly `fastify.listen` doesn't support passing more than 1 address 
							
						 
						
							2025-02-10 10:40:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								7b507485b5 
								
							 
						 
						
							
							
								
								search-by-tags returns "home" notes -  fixes   #933  
							
							... 
							
							
							
							featured / trending tags count both "home" and "public" notes, so this
should do the same 
							
						 
						
							2025-02-10 10:16:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								4567f243a9 
								
							 
						 
						
							
							
								
								allow overriding logging via env  
							
							
							
						 
						
							2025-02-09 12:15:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								3cd7cc5900 
								
							 
						 
						
							
							
								
								remove unstable "detector" tests from megalodon  
							
							
							
						 
						
							2025-02-09 00:48:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								7a8abbba6a 
								
							 
						 
						
							
							
								
								regenerate misskey-js  
							
							
							
						 
						
							2025-02-08 13:19:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								1126c09669 
								
							 
						 
						
							
							
								
								make convertAttachment match file->attachment schema  
							
							
							
						 
						
							2025-02-08 13:17:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								daf715578e 
								
							 
						 
						
							
							
								
								fix mastodon media attachment conversion ( resolves   #495 )  
							
							
							
						 
						
							2025-02-08 13:17:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								1e43162ba7 
								
							 
						 
						
							
							
								
								improve mastodon note conversion and use access checks in more places ( resolves   #509 )  
							
							
							
						 
						
							2025-02-08 13:17:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								3550ce27d5 
								
							 
						 
						
							
							
								
								hide restricted edit history from mastodon api ( resolves   #811 )  
							
							
							
						 
						
							2025-02-08 13:17:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								bd95e8a555 
								
							 
						 
						
							
							
								
								fix relationship data for Mastodon API ( resolves   #714 )  
							
							
							
						 
						
							2025-02-08 13:17:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								5a1d1394d4 
								
							 
						 
						
							
							
								
								add memo and isInstanceMuted to UserRelation API entity  
							
							
							
						 
						
							2025-02-08 13:17:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								02e90e23b7 
								
							 
						 
						
							
							
								
								fix build target for megalodon  
							
							
							
						 
						
							2025-02-08 13:17:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								bbfba495df 
								
							 
						 
						
							
							
								
								remove un-needed relationshipModel static data  
							
							
							
						 
						
							2025-02-08 13:17:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								c38f04fe38 
								
							 
						 
						
							
							
								
								fix empty masto-api responses for several endpoints ( resolves   #721  and  #707 )  
							
							
							
						 
						
							2025-02-08 13:17:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								16f483d273 
								
							 
						 
						
							
							
								
								cleanup Mastodon API ( resolves   #804  and  #865 , partially  resolves   #492 )  
							
							... 
							
							
							
							* Fix TS errors and warnings
* Fix ESLint errors and warnings
* Fix property typos in various places
* Fix property data conversion
* Add missing entity properties
* Normalize logging and reduce spam
* Check for missing request parameters
* Allow mastodon API to work with local debugging
* Safer error handling
* Fix quote-post detection 
							
						 
						
							2025-02-08 13:17:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								2c2fb8a692 
								
							 
						 
						
							
							
								
								export logger Data types for reference elsewhere  
							
							
							
						 
						
							2025-02-08 13:17:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								5347bbf154 
								
							 
						 
						
							
							
								
								export megalodon generator in a way that doesn't break TypeScript  
							
							
							
						 
						
							2025-02-08 13:17:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								7e1b4b259a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	packages/backend/src/server/ActivityPubServerService.ts
#	pnpm-lock.yaml 
							
						 
						
							2025-02-08 13:16:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								50a3e55be4 
								
							 
						 
						
							
							
								
								merge: Rework rate limit factors and add caching ( resolves   #884 ) ( !884 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/884 
Closes  #884 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-08 15:05:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								9731a614a1 
								
							 
						 
						
							
							
								
								merge: Enable FreeBSD to be used for deployment ( !887 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/887 
Closes  #928 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com> 
							
						 
						
							2025-02-07 20:37:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								170c0f111e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'fEmber/merge/2024-02-03' into merge/2024-02-03  
							
							
							
						 
						
							2025-02-07 13:53:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								e96fe824bb 
								
							 
						 
						
							
							
								
								print an error when booting with both MK_ONLY_SERVER and MK_ONLY_QUEUE set  
							
							
							
						 
						
							2025-02-07 13:52:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								01006058c4 
								
							 
						 
						
							
							
								
								simpler genKeys  
							
							
							
						 
						
							2025-02-07 18:42:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								09128ef399 
								
							 
						 
						
							
							
								
								pick lints  
							
							
							
						 
						
							2025-02-07 18:33:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								d426e2a7ef 
								
							 
						 
						
							
							
								
								fix our ruby/group hack  
							
							
							
						 
						
							2025-02-07 18:22:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								105f8be9f5 
								
							 
						 
						
							
							
								
								copy changes from MkInstanceTicker to SkInstanceTicker  
							
							
							
						 
						
							2025-02-07 12:16:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								92a6757914 
								
							 
						 
						
							
							
								
								allow environment override for fulltextSearch.provider property  
							
							
							
						 
						
							2025-02-07 11:59:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								f36029f795 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into merge/2024-02-03  
							
							... 
							
							
							
							# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml 
							
						 
						
							2025-02-07 11:57:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef90b2e5a7 
								
							 
						 
						
							
							
								
								chore: add quotes to RoleService  
							
							
							
						 
						
							2025-02-07 15:09:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c889948f95 
								
							 
						 
						
							
							
								
								feat: Add generation of keys to admin page  
							
							
							
						 
						
							2025-02-07 06:00:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								d6c4b728df 
								
							 
						 
						
							
							
								
								merge: Add "follow back" button on follow-related notifications ( resolves   #895 ) ( !873 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/873 
Closes  #895 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-07 03:50:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								d629b882b0 
								
							 
						 
						
							
							
								
								merge: Allow users to set a default content warning for their new posts ( resolves   #901 ) ( !881 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/881 
Closes  #901 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-07 03:47:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								2434922f7d 
								
							 
						 
						
							
							
								
								merge: Increase the rate limit for /api/i endpoint ( !882 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/882 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-07 03:44:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								de7ecdc487 
								
							 
						 
						
							
							
								
								merge: Add buttons to accept/reject follow request from the requestor's profile ( resolves   #896 ) ( !872 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/872 
Closes  #896 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-07 03:43:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								e401724835 
								
							 
						 
						
							
							
								
								merge: Increase rate limit on federation/update-remote-user endpoint ( !880 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/880 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-07 03:41:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								2928ccf1e4 
								
							 
						 
						
							
							
								
								merge: handle more complex ruby from/to html -  fixes   #605  ( !866 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/866 
Closes  #605 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2025-02-07 03:40:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								24528ed0c3 
								
							 
						 
						
							
							
								
								fix: Allow FreeBSD to start Backend without any issues  
							
							
							
						 
						
							2025-02-06 22:54:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								0d1c993dd2 
								
							 
						 
						
							
							
								
								restore support for local dev using a non-local url  
							
							
							
						 
						
							2025-02-06 12:57:44 -05:00