From f82810cf1ba14c4718429bca2c0bf033012629c9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 May 2023 20:48:46 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore(frontend):=20=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E5=85=A8=E8=88=AC?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 1 + .../frontend/src/pages/settings/general.vue | 31 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 402eeac16e..b87f4d9cb4 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1035,6 +1035,7 @@ archive: "アーカイブ" channelArchiveConfirmTitle: "{name}をアーカイブしますか？" channelArchiveConfirmDescription: "アーカイブすると、チャンネル一覧や検索結果に表示されなくなり、新たな書き込みもできなくなります。" thisChannelArchived: "このチャンネルはアーカイブされています。" +displayOfNote: "ノートの表示" _serverRules: description: "新規登録前に表示する、サーバーの簡潔なルールを設定します。内容は利用規約の要約とすることを推奨します。" diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 0a53ed2c8d..be9ed0141a 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -42,7 +42,7 @@ - +
@@ -52,11 +52,28 @@ {{ i18n.ts.collapseRenotes }} {{ i18n.ts.enableAdvancedMfm }} {{ i18n.ts.enableAnimatedMfm }} + {{ i18n.ts.showGapBetweenNotesInTimeline }} + {{ i18n.ts.loadRawImages }} +
+ + + + + + + + +
+ + + + + +
+
{{ i18n.ts.reduceUiAnimation }} {{ i18n.ts.useBlurEffect }} {{ i18n.ts.useBlurEffectForModal }} - {{ i18n.ts.showGapBetweenNotesInTimeline }} - {{ i18n.ts.loadRawImages }} {{ i18n.ts.disableShowingAnimatedImages }} {{ i18n.ts.squareAvatars }} {{ i18n.ts.useSystemFont }} @@ -81,14 +98,6 @@ - - - - - - - -
From 63a0b7353ad0b072f441f6485e48a2499b1a048a Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 May 2023 20:56:46 +0900 Subject: [PATCH 2/6] =?UTF-8?q?chore(frontend):=20=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E5=85=A8=E8=88=AC?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/pages/settings/general.vue | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index be9ed0141a..88b5690f32 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -20,24 +20,10 @@ - {{ i18n.ts.showFixedPostForm }} - {{ i18n.ts.showFixedPostFormInChannel }} - - - -
-
- {{ i18n.ts.openImageInNewTab }} - {{ i18n.ts.enableInfiniteScroll }} - {{ i18n.ts.useReactionPickerForContextMenu }} -
- - - - - - +
+ {{ i18n.ts.showFixedPostForm }} + {{ i18n.ts.showFixedPostFormInChannel }}
@@ -56,6 +42,20 @@ {{ i18n.ts.loadRawImages }}
+ + + + + + + + + + + + + + @@ -122,27 +122,30 @@ - {{ i18n.ts.aiChanMode }} + + +
+
+ {{ i18n.ts.openImageInNewTab }} + {{ i18n.ts.enableInfiniteScroll }} + {{ i18n.ts.useReactionPickerForContextMenu }} +
+ + + + + + + + + + +
- - - - - - - - - - - - - - - - - - + + {{ i18n.ts.aiChanMode }} + {{ i18n.ts.deck }} From 7d1dde0f0476ebfe7ac1311cffeb5ffc897d9e57 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 May 2023 20:59:29 +0900 Subject: [PATCH 3/6] =?UTF-8?q?chore(frontend):=20=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E5=85=A8=E8=88=AC?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frontend/src/pages/settings/general.vue | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 88b5690f32..7c1522e059 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -40,6 +40,7 @@ {{ i18n.ts.enableAnimatedMfm }} {{ i18n.ts.showGapBetweenNotesInTimeline }} {{ i18n.ts.loadRawImages }} + {{ i18n.ts.useReactionPickerForContextMenu }}
@@ -66,6 +67,26 @@ + + + +
+ + + + + + + + + + + + + +
+ + @@ -101,26 +122,6 @@ - - - -
- - - - - - - - - - - - - -
- - @@ -128,7 +129,6 @@
{{ i18n.ts.openImageInNewTab }} {{ i18n.ts.enableInfiniteScroll }} - {{ i18n.ts.useReactionPickerForContextMenu }}
From 4dfe2c15b0f8f673f349d4b7db70c20fee6d73c4 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 7 May 2023 11:58:08 +0000 Subject: [PATCH 4/6] fix(backend): Fix #10786 --- packages/backend/src/server/web/UrlPreviewService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts index b3e193cd34..e61e92c623 100644 --- a/packages/backend/src/server/web/UrlPreviewService.ts +++ b/packages/backend/src/server/web/UrlPreviewService.ts @@ -70,10 +70,10 @@ export class UrlPreviewService { await summaly(url, { followRedirects: false, lang: lang ?? 'ja-JP', - agent: { + agent: this.config.proxy ? { http: this.httpRequestService.httpAgent, https: this.httpRequestService.httpsAgent, - }, + } : undefined, }); this.logger.succ(`Got preview of ${url}: ${summary.title}`); From 44ba2fd7cb65b94add7ad5c1f61baf54872153b0 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 7 May 2023 12:37:11 +0000 Subject: [PATCH 5/6] =?UTF-8?q?fix(client):=20Fix=20#10746=20NSFW=E3=83=A1?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=82=A2=E3=81=AE=E4=B8=8A=E3=81=AB=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=9F=EF=BD=A2=E3=82=82=E3=81=A3?= =?UTF-8?q?=E3=81=A8=E8=A6=8B=E3=82=8B=EF=BD=A3=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=81=8C=E6=8A=BC=E3=81=97=E3=81=A5=E3=82=89=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/frontend/src/components/MkNote.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d2a0032e3..027c369817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - Fix: AiScript APIのMk:dialogで何も返していなかったのをNULLを返すように修正 - Fix: 1:1ではない画像のリアクション通知バッジが左や上に寄ってしまっていたのを中央に来るように修正 - Fix: リアクションをホバーした時のユーザーリストで猫耳が切れてしまっていた問題を修正 +- Fix: NSFWメディアの上に表示された｢もっと見る｣ボタンが押しづらい問題を修正 ### Server - channel/searchのqueryが空の場合に全てのチャンネルを返すように変更 diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 4273af51e6..d95f8de311 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -695,6 +695,7 @@ function showReactions(): void { position: absolute; bottom: 0; left: 0; + z-index: 2; width: 100%; height: 64px; background: linear-gradient(0deg, var(--panel), var(--X15)); From b8b91b39f4d3efe809c364aa0810f6cca1cee3a2 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 7 May 2023 18:36:48 +0000 Subject: [PATCH 6/6] enhance(client): :art: gallery/:id/edit --- packages/frontend/src/pages/gallery/edit.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/pages/gallery/edit.vue b/packages/frontend/src/pages/gallery/edit.vue index 1fae7686e5..cafcee0c33 100644 --- a/packages/frontend/src/pages/gallery/edit.vue +++ b/packages/frontend/src/pages/gallery/edit.vue @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ -
+
{{ file.name }}
@@ -21,10 +21,12 @@ {{ i18n.ts.markAsSensitive }} - {{ i18n.ts.save }} - {{ i18n.ts.publish }} +
+ {{ i18n.ts.save }} + {{ i18n.ts.publish }} - {{ i18n.ts.delete }} + {{ i18n.ts.delete }} +