From 4f34a4e4d81cb47f585ec1f614019837fc9b6cc4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:42:26 +0000
Subject: [PATCH 1/5] [skip ci] Update CHANGELOG.md (prepend template)

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fbb46786..db969a63c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2024.9.0
 
 ### General

From 507e9e580f4f040c5b41cb85c86e84bfef3d5bc9 Mon Sep 17 00:00:00 2001
From: laoXong <admin@moec.top>
Date: Mon, 30 Sep 2024 00:39:00 +0800
Subject: [PATCH 2/5] Update Github Action

---
 .github/workflows/docker-develop.yml | 4 ++--
 .github/workflows/docker.yml         | 2 +-
 .github/workflows/storybook.yml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index ac2b1b4d3..f4b10bcd7 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY_IMAGE: misskey/misskey
+  REGISTRY_IMAGE: laoxong/misskey
 
 jobs:
   # see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
@@ -20,7 +20,7 @@ jobs:
         platform:
           - linux/amd64
           - linux/arm64
-    if: github.repository == 'misskey-dev/misskey'
+    if: github.repository == 'laoxong/misskey'
     steps:
       - name: Prepare
         run: |
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a7e14c884..2b3f52332 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -25,7 +25,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          - linux/arm64
+        #  - linux/arm64
     steps:
       - name: Prepare
         run: |
diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index c02f38ee0..682b6b202 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -19,7 +19,7 @@ jobs:
 
     env:
       NODE_OPTIONS: "--max_old_space_size=7168"
-
+    if: github.repository == 'misskey-dev/misskey'
     steps:
     - uses: actions/checkout@v4.1.1
       if: github.event_name != 'pull_request_target'

From 70045735a78e34fde06bd6dffb770862ea7f3c22 Mon Sep 17 00:00:00 2001
From: Lhc_fl <linca@discourse.org>
Date: Tue, 17 Sep 2024 18:11:46 +0800
Subject: [PATCH 3/5] feat: make notification read more smart

---
 .gitignore                                    |  2 ++
 .../src/components/MkNotifications.vue        | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b270d5cb3..00992f862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,5 @@ vite.config.ts.timestamp-*
 
 # VSCode addon
 .favorites.json
+
+/dump.rdb
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index d67616e6b..31ac709fe 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <MkPullToRefresh :refresher="() => reload()">
-	<MkPagination ref="pagingComponent" :pagination="pagination">
+	<MkPagination ref="pagingComponent" :pagination="pagination" @queue="onQueue">
 		<template #empty>
 			<div class="_fullinfo">
 				<img :src="infoImageUrl" class="_ghost"/>
@@ -65,9 +65,26 @@ function onNotification(notification) {
 
 	if (!isMuted) {
 		pagingComponent.value?.prepend(notification);
+		onQueue();
 	}
 }
 
+let queued = false;
+
+function checkAllNotificationsCanRead() {
+	queued = false;
+	if (!document.hasFocus()) { onQueue(); return; }
+	if (!(pagingComponent.value?.queue.size) && !(props.excludeTypes?.length)) {
+		misskeyApi('notifications/mark-all-as-read');
+	}
+}
+
+function onQueue() {
+	if (queued) return;
+	queued = true;
+	setTimeout(() => checkAllNotificationsCanRead(), 2000);
+}
+
 function reload() {
 	return new Promise<void>((res) => {
 		pagingComponent.value?.reload().then(() => {

From c922a2479bc84c2f207f9c38308e64a1a2ff3fed Mon Sep 17 00:00:00 2001
From: Nya Candy <dev@candinya.com>
Date: Thu, 4 Jan 2024 15:13:51 +0800
Subject: [PATCH 4/5] feat: no notify when ws disconnect

---
 packages/frontend/src/pages/settings/general.vue | 1 +
 packages/frontend/src/store.ts                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 1bfdfd0e7..127f78b8c 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -173,6 +173,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<MkSelect v-model="serverDisconnectedBehavior">
 				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
+				<option :value="null">什么都不做</option>
 				<option value="reload">{{ i18n.ts._serverDisconnectedBehavior.reload }}</option>
 				<option value="dialog">{{ i18n.ts._serverDisconnectedBehavior.dialog }}</option>
 				<option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 1ddcca5af..e48723dcb 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -206,7 +206,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	serverDisconnectedBehavior: {
 		where: 'device',
-		default: 'quiet' as 'quiet' | 'reload' | 'dialog',
+		default: null as null | 'quiet' | 'reload' | 'dialog',
 	},
 	nsfw: {
 		where: 'device',

From 465ced12db3e0cd2072b32288262282985bcdf53 Mon Sep 17 00:00:00 2001
From: laoXong <admin@moec.top>
Date: Mon, 30 Sep 2024 12:10:23 +0800
Subject: [PATCH 5/5] Fix make notification read more smart

---
 packages/frontend/src/components/MkNoteDetailed.vue  | 2 +-
 packages/frontend/src/components/MkNotifications.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index a9c72301e..c1b150e25 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -545,7 +545,7 @@ function loadConversation() {
 	});
 }
 
-onMounted(()=>{
+onMounted(() => {
 	loadReplies();
 	loadConversation();
 });
diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue
index 31ac709fe..3405380c6 100644
--- a/packages/frontend/src/components/MkNotifications.vue
+++ b/packages/frontend/src/components/MkNotifications.vue
@@ -36,6 +36,7 @@ import { infoImageUrl } from '@/instance.js';
 import { defaultStore } from '@/store.js';
 import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
 import * as Misskey from 'misskey-js';
+import { misskeyApi } from '@/scripts/misskey-api';
 
 const props = defineProps<{
 	excludeTypes?: typeof notificationTypes[number][];