From dc0b197d4a8fe4393a307fbfc479b3a011fa6c7a Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 28 Apr 2025 16:15:57 +0900 Subject: [PATCH] wip --- locales/index.d.ts | 4 ---- locales/ja-JP.yml | 1 - .../frontend/src/components/MkTimeline.vue | 24 ++++++++++--------- .../src/pages/settings/preferences.vue | 10 -------- packages/frontend/src/pref-migrate.ts | 1 - packages/frontend/src/preferences/def.ts | 3 --- packages/frontend/src/store.ts | 4 ---- 7 files changed, 13 insertions(+), 34 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 1ee01d52f4..12c8dcffa0 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -4966,10 +4966,6 @@ export interface Locale extends ILocale { * 引っ張ってリロード */ "pullDownToRefresh": string; - /** - * タイムラインのリアルタイム更新を無効にする - */ - "disableStreamingTimeline": string; /** * 通知をグルーピング */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index edb7914110..80c2b4dae7 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1237,7 +1237,6 @@ showAvatarDecorations: "アイコンのデコレーションを表示" releaseToRefresh: "離してリロード" refreshing: "リロード中" pullDownToRefresh: "引っ張ってリロード" -disableStreamingTimeline: "タイムラインのリアルタイム更新を無効にする" useGroupedNotifications: "通知をグルーピング" signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。" cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。" diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue index a5818929ba..1d8b39ad37 100644 --- a/packages/frontend/src/components/MkTimeline.vue +++ b/packages/frontend/src/components/MkTimeline.vue @@ -109,17 +109,19 @@ let tlNotesCount = 0; const POLLING_INTERVAL = 1000 * 10; -useInterval(async () => { - const notes = await misskeyApi(paginationQuery.endpoint, { - ...paginationQuery.params, - limit: 10, - sinceId: Array.from(paginator.items.value.keys()).at(-1), +if (!store.s.realtimeMode) { + useInterval(async () => { + const notes = await misskeyApi(paginationQuery.endpoint, { + ...paginationQuery.params, + 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(); } diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue index f96accf68a..379b07ff89 100644 --- a/packages/frontend/src/pages/settings/preferences.vue +++ b/packages/frontend/src/pages/settings/preferences.vue @@ -148,14 +148,6 @@ SPDX-License-Identifier: AGPL-3.0-only - - - - - - - - @@ -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, diff --git a/packages/frontend/src/pref-migrate.ts b/packages/frontend/src/pref-migrate.ts index 414bb9c5aa..a5e915f66e 100644 --- a/packages/frontend/src/pref-migrate.ts +++ b/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); diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts index ac8996058f..6af3abbadd 100644 --- a/packages/frontend/src/preferences/def.ts +++ b/packages/frontend/src/preferences/def.ts @@ -277,9 +277,6 @@ export const PREF_DEF = { keepScreenOn: { default: false, }, - disableStreamingTimeline: { - default: false, - }, useGroupedNotifications: { default: true, }, diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 5c10d8909e..b5ba25be8c 100644 --- a/packages/frontend/src/store.ts +++ b/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,