よく話すユーザーの閉じるが保存されるようになど Resolve #4676 (#4677)

mei23 · Aug 14, 2023 · b64f747 · b64f747
1 parent 727ac19
commit b64f747
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue
@@ -100,6 +100,7 @@ export default Vue.extend({
 
 		onToggle(show: boolean) {
 			if (show && !this.initialized) this.init();
+			this.$emit('toggle', show);
 		}
 	}
 });

diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -19,7 +19,13 @@
 	<!-- リアクション -->
 	<x-reactions :user="user" :key="user.id" :deck="true"/>
 	<!-- よく話すユーザー -->
-	<mk-user-list :make-promise="makeFrequentlyRepliedUsersPromise" :icon-only="true" :key="user.id"><fa icon="users"/> {{ $t('@.frequently-replied-users') }}</mk-user-list>
+	<mk-user-list
+		:make-promise="makeFrequentlyRepliedUsersPromise"
+		:expanded="$store.state.device.expandUsersFrequentlyRepliedUsers"
+		@toggle="expanded => $store.commit('device/set', { key: 'expandUsersFrequentlyRepliedUsers', value: expanded })"
+		:icon-only="true"
+		:key="user.id"
+	><fa icon="users"/> {{ $t('@.frequently-replied-users') }}</mk-user-list>
 	<!-- フォト -->
 	<ui-container v-if="images.length > 0" :body-togglable="true"
 		:expanded="$store.state.device.expandUsersPhotos"

diff --git a/src/client/app/desktop/views/home/user/user.home.vue b/src/client/app/desktop/views/home/user/user.home.vue
@@ -15,7 +15,11 @@
 	<!-- リアクション -->
 	<x-reactions :user="user"/>
 	<!-- よく話すユーザー -->
-	<mk-user-list :make-promise="makeFrequentlyRepliedUsersPromise" :icon-only="true"><fa icon="users"/> {{ $t('@.frequently-replied-users') }}</mk-user-list>
+	<mk-user-list :make-promise="makeFrequentlyRepliedUsersPromise"
+		:expanded="$store.state.device.expandUsersFrequentlyRepliedUsers"
+		@toggle="expanded => $store.commit('device/set', { key: 'expandUsersFrequentlyRepliedUsers', value: expanded })"
+		:icon-only="true"
+	><fa icon="users"/> {{ $t('@.frequently-replied-users') }}</mk-user-list>
 	<!-- フォト -->
 	<x-photos :user="user"/>
 	<!-- タイムライン -->

diff --git a/src/client/app/mobile/views/pages/user/home.vue b/src/client/app/mobile/views/pages/user/home.vue
@@ -20,7 +20,12 @@
 		</div>
 	</ui-container>
 	<x-reactions :user="user" style="margin-top: 16px; margin-bottom: 16px; "/>
-	<mk-user-list :make-promise="makeFrequentlyRepliedUsersPromise" :icon-only="true"><fa icon="users"/> {{ $t('frequently-replied-users') }}</mk-user-list>
+	<mk-user-list
+		:make-promise="makeFrequentlyRepliedUsersPromise"
+		:expanded="$store.state.device.expandUsersFrequentlyRepliedUsers"
+		@toggle="expanded => $store.commit('device/set', { key: 'expandUsersFrequentlyRepliedUsers', value: expanded })"
+		:icon-only="true"
+	><fa icon="users"/> {{ $t('frequently-replied-users') }}</mk-user-list>
 </div>
 </template>
 

diff --git a/src/client/app/store.ts b/src/client/app/store.ts
@@ -81,8 +81,9 @@ const defaultDeviceSettings = Object.assign({
 	expandUsersPhotos: true,
 	expandUsersWarp: false,
 	expandUsersActivity: true,
-	expandUsersReactions: true,
-	expandUsersReacteds: true,
+	expandUsersReactions: false,
+	expandUsersReacteds: false,
+	expandUsersFrequentlyRepliedUsers: false,
 	showPostPreview: true,
 	enableMobileQuickNotificationView: false,
 	roomGraphicsQuality: 'medium',
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,6 +100,7 @@ export default Vue.extend({ @@
     		onToggle(show: boolean) {
     			if (show && !this.initialized) this.init();
+    			this.$emit('toggle', show);
     		}
     	}
     });
@@ Expand Down @@