natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
ThatOneCalculator 2022-07-21 23:43:30 -07:00
parent db97dff0cb 43ee600fb3
commit d2b0367e8f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

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

2
packages/backend/src/remote/activitypub/renderer/block.ts
View File

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