CHANGELOG.md

@@ -24,9 +24,6 @@
 - Feat: プラグイン・テーマを外部サイトから直接インストールできるようになりました
 	- 外部サイトでの実装が必要です。詳細は Misskey Hub をご覧ください
 	  https://misskey-hub.net/docs/advanced/publish-on-your-website.html
-- Enhance: スワイプしてタイムラインを再読込できるように
-	- PCの場合は右上のボタンからでも再読込できます
-- Enhance: タイムラインの自動更新を無効にできるように
 - Enhance: コードのシンタックスハイライトエンジンをShikiに変更
   - AiScriptのシンタックスハイライトに対応
   - MFMでAiScriptをハイライトする場合、コードブロックの開始部分を ` ```is ` もしくは ` ```aiscript ` としてください
@@ -39,7 +36,6 @@
 - Fix: 「検索」MFMにおいて一部の検索キーワードが正しく認識されない問題を修正
 - Fix: 一部の言語でMisskey Webがクラッシュする問題を修正
 - Fix: チャンネルの作成・更新時に失敗した場合何も表示されない問題を修正 #11983
-- Fix: 個人カードのemojiがバッテリーになっている問題を修正
 
 ### Server
 - Enhance: RedisへのTLのキャッシュをオフにできるように
@@ -52,7 +48,7 @@
 - Fix: RedisへのTLキャッシュが有効の場合にHTL/LTL/STLが空になることがある問題を修正
 - Fix: STLでフォローしていないチャンネルが取得される問題を修正
 - Fix: `hashtags/trend`にてRedisからトレンドの情報が取得できない際にInternal Server Errorになる問題を修正
-- Fix: HTLをリロードまたは遡行したとき、フォローしているチャンネルのノートが含まれない問題を修正 #11765 #12181
+- Fix: HTLをリロードまたは遡行したとき、フォローしているチャンネルのノートが含まれない問題を修正 #11765
 - Fix: リノートをリノートできるのを修正
 
 ## 2023.10.2

locales/index.d.ts

