From 8577f104569a5ef53f3ec0552d4ed402a821ff2d 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: Thu, 1 Jan 2026 00:00:00 +0900
Subject: [PATCH 1/2] 2026 (#17052)
---
.github/ISSUE_TEMPLATE/01_bug-report.yml | 4 ++--
COPYING | 2 +-
packages/misskey-js/LICENSE | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.yml b/.github/ISSUE_TEMPLATE/01_bug-report.yml
index fd68e602dd..00da7e9a2a 100644
--- a/.github/ISSUE_TEMPLATE/01_bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug-report.yml
@@ -54,7 +54,7 @@ body:
* Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4
* Browser: Chrome 113.0.5672.126
* Server URL: misskey.example.com
- * Misskey: 2025.x.x
+ * Misskey: 2026.x.x
value: |
* Model and OS of the device(s):
* Browser:
@@ -74,7 +74,7 @@ body:
Examples:
* Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
- * Misskey: 2025.x.x
+ * Misskey: 2026.x.x
* Node: 20.x.x
* PostgreSQL: 18.x.x
* Redis: 7.x.x
diff --git a/COPYING b/COPYING
index 7635bfc913..a17c82c002 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
Unless otherwise stated this repository is
-Copyright © 2014-2025 syuilo and contributors
+Copyright © 2014-2026 syuilo and contributors
And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
diff --git a/packages/misskey-js/LICENSE b/packages/misskey-js/LICENSE
index 16352625db..d666d5ef7f 100644
--- a/packages/misskey-js/LICENSE
+++ b/packages/misskey-js/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2021-2025 syuilo and other contributors
+Copyright (c) 2021-2026 syuilo and other contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
From b5454cb2c460db2f3016d0ec788095454c7ff882 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: Thu, 1 Jan 2026 10:32:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix(frontend):=20=E7=99=BB=E9=8C=B2?=
=?UTF-8?q?=E6=97=A5=E3=81=AB=E3=82=88=E3=82=8B=E3=82=BD=E3=83=BC=E3=83=88?=
=?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AFpaginator=E5=81=B4=E3=81=AE?=
=?UTF-8?q?=E3=82=BD=E3=83=BC=E3=83=88=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99?=
=?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#17048)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(frontend): 登録日によるソートの場合はpaginator側のソートを使用するように
* Update Changelog
* fix lint
* refactor
---
CHANGELOG.md | 1 +
packages/frontend/src/components/MkDrive.vue | 27 +++++++++++++-------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 520cb109b0..88f3981473 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
- Enhance: ウィジェットの表示設定をプレビューを見ながら行えるように
- Enhance: ウィジェットの設定項目のラベルの多言語対応
- Fix: ドライブクリーナーでファイルを削除しても画面に反映されない問題を修正 #16061
+- Fix: ドライブのソートが「登録日（昇順）」の場合に正しく動作しない問題を修正
### Server
- Enhance: OAuthのクライアント情報取得（Client Information Discovery）において、IndieWeb Living Standard 11 July 2024で定義されているJSONドキュメント形式に対応しました
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index 314a776c54..71ffb252df 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -133,12 +133,12 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.loadMore }}
@@ -238,10 +238,9 @@ const filesPaginator = markRaw(new Paginator('drive/files', {
params: () => ({ // 自動でリロードしたくないためcomputedParamsは使わない
folderId: folder.value ? folder.value.id : null,
type: props.type,
- sort: sortModeSelect.value,
+ sort: ['-createdAt', '+createdAt'].includes(sortModeSelect.value) ? null : sortModeSelect.value,
}),
}));
-
const foldersPaginator = markRaw(new Paginator('drive/folders', {
limit: 30,
canFetchDetection: 'limit',
@@ -250,6 +249,16 @@ const foldersPaginator = markRaw(new Paginator('drive/folders', {
}),
}));
+const canFetchFiles = computed(() => !fetching.value && (filesPaginator.order.value === 'oldest' ? filesPaginator.canFetchNewer.value : filesPaginator.canFetchOlder.value));
+
+async function fetchMoreFiles() {
+ if (filesPaginator.order.value === 'oldest') {
+ filesPaginator.fetchNewer();
+ } else {
+ filesPaginator.fetchOlder();
+ }
+}
+
const filesTimeline = makeDateGroupedTimelineComputedRef(filesPaginator.items, 'month');
const shouldBeGroupedByDate = computed(() => ['+createdAt', '-createdAt'].includes(sortModeSelect.value));
@@ -260,10 +269,10 @@ watch(sortModeSelect, () => {
async function initialize() {
fetching.value = true;
- await Promise.all([
- foldersPaginator.init(),
- filesPaginator.init(),
- ]);
+ await foldersPaginator.reload();
+ filesPaginator.initialDirection = sortModeSelect.value === '-createdAt' ? 'newer' : 'older';
+ filesPaginator.order.value = sortModeSelect.value === '-createdAt' ? 'oldest' : 'newest';
+ await filesPaginator.reload();
fetching.value = false;
}