Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								2cd41228d8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.9.0  
							
							
							
						 
						
							2024-10-13 11:35:10 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								fb23b24f5c 
								
							 
						 
						
							
							
								
								Bump version to 2024.10.1-beta.4  
							
							
							
						 
						
							2024-10-13 11:43:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									おさむのひと 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								33b34ad7b8 
								
							 
						 
						
							
							
								
								feat: 運営のアクティビティが一定期間ない場合は通知+招待制に移行した際に通知 ( #14757 )  
							
							... 
							
							
							
							* feat: 運営のアクティビティが一定期間ない場合は通知+招待制に移行した際に通知
* fix misskey-js.api.md
* Revert "feat: 運営のアクティビティが一定期間ない場合は通知+招待制に移行した際に通知"
This reverts commit 3ab953bdf87f28411a1a10bce787a23d238cda80.
* 通知をやめてユーザ単位でのお知らせ機能に変更
* テスト用実装を戻す
* Update packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
* fix remove empty then
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> 
							
						 
						
							2024-10-13 20:32:12 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								5229f5de4d 
								
							 
						 
						
							
							
								
								refactor(backend): remove unnecessary .then  
							
							
							
						 
						
							2024-10-13 20:32:02 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff47fef572 
								
							 
						 
						
							
							
								
								feat: リモートサーバーのサーバー情報を収集しないオプション ( #14634 )  
							
							... 
							
							
							
							* wip
* wip
* Update FetchInstanceMetadataService.ts
* Update FetchInstanceMetadataService.ts
* Update types.ts 
							
						 
						
							2024-10-13 20:22:16 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45d42b8641 
								
							 
						 
						
							
							
								
								feat: ユーザーの名前に禁止ワードを設定できるように ( #14756 )  
							
							... 
							
							
							
							* wip
* 🎨 
* Enhance: モデレーター以上は制限の影響を受けないように
* refactor
* better error handling
* fix
* Revert "better error handling"
This reverts commit 5670b29cfa18a3894d0c2abfe0e5ef862e3b9ffa.
* error handling
* エラーが出ないのを修正
* translation
* Update Changelog
* status code
* ✌️ 
* モデレーター以上は影響ないことを明記
* 🎨 
* update changelog
* spdx
* Update update.ts
* refactor
* eliminate `screen name`
* remove untracked file
---------
Co-authored-by: KanariKanaru <93921745+kanarikanaru@users.noreply.github.com> 
							
						 
						
							2024-10-13 20:21:25 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								bd2cdd9363 
								
							 
						 
						
							
							
								
								restore missing hasPendingReceivedFollowRequest in navbar  
							
							
							
						 
						
							2024-10-13 01:09:49 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lhc_fl 
								
							 
						 
						
							
							
							
							
								
							
							
								edce54ad0f 
								
							 
						 
						
							
							
								
								add new i18n pendingFollowRequests  
							
							
							
						 
						
							2024-10-13 01:04:41 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lhc_fl 
								
							 
						 
						
							
							
							
							
								
							
							
								19a1f3111b 
								
							 
						 
						
							
							
								
								fix default followreq tab  
							
							
							
						 
						
							2024-10-13 01:04:41 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lhc_fl 
								
							 
						 
						
							
							
							
							
								
							
							
								0c03f9ead0 
								
							 
						 
						
							
							
								
								fix default followreq tab  
							
							
							
						 
						
							2024-10-13 01:04:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lhc_fl 
								
							 
						 
						
							
							
							
							
								
							
							
								0e6ba9ccd4 
								
							 
						 
						
							
							
								
								ux: should not show follow requests tab when have no pending sent follow req  
							
							
							
						 
						
							2024-10-13 01:04:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lhc_fl 
								
							 
						 
						
							
							
							
							
								
							
							
								1eacf0772c 
								
							 
						 
						
							
							
								
								FEAT: Allow users to view pending follow requests they sent  
							
							... 
							
							
							
							This commit implements the `following/requests/sent` interface firstly
implemented on Firefish, and provides a UI interface to view the pending
follow requests users sent. 
							
						 
						
							2024-10-13 01:04:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								45974a53f8 
								
							 
						 
						
							
							
								
								merge: try to avoid insert races in FederatedInstanceService ( !683 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/683 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-10-13 00:17:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								75ed3843fa 
								
							 
						 
						
							
							
								
								merge: CONTRIBUTING.md: fix command to generate new migration ( resolves   #727 ) ( !673 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/673 
Closes  #727 
Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se> 
							
						 
						
							2024-10-13 00:13:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								fdfb0faab0 
								
							 
						 
						
							
							
								
								merge: Add missing rejectReports field to show-instance API response ( !679 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/679 
Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se> 
							
						 
						
							2024-10-13 00:13:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								808963189e 
								
							 
						 
						
							
							
								
								Autogen seems to have generated this file  
							
							... 
							
							
							
							This doesn't seem related so I'm putting it in its own commit so it can be dropped easily if needed 
							
						 
						
							2024-10-13 01:03:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CenTdemeern1 
								
							 
						 
						
							
							
							
							
								
							
							
								5085c39440 
								
							 
						 
						
							
							
								
								Implement clickable notifications  
							
							... 
							
							
							
							I'm not sure about the get function pattern here as it doesn't include a value to base reactivity on; I might be too used to Svelte though and maybe that's fine 
							
						 
						
							2024-10-13 01:03:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								3093707469 
								
							 
						 
						
							
							
								
								merge: Prevent usernames from overflowing the reactions hover-list ( resolves   #737 ) ( !682 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/682 
Closes  #737 
Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se> 
							
						 
						
							2024-10-12 21:46:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								a44d58781f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.9.0  
							
							
							
						 
						
							2024-10-12 20:00:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								80fdb595a6 
								
							 
						 
						
							
							
								
								fix editing notes  
							
							
							
						 
						
							2024-10-12 19:45:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								14e21d00b9 
								
							 
						 
						
							
							
								
								honour prefers-reduced-motion in embeds  
							
							
							
						 
						
							2024-10-12 19:45:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								669e5c6ca0 
								
							 
						 
						
							
							
								
								merge: ignore stale users/show responses -  fixes   #741  ( !684 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/684 
Closes  #741 
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-10-12 17:57:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								bf6ca8efdc 
								
							 
						 
						
							
							
								
								also ignore stale *failed* responses -  #741  
							
							... 
							
							
							
							since `misskeyApi` doesn't pass us the request, we close over a copy
of the username we requested, to make sure it still matches the
current username value 
							
						 
						
							2024-10-12 18:23:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								5af38db74b 
								
							 
						 
						
							
							
								
								ignore stale users/show responses -  fixes   #741  
							
							... 
							
							
							
							* person starts typing "abcd"
* request for user "abcd" is sent to server
* person continues typing "ef"
* request for user "abcdef" is sent to server
* response for user "abcdef" arrives, icon for user "abcdef" is shown
* response for user "abcd" arrives, icon for user "abcd" was shown –
  with this commit, this response is ignored instead
This is not just "showing the wrong avatar", btw: `MkSignin` uses the
`user` variable to decide whether to use 2FA, so having the wrong data
in user can make a login attempt fail. 
							
						 
						
							2024-10-12 18:16:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								464fb22710 
								
							 
						 
						
							
							
								
								fix: accidental double backslash in DEFAULT_INFO_IMAGE_URL  
							
							
							
						 
						
							2024-10-12 11:41:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								06bd29f209 
								
							 
						 
						
							
							
								
								try to avoid insert races in FederatedInstanceService  
							
							... 
							
							
							
							Despite the cache, different processes can race to insert a row for
the same remote host.
This is particularly apparent in our unit tests, with
`test/unit/activitypub.ts` randomly failing.
This is a (somewhat clumsy) attempt at working around that race: trap
the "duplicate key value" error, and fetch the record.
Tests pass, with or without values in the cache. 
							
						 
						
							2024-10-12 10:57:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dakkar 
								
							 
						 
						
							
							
							
							
								
							
							
								98f1f30e72 
								
							 
						 
						
							
							
								
								fix "federation allowed" check in our code  
							
							
							
						 
						
							2024-10-12 09:35:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								a1375c8ab7 
								
							 
						 
						
							
							
								
								prevent usernames from overflowing the reactions hover-list  
							
							
							
						 
						
							2024-10-12 00:29:40 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								c4c69cd267 
								
							 
						 
						
							
							
								
								🎨  
							
							
							
						 
						
							2024-10-12 11:28:58 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FineArchs 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee08e9f51e 
								
							 
						 
						
							
							
								
								refactor: MkStickyContainerで<style />を使う ( #14755 )  
							
							... 
							
							
							
							* remove rootEL ref
* use css module
* use v-bind in css
* --MI prefix
* remove unused ref
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> 
							
						 
						
							2024-10-12 11:20:55 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								85bb1ff1db 
								
							 
						 
						
							
							
								
								🎨  
							
							
							
						 
						
							2024-10-12 11:18:26 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								824c51a19f 
								
							 
						 
						
							
							
								
								fix(frontend): fix style  
							
							... 
							
							
							
							Fix  #14754  
						
							2024-10-12 10:32:00 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								ef90f83917 
								
							 
						 
						
							
							
								
								Update index.d.ts  
							
							
							
						 
						
							2024-10-12 10:31:40 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									syuilo 
								
							 
						 
						
							
							
							
							
								
							
							
								a87a18f40d 
								
							 
						 
						
							
							
								
								Update about-misskey.vue  
							
							
							
						 
						
							2024-10-12 10:11:55 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								f68c0ac05d 
								
							 
						 
						
							
							
								
								fix: broken error images  
							
							
							
						 
						
							2024-10-11 22:06:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								adbea34c11 
								
							 
						 
						
							
							
								
								generate missing type for UserLite.isSilenced  
							
							
							
						 
						
							2024-10-11 14:10:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								b27b398717 
								
							 
						 
						
							
							
								
								fix calculation of instance-info.isSuspended when instance is null  
							
							
							
						 
						
							2024-10-11 14:07:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								148bf98f21 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/2024.9.0  
							
							... 
							
							
							
							# Conflicts:
#	packages/frontend/src/pages/instance-info.vue 
							
						 
						
							2024-10-11 14:06:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marie 
								
							 
						 
						
							
							
							
							
								
							
							
								f3e6b43ea4 
								
							 
						 
						
							
							
								
								merge: New logo ( !681 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/681 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-10-11 18:04:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								883168bc00 
								
							 
						 
						
							
							
								
								merge: Replace "suspend delivery" button with a toggle ( resolves   #725 ) ( !677 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/677 
Closes  #725 
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev> 
							
						 
						
							2024-10-11 18:03:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ruben 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69483bb55b 
								
							 
						 
						
							
							
								
								new logo  
							
							
							
						 
						
							2024-10-11 11:32:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								7837852149 
								
							 
						 
						
							
							
								
								copy iAmModerator check to other instance-info controls  
							
							
							
						 
						
							2024-10-11 11:25:10 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								66a88c89b5 
								
							 
						 
						
							
							
								
								fix TypeScript and ESLint errors in instance-info.vue  
							
							
							
						 
						
							2024-10-11 11:24:39 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								a39f5c92b4 
								
							 
						 
						
							
							
								
								add missing rejectReports field to show-instance response  
							
							
							
						 
						
							2024-10-11 10:21:32 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								f496d4b88b 
								
							 
						 
						
							
							
								
								re-implement suspension toggle to match other controls  
							
							
							
						 
						
							2024-10-11 10:16:57 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								5a49955064 
								
							 
						 
						
							
							
								
								fix typo in "Server is suspended due to no responding"  
							
							
							
						 
						
							2024-10-11 09:52:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								87a12c020f 
								
							 
						 
						
							
							
								
								convert "suspend deliver" button into a toggle  
							
							
							
						 
						
							2024-10-11 09:52:59 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hazelnoot 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2ea85d40 
								
							 
						 
						
							
							
								
								merge: Minor improvements to relation badges on user profiles ( !674 )  
							
							... 
							
							
							
							View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674 
Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net> 
							
						 
						
							2024-10-11 13:28:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									かっこかり 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f09d69773 
								
							 
						 
						
							
							
								
								fix(backend): キューのエラーログを簡略化するように ( #14748 )  
							
							... 
							
							
							
							* reduce federation log spam
* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces.
(cherry picked from commit ed0570110b20dd66f73583869e1c47786702e076b4d10aa8f8f62cd8941cd8e1e4890dd867c2089b5171ba7113a5316c06ed 
							
						 
						
							2024-10-11 21:29:03 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								777804605e 
								
							 
						 
						
							
							
								
								Bump version to 2024.10.1-beta.3  
							
							
							
						 
						
							2024-10-11 12:13:47 +00:00