Merge remote-tracking branch 'misskey/develop' into develop

CHANGELOG.md

@@ -15,6 +15,7 @@ You should also include the user name that made the change.
 - Client: Add vi-VN language support
 
 ### Bugfixes
+- Server: リモートユーザーを正しくブロックできるように修正する @xianonn
 - Client: 一度作ったwebhookの設定画面を開こうとするとページがフリーズする @syuilo
 - Client: MiAuth認証ページが機能していない @syuilo
 

packages/backend/src/remote/activitypub/renderer/block.ts

@@ -7,7 +7,7 @@ import { Blocking } from '@/models/entities/blocking.js';
  * @param block The block to be rendered. The blockee relation must be loaded.
  */
 export function renderBlock(block: Blocking) {
-	if (block.blockee?.url == null) {
+	if (block.blockee?.uri == null) {
 		throw new Error('renderBlock: missing blockee uri');
 	}