From 7e7aece2f554d605efeaed44d84a7f6d20285a4b Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 28 Jul 2023 15:54:06 +0000
Subject: [PATCH] :v:

---
 packages/frontend/src/components/MkNote.vue   | 23 ++++++++++++++-----
 .../frontend/src/scripts/entity-manager.ts    |  3 ++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index e020ef2f99..5f32af6b66 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -238,7 +238,16 @@ const translation = ref<any>(null);
 const translating = ref(false);
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && !!appearNote?.user.instance);
 const canRenote = computed(() => (!!appearNote && !!$i) && (['public', 'home'].includes(appearNote.visibility) || appearNote.userId === $i.id));
-let renoteCollapsed = $ref(note && appearNote && defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId || $i.id === appearNote.userId)) || (appearNote.myReaction != null)));
+let renoteCollapsed = $ref(
+	note &&
+	appearNote &&
+	defaultStore.state.collapseRenotes &&
+	isRenote.value &&
+	(
+		($i && ($i.id === note.userId || $i.id === appearNote.userId)) ||
+		(appearNote.myReaction != null)
+	)
+);
 
 const keymap = {
 	'r': () => reply(true),
@@ -518,12 +527,14 @@ onActivated(() => {
 });
 
 onDeactivated(() => {
-	if (unuse.value) {
-		unuse.value();
-		unuse.value = undefined;
-	}
+	// 不要なキャッシュ消去や通信を防止するため遅延させる
+	setTimeout(() => {
+		if (unuse.value) {
+			unuse.value();
+			unuse.value = undefined;
+		}
+	}, 1000);
 });
-
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/scripts/entity-manager.ts b/packages/frontend/src/scripts/entity-manager.ts
index 9481ddbd0b..89dd4fae8e 100644
--- a/packages/frontend/src/scripts/entity-manager.ts
+++ b/packages/frontend/src/scripts/entity-manager.ts
@@ -131,7 +131,8 @@ export class NoteManager {
     public async fetch(id: string, force = false): Promise<CachedNote> {
         if (!force) {
             const updatedAt = this.updatedAt.get(id);
-            if (updatedAt && Date.now() - updatedAt < 1000 * 30) {
+            // 2分以上経過していない場合はキャッシュを返す
+            if (updatedAt && Date.now() - updatedAt < 1000 * 120) {
                 const cachedNote = this.get(id);
                 if (cachedNote) {
                     return cachedNote;