wip

locales/index.d.ts

@@ -4966,10 +4966,6 @@ export interface Locale extends ILocale {
      * 引っ張ってリロード
      */
     "pullDownToRefresh": string;
-    /**
-     * タイムラインのリアルタイム更新を無効にする
-     */
-    "disableStreamingTimeline": string;
     /**
      * 通知をグルーピング
      */

locales/ja-JP.yml

@@ -1237,7 +1237,6 @@ showAvatarDecorations: "アイコンのデコレーションを表示"
 releaseToRefresh: "離してリロード"
 refreshing: "リロード中"
 pullDownToRefresh: "引っ張ってリロード"
-disableStreamingTimeline: "タイムラインのリアルタイム更新を無効にする"
 useGroupedNotifications: "通知をグルーピング"
 signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"

packages/frontend/src/components/MkTimeline.vue

@@ -109,17 +109,19 @@ let tlNotesCount = 0;
 
 const POLLING_INTERVAL = 1000 * 10;
 
-useInterval(async () => {
+if (!store.s.realtimeMode) {
-	const notes = await misskeyApi(paginationQuery.endpoint, {
+	useInterval(async () => {
-		...paginationQuery.params,
+		const notes = await misskeyApi(paginationQuery.endpoint, {
-		limit: 10,
+			...paginationQuery.params,
-		sinceId: Array.from(paginator.items.value.keys()).at(-1),
+			limit: 10,
+			sinceId: Array.from(paginator.items.value.keys()).at(-1),
+		});
+		console.log(notes);
+	}, POLLING_INTERVAL, {
+		immediate: false,
+		afterMounted: true,
 	});
-	console.log(notes);
+}
-}, POLLING_INTERVAL, {
-	immediate: false,
-	afterMounted: true,
-});
 
 function prepend(note) {
 	tlNotesCount++;
@@ -280,7 +282,7 @@ function updatePaginationQuery() {
 }
 
 function refreshEndpointAndChannel() {
-	if (!prefer.s.disableStreamingTimeline && store.s.realtimeMode) {
+	if (store.s.realtimeMode) {
 		disconnectChannel();
 		connectChannel();
 	}

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

@@ -148,14 +148,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</MkPreferenceContainer>
 							</SearchMarker>
 
-							<SearchMarker :keywords="['disable', 'streaming', 'timeline']">
-								<MkPreferenceContainer k="disableStreamingTimeline">
-									<MkSwitch v-model="disableStreamingTimeline">
-										<template #label><SearchLabel>{{ i18n.ts.disableStreamingTimeline }}</SearchLabel></template>
-									</MkSwitch>
-								</MkPreferenceContainer>
-							</SearchMarker>
-
 							<SearchMarker :keywords="['pinned', 'list']">
 								<MkFolder>
 									<template #label><SearchLabel>{{ i18n.ts.pinnedList }}</SearchLabel></template>
@@ -759,7 +751,6 @@ const showFixedPostFormInChannel = prefer.model('showFixedPostFormInChannel');
 const numberOfPageCache = prefer.model('numberOfPageCache');
 const enableInfiniteScroll = prefer.model('enableInfiniteScroll');
 const useReactionPickerForContextMenu = prefer.model('useReactionPickerForContextMenu');
-const disableStreamingTimeline = prefer.model('disableStreamingTimeline');
 const useGroupedNotifications = prefer.model('useGroupedNotifications');
 const alwaysConfirmFollow = prefer.model('alwaysConfirmFollow');
 const confirmWhenRevealingSensitiveMedia = prefer.model('confirmWhenRevealingSensitiveMedia');
@@ -827,7 +818,6 @@ watch([
 	enableInfiniteScroll,
 	showNoteActionsOnlyHover,
 	overridedDeviceKind,
-	disableStreamingTimeline,
 	alwaysConfirmFollow,
 	confirmWhenRevealingSensitiveMedia,
 	showGapBetweenNotesInTimeline,

packages/frontend/src/pref-migrate.ts

@@ -115,7 +115,6 @@ export function migrateOldSettings() {
 		prefer.commit('notificationStackAxis', store.s.notificationStackAxis);
 		prefer.commit('enableCondensedLine', store.s.enableCondensedLine);
 		prefer.commit('keepScreenOn', store.s.keepScreenOn);
-		prefer.commit('disableStreamingTimeline', store.s.disableStreamingTimeline);
 		prefer.commit('useGroupedNotifications', store.s.useGroupedNotifications);
 		prefer.commit('dataSaver', store.s.dataSaver);
 		prefer.commit('enableSeasonalScreenEffect', store.s.enableSeasonalScreenEffect);

packages/frontend/src/preferences/def.ts

@@ -277,9 +277,6 @@ export const PREF_DEF = {
 	keepScreenOn: {
 		default: false,
 	},
-	disableStreamingTimeline: {
-		default: false,
-	},
 	useGroupedNotifications: {
 		default: true,
 	},

packages/frontend/src/store.ts

@@ -382,10 +382,6 @@ export const store = markRaw(new Pizzax('base', {
 		where: 'device',
 		default: false,
 	},
-	disableStreamingTimeline: {
-		where: 'device',
-		default: false,
-	},
 	useGroupedNotifications: {
 		where: 'device',
 		default: true,