CHANGELOG.md

@@ -4,18 +4,11 @@
 -
 
 ### Client
-- Feat: マウスでもタイムラインを引っ張って更新できるように
-  - アクセシビリティ設定からオフにすることもできます
-- Enhance: タイムラインのパフォーマンスを向上
+-
 
 ### Server
 - Enhance: 凍結されたユーザのノートが各種タイムラインで表示されないように `#15775`
 - Enhance: 連合先のソフトウェア及びバージョン名により配信停止を行えるように `#15727`
-- Enhance: 2025.4.1 で追加されたインデックスの再生成をノートの追加しながら行えるようになりました。 `#15915`
-  - `MISSKEY_MIGRATION_CREATE_INDEX_CONCURRENTLY` 環境変数を `1` にセットしていると、巨大なテーブルの既存のカラムに関するインデックス再生成が`CREATE INDEX CONCURRENTLY`を使用するようになりました。
-  - 複数のサーバープロセスをクラスタリングしているサーバーにおいて、一部のプロセスが起動している状態でこのオプションを有効にしてマイグレーションすることにより、ダウンタイムを削減することができます。
-  - ただし、このオプションを有効にする場合、インデックスの作成にかかる時間が倍~3倍以上になることがあります。
-  - また、大きなインスタンスである場合にはインデックスの作成に失敗し、複数回再試行する必要がある可能性があります。
 
 ## 2025.4.1
 

locales/index.d.ts

