Merge branch 'develop' into fix-signout

.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

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Enhance: ウィジェットの設定項目のラベルの多言語対応
 - Enhance: アカウント管理ページで、全てのアカウントから一括でログアウトできるように
 - Fix: ドライブクリーナーでファイルを削除しても画面に反映されない問題を修正 #16061
+- Fix: ドライブのソートが「登録日（昇順）」の場合に正しく動作しない問題を修正
 - Fix: ログアウトボタンを押下するとすべてのアカウントからログアウトする問題を修正
 - Fix: アカウント管理ページで、アカウントの追加・削除を行ってもリストに反映されない問題を修正
 

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.
 

packages/frontend/src/components/MkDrive.vue

@@ -133,12 +133,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</TransitionGroup>
 
 			<MkButton
-				v-show="filesPaginator.canFetchOlder.value"
-				v-appear="shouldEnableInfiniteScroll ? filesPaginator.fetchOlder : null"
+				v-show="canFetchFiles"
+				v-appear="shouldEnableInfiniteScroll ? fetchMoreFiles : null"
 				:class="$style.loadMore"
 				primary
 				rounded
-				@click="filesPaginator.fetchOlder()"
+				@click="fetchMoreFiles"
 			>{{ i18n.ts.loadMore }}</MkButton>
 
 			<div v-if="filesPaginator.items.value.length == 0 && foldersPaginator.items.value.length == 0 && !fetching" :class="$style.empty">
@@ -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;
 }
 

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