@@ -1152,10 +1152,6 @@ export interface Locale {
     "angle": string;
     "flip": string;
     "showAvatarDecorations": string;
-    "releaseToRefresh": string;
-    "refreshing": string;
-    "pullDownToRefresh": string;
-    "disableStreamingTimeline": string;
     "_announcement": {
         "forExistingUsers": string;
         "forExistingUsersDescription": string;

locales/ja-JP.yml

@@ -1149,10 +1149,6 @@ detach: "外す"
 angle: "角度"
 flip: "反転"
 showAvatarDecorations: "アイコンのデコレーションを表示"
-releaseToRefresh: "離してリロード"
-refreshing: "リロード中"
-pullDownToRefresh: "引っ張ってリロード"
-disableStreamingTimeline: "タイムラインのリアルタイム更新を無効にする"
 
 _announcement:
   forExistingUsers: "既存ユーザーのみ"

packages/backend/src/core/NoteDeleteService.ts

@@ -24,7 +24,6 @@ import { bindThis } from '@/decorators.js';
 import { MetaService } from '@/core/MetaService.js';
 import { SearchService } from '@/core/SearchService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { isPureRenote } from '@/misc/is-pure-renote.js';
 
 @Injectable()
 export class NoteDeleteService {
@@ -78,8 +77,8 @@ export class NoteDeleteService {
 			if (this.userEntityService.isLocalUser(user) && !note.localOnly) {
 				let renote: MiNote | null = null;
 
-				// if deleted note is renote
-				if (isPureRenote(note)) {
+				// if deletd note is renote
+				if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
 					renote = await this.notesRepository.findOneBy({
 						id: note.renoteId,
 					});

packages/backend/src/core/activitypub/models/ApPersonService.ts

@@ -319,17 +319,9 @@ export class ApPersonService implements OnModuleInit {
 					emojis,
 				})) as MiRemoteUser;
 
-				let _description: string | null = null;
-
-				if (person._misskey_summary) {
-					_description = truncate(person._misskey_summary, summaryLength);
-				} else if (person.summary) {
-					_description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag);
-				}
-
 				await transactionalEntityManager.save(new MiUserProfile({
 					userId: user.id,
-					description: _description,
+					description: person._misskey_summary ? truncate(person._misskey_summary, summaryLength) : person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
 					url,
 					fields,
 					birthday: bday?.[0] ?? null,
@@ -495,18 +487,10 @@ export class ApPersonService implements OnModuleInit {
 			});
 		}
 
-		let _description: string | null = null;
-
-		if (person._misskey_summary) {
-			_description = truncate(person._misskey_summary, summaryLength);
-		} else if (person.summary) {
-			_description = this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag);
-		}
-
 		await this.userProfilesRepository.update({ userId: exist.id }, {
 			url,
 			fields,
-			description: _description,
+			description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
 			birthday: bday?.[0] ?? null,
 			location: person['vcard:Address'] ?? null,
 		});

packages/backend/src/misc/is-pure-renote.ts

@@ -1,10 +0,0 @@
-import type { MiNote } from '@/models/Note.js';
-
-export function isPureRenote(note: MiNote): note is MiNote & { renoteId: NonNullable<MiNote['renoteId']> } {
-	if (!note.renoteId) return false;
-
-	if (note.text) return false; // it's quoted with text
-	if (note.fileIds.length !== 0) return false; // it's quoted with files
-	if (note.hasPoll) return false; // it's quoted with poll
-	return true;
-}

packages/backend/src/server/ActivityPubServerService.ts

@@ -26,7 +26,6 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { IActivity } from '@/core/activitypub/type.js';
-import { isPureRenote } from '@/misc/is-pure-renote.js';
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions } from 'fastify';
 import type { FindOptionsWhere } from 'typeorm';
 
@@ -89,7 +88,7 @@ export class ActivityPubServerService {
 	 */
 	@bindThis
 	private async packActivity(note: MiNote): Promise<any> {
-		if (isPureRenote(note)) {
+		if (note.renoteId && note.text == null && !note.hasPoll && (note.fileIds == null || note.fileIds.length === 0)) {
 			const renote = await this.notesRepository.findOneByOrFail({ id: note.renoteId });
 			return this.apRendererService.renderAnnounce(renote.uri ? renote.uri : `${this.config.url}/notes/${renote.id}`, note);
 		}

packages/backend/src/server/api/endpoints/notes/create.ts

@@ -17,7 +17,6 @@ import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
 import { DI } from '@/di-symbols.js';
 import { ApiError } from '../../error.js';
-import { isPureRenote } from '@/misc/is-pure-renote.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -215,6 +214,20 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				}
 			}
 
+			function isPureRenote(note: MiNote): boolean {
+				console.log("isPureRenote", note);
+				if (!note.renoteId) return false;
+
+				console.log("isPureRenote: no renoteId");
+				if (note.text) return false; // it's quoted with text
+				console.log("isPureRenote: not quoted with text");
+				if (note.fileIds.length !== 0) return false; // it's quoted with files
+				console.log("isPureRenote: not quoted with file");
+				if (note.hasPoll) return false; // it's quoted with poll
+				console.log("isPureRenote: not quoted with poll");
+				return true;
+			}
+
 			let renote: MiNote | null = null;
 			if (ps.renoteId != null) {
 				// Fetch renote to note

packages/backend/src/server/api/endpoints/notes/timeline.ts

@@ -183,11 +183,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const followingChannelIds = followingChannels.map(x => x.followeeId);
 			query.andWhere(new Brackets(qb => {
 				qb
-					.where(new Brackets(qb2 => {
-						qb2
-							.where('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds })
-							.andWhere('note.channelId IS NULL');
-					}))
+					.where('note.userId IN (:...meOrFolloweeIds)', { meOrFolloweeIds: meOrFolloweeIds })
 					.orWhere('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
 			}));
 		} else if (followees.length > 0) {

packages/frontend/src/boot/main-boot.ts

@@ -8,7 +8,7 @@ import { common } from './common.js';
 import { version, ui, lang, updateLocale } from '@/config.js';
 import { i18n, updateI18n } from '@/i18n.js';
 import { confirm, alert, post, popup, toast } from '@/os.js';
-import { useStream, isReloading } from '@/stream.js';
+import { useStream } from '@/stream.js';
 import * as sound from '@/scripts/sound.js';
 import { $i, refreshAccount, login, updateAccount, signout } from '@/account.js';
 import { defaultStore, ColdDeviceStorage } from '@/store.js';
@@ -39,7 +39,6 @@ export async function mainBoot() {
 
 	let reloadDialogShowing = false;
 	stream.on('_disconnected_', async () => {
-		if (isReloading) return;
 		if (defaultStore.state.serverDisconnectedBehavior === 'reload') {
 			location.reload();
 		} else if (defaultStore.state.serverDisconnectedBehavior === 'dialog') {

packages/frontend/src/components/MkPageWindow.vue

@@ -166,8 +166,6 @@ defineExpose({
 
 <style lang="scss" module>
 .root {
-	overscroll-behavior: none;
-
 	min-height: 100%;
 	background: var(--bg);
 

packages/frontend/src/components/MkPagination.vue

@@ -102,7 +102,6 @@ const props = withDefaults(defineProps<{
 
 const emit = defineEmits<{
 	(ev: 'queue', count: number): void;
-	(ev: 'status', error: boolean): void;
 }>();
 
 let rootEl = $shallowRef<HTMLElement>();
@@ -194,11 +193,6 @@ watch(queue, (a, b) => {
 	emit('queue', queue.value.size);
 }, { deep: true });
 
-watch(error, (n, o) => {
-	if (n === o) return;
-	emit('status', n);
-});
-
 async function init(): Promise<void> {
 	items.value = new Map();
 	queue.value = new Map();

packages/frontend/src/components/MkPullToRefresh.vue

@@ -1,238 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and other misskey contributors
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div ref="rootEl">
-	<div v-if="isPullStart" :class="$style.frame" :style="`--frame-min-height: ${currentHeight / 3}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]: isPullEnd }]"></i>
-			<div :class="$style.text">
-				<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>
-		</div>
-	</div>
-	<div :class="{ [$style.slotClip]: isPullStart }">
-		<slot/>
-	</div>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, onUnmounted } from 'vue';
-import { deviceKind } from '@/scripts/device-kind.js';
-import { i18n } from '@/i18n.js';
-
-const SCROLL_STOP = 10;
-const MAX_PULL_DISTANCE = Infinity;
-const FIRE_THRESHOLD = 200;
-const RELEASE_TRANSITION_DURATION = 200;
-
-let isPullStart = $ref(false);
-let isPullEnd = $ref(false);
-let isRefreshing = $ref(false);
-let currentHeight = $ref(0);
-
-let supportPointerDesktop = false;
-let startScreenY: number | null = null;
-
-const rootEl = $shallowRef<HTMLDivElement>();
-let scrollEl: HTMLElement | null = null;
-
-let disabled = false;
-
-const emits = defineEmits<{
-	(ev: 'refresh'): void;
-}>();
-
-function getScrollableParentElement(node) {
-	if (node == null) {
-		return null;
-	}
-
-	if (node.scrollHeight > node.clientHeight) {
-		return node;
-	} else {
-		return getScrollableParentElement(node.parentNode);
-	}
-}
-
-function getScreenY(event) {
-	if (supportPointerDesktop) {
-		return event.screenY;
-	}
-	return event.touches[0].screenY;
-}
-
-function moveStart(event) {
-	if (!isPullStart && !isRefreshing && !disabled) {
-		isPullStart = true;
-		startScreenY = getScreenY(event);
-		currentHeight = 0;
-	}
-}
-
-function moveBySystem(to: number): Promise<void> {
-	return new Promise(r => {
-		const startHeight = currentHeight;
-		const overHeight = currentHeight - to;
-		if (overHeight < 1) {
-			r();
-			return;
-		}
-		const startTime = Date.now();
-		let intervalId = setInterval(() => {
-			const time = Date.now() - startTime;
-			if (time > RELEASE_TRANSITION_DURATION) {
-				currentHeight = to;
-				clearInterval(intervalId);
-				r();
-				return;
-			}
-			const nextHeight = startHeight - (overHeight / RELEASE_TRANSITION_DURATION) * time;
-			if (currentHeight < nextHeight) return;
-			currentHeight = nextHeight;
-		}, 1);
-	});
-}
-
-async function fixOverContent() {
-	if (currentHeight > FIRE_THRESHOLD) {
-		await moveBySystem(FIRE_THRESHOLD);
-	}
-}
-
-async function closeContent() {
-	if (currentHeight > 0) {
-		await moveBySystem(0);
-	}
-}
-
-function moveEnd() {
-	if (isPullStart && !isRefreshing) {
-		startScreenY = null;
-		if (isPullEnd) {
-			isPullEnd = false;
-			isRefreshing = true;
-			fixOverContent().then(() => emits('refresh'));
-		} else {
-			closeContent().then(() => isPullStart = false);
-		}
-	}
-}
-
-function moving(event) {
-	if (!isPullStart || isRefreshing || disabled) return;
-
-	if (!scrollEl) {
-		scrollEl = getScrollableParentElement(rootEl);
-	}
-	if ((scrollEl?.scrollTop ?? 0) > (supportPointerDesktop ? SCROLL_STOP : SCROLL_STOP + currentHeight)) {
-		currentHeight = 0;
-		isPullEnd = false;
-		moveEnd();
-		return;
-	}
-
-	if (startScreenY === null) {
-		startScreenY = getScreenY(event);
-	}
-	const moveScreenY = getScreenY(event);
-
-	const moveHeight = moveScreenY - startScreenY!;
-	currentHeight = Math.min(Math.max(moveHeight, 0), MAX_PULL_DISTANCE);
-
-	isPullEnd = currentHeight >= FIRE_THRESHOLD;
-}
-
-/**
- * emit(refresh)が完了したことを知らせる関数
- *
- * タイムアウトがないのでこれを最終的に実行しないと出たままになる
- */
-function refreshFinished() {
-	closeContent().then(() => {
-		isPullStart = false;
-		isRefreshing = false;
-	});
-}
-
-function setDisabled(value) {
-	disabled = value;
-}
-
-onMounted(() => {
-	// マウス操作でpull to refreshするのは不便そう
-	//supportPointerDesktop = !!window.PointerEvent && deviceKind === 'desktop';
-
-	if (supportPointerDesktop) {
-		rootEl.addEventListener('pointerdown', moveStart);
-		// ポインターの場合、ポップアップ系の動作をするとdownだけ発火されてupが発火されないため
-		window.addEventListener('pointerup', moveEnd);
-		rootEl.addEventListener('pointermove', moving, { passive: true });
-	} else {
-		rootEl.addEventListener('touchstart', moveStart);
-		rootEl.addEventListener('touchend', moveEnd);
-		rootEl.addEventListener('touchmove', moving, { passive: true });
-	}
-});
-
-onUnmounted(() => {
-	if (supportPointerDesktop) window.removeEventListener('pointerup', moveEnd);
-});
-
-defineExpose({
-	refreshFinished,
-	setDisabled,
-});
-</script>
-
-<style lang="scss" module>
-.frame {
-	position: relative;
-	overflow: clip;
-
-	width: 100%;
-	min-height: var(--frame-min-height, 0px);
-
-	mask-image: linear-gradient(90deg, #000 0%, #000 80%, transparent);
-	-webkit-mask-image: -webkit-linear-gradient(90deg, #000 0%, #000 80%, transparent);
-
-	pointer-events: none;
-}
-
-.frameContent {
-	position: absolute;
-	bottom: 0;
-	width: 100%;
-	margin: 5px 0;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	font-size: 14px;
-
-	> .icon, > .loader {
-		margin: 6px 0;
-	}
-
-	> .icon {
-		transition: transform .25s;
-
-		&.refresh {
-			transform: rotate(180deg);
-		}
-	}
-
-	> .text {
-		margin: 5px 0;
-	}
-}
-
-.slotClip {
-	overflow-y: clip;
-}
-</style>

packages/frontend/src/components/MkTimeline.vue

@@ -4,16 +4,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkPullToRefresh ref="prComponent" @refresh="() => reloadTimeline(true)">
-	<MkNotes ref="tlComponent" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline" :pagination="pagination" @queue="emit('queue', $event)" @status="prComponent.setDisabled($event)"/>
-</MkPullToRefresh>
+<MkNotes ref="tlComponent" :noGap="!defaultStore.state.showGapBetweenNotesInTimeline" :pagination="pagination" @queue="emit('queue', $event)"/>
 </template>
 
 <script lang="ts" setup>
 import { computed, provide, onUnmounted } from 'vue';
 import MkNotes from '@/components/MkNotes.vue';
-import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
-import { useStream, reloadStream } from '@/stream.js';
+import { useStream } from '@/stream.js';
 import * as sound from '@/scripts/sound.js';
 import { $i } from '@/account.js';
 import { instance } from '@/instance.js';
@@ -42,7 +39,6 @@ const emit = defineEmits<{
 
 provide('inChannel', computed(() => props.src === 'channel'));
 
-const prComponent: InstanceType<typeof MkPullToRefresh> = $ref();
 const tlComponent: InstanceType<typeof MkNotes> = $ref();
 
 let tlNotesCount = 0;
@@ -69,73 +65,29 @@ let connection;
 let connection2;
 
 const stream = useStream();
-const connectChannel = () => {
-	if (props.src === 'antenna') {
-		connection = stream.useChannel('antenna', {
-			antennaId: props.antenna,
-		});
-	} else if (props.src === 'home') {
-		connection = stream.useChannel('homeTimeline', {
-			withRenotes: props.withRenotes,
-			withFiles: props.onlyFiles ? true : undefined,
-		});
-		connection2 = stream.useChannel('main');
-	} else if (props.src === 'local') {
-		connection = stream.useChannel('localTimeline', {
-			withRenotes: props.withRenotes,
-			withReplies: props.withReplies,
-			withFiles: props.onlyFiles ? true : undefined,
-		});
-	} else if (props.src === 'social') {
-		connection = stream.useChannel('hybridTimeline', {
-			withRenotes: props.withRenotes,
-			withReplies: props.withReplies,
-			withFiles: props.onlyFiles ? true : undefined,
-		});
-	} else if (props.src === 'global') {
-		connection = stream.useChannel('globalTimeline', {
-			withRenotes: props.withRenotes,
-			withFiles: props.onlyFiles ? true : undefined,
-		});
-	} else if (props.src === 'mentions') {
-		connection = stream.useChannel('main');
-		connection.on('mention', prepend);
-	} else if (props.src === 'directs') {
-		const onNote = note => {
-			if (note.visibility === 'specified') {
-				prepend(note);
-			}
-		};
-		connection = stream.useChannel('main');
-		connection.on('mention', onNote);
-	} else if (props.src === 'list') {
-		connection = stream.useChannel('userList', {
-			withFiles: props.onlyFiles ? true : undefined,
-			listId: props.list,
-		});
-	} else if (props.src === 'channel') {
-		connection = stream.useChannel('channel', {
-			channelId: props.channel,
-		});
-	} else if (props.src === 'role') {
-		connection = stream.useChannel('roleTimeline', {
-			roleId: props.role,
-		});
-	}
-	if (props.src !== 'directs' || props.src !== 'mentions') connection.on('note', prepend);
-};
 
 if (props.src === 'antenna') {
 	endpoint = 'antennas/notes';
 	query = {
 		antennaId: props.antenna,
 	};
+	connection = stream.useChannel('antenna', {
+		antennaId: props.antenna,
+	});
+	connection.on('note', prepend);
 } else if (props.src === 'home') {
 	endpoint = 'notes/timeline';
 	query = {
 		withRenotes: props.withRenotes,
 		withFiles: props.onlyFiles ? true : undefined,
 	};
+	connection = stream.useChannel('homeTimeline', {
+		withRenotes: props.withRenotes,
+		withFiles: props.onlyFiles ? true : undefined,
+	});
+	connection.on('note', prepend);
+
+	connection2 = stream.useChannel('main');
 } else if (props.src === 'local') {
 	endpoint = 'notes/local-timeline';
 	query = {
@@ -143,6 +95,12 @@ if (props.src === 'antenna') {
 		withReplies: props.withReplies,
 		withFiles: props.onlyFiles ? true : undefined,
 	};
+	connection = stream.useChannel('localTimeline', {
+		withRenotes: props.withRenotes,
+		withReplies: props.withReplies,
+		withFiles: props.onlyFiles ? true : undefined,
+	});
+	connection.on('note', prepend);
 } else if (props.src === 'social') {
 	endpoint = 'notes/hybrid-timeline';
 	query = {
@@ -150,44 +108,68 @@ if (props.src === 'antenna') {
 		withReplies: props.withReplies,
 		withFiles: props.onlyFiles ? true : undefined,
 	};
+	connection = stream.useChannel('hybridTimeline', {
+		withRenotes: props.withRenotes,
+		withReplies: props.withReplies,
+		withFiles: props.onlyFiles ? true : undefined,
+	});
+	connection.on('note', prepend);
 } else if (props.src === 'global') {
 	endpoint = 'notes/global-timeline';
 	query = {
 		withRenotes: props.withRenotes,
 		withFiles: props.onlyFiles ? true : undefined,
 	};
+	connection = stream.useChannel('globalTimeline', {
+		withRenotes: props.withRenotes,
+		withFiles: props.onlyFiles ? true : undefined,
+	});
+	connection.on('note', prepend);
 } else if (props.src === 'mentions') {
 	endpoint = 'notes/mentions';
+	connection = stream.useChannel('main');
+	connection.on('mention', prepend);
 } else if (props.src === 'directs') {
 	endpoint = 'notes/mentions';
 	query = {
 		visibility: 'specified',
 	};
+	const onNote = note => {
+		if (note.visibility === 'specified') {
+			prepend(note);
+		}
+	};
+	connection = stream.useChannel('main');
+	connection.on('mention', onNote);
 } else if (props.src === 'list') {
 	endpoint = 'notes/user-list-timeline';
 	query = {
 		withFiles: props.onlyFiles ? true : undefined,
 		listId: props.list,
 	};
+	connection = stream.useChannel('userList', {
+		withFiles: props.onlyFiles ? true : undefined,
+		listId: props.list,
+	});
+	connection.on('note', prepend);
 } else if (props.src === 'channel') {
 	endpoint = 'channels/timeline';
 	query = {
 		channelId: props.channel,
 	};
+	connection = stream.useChannel('channel', {
+		channelId: props.channel,
+	});
+	connection.on('note', prepend);
 } else if (props.src === 'role') {
 	endpoint = 'roles/notes';
 	query = {
 		roleId: props.role,
 	};
-}
-
-if (!defaultStore.state.disableStreamingTimeline) {
-	connectChannel();
-
-	onUnmounted(() => {
-		connection.dispose();
-		if (connection2) connection2.dispose();
+	connection = stream.useChannel('roleTimeline', {
+		roleId: props.role,
 	});
+	connection.on('note', prepend);
 }
 
 const pagination = {
@@ -196,19 +178,9 @@ const pagination = {
 	params: query,
 };
 
-const reloadTimeline = (fromPR = false) => {
-	tlNotesCount = 0;
-
-	tlComponent.pagingComponent?.reload().then(() => {
-		reloadStream();
-		if (fromPR) prComponent.refreshFinished();
-	});
-};
-
-//const pullRefresh = () => reloadTimeline(true);
-
-defineExpose({
-	reloadTimeline,
+onUnmounted(() => {
+	connection.dispose();
+	if (connection2) connection2.dispose();
 });
 
 /* TODO

packages/frontend/src/emojilist.json

@@ -1061,7 +1061,7 @@
 	["💰", "moneybag", 6],
 	["🪙", "coin", 6],
 	["💳", "credit_card", 6],
-	["🪪", "identification_card", 6],
+	["🪫", "identification_card", 6],
 	["💎", "gem", 6],
 	["⚖", "balance_scale", 6],
 	["🧰", "toolbox", 6],

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

@@ -151,7 +151,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="imageNewTab">{{ i18n.ts.openImageInNewTab }}</MkSwitch>
 				<MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
 				<MkSwitch v-model="keepScreenOn">{{ i18n.ts.keepScreenOn }}</MkSwitch>
-				<MkSwitch v-model="disableStreamingTimeline">{{ i18n.ts.disableStreamingTimeline }}</MkSwitch>
 			</div>
 			<MkSelect v-model="serverDisconnectedBehavior">
 				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
@@ -254,7 +253,6 @@ const notificationPosition = computed(defaultStore.makeGetterSetter('notificatio
 const notificationStackAxis = computed(defaultStore.makeGetterSetter('notificationStackAxis'));
 const keepScreenOn = computed(defaultStore.makeGetterSetter('keepScreenOn'));
 const defaultWithReplies = computed(defaultStore.makeGetterSetter('defaultWithReplies'));
-const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disableStreamingTimeline'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
@@ -291,7 +289,6 @@ watch([
 	reactionsDisplaySize,
 	highlightSensitiveMedia,
 	keepScreenOn,
-	disableStreamingTimeline,
 ], async () => {
 	await reloadAsk();
 });

packages/frontend/src/pages/timeline.vue

@@ -44,7 +44,6 @@ import { $i } from '@/account.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { miLocalStorage } from '@/local-storage.js';
 import { antennasCache, userListsCache } from '@/cache.js';
-import { deviceKind } from '@/scripts/device-kind.js';
 
 provide('shouldOmitHeaderTitle', true);
 
@@ -140,36 +139,27 @@ function focus(): void {
 	tlComponent.focus();
 }
 
-const headerActions = $computed(() => [
-	...[deviceKind === 'desktop' ? {
-		icon: 'ti ti-refresh',
-		text: i18n.ts.reload,
-		handler: (ev) => {
-			console.log('called');
-			tlComponent.reloadTimeline();
-		},
-	} : {}], {
-		icon: 'ti ti-dots',
-		text: i18n.ts.options,
-		handler: (ev) => {
-			os.popupMenu([{
-				type: 'switch',
-				text: i18n.ts.showRenotes,
-				icon: 'ti ti-repeat',
-				ref: $$(withRenotes),
-			}, src === 'local' || src === 'social' ? {
-				type: 'switch',
-				text: i18n.ts.showRepliesToOthersInTimeline,
-				ref: $$(withReplies),
-			} : undefined, {
-				type: 'switch',
-				text: i18n.ts.fileAttachedOnly,
-				icon: 'ti ti-photo',
-				ref: $$(onlyFiles),
-			}], ev.currentTarget ?? ev.target);
-		},
-	}
-]);
+const headerActions = $computed(() => [{
+	icon: 'ti ti-dots',
+	text: i18n.ts.options,
+	handler: (ev) => {
+		os.popupMenu([{
+			type: 'switch',
+			text: i18n.ts.showRenotes,
+			icon: 'ti ti-repeat',
+			ref: $$(withRenotes),
+		}, src === 'local' || src === 'social' ? {
+			type: 'switch',
+			text: i18n.ts.showRepliesToOthersInTimeline,
+			ref: $$(withReplies),
+		} : undefined, {
+			type: 'switch',
+			text: i18n.ts.fileAttachedOnly,
+			icon: 'ti ti-photo',
+			ref: $$(onlyFiles),
+		}], ev.currentTarget ?? ev.target);
+	},
+}]);
 
 const headerTabs = $computed(() => [...(defaultStore.reactiveState.pinnedUserLists.value.map(l => ({
 	key: 'list:' + l.id,

packages/frontend/src/store.ts

@@ -369,10 +369,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: false,
 	},
-	disableStreamingTimeline: {
-		where: 'device',
-		default: false,
-	},
 }));
 
 // TODO: 他のタブと永続化されたstateを同期

packages/frontend/src/stream.ts

@@ -9,9 +9,6 @@ import { $i } from '@/account.js';
 import { url } from '@/config.js';
 
 let stream: Misskey.Stream | null = null;
-let timeoutHeartBeat: number | null = null;
-
-export let isReloading: boolean = false;
 
 export function useStream(): Misskey.Stream {
 	if (stream) return stream;
@@ -20,20 +17,7 @@ export function useStream(): Misskey.Stream {
 		token: $i.token,
 	} : null));
 
-	timeoutHeartBeat = window.setTimeout(heartbeat, 1000 * 60);
-
-	return stream;
-}
-
-export function reloadStream() {
-	if (!stream) return useStream();
-	if (timeoutHeartBeat) window.clearTimeout(timeoutHeartBeat);
-	isReloading = true;
-
-	stream.close();
-	stream.once('_connected_', () => isReloading = false);
-	stream.stream.reconnect();
-	timeoutHeartBeat = window.setTimeout(heartbeat, 1000 * 60);
+	window.setTimeout(heartbeat, 1000 * 60);
 
 	return stream;
 }
@@ -42,5 +26,5 @@ function heartbeat(): void {
 	if (stream != null && document.visibilityState === 'visible') {
 		stream.heartbeat();
 	}
-	timeoutHeartBeat = window.setTimeout(heartbeat, 1000 * 60);
+	window.setTimeout(heartbeat, 1000 * 60);
 }

packages/frontend/src/ui/_common_/stream-indicator.vue

@@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { onUnmounted } from 'vue';
-import { useStream, isReloading } from '@/stream.js';
+import { useStream } from '@/stream.js';
 import { i18n } from '@/i18n.js';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
@@ -26,7 +26,6 @@ const zIndex = os.claimZIndex('high');
 let hasDisconnected = $ref(false);
 
 function onDisconnected() {
-	if (isReloading) return;
 	hasDisconnected = true;
 }
 

packages/frontend/src/ui/universal.vue

@@ -319,7 +319,7 @@ $widgets-hide-threshold: 1090px;
 	min-width: 0;
 	overflow: auto;
 	overflow-y: scroll;
-	overscroll-behavior: none;
+	overscroll-behavior: contain;
 	background: var(--bg);
 }