@@ -5709,10 +5709,6 @@ export interface Locale extends ILocale {
          * デバイス間でインストールしたテーマを同期
          */
         "enableSyncThemesBetweenDevices": string;
-        /**
-         * ひっぱって更新
-         */
-        "enablePullToRefresh": string;
         "_chat": {
             /**
              * 送信者の名前を表示

locales/ja-JP.yml

@@ -1427,7 +1427,6 @@ _settings:
   ifOn: "オンのとき"
   ifOff: "オフのとき"
   enableSyncThemesBetweenDevices: "デバイス間でインストールしたテーマを同期"
-  enablePullToRefresh: "ひっぱって更新"
 
   _chat:
     showSenderName: "送信者の名前を表示"

packages/backend/migration/1745378064470-composite-note-index.js

@@ -3,25 +3,11 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { isConcurrentIndexMigrationEnabled } from "./js/migration-config.js";
-
 export class CompositeNoteIndex1745378064470 {
 	name = 'CompositeNoteIndex1745378064470';
-	transaction = isConcurrentIndexMigrationEnabled() ? false : undefined;
 
 	async up(queryRunner) {
-		const concurrently = isConcurrentIndexMigrationEnabled();
-
-		if (concurrently) {
-			const hasValidIndex = await queryRunner.query(`SELECT indisvalid FROM pg_index INNER JOIN pg_class ON pg_index.indexrelid = pg_class.oid WHERE pg_class.relname = 'IDX_724b311e6f883751f261ebe378'`);
-			if (!hasValidIndex || hasValidIndex[0].indisvalid !== true) {
-				await queryRunner.query(`DROP INDEX IF EXISTS "IDX_724b311e6f883751f261ebe378"`);
-				await queryRunner.query(`CREATE INDEX CONCURRENTLY "IDX_724b311e6f883751f261ebe378" ON "note" ("userId", "id" DESC)`);
-			}
-		} else {
-			await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_724b311e6f883751f261ebe378" ON "note" ("userId", "id" DESC)`);
-		}
-
+		await queryRunner.query(`CREATE INDEX "IDX_724b311e6f883751f261ebe378" ON "note" ("userId", "id" DESC)`);
 		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_5b87d9d19127bd5d92026017a7"`);
 		// Flush all cached Linear Scan Plans and redo statistics for composite index
 		// this is important for Postgres to learn that even in highly complex queries, using this index first can reduce the result set significantly
@@ -29,8 +15,7 @@ export class CompositeNoteIndex1745378064470 {
 	}
 
 	async down(queryRunner) {
-		const mayConcurrently = isConcurrentIndexMigrationEnabled() ? 'CONCURRENTLY' : '';
 		await queryRunner.query(`DROP INDEX IF EXISTS "IDX_724b311e6f883751f261ebe378"`);
-		await queryRunner.query(`CREATE INDEX ${mayConcurrently} "IDX_5b87d9d19127bd5d92026017a7" ON "note" ("userId")`);
+		await queryRunner.query(`CREATE INDEX "IDX_5b87d9d19127bd5d92026017a7" ON "note" ("userId")`);
 	}
 }

packages/backend/migration/js/migration-config.js

@@ -1,8 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export function isConcurrentIndexMigrationEnabled() {
-	return process.env.MISSKEY_MIGRATION_CREATE_INDEX_CONCURRENTLY === '1';
-}

packages/backend/ormconfig.js

@@ -1,7 +1,6 @@
 import { DataSource } from 'typeorm';
 import { loadConfig } from './built/config.js';
 import { entities } from './built/postgres.js';
-import { isConcurrentIndexMigrationEnabled } from "./migration/js/migration-config.js";
 
 const config = loadConfig();
 
@@ -15,5 +14,4 @@ export default new DataSource({
 	extra: config.db.extra,
 	entities: entities,
 	migrations: ['migration/*.js'],
-	migrationsTransactionMode: isConcurrentIndexMigrationEnabled() ? 'each' : 'all',
 });

packages/backend/src/GlobalModule.ts

@@ -24,13 +24,8 @@ const $config: Provider = {
 const $db: Provider = {
 	provide: DI.db,
 	useFactory: async (config) => {
-		try {
-			const db = createPostgresDataSource(config);
-			return await db.initialize();
-		} catch (e) {
-			console.log(e);
-			throw e;
-		}
+		const db = createPostgresDataSource(config);
+		return await db.initialize();
 	},
 	inject: [DI.config],
 };

packages/backend/src/models/Note.ts

@@ -10,16 +10,6 @@ import { MiUser } from './User.js';
 import { MiChannel } from './Channel.js';
 import type { MiDriveFile } from './DriveFile.js';
 
-// Note: When you create a new index for existing column of this table,
-// it might be better to index concurrently under isConcurrentIndexMigrationEnabled flag
-// by editing generated migration file since this table is very large,
-// and it will make a long lock to create index in most cases.
-// Please note that `CREATE INDEX CONCURRENTLY` is not supported in transaction,
-// so you need to set `transaction = false` in migration if isConcurrentIndexMigrationEnabled() is true.
-// Please refer 1745378064470-composite-note-index.js for example.
-// You should not use `@Index({ concurrent: true })` decorator because database initialization for test will fail
-// because it will always run CREATE INDEX in transaction based on decorators.
-// Not appending `{ concurrent: true }` to `@Index` will not cause any problem in production,
 @Index(['userId', 'id'])
 @Entity('note')
 export class MiNote {

packages/frontend/src/components/MkNotifications.vue

@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<component :is="prefer.s.enablePullToRefresh ? MkPullToRefresh : 'div'" :refresher="() => reload()">
+<MkPullToRefresh :refresher="() => reload()">
 	<MkPagination ref="pagingComponent" :pagination="pagination">
 		<template #empty>
 			<div class="_fullinfo">
@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</component>
 		</template>
 	</MkPagination>
-</component>
+</MkPullToRefresh>
 </template>
 
 <script lang="ts" setup>

packages/frontend/src/components/MkPullToRefresh.vue

@@ -5,12 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div ref="rootEl">
-	<div v-if="isPulling" :class="$style.frame" :style="`--frame-min-height: ${pullDistance / (PULL_BRAKE_BASE + (pullDistance / PULL_BRAKE_FACTOR))}px;`">
+	<div v-if="isPullStart" :class="$style.frame" :style="`--frame-min-height: ${pullDistance / (PULL_BRAKE_BASE + (pullDistance / PULL_BRAKE_FACTOR))}px;`">
 		<div :class="$style.frameContent">
 			<MkLoading v-if="isRefreshing" :class="$style.loader" :em="true"/>
-			<i v-else class="ti ti-arrow-bar-to-down" :class="[$style.icon, { [$style.refresh]: isPulledEnough }]"></i>
+			<i v-else class="ti ti-arrow-bar-to-down" :class="[$style.icon, { [$style.refresh]: isPullEnd }]"></i>
 			<div :class="$style.text">
-				<template v-if="isPulledEnough">{{ i18n.ts.releaseToRefresh }}</template>
+				<template v-if="isPullEnd">{{ i18n.ts.releaseToRefresh }}</template>
 				<template v-else-if="isRefreshing">{{ i18n.ts.refreshing }}</template>
 				<template v-else>{{ i18n.ts.pullDownToRefresh }}</template>
 			</div>
@@ -34,16 +34,19 @@ const RELEASE_TRANSITION_DURATION = 200;
 const PULL_BRAKE_BASE = 1.5;
 const PULL_BRAKE_FACTOR = 170;
 
-const isPulling = ref(false);
-const isPulledEnough = ref(false);
+const isPullStart = ref(false);
+const isPullEnd = ref(false);
 const isRefreshing = ref(false);
 const pullDistance = ref(0);
 
+let supportPointerDesktop = false;
 let startScreenY: number | null = null;
 
 const rootEl = useTemplateRef('rootEl');
 let scrollEl: HTMLElement | null = null;
 
+let disabled = false;
+
 const props = withDefaults(defineProps<{
 	refresher: () => Promise<void>;
 }>(), {
@@ -54,51 +57,18 @@ const emit = defineEmits<{
 	(ev: 'refresh'): void;
 }>();
 
-function getScreenY(event: TouchEvent | MouseEvent | PointerEvent): number {
-	if (event.touches && event.touches[0] && event.touches[0].screenY != null) {
-		return event.touches[0].screenY;
-	} else {
+function getScreenY(event) {
+	if (supportPointerDesktop) {
 		return event.screenY;
 	}
+	return event.touches[0].screenY;
 }
 
-// When at the top of the page, disable vertical overscroll so passive touch listeners can take over.
-function lockDownScroll() {
-	scrollEl!.style.touchAction = 'pan-x pan-down pinch-zoom';
-	scrollEl!.style.overscrollBehavior = 'none';
-}
-
-function unlockDownScroll() {
-	scrollEl!.style.touchAction = 'auto';
-	scrollEl!.style.overscrollBehavior = 'contain';
-}
-
-function moveStart(event: PointerEvent) {
-	const scrollPos = scrollEl!.scrollTop;
-	if (scrollPos === 0) {
-		lockDownScroll();
-		if (!isPulling.value && !isRefreshing.value) {
-			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 });
-			}
-		}
-	} else {
-		unlockDownScroll();
+function moveStart(event) {
+	if (!isPullStart.value && !isRefreshing.value && !disabled) {
+		isPullStart.value = true;
+		startScreenY = getScreenY(event);
+		pullDistance.value = 0;
 	}
 }
 
@@ -138,39 +108,31 @@ async function closeContent() {
 	}
 }
 
-function onPullRelease() {
-	window.document.body.removeAttribute('inert');
-	startScreenY = null;
-	if (isPulledEnough.value) {
-		isPulledEnough.value = false;
-		isRefreshing.value = true;
-		fixOverContent().then(() => {
-			emit('refresh');
-			props.refresher().then(() => {
-				refreshFinished();
+function moveEnd() {
+	if (isPullStart.value && !isRefreshing.value) {
+		startScreenY = null;
+		if (isPullEnd.value) {
+			isPullEnd.value = false;
+			isRefreshing.value = true;
+			fixOverContent().then(() => {
+				emit('refresh');
+				props.refresher().then(() => {
+					refreshFinished();
+				});
 			});
-		});
-	} else {
-		closeContent().then(() => isPulling.value = false);
+		} else {
+			closeContent().then(() => isPullStart.value = false);
+		}
 	}
 }
 
-function toggleScrollLockOnTouchEnd() {
-	const scrollPos = scrollEl!.scrollTop;
-	if (scrollPos === 0) {
-		lockDownScroll();
-	} else {
-		unlockDownScroll();
-	}
-}
+function moving(event: TouchEvent | PointerEvent) {
+	if (!isPullStart.value || isRefreshing.value || disabled) return;
 
-function moving(event: MouseEvent | TouchEvent) {
-	if (!isPulling.value || isRefreshing.value) return;
-
-	if ((scrollEl?.scrollTop ?? 0) > SCROLL_STOP + pullDistance.value || isHorizontalSwipeSwiping.value) {
+	if ((scrollEl?.scrollTop ?? 0) > (supportPointerDesktop ? SCROLL_STOP : SCROLL_STOP + pullDistance.value) || isHorizontalSwipeSwiping.value) {
 		pullDistance.value = 0;
-		isPulledEnough.value = false;
-		onPullRelease();
+		isPullEnd.value = false;
+		moveEnd();
 		return;
 	}
 
@@ -182,12 +144,15 @@ function moving(event: MouseEvent | TouchEvent) {
 	const moveHeight = moveScreenY - startScreenY!;
 	pullDistance.value = Math.min(Math.max(moveHeight, 0), MAX_PULL_DISTANCE);
 
-	// マウスでのpull時、画面上のテキスト選択が発生して画面がスクロールされたりするのを防ぐ
-	if (pullDistance.value > 3) { // ある程度遊びを持たせないと通常のクリックでも発火しクリックできなくなる
-		window.document.body.setAttribute('inert', 'true');
+	if (pullDistance.value > 0) {
+		if (event.cancelable) event.preventDefault();
 	}
 
-	isPulledEnough.value = pullDistance.value >= FIRE_THRESHOLD;
+	if (pullDistance.value > SCROLL_STOP) {
+		event.stopPropagation();
+	}
+
+	isPullEnd.value = pullDistance.value >= FIRE_THRESHOLD;
 }
 
 /**
@@ -197,23 +162,61 @@ function moving(event: MouseEvent | TouchEvent) {
  */
 function refreshFinished() {
 	closeContent().then(() => {
-		isPulling.value = false;
+		isPullStart.value = false;
 		isRefreshing.value = false;
 	});
 }
 
+function setDisabled(value) {
+	disabled = value;
+}
+
+function onScrollContainerScroll() {
+	const scrollPos = scrollEl!.scrollTop;
+
+	// When at the top of the page, disable vertical overscroll so passive touch listeners can take over.
+	if (scrollPos === 0) {
+		scrollEl!.style.touchAction = 'pan-x pan-down pinch-zoom';
+		registerEventListenersForReadyToPull();
+	} else {
+		scrollEl!.style.touchAction = 'auto';
+		unregisterEventListenersForReadyToPull();
+	}
+}
+
+function registerEventListenersForReadyToPull() {
+	if (rootEl.value == null) return;
+	rootEl.value.addEventListener('touchstart', moveStart, { passive: true });
+	rootEl.value.addEventListener('touchmove', moving, { passive: false }); // passive: falseにしないとpreventDefaultが使えない
+}
+
+function unregisterEventListenersForReadyToPull() {
+	if (rootEl.value == null) return;
+	rootEl.value.removeEventListener('touchstart', moveStart);
+	rootEl.value.removeEventListener('touchmove', moving);
+}
+
 onMounted(() => {
 	if (rootEl.value == null) return;
 
 	scrollEl = getScrollContainer(rootEl.value);
+	if (scrollEl == null) return;
 
-	rootEl.value.addEventListener('pointerdown', moveStart, { passive: true });
-	rootEl.value.addEventListener('touchend', toggleScrollLockOnTouchEnd, { passive: true });
+	scrollEl.addEventListener('scroll', onScrollContainerScroll, { passive: true });
+
+	rootEl.value.addEventListener('touchend', moveEnd, { passive: true });
+
+	registerEventListenersForReadyToPull();
 });
 
 onUnmounted(() => {
-	rootEl.value.removeEventListener('pointerdown', moveStart);
-	rootEl.value.removeEventListener('touchend', toggleScrollLockOnTouchEnd);
+	if (scrollEl) scrollEl.removeEventListener('scroll', onScrollContainerScroll);
+
+	unregisterEventListenersForReadyToPull();
+});
+
+defineExpose({
+	setDisabled,
 });
 </script>
 

packages/frontend/src/components/MkTimeline.vue

@@ -4,8 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<component :is="prefer.s.enablePullToRefresh ? MkPullToRefresh : 'div'" :refresher="() => reloadTimeline()">
-	<MkPagination v-if="paginationQuery" ref="pagingComponent" :pagination="paginationQuery" @queue="emit('queue', $event)">
+<MkPullToRefresh ref="prComponent" :refresher="() => reloadTimeline()">
+	<MkPagination v-if="paginationQuery" ref="pagingComponent" :pagination="paginationQuery" @queue="emit('queue', $event)" @status="prComponent?.setDisabled($event)">
 		<template #empty>
 			<div class="_fullinfo">
 				<img :src="infoImageUrl" draggable="false"/>
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</component>
 		</template>
 	</MkPagination>
-</component>
+</MkPullToRefresh>
 </template>
 
 <script lang="ts" setup>
@@ -93,6 +93,7 @@ type TimelineQueryType = {
 	roleId?: string
 };
 
+const prComponent = useTemplateRef('prComponent');
 const pagingComponent = useTemplateRef('pagingComponent');
 
 let tlNotesCount = 0;

packages/frontend/src/pages/settings/preferences.vue

@@ -471,14 +471,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</MkPreferenceContainer>
 							</SearchMarker>
 
-							<SearchMarker :keywords="['swipe', 'pull', 'refresh']">
-								<MkPreferenceContainer k="enablePullToRefresh">
-									<MkSwitch v-model="enablePullToRefresh">
-										<template #label><SearchLabel>{{ i18n.ts._settings.enablePullToRefresh }}</SearchLabel></template>
-									</MkSwitch>
-								</MkPreferenceContainer>
-							</SearchMarker>
-
 							<SearchMarker :keywords="['keep', 'screen', 'display', 'on']">
 								<MkPreferenceContainer k="keepScreenOn">
 									<MkSwitch v-model="keepScreenOn">
@@ -808,7 +800,6 @@ const animatedMfm = prefer.model('animatedMfm');
 const disableShowingAnimatedImages = prefer.model('disableShowingAnimatedImages');
 const keepScreenOn = prefer.model('keepScreenOn');
 const enableHorizontalSwipe = prefer.model('enableHorizontalSwipe');
-const enablePullToRefresh = prefer.model('enablePullToRefresh');
 const useNativeUiForVideoAudioPlayer = prefer.model('useNativeUiForVideoAudioPlayer');
 const contextMenu = prefer.model('contextMenu');
 const menuStyle = prefer.model('menuStyle');
@@ -866,8 +857,6 @@ watch([
 	fontSize,
 	useSystemFont,
 	makeEveryTextElementsSelectable,
-	enableHorizontalSwipe,
-	enablePullToRefresh,
 ], async () => {
 	await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
 });

packages/frontend/src/preferences/def.ts

@@ -300,9 +300,6 @@ export const PREF_DEF = {
 	enableHorizontalSwipe: {
 		default: true,
 	},
-	enablePullToRefresh: {
-		default: true,
-	},
 	useNativeUiForVideoAudioPlayer: {
 		default: false,
 	},

packages/frontend/src/ui/universal.vue

@@ -39,7 +39,6 @@ import type { PageMetadata } from '@/page.js';
 import XMobileFooterMenu from '@/ui/_common_/mobile-footer-menu.vue';
 import XPreferenceRestore from '@/ui/_common_/PreferenceRestore.vue';
 import XTitlebar from '@/ui/_common_/titlebar.vue';
-import XSidebar from '@/ui/_common_/navbar.vue';
 import * as os from '@/os.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/i.js';
@@ -52,6 +51,7 @@ import { shouldSuggestRestoreBackup } from '@/preferences/utility.js';
 import { DI } from '@/di.js';
 
 const XWidgets = defineAsyncComponent(() => import('./_common_/widgets.vue'));
+const XSidebar = defineAsyncComponent(() => import('@/ui/_common_/navbar.vue'));
 const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
 const XAnnouncements = defineAsyncComponent(() => import('@/ui/_common_/announcements.vue'));