-
From 14d6734cb103d45ed29fdc374d174dfec67b3acc Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 4 May 2025 18:51:30 +0900
Subject: [PATCH 07/40] Fix MkPullToRefresh behaviour (#15944)
* Update MkPullToRefresh.vue
* Update MkPullToRefresh.vue
* Update MkPullToRefresh.vue
---
.../src/components/MkPullToRefresh.vue | 53 ++++++++++++-------
1 file changed, 33 insertions(+), 20 deletions(-)
diff --git a/packages/frontend/src/components/MkPullToRefresh.vue b/packages/frontend/src/components/MkPullToRefresh.vue
index 7b5335aa74..b0638db785 100644
--- a/packages/frontend/src/components/MkPullToRefresh.vue
+++ b/packages/frontend/src/components/MkPullToRefresh.vue
@@ -76,8 +76,8 @@ function unlockDownScroll() {
scrollEl.style.overscrollBehavior = 'contain';
}
-function moveStart(event: PointerEvent) {
- if (event.pointerType === 'mouse' && event.button !== 1) return;
+function moveStartByMouse(event: MouseEvent) {
+ if (event.button !== 1) return;
if (isRefreshing.value) return;
const scrollPos = scrollEl!.scrollTop;
@@ -88,27 +88,39 @@ function moveStart(event: PointerEvent) {
lockDownScroll();
- // マウスでのpull時、画面上のテキスト選択が発生したり、ブラウザの中クリックによる挙動が競合したりして画面がスクロールされたりするのを防ぐ
- window.document.body.setAttribute('inert', 'true');
+ event.preventDefault(); // 中クリックによるスクロール、テキスト選択などを防ぐ
isPulling.value = true;
startScreenY = getScreenY(event);
pullDistance.value = 0;
- // タッチデバイスでPointerEventを使うとなんか挙動がおかしいので、TouchEventとMouseEventを使い分ける
- if (event.pointerType === 'mouse') {
- window.addEventListener('mousemove', moving, { passive: true });
- window.addEventListener('mouseup', () => {
- window.removeEventListener('mousemove', moving);
- onPullRelease();
- }, { passive: true, once: true });
- } else {
- window.addEventListener('touchmove', moving, { passive: true });
- window.addEventListener('touchend', () => {
- window.removeEventListener('touchmove', moving);
- onPullRelease();
- }, { passive: true, once: true });
+ window.addEventListener('mousemove', moving, { passive: true });
+ window.addEventListener('mouseup', () => {
+ window.removeEventListener('mousemove', moving);
+ onPullRelease();
+ }, { passive: true, once: true });
+}
+
+function moveStartByTouch(event: TouchEvent) {
+ if (isRefreshing.value) return;
+
+ const scrollPos = scrollEl!.scrollTop;
+ if (scrollPos !== 0) {
+ unlockDownScroll();
+ return;
}
+
+ lockDownScroll();
+
+ isPulling.value = true;
+ startScreenY = getScreenY(event);
+ pullDistance.value = 0;
+
+ window.addEventListener('touchmove', moving, { passive: true });
+ window.addEventListener('touchend', () => {
+ window.removeEventListener('touchmove', moving);
+ onPullRelease();
+ }, { passive: true, once: true });
}
function moveBySystem(to: number): Promise\nYou can reuse these files when attaching them to notes, or you can upload files in advance to post later.
\nBe careful when deleting a file, as it will not be available in all places where it was used (such as notes, pages, avatars, banners, etc.).
\nYou can also create folders to organize your files." +scrollToClose: "Scroll to close" _chat: noMessagesYet: "No messages yet" newMessage: "New message" @@ -1425,6 +1426,7 @@ _settings: ifOff: "When turned off" enableSyncThemesBetweenDevices: "Synchronize installed themes across devices" enablePullToRefresh: "Pull to Refresh" + enablePullToRefresh_description: "When using a mouse, drag while pressing in the scrolling wheel." _chat: showSenderName: "Show sender's name" sendOnEnter: "Press Enter to send" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index a57d26c113..1c15fd48d1 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1348,6 +1348,7 @@ readonly: "唯讀" goToDeck: "回去甲板" federationJobs: "聯邦通訊作業" driveAboutTip: "在「雲端硬碟」中，會顯示過去上傳的檔案列表。
\n可以在附加到貼文時重新利用，或者事先上傳之後再用於發布。
\n請注意，刪除檔案後，之前使用過該檔案的所有地方（貼文、頁面、大頭貼、橫幅等）也會一併無法顯示。
\n也可以建立資料夾來整理檔案。" +scrollToClose: "用滾輪關閉" _chat: noMessagesYet: "尚無訊息" newMessage: "新訊息" @@ -1425,6 +1426,7 @@ _settings: ifOff: "關閉時" enableSyncThemesBetweenDevices: "在裝置之間同步已安裝的主題" enablePullToRefresh: "下拉更新" + enablePullToRefresh_description: "使用滑鼠，按下並拖曳滾輪。" _chat: showSenderName: "顯示發送者的名稱" sendOnEnter: "按下 Enter 發送訊息" From 080276e3e75cc0c57dc141a7826d6255759885ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]"
-
-
+ (null);
const top = ref(0);
const left = ref(0);
+const error = ref(false);
function showMenu(ev: MouseEvent) {
if (user.value == null) return;
@@ -92,19 +94,27 @@ function showMenu(ev: MouseEvent) {
os.popupMenu(menu, ev.currentTarget ?? ev.target).finally(cleanup);
}
-onMounted(() => {
+async function fetchUser() {
if (typeof props.q === 'object') {
user.value = props.q;
+ error.value = false;
} else {
- const query = props.q.startsWith('@') ?
+ const query: Omit = props.q.startsWith('@') ?
Misskey.acct.parse(props.q.substring(1)) :
{ userId: props.q };
misskeyApi('users/show', query).then(res => {
if (!props.showing) return;
user.value = res;
+ error.value = false;
+ }, () => {
+ error.value = true;
});
}
+}
+
+onMounted(() => {
+ fetchUser();
const rect = props.source.getBoundingClientRect();
const x = ((rect.left + (props.source.offsetWidth / 2)) - (300 / 2)) + window.scrollX;
From 6bbda4d67c42b94e5918fef755d9fae5d1cf13d5 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 5 May 2025 07:28:15 +0900
Subject: [PATCH 13/40] fix(frontend): make enableHorizontalSwipe default false
---
packages/frontend/src/preferences/def.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 37c7098511..96f43bb2f6 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -298,7 +298,7 @@ export const PREF_DEF = {
default: false,
},
enableHorizontalSwipe: {
- default: true,
+ default: false,
},
enablePullToRefresh: {
default: true,
From 57a1ac3dd09f1e1521d8066fa7547e5fce654e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
<67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Mon, 5 May 2025 14:28:54 +0900
Subject: [PATCH 14/40] =?UTF-8?q?fix(frontend):=20=E6=A8=AA=E3=82=B9?=
=?UTF-8?q?=E3=83=AF=E3=82=A4=E3=83=97=E3=81=AE=E6=8C=99=E5=8B=95=E6=94=B9?=
=?UTF-8?q?=E5=96=84=20(#15952)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/MkSwiper.vue | 27 ++++++++++++++-----
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/packages/frontend/src/components/MkSwiper.vue b/packages/frontend/src/components/MkSwiper.vue
index 1d0ffaea11..b66bfb0e9d 100644
--- a/packages/frontend/src/components/MkSwiper.vue
+++ b/packages/frontend/src/components/MkSwiper.vue
@@ -53,12 +53,12 @@ const MIN_SWIPE_DISTANCE = 20;
// スワイプ時の動作を発火する最小の距離
const SWIPE_DISTANCE_THRESHOLD = 70;
-// スワイプを中断するY方向の移動距離
-const SWIPE_ABORT_Y_THRESHOLD = 75;
-
// スワイプできる最大の距離
const MAX_SWIPE_DISTANCE = 120;
+// スワイプ方向を判定する角度の許容範囲（度数）
+const SWIPE_DIRECTION_ANGLE_THRESHOLD = 50;
+
// ▲ しきい値 ▲ //
let startScreenX: number | null = null;
@@ -69,6 +69,7 @@ const currentTabIndex = computed(() => props.tabs.findIndex(tab => tab.key === t
const pullDistance = ref(0);
const isSwipingForClass = ref(false);
let swipeAborted = false;
+let swipeDirectionLocked: 'horizontal' | 'vertical' | null = null;
function touchStart(event: TouchEvent) {
if (!prefer.r.enableHorizontalSwipe.value) return;
@@ -79,6 +80,7 @@ function touchStart(event: TouchEvent) {
startScreenX = event.touches[0].screenX;
startScreenY = event.touches[0].screenY;
+ swipeDirectionLocked = null; // スワイプ方向をリセット
}
function touchMove(event: TouchEvent) {
@@ -95,15 +97,24 @@ function touchMove(event: TouchEvent) {
let distanceX = event.touches[0].screenX - startScreenX;
let distanceY = event.touches[0].screenY - startScreenY;
- if (Math.abs(distanceY) > SWIPE_ABORT_Y_THRESHOLD) {
- swipeAborted = true;
+ // スワイプ方向をロック
+ if (!swipeDirectionLocked) {
+ const angle = Math.abs(Math.atan2(distanceY, distanceX) * (180 / Math.PI));
+ if (angle > 90 - SWIPE_DIRECTION_ANGLE_THRESHOLD && angle < 90 + SWIPE_DIRECTION_ANGLE_THRESHOLD) {
+ swipeDirectionLocked = 'vertical';
+ } else {
+ swipeDirectionLocked = 'horizontal';
+ }
+ }
+ // 縦方向のスワイプの場合は中断
+ if (swipeDirectionLocked === 'vertical') {
+ swipeAborted = true;
pullDistance.value = 0;
isSwiping.value = false;
window.setTimeout(() => {
isSwipingForClass.value = false;
}, 400);
-
return;
}
@@ -164,6 +175,8 @@ function touchEnd(event: TouchEvent) {
window.setTimeout(() => {
isSwipingForClass.value = false;
}, 400);
+
+ swipeDirectionLocked = null; // スワイプ方向をリセット
}
/** 横スワイプに関与する可能性のある要素を調べる */
@@ -190,7 +203,7 @@ watch(tabModel, (newTab, oldTab) => {
const newIndex = props.tabs.findIndex(tab => tab.key === newTab);
const oldIndex = props.tabs.findIndex(tab => tab.key === oldTab);
- if (oldIndex >= 0 && newIndex && oldIndex < newIndex) {
+ if (oldIndex >= 0 && newIndex >= 0 && oldIndex < newIndex) {
transitionName.value = 'swipeAnimationLeft';
} else {
transitionName.value = 'swipeAnimationRight';
From 45d6c090f26e80276894c43429f9b0b30bcf20de Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Mon, 5 May 2025 05:41:19 +0000
Subject: [PATCH 15/40] Bump version to 2025.5.0-alpha.2
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 308cfe0a23..eb42a78c30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.5.0-alpha.1",
+ "version": "2025.5.0-alpha.2",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index bf28a383b4..443d4f22d5 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.5.0-alpha.1",
+ "version": "2025.5.0-alpha.2",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From fc2e128fade36a2fa29d81b7e05932bc1135a733 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 5 May 2025 18:20:55 +0900
Subject: [PATCH 16/40] tweak ui style
---
packages/frontend/src/style.scss | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index 32db5cebf9..b7ca0cfd01 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -179,7 +179,12 @@ rt {
._spacer {
width: 100%;
max-width: min(var(--MI_SPACER-w, 100%), calc(100% - (var(--MI_SPACER-max, 24px) * 2)));
- margin: var(--MI_SPACER-max, 24px) auto;
+
+ /* marginを使って余白を表現すると、margin特有の親突き抜け仕様などが厄介になってくるので上下はpaddingを使う */
+ padding: var(--MI_SPACER-max, 24px) 0;
+ margin: 0 auto;
+
+ box-sizing: border-box;
container-type: inline-size;
/* 子に継承させない */
@@ -190,13 +195,13 @@ rt {
._forceShrinkSpacer ._spacer {
max-width: min(var(--MI_SPACER-w, 100%), calc(100% - (var(--MI_SPACER-min, 12px) * 2)));
- margin: var(--MI_SPACER-min, 12px) auto;
+ padding: var(--MI_SPACER-min, 12px) 0;
}
@container (max-width: 450px) {
._spacer {
max-width: min(var(--MI_SPACER-w, 100%), calc(100% - (var(--MI_SPACER-min, 12px) * 2)));
- margin: var(--MI_SPACER-min, 12px) auto;
+ padding: var(--MI_SPACER-min, 12px) 0;
}
}
From f6158abb683eab002d3e3cdf399a98adf8a425bb Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 5 May 2025 18:23:25 +0900
Subject: [PATCH 17/40] use sharp 0.33.5
Fix #15920
---
packages/backend/package.json | 2 +-
pnpm-lock.yaml | 221 +++++++++++++++++++++++++++++++++-
2 files changed, 216 insertions(+), 7 deletions(-)
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 71f301d430..a26a77c416 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -168,7 +168,7 @@
"rxjs": "7.8.2",
"sanitize-html": "2.16.0",
"secure-json-parse": "3.0.2",
- "sharp": "0.34.1",
+ "sharp": "0.33.5",
"semver": "7.7.1",
"slacc": "0.0.10",
"strict-event-emitter-types": "2.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4608ae78e9..7df9ec5566 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -394,8 +394,8 @@ importers:
specifier: 7.7.1
version: 7.7.1
sharp:
- specifier: 0.34.1
- version: 0.34.1
+ specifier: 0.33.5
+ version: 0.33.5
slacc:
specifier: 0.0.10
version: 0.0.10
@@ -2424,33 +2424,65 @@ packages:
resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==}
engines: {node: '>=18.18'}
+ '@img/sharp-darwin-arm64@0.33.5':
+ resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [darwin]
+
'@img/sharp-darwin-arm64@0.34.1':
resolution: {integrity: sha512-pn44xgBtgpEbZsu+lWf2KNb6OAf70X68k+yk69Ic2Xz11zHR/w24/U49XT7AeRwJ0Px+mhALhU5LPci1Aymk7A==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [darwin]
+ '@img/sharp-darwin-x64@0.33.5':
+ resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [darwin]
+
'@img/sharp-darwin-x64@0.34.1':
resolution: {integrity: sha512-VfuYgG2r8BpYiOUN+BfYeFo69nP/MIwAtSJ7/Zpxc5QF3KS22z8Pvg3FkrSFJBPNQ7mmcUcYQFBmEQp7eu1F8Q==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [darwin]
+ '@img/sharp-libvips-darwin-arm64@1.0.4':
+ resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
+ cpu: [arm64]
+ os: [darwin]
+
'@img/sharp-libvips-darwin-arm64@1.1.0':
resolution: {integrity: sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==}
cpu: [arm64]
os: [darwin]
+ '@img/sharp-libvips-darwin-x64@1.0.4':
+ resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
+ cpu: [x64]
+ os: [darwin]
+
'@img/sharp-libvips-darwin-x64@1.1.0':
resolution: {integrity: sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==}
cpu: [x64]
os: [darwin]
+ '@img/sharp-libvips-linux-arm64@1.0.4':
+ resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
+ cpu: [arm64]
+ os: [linux]
+
'@img/sharp-libvips-linux-arm64@1.1.0':
resolution: {integrity: sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==}
cpu: [arm64]
os: [linux]
+ '@img/sharp-libvips-linux-arm@1.0.5':
+ resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
+ cpu: [arm]
+ os: [linux]
+
'@img/sharp-libvips-linux-arm@1.1.0':
resolution: {integrity: sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==}
cpu: [arm]
@@ -2461,73 +2493,146 @@ packages:
cpu: [ppc64]
os: [linux]
+ '@img/sharp-libvips-linux-s390x@1.0.4':
+ resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
+ cpu: [s390x]
+ os: [linux]
+
'@img/sharp-libvips-linux-s390x@1.1.0':
resolution: {integrity: sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==}
cpu: [s390x]
os: [linux]
+ '@img/sharp-libvips-linux-x64@1.0.4':
+ resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
+ cpu: [x64]
+ os: [linux]
+
'@img/sharp-libvips-linux-x64@1.1.0':
resolution: {integrity: sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==}
cpu: [x64]
os: [linux]
+ '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+ resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
+ cpu: [arm64]
+ os: [linux]
+
'@img/sharp-libvips-linuxmusl-arm64@1.1.0':
resolution: {integrity: sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==}
cpu: [arm64]
os: [linux]
+ '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+ resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
+ cpu: [x64]
+ os: [linux]
+
'@img/sharp-libvips-linuxmusl-x64@1.1.0':
resolution: {integrity: sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==}
cpu: [x64]
os: [linux]
+ '@img/sharp-linux-arm64@0.33.5':
+ resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [linux]
+
'@img/sharp-linux-arm64@0.34.1':
resolution: {integrity: sha512-kX2c+vbvaXC6vly1RDf/IWNXxrlxLNpBVWkdpRq5Ka7OOKj6nr66etKy2IENf6FtOgklkg9ZdGpEu9kwdlcwOQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [linux]
+ '@img/sharp-linux-arm@0.33.5':
+ resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm]
+ os: [linux]
+
'@img/sharp-linux-arm@0.34.1':
resolution: {integrity: sha512-anKiszvACti2sGy9CirTlNyk7BjjZPiML1jt2ZkTdcvpLU1YH6CXwRAZCA2UmRXnhiIftXQ7+Oh62Ji25W72jA==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm]
os: [linux]
+ '@img/sharp-linux-s390x@0.33.5':
+ resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [s390x]
+ os: [linux]
+
'@img/sharp-linux-s390x@0.34.1':
resolution: {integrity: sha512-7s0KX2tI9mZI2buRipKIw2X1ufdTeaRgwmRabt5bi9chYfhur+/C1OXg3TKg/eag1W+6CCWLVmSauV1owmRPxA==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [s390x]
os: [linux]
+ '@img/sharp-linux-x64@0.33.5':
+ resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [linux]
+
'@img/sharp-linux-x64@0.34.1':
resolution: {integrity: sha512-wExv7SH9nmoBW3Wr2gvQopX1k8q2g5V5Iag8Zk6AVENsjwd+3adjwxtp3Dcu2QhOXr8W9NusBU6XcQUohBZ5MA==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [linux]
+ '@img/sharp-linuxmusl-arm64@0.33.5':
+ resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [arm64]
+ os: [linux]
+
'@img/sharp-linuxmusl-arm64@0.34.1':
resolution: {integrity: sha512-DfvyxzHxw4WGdPiTF0SOHnm11Xv4aQexvqhRDAoD00MzHekAj9a/jADXeXYCDFH/DzYruwHbXU7uz+H+nWmSOQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [linux]
+ '@img/sharp-linuxmusl-x64@0.33.5':
+ resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [linux]
+
'@img/sharp-linuxmusl-x64@0.34.1':
resolution: {integrity: sha512-pax/kTR407vNb9qaSIiWVnQplPcGU8LRIJpDT5o8PdAx5aAA7AS3X9PS8Isw1/WfqgQorPotjrZL3Pqh6C5EBg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [linux]
+ '@img/sharp-wasm32@0.33.5':
+ resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [wasm32]
+
'@img/sharp-wasm32@0.34.1':
resolution: {integrity: sha512-YDybQnYrLQfEpzGOQe7OKcyLUCML4YOXl428gOOzBgN6Gw0rv8dpsJ7PqTHxBnXnwXr8S1mYFSLSa727tpz0xg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [wasm32]
+ '@img/sharp-win32-ia32@0.33.5':
+ resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [ia32]
+ os: [win32]
+
'@img/sharp-win32-ia32@0.34.1':
resolution: {integrity: sha512-WKf/NAZITnonBf3U1LfdjoMgNO5JYRSlhovhRhMxXVdvWYveM4kM3L8m35onYIdh75cOMCo1BexgVQcCDzyoWw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [ia32]
os: [win32]
+ '@img/sharp-win32-x64@0.33.5':
+ resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+ cpu: [x64]
+ os: [win32]
+
'@img/sharp-win32-x64@0.34.1':
resolution: {integrity: sha512-hw1iIAHpNE8q3uMIRCgGOeDoz9KtFNarFLQclLxr/LK1VBkj8nby18RjFvr6aP7USRYAjTZW6yisnBWMX571Tw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -9605,6 +9710,10 @@ packages:
resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
hasBin: true
+ sharp@0.33.5:
+ resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
+ engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
sharp@0.34.1:
resolution: {integrity: sha512-1j0w61+eVxu7DawFJtnfYcvSv6qPFvfTaqzTQ2BLknVhHTwGS8sc63ZBF4rzkWMBVKybo4S5OBtDdZahh2A1xg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -12325,81 +12434,156 @@ snapshots:
'@humanwhocodes/retry@0.4.2': {}
+ '@img/sharp-darwin-arm64@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-darwin-arm64': 1.0.4
+ optional: true
+
'@img/sharp-darwin-arm64@0.34.1':
optionalDependencies:
'@img/sharp-libvips-darwin-arm64': 1.1.0
optional: true
+ '@img/sharp-darwin-x64@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-darwin-x64': 1.0.4
+ optional: true
+
'@img/sharp-darwin-x64@0.34.1':
optionalDependencies:
'@img/sharp-libvips-darwin-x64': 1.1.0
optional: true
+ '@img/sharp-libvips-darwin-arm64@1.0.4':
+ optional: true
+
'@img/sharp-libvips-darwin-arm64@1.1.0':
optional: true
+ '@img/sharp-libvips-darwin-x64@1.0.4':
+ optional: true
+
'@img/sharp-libvips-darwin-x64@1.1.0':
optional: true
+ '@img/sharp-libvips-linux-arm64@1.0.4':
+ optional: true
+
'@img/sharp-libvips-linux-arm64@1.1.0':
optional: true
+ '@img/sharp-libvips-linux-arm@1.0.5':
+ optional: true
+
'@img/sharp-libvips-linux-arm@1.1.0':
optional: true
'@img/sharp-libvips-linux-ppc64@1.1.0':
optional: true
+ '@img/sharp-libvips-linux-s390x@1.0.4':
+ optional: true
+
'@img/sharp-libvips-linux-s390x@1.1.0':
optional: true
+ '@img/sharp-libvips-linux-x64@1.0.4':
+ optional: true
+
'@img/sharp-libvips-linux-x64@1.1.0':
optional: true
+ '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+ optional: true
+
'@img/sharp-libvips-linuxmusl-arm64@1.1.0':
optional: true
+ '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+ optional: true
+
'@img/sharp-libvips-linuxmusl-x64@1.1.0':
optional: true
+ '@img/sharp-linux-arm64@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-arm64': 1.0.4
+ optional: true
+
'@img/sharp-linux-arm64@0.34.1':
optionalDependencies:
'@img/sharp-libvips-linux-arm64': 1.1.0
optional: true
+ '@img/sharp-linux-arm@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-arm': 1.0.5
+ optional: true
+
'@img/sharp-linux-arm@0.34.1':
optionalDependencies:
'@img/sharp-libvips-linux-arm': 1.1.0
optional: true
+ '@img/sharp-linux-s390x@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-s390x': 1.0.4
+ optional: true
+
'@img/sharp-linux-s390x@0.34.1':
optionalDependencies:
'@img/sharp-libvips-linux-s390x': 1.1.0
optional: true
+ '@img/sharp-linux-x64@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linux-x64': 1.0.4
+ optional: true
+
'@img/sharp-linux-x64@0.34.1':
optionalDependencies:
'@img/sharp-libvips-linux-x64': 1.1.0
optional: true
+ '@img/sharp-linuxmusl-arm64@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+ optional: true
+
'@img/sharp-linuxmusl-arm64@0.34.1':
optionalDependencies:
'@img/sharp-libvips-linuxmusl-arm64': 1.1.0
optional: true
+ '@img/sharp-linuxmusl-x64@0.33.5':
+ optionalDependencies:
+ '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+ optional: true
+
'@img/sharp-linuxmusl-x64@0.34.1':
optionalDependencies:
'@img/sharp-libvips-linuxmusl-x64': 1.1.0
optional: true
+ '@img/sharp-wasm32@0.33.5':
+ dependencies:
+ '@emnapi/runtime': 1.4.0
+ optional: true
+
'@img/sharp-wasm32@0.34.1':
dependencies:
'@emnapi/runtime': 1.4.0
optional: true
+ '@img/sharp-win32-ia32@0.33.5':
+ optional: true
+
'@img/sharp-win32-ia32@0.34.1':
optional: true
+ '@img/sharp-win32-x64@0.33.5':
+ optional: true
+
'@img/sharp-win32-x64@0.34.1':
optional: true
@@ -12663,7 +12847,7 @@ snapshots:
'@mapbox/node-pre-gyp@1.0.9(encoding@0.1.13)':
dependencies:
- detect-libc: 2.0.3
+ detect-libc: 2.0.4
https-proxy-agent: 5.0.1
make-dir: 3.1.0
node-fetch: 2.7.0(encoding@0.1.13)
@@ -16590,8 +16774,7 @@ snapshots:
detect-libc@2.0.3: {}
- detect-libc@2.0.4:
- optional: true
+ detect-libc@2.0.4: {}
detect-newline@3.1.0: {}
@@ -21044,10 +21227,36 @@ snapshots:
inherits: 2.0.4
safe-buffer: 5.2.1
+ sharp@0.33.5:
+ dependencies:
+ color: 4.2.3
+ detect-libc: 2.0.4
+ semver: 7.7.1
+ optionalDependencies:
+ '@img/sharp-darwin-arm64': 0.33.5
+ '@img/sharp-darwin-x64': 0.33.5
+ '@img/sharp-libvips-darwin-arm64': 1.0.4
+ '@img/sharp-libvips-darwin-x64': 1.0.4
+ '@img/sharp-libvips-linux-arm': 1.0.5
+ '@img/sharp-libvips-linux-arm64': 1.0.4
+ '@img/sharp-libvips-linux-s390x': 1.0.4
+ '@img/sharp-libvips-linux-x64': 1.0.4
+ '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+ '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+ '@img/sharp-linux-arm': 0.33.5
+ '@img/sharp-linux-arm64': 0.33.5
+ '@img/sharp-linux-s390x': 0.33.5
+ '@img/sharp-linux-x64': 0.33.5
+ '@img/sharp-linuxmusl-arm64': 0.33.5
+ '@img/sharp-linuxmusl-x64': 0.33.5
+ '@img/sharp-wasm32': 0.33.5
+ '@img/sharp-win32-ia32': 0.33.5
+ '@img/sharp-win32-x64': 0.33.5
+
sharp@0.34.1:
dependencies:
color: 4.2.3
- detect-libc: 2.0.3
+ detect-libc: 2.0.4
semver: 7.7.1
optionalDependencies:
'@img/sharp-darwin-arm64': 0.34.1
From f251ca8303a35151d287b02838434bf32489cf13 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Mon, 5 May 2025 09:31:57 +0000
Subject: [PATCH 18/40] Bump version to 2025.5.0-beta.0
---
package.json | 2 +-
packages/misskey-js/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index eb42a78c30..6d46d1c641 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "2025.5.0-alpha.2",
+ "version": "2025.5.0-beta.0",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 443d4f22d5..fa3ee0c029 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
{
"type": "module",
"name": "misskey-js",
- "version": "2025.5.0-alpha.2",
+ "version": "2025.5.0-beta.0",
"description": "Misskey SDK for JavaScript",
"license": "MIT",
"main": "./built/index.js",
From d476f7ff50d577419d233f2e8812bf15626d1488 Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Mon, 5 May 2025 20:00:42 +0900
Subject: [PATCH 19/40] =?UTF-8?q?chore(deps):=20sharp=E3=82=92=E5=9B=BA?=
=?UTF-8?q?=E5=AE=9A=20(#15957)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
cf. misskey-dev#15920
---
renovate.json5 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/renovate.json5 b/renovate.json5
index d2a491a7b4..7cae799e76 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -20,6 +20,8 @@
'@typescript/lib-webworker',
// https://github.com/misskey-dev/misskey/pull/15494#issuecomment-2660775258
'nsfwjs',
+ // https://github.com/misskey-dev/misskey/issues/15920
+ 'sharp',
],
packageRules: [
{
From 8959bfa1c0b558888aa7da207f8166092c51a353 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 6 May 2025 14:41:31 +0900
Subject: [PATCH 20/40] =?UTF-8?q?refactor(frontend):=20=E7=A9=BA/=E3=82=A8?=
=?UTF-8?q?=E3=83=A9=E3=83=BC=E7=B5=90=E6=9E=9C=E8=A1=A8=E7=A4=BA=E3=82=92?=
=?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88?=
=?UTF-8?q?=E5=8C=96=20(#15963)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* wip
* wip
* wip
* wip
* wip
* Update MkResult.vue
* Add storybook story for MkResult (#15964)
* Update MkResult.vue
---------
Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
---
.../frontend-embed/src/pages/not-found.vue | 4 --
packages/frontend-embed/src/style.scss | 7 ---
packages/frontend-shared/js/const.ts | 4 --
.../frontend/src/components/MkChannelList.vue | 8 +--
.../src/components/MkChatHistories.vue | 4 +-
.../frontend/src/components/MkFormDialog.vue | 6 +-
packages/frontend/src/components/MkNotes.vue | 8 +--
.../src/components/MkNotification.vue | 2 -
.../src/components/MkNotifications.vue | 8 +--
.../frontend/src/components/MkPagination.vue | 8 +--
.../frontend/src/components/MkTimeline.vue | 8 +--
.../frontend/src/components/MkUserList.vue | 8 +--
.../src/components/global/MkError.vue | 4 +-
.../global/MkResult.stories.impl.ts | 57 +++++++++++++++++++
.../src/components/global/MkResult.vue | 44 ++++++++++++++
packages/frontend/src/components/index.ts | 3 +
packages/frontend/src/instance.ts | 7 ---
packages/frontend/src/pages/_error_.vue | 4 +-
.../frontend/src/pages/admin/roles.role.vue | 8 +--
.../src/pages/chat/home.invitations.vue | 4 +-
.../src/pages/chat/home.joiningRooms.vue | 4 +-
.../src/pages/chat/home.ownedRooms.vue | 4 +-
.../frontend/src/pages/chat/room.search.vue | 6 +-
.../frontend/src/pages/drive.file.info.vue | 6 +-
packages/frontend/src/pages/favorites.vue | 8 +--
.../frontend/src/pages/follow-requests.vue | 8 +--
packages/frontend/src/pages/invite.vue | 30 +---------
packages/frontend/src/pages/list.vue | 9 +--
.../frontend/src/pages/my-antennas/index.vue | 8 +--
.../frontend/src/pages/my-lists/index.vue | 8 +--
packages/frontend/src/pages/not-found.vue | 6 +-
packages/frontend/src/pages/role.vue | 41 +------------
packages/frontend/src/pages/settings/apps.vue | 8 +--
.../src/pages/settings/mute-block.vue | 23 ++------
packages/frontend/src/style.scss | 12 ----
.../src/widgets/WidgetBirthdayFollowings.vue | 12 +---
packages/frontend/src/widgets/WidgetRss.vue | 6 +-
37 files changed, 140 insertions(+), 265 deletions(-)
create mode 100644 packages/frontend/src/components/global/MkResult.stories.impl.ts
create mode 100644 packages/frontend/src/components/global/MkResult.vue
diff --git a/packages/frontend-embed/src/pages/not-found.vue b/packages/frontend-embed/src/pages/not-found.vue
index 061254a39a..68897ca7e1 100644
--- a/packages/frontend-embed/src/pages/not-found.vue
+++ b/packages/frontend-embed/src/pages/not-found.vue
@@ -6,7 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -14,11 +13,8 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend-embed/src/style.scss b/packages/frontend-embed/src/style.scss
index b67f929933..035d687ee4 100644
--- a/packages/frontend-embed/src/style.scss
+++ b/packages/frontend-embed/src/style.scss
@@ -286,13 +286,6 @@ rt {
._fullinfo {
padding: 64px 32px;
text-align: center;
-
- > img {
- vertical-align: bottom;
- height: 128px;
- margin-bottom: 16px;
- border-radius: 16px;
- }
}
._link {
diff --git a/packages/frontend-shared/js/const.ts b/packages/frontend-shared/js/const.ts
index 84b5afe78f..8c49b41f4d 100644
--- a/packages/frontend-shared/js/const.ts
+++ b/packages/frontend-shared/js/const.ts
@@ -112,10 +112,6 @@ export const ROLE_POLICIES = [
'chatAvailability',
] as const;
-export const DEFAULT_SERVER_ERROR_IMAGE_URL = 'https://xn--931a.moe/assets/error.jpg';
-export const DEFAULT_NOT_FOUND_IMAGE_URL = 'https://xn--931a.moe/assets/not-found.jpg';
-export const DEFAULT_INFO_IMAGE_URL = 'https://xn--931a.moe/assets/info.jpg';
-
export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'border', 'font', 'blur', 'rainbow', 'sparkle', 'rotate', 'ruby', 'unixtime'];
export const MFM_PARAMS: Record = {
tada: ['speed=', 'delay='],
diff --git a/packages/frontend/src/components/MkChannelList.vue b/packages/frontend/src/components/MkChannelList.vue
index fdb7d2a1c4..d0b50f04f2 100644
--- a/packages/frontend/src/components/MkChannelList.vue
+++ b/packages/frontend/src/components/MkChannelList.vue
@@ -5,12 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
{{ i18n.ts.followsYou }}
@@ -85,6 +86,7 @@ const zIndex = os.claimZIndex('middle');
const user = ref
- ![]()
{{ i18n.ts.notFoundDescription }}
- ![]()
-
-
+ {{ i18n.ts.notFound }}
-
-
+{{ i18n.ts._chat.noHistory }}
-
- ![]()
-
+ {{ i18n.ts.nothing }}
-
- ![]()
-
-
+ {{ i18n.ts.noNotes }}
-
@@ -34,7 +29,6 @@ import type { Paging } from '@/components/MkPagination.vue';
import MkNote from '@/components/MkNote.vue';
import MkPagination from '@/components/MkPagination.vue';
import { i18n } from '@/i18n.js';
-import { infoImageUrl } from '@/instance.js';
const props = defineProps<{
pagination: Paging;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 9672efca0a..21104b41df 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -11,7 +11,6 @@ SPDX-License-Identifier: AGPL-3.0-only
![]()
![]()
-
-
diff --git a/packages/frontend/src/pages/chat/room.search.vue b/packages/frontend/src/pages/chat/room.search.vue
index 20b6e22a46..1e4eaf5639 100644
--- a/packages/frontend/src/pages/chat/room.search.vue
+++ b/packages/frontend/src/pages/chat/room.search.vue
@@ -24,10 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
- ![]()
-
-
+ {{ i18n.ts.noNotifications }}
-
-
-
+
- ![]()
-
- {{ i18n.ts.nothing }}
-
@@ -88,7 +83,6 @@ function concatMapWithArray(map: MisskeyEntityMap, entities: MisskeyEntity[]): M
+
+
diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts
index ec6ea7c569..33d3532c1d 100644
--- a/packages/frontend/src/components/index.ts
+++ b/packages/frontend/src/components/index.ts
@@ -24,6 +24,7 @@ import MkAd from './global/MkAd.vue';
import MkPageHeader from './global/MkPageHeader.vue';
import MkStickyContainer from './global/MkStickyContainer.vue';
import MkLazy from './global/MkLazy.vue';
+import MkResult from './global/MkResult.vue';
import PageWithHeader from './global/PageWithHeader.vue';
import PageWithAnimBg from './global/PageWithAnimBg.vue';
import SearchMarker from './global/SearchMarker.vue';
@@ -61,6 +62,7 @@ export const components = {
MkPageHeader: MkPageHeader,
MkStickyContainer: MkStickyContainer,
MkLazy: MkLazy,
+ MkResult: MkResult,
PageWithHeader: PageWithHeader,
PageWithAnimBg: PageWithAnimBg,
SearchMarker: SearchMarker,
@@ -92,6 +94,7 @@ declare module '@vue/runtime-core' {
MkPageHeader: typeof MkPageHeader;
MkStickyContainer: typeof MkStickyContainer;
MkLazy: typeof MkLazy;
+ MkResult: typeof MkResult;
PageWithHeader: typeof PageWithHeader;
PageWithAnimBg: typeof PageWithAnimBg;
SearchMarker: typeof SearchMarker;
diff --git a/packages/frontend/src/instance.ts b/packages/frontend/src/instance.ts
index e75e3dfd34..2943e60e43 100644
--- a/packages/frontend/src/instance.ts
+++ b/packages/frontend/src/instance.ts
@@ -7,7 +7,6 @@ import { computed, reactive } from 'vue';
import * as Misskey from 'misskey-js';
import { misskeyApi } from '@/utility/misskey-api.js';
import { miLocalStorage } from '@/local-storage.js';
-import { DEFAULT_INFO_IMAGE_URL, DEFAULT_NOT_FOUND_IMAGE_URL, DEFAULT_SERVER_ERROR_IMAGE_URL } from '@@/js/const.js';
// TODO: 他のタブと永続化されたstateを同期
@@ -30,12 +29,6 @@ if (providedAt > cachedAt) {
export const instance: Misskey.entities.MetaDetailed = reactive(cachedMeta ?? {});
-export const serverErrorImageUrl = computed(() => instance.serverErrorImageUrl ?? DEFAULT_SERVER_ERROR_IMAGE_URL);
-
-export const infoImageUrl = computed(() => instance.infoImageUrl ?? DEFAULT_INFO_IMAGE_URL);
-
-export const notFoundImageUrl = computed(() => instance.notFoundImageUrl ?? DEFAULT_NOT_FOUND_IMAGE_URL);
-
export const isEnabledUrlPreview = computed(() => instance.enableUrlPreview ?? true);
export async function fetchInstance(force = false): Promise {
diff --git a/packages/frontend/src/pages/_error_.vue b/packages/frontend/src/pages/_error_.vue
index 791267f5ca..d656f93fa3 100644
--- a/packages/frontend/src/pages/_error_.vue
+++ b/packages/frontend/src/pages/_error_.vue
@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/chat/home.ownedRooms.vue b/packages/frontend/src/pages/chat/home.ownedRooms.vue
index ce7da15563..9a7ae5dd72 100644
--- a/packages/frontend/src/pages/chat/home.ownedRooms.vue
+++ b/packages/frontend/src/pages/chat/home.ownedRooms.vue
@@ -8,9 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- ![]()
+ ![]()
{{ i18n.ts.assign }}
-
-
-
diff --git a/packages/frontend/src/pages/chat/home.joiningRooms.vue b/packages/frontend/src/pages/chat/home.joiningRooms.vue
index f9fd6bfd55..8887aec3d5 100644
--- a/packages/frontend/src/pages/chat/home.joiningRooms.vue
+++ b/packages/frontend/src/pages/chat/home.joiningRooms.vue
@@ -8,9 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.pageLoadError }}
{{ i18n.ts.pageLoadErrorDescription }}
@@ -36,7 +36,7 @@ import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { miLocalStorage } from '@/local-storage.js';
import { prefer } from '@/preferences.js';
-import { serverErrorImageUrl } from '@/instance.js';
+import { instance } from '@/instance.js';
const props = withDefaults(defineProps<{
error?: Error;
diff --git a/packages/frontend/src/pages/admin/roles.role.vue b/packages/frontend/src/pages/admin/roles.role.vue
index 69645957bf..61d72777b8 100644
--- a/packages/frontend/src/pages/admin/roles.role.vue
+++ b/packages/frontend/src/pages/admin/roles.role.vue
@@ -24,12 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
@@ -70,7 +65,6 @@ import MkButton from '@/components/MkButton.vue';
import MkUserCardMini from '@/components/MkUserCardMini.vue';
import MkInfo from '@/components/MkInfo.vue';
import MkPagination from '@/components/MkPagination.vue';
-import { infoImageUrl } from '@/instance.js';
import { useRouter } from '@/router.js';
const router = useRouter();
diff --git a/packages/frontend/src/pages/chat/home.invitations.vue b/packages/frontend/src/pages/chat/home.invitations.vue
index 82b22ea9dd..3cbe186e9d 100644
--- a/packages/frontend/src/pages/chat/home.invitations.vue
+++ b/packages/frontend/src/pages/chat/home.invitations.vue
@@ -27,9 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+ {{ i18n.ts._chat.noInvitations }}
-
-
+ {{ i18n.ts._chat.noRooms }}
-
-
+ {{ i18n.ts._chat.noRooms }}
-
- ![]()
-
+ {{ i18n.ts.notFound }}
-
- ![]()
-
+ {{ i18n.ts.nothing }}
-
- ![]()
-
-
+ {{ i18n.ts.noNotes }}
-
- ![]()
-
-
+ {{ i18n.ts.noFollowRequests }}
-
@@ -48,7 +43,6 @@ import { userPage, acct } from '@/filters/user.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
-import { infoImageUrl } from '@/instance.js';
import { $i } from '@/i.js';
const paginationComponent = useTemplateRef('paginationComponent');
diff --git a/packages/frontend/src/pages/invite.vue b/packages/frontend/src/pages/invite.vue
index cc114ae9b3..406c08bcf2 100644
--- a/packages/frontend/src/pages/invite.vue
+++ b/packages/frontend/src/pages/invite.vue
@@ -6,13 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- ![]()
-
+
-
- {{ i18n.ts.nothing }}
-
-
@@ -43,7 +37,7 @@ import MkButton from '@/components/MkButton.vue';
import MkPagination from '@/components/MkPagination.vue';
import MkInviteCode from '@/components/MkInviteCode.vue';
import { definePage } from '@/page.js';
-import { serverErrorImageUrl, instance } from '@/instance.js';
+import { instance } from '@/instance.js';
import { $i } from '@/i.js';
const pagingComponent = useTemplateRef('pagingComponent');
@@ -96,23 +90,3 @@ definePage(() => ({
icon: 'ti ti-user-plus',
}));
-
-
diff --git a/packages/frontend/src/pages/list.vue b/packages/frontend/src/pages/list.vue
index e9e3c79be5..4368aff8be 100644
--- a/packages/frontend/src/pages/list.vue
+++ b/packages/frontend/src/pages/list.vue
@@ -6,13 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
- ![]()
-
+ - - {{ i18n.ts.nothing }} -
-
@@ -42,7 +36,6 @@ import { i18n } from '@/i18n.js';
import MkUserCardMini from '@/components/MkUserCardMini.vue';
import MkButton from '@/components/MkButton.vue';
import { definePage } from '@/page.js';
-import { serverErrorImageUrl } from '@/instance.js';
const props = defineProps<{
listId: string;
diff --git a/packages/frontend/src/pages/my-antennas/index.vue b/packages/frontend/src/pages/my-antennas/index.vue
index 6f623abb64..95a3108e3a 100644
--- a/packages/frontend/src/pages/my-antennas/index.vue
+++ b/packages/frontend/src/pages/my-antennas/index.vue
@@ -7,12 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.add }}
@@ -32,7 +27,6 @@ import MkButton from '@/components/MkButton.vue';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { antennasCache } from '@/cache.js';
-import { infoImageUrl } from '@/instance.js';
const antennas = computed(() => antennasCache.value.value ?? []);
diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue
index c974f3afc7..41afabff99 100644
--- a/packages/frontend/src/pages/my-lists/index.vue
+++ b/packages/frontend/src/pages/my-lists/index.vue
@@ -7,12 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
- ![]()
-
- {{ i18n.ts.nothing }}
-
- {{ i18n.ts.createList }}
@@ -35,7 +30,6 @@ import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { userListsCache } from '@/cache.js';
-import { infoImageUrl } from '@/instance.js';
import { ensureSignin } from '@/i.js';
const $i = ensureSignin();
diff --git a/packages/frontend/src/pages/not-found.vue b/packages/frontend/src/pages/not-found.vue
index 684a3bb5bd..305518f64a 100644
--- a/packages/frontend/src/pages/not-found.vue
+++ b/packages/frontend/src/pages/not-found.vue
@@ -5,10 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
@@ -37,13 +25,11 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
diff --git a/packages/frontend/src/pages/settings/apps.vue b/packages/frontend/src/pages/settings/apps.vue
index c72179b9a1..33c17e5d7f 100644
--- a/packages/frontend/src/pages/settings/apps.vue
+++ b/packages/frontend/src/pages/settings/apps.vue
@@ -6,12 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
@@ -63,7 +58,6 @@ import { definePage } from '@/page.js';
import MkKeyValue from '@/components/MkKeyValue.vue';
import MkButton from '@/components/MkButton.vue';
import MkFolder from '@/components/MkFolder.vue';
-import { infoImageUrl } from '@/instance.js';
const list = ref>();
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue
index fc9cd8f892..7c2376249e 100644
--- a/packages/frontend/src/pages/settings/mute-block.vue
+++ b/packages/frontend/src/pages/settings/mute-block.vue
@@ -69,12 +69,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.mutedUsers }} ({{ i18n.ts.renote }})
-
-
-
+
- ![]()
-
- {{ i18n.ts.nothing }}
-
-
@@ -17,7 +14,6 @@ import { computed } from 'vue';
import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import { pleaseLogin } from '@/utility/please-login.js';
-import { notFoundImageUrl } from '@/instance.js';
const props = defineProps<{
showLoginPopup?: boolean;
diff --git a/packages/frontend/src/pages/role.vue b/packages/frontend/src/pages/role.vue
index 82e5999406..9d01edb255 100644
--- a/packages/frontend/src/pages/role.vue
+++ b/packages/frontend/src/pages/role.vue
@@ -6,30 +6,18 @@ SPDX-License-Identifier: AGPL-3.0-only
- ![]()
-
+ {{ i18n.ts.notFoundDescription }}
-
-
- ![]()
-
+ - - {{ error }} -
-{{ role.description }}
- ![]()
-
+ {{ i18n.ts.nothing }}
-
- ![]()
-
+ {{ i18n.ts.nothing }}
-
- ![]()
-
-
+ {{ i18n.ts.nothing }}
-
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
@@ -105,12 +100,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.mutedUsers }}
-
- ({
justify-content: center;
align-items: center;
}
-
-.bdayFFallbackImage {
- height: 96px;
- width: auto;
- max-width: 90%;
- margin-bottom: 8px;
- border-radius: var(--MI-radius);
-}
diff --git a/packages/frontend/src/widgets/WidgetRss.vue b/packages/frontend/src/widgets/WidgetRss.vue
index 132eb0a629..2594262df1 100644
--- a/packages/frontend/src/widgets/WidgetRss.vue
+++ b/packages/frontend/src/widgets/WidgetRss.vue
@@ -11,10 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
@@ -143,12 +133,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.blockedUsers }}
-
-
@@ -32,7 +31,6 @@ import type { GetFormResultType } from '@/utility/form.js';
import MkContainer from '@/components/MkContainer.vue';
import { misskeyApi } from '@/utility/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { infoImageUrl } from '@/instance.js';
import { $i } from '@/i.js';
const name = i18n.ts._widgets.birthdayFollowings;
@@ -134,12 +132,4 @@ defineExpose
- ![]()
-
-
+ {{ i18n.ts.noUsers }}
-
@@ -186,7 +171,7 @@ import { i18n } from '@/i18n.js';
import { definePage } from '@/page.js';
import MkUserCardMini from '@/components/MkUserCardMini.vue';
import * as os from '@/os.js';
-import { instance, infoImageUrl } from '@/instance.js';
+import { instance } from '@/instance.js';
import { ensureSignin } from '@/i.js';
import MkInfo from '@/components/MkInfo.vue';
import MkFolder from '@/components/MkFolder.vue';
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index b7ca0cfd01..341f5cb621 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -486,18 +486,6 @@ rt {
}
}
-._fullinfo {
- padding: 64px 32px;
- text-align: center;
-
- > img {
- vertical-align: bottom;
- height: 128px;
- margin-bottom: 16px;
- border-radius: 16px;
- }
-}
-
._link {
color: var(--MI_THEME-link);
}
diff --git a/packages/frontend/src/widgets/WidgetBirthdayFollowings.vue b/packages/frontend/src/widgets/WidgetBirthdayFollowings.vue
index 6fe743aed2..4790f143cb 100644
--- a/packages/frontend/src/widgets/WidgetBirthdayFollowings.vue
+++ b/packages/frontend/src/widgets/WidgetBirthdayFollowings.vue
@@ -15,8 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- ![]()
-
{{ i18n.ts.nothing }}
+
- ![]()
-
+ {{ i18n.ts.nothing }}
-
+
![]()
-
- ![]()
+
+
+
{{ props.text ?? (type === 'empty' ? i18n.ts.nothing : type === 'notFound' ? i18n.ts.notFound : null) }}
+
+ {{ props.text ?? (type === 'empty' ? i18n.ts.nothing : type === 'notFound' ? i18n.ts.notFound : null) }}
+
-
+
+ {{ i18n.ts.retry }}
+
diff --git a/packages/frontend/src/components/global/MkResult.vue b/packages/frontend/src/components/global/MkResult.vue
index 6990d69bd3..89ac2eb3d3 100644
--- a/packages/frontend/src/components/global/MkResult.vue
+++ b/packages/frontend/src/components/global/MkResult.vue
@@ -4,37 +4,56 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-$S;&&~w;Z_E6@<2>X4zW={H
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
- ![]()
- {{ i18n.ts.retry }}
-
-{{ i18n.ts.somethingHappened }}
-
- ![]()
-
- ![]()
-
+
+
+
+
+
diff --git a/packages/frontend/src/preferences/utility.ts b/packages/frontend/src/preferences/utility.ts
index adba908c3c..af5b178df6 100644
--- a/packages/frontend/src/preferences/utility.ts
+++ b/packages/frontend/src/preferences/utility.ts
@@ -74,12 +74,17 @@ export function getPreferencesProfileMenu(): MenuItem[] {
action: () => {
importProfile();
},
+ }, {
+ type: 'divider',
+ }, {
+ type: 'link',
+ text: i18n.ts._preferencesProfile.manageProfiles + '...',
+ icon: 'ti ti-settings-cog',
+ to: '/settings/profiles',
}];
if (prefer.s.devMode) {
menu.push({
- type: 'divider',
- }, {
text: 'Copy profile as text',
icon: 'ti ti-clipboard',
action: () => {
@@ -145,17 +150,30 @@ export async function cloudBackup() {
});
}
-export async function restoreFromCloudBackup() {
- if ($i == null) return;
-
- // TODO: 更新日時でソートして取得したい
+export async function listCloudBackups() {
const keys = await misskeyApi('i/registry/keys', {
scope: ['client', 'preferences', 'backups'],
});
- if (_DEV_) console.log(keys);
+ return keys.map(k => ({
+ name: k,
+ }));
+}
- if (keys.length === 0) {
+export async function deleteCloudBackup(key: string) {
+ await os.apiWithDialog('i/registry/remove', {
+ scope: ['client', 'preferences', 'backups'],
+ key,
+ });
+}
+
+export async function restoreFromCloudBackup() {
+ if ($i == null) return;
+
+ // TODO: 更新日時でソートしたい
+ const backups = await listCloudBackups();
+
+ if (backups.length === 0) {
os.alert({
type: 'warning',
title: i18n.ts._preferencesBackup.noBackupsFoundTitle,
@@ -166,9 +184,9 @@ export async function restoreFromCloudBackup() {
const select = await os.select({
title: i18n.ts._preferencesBackup.selectBackupToRestore,
- items: keys.map(k => ({
- text: k,
- value: k,
+ items: backups.map(backup => ({
+ text: backup.name,
+ value: backup.name,
})),
});
if (select.canceled) return;
diff --git a/packages/frontend/src/router.definition.ts b/packages/frontend/src/router.definition.ts
index d8bdbb7d02..462b8e713f 100644
--- a/packages/frontend/src/router.definition.ts
+++ b/packages/frontend/src/router.definition.ts
@@ -180,6 +180,10 @@ export const ROUTE_DEF = [{
path: '/custom-css',
name: 'preferences',
component: page(() => import('@/pages/settings/custom-css.vue')),
+ }, {
+ path: '/profiles',
+ name: 'profiles',
+ component: page(() => import('@/pages/settings/profiles.vue')),
}, {
path: '/accounts',
name: 'profile',
From 921b13c26fca58d752a6105ed9bdd6664acd480a Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 6 May 2025 21:49:10 +0900
Subject: [PATCH 31/40] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/components/global/MkResult.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/frontend/src/components/global/MkResult.vue b/packages/frontend/src/components/global/MkResult.vue
index 0cba254358..dda35babdc 100644
--- a/packages/frontend/src/components/global/MkResult.vue
+++ b/packages/frontend/src/components/global/MkResult.vue
@@ -88,8 +88,8 @@ const props = defineProps<{
}
.icon {
- width: 64px;
- height: 64px;
+ width: 50px;
+ height: 50px;
margin: 0 auto;
color: var(--MI_THEME-accent);
}
From cdd131d542a9f8ef09870a65b1e91b647002f89a Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 7 May 2025 08:55:42 +0900
Subject: [PATCH 32/40] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/ui-icons.afdesign | Bin 54363 -> 59413 bytes
.../src/components/global/MkResult.vue | 49 +----------
.../src/components/global/MkSystemIcon.vue | 76 ++++++++++++++++++
packages/frontend/src/components/index.ts | 3 +
4 files changed, 82 insertions(+), 46 deletions(-)
create mode 100644 packages/frontend/src/components/global/MkSystemIcon.vue
diff --git a/assets/ui-icons.afdesign b/assets/ui-icons.afdesign
index e36bfcd3ca9823a330f6c1acc9ccfeb45cc4528c..79350f51d91a588ecb728921c950a31319d1bdf0 100644
GIT binary patch
literal 59413
zcma(2by!s2`#lcN3`0tHBb`d8NVjxJNtcAQ(nEK5cSs3{fI&-#LkfsUmw
+ ![]()
+
+ ![]()
+
+ ![]()
+
-
+ {{ props.text ?? (type === 'empty' ? i18n.ts.nothing : type === 'notFound' ? i18n.ts.notFound : null) }}
- {{ props.text ?? (type === 'empty' ? i18n.ts.nothing : type === 'notFound' ? i18n.ts.notFound : type === 'error' ? i18n.ts.somethingHappened : null) }}
+