From ab37b5f74c8297a96509422b4ce1d6e0c856a859 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Tue, 12 Sep 2023 13:19:15 +0200
Subject: [PATCH] redo ExpirationSettings.vue for non-moderators

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .../ConversationSettingsDialog.vue            | 14 +++++---
 .../ExpirationSettings.vue                    | 35 ++++++++++++++-----
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue
index 09f5da5f7db..8a174ef30cd 100644
--- a/src/components/ConversationSettings/ConversationSettingsDialog.vue
+++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue
@@ -46,12 +46,16 @@
 				<NotificationsSettings :conversation="conversation" />
 			</NcAppSettingsSection>
 
-			<NcAppSettingsSection id="conversation-settings"
+			<NcAppSettingsSection v-if="canFullModerate"
+				id="conversation-settings"
 				:title="t('spreed', 'Moderation')">
-				<ListableSettings v-if="canFullModerate"
-					:token="token" />
-				<LinkShareSettings v-if="canFullModerate"
-					ref="linkShareSettings" />
+				<ListableSettings :token="token" />
+				<LinkShareSettings ref="linkShareSettings" />
+				<ExpirationSettings :token="token" can-full-moderate />
+			</NcAppSettingsSection>
+			<NcAppSettingsSection v-else
+				id="conversation-settings"
+				:title="t('spreed', 'Setup summary')">
 				<ExpirationSettings :token="token" />
 			</NcAppSettingsSection>
 
diff --git a/src/components/ConversationSettings/ExpirationSettings.vue b/src/components/ConversationSettings/ExpirationSettings.vue
index 43f33d426c6..fca8b1eb5a9 100644
--- a/src/components/ConversationSettings/ExpirationSettings.vue
+++ b/src/components/ConversationSettings/ExpirationSettings.vue
@@ -27,12 +27,26 @@
 		<div class="app-settings-section__hint">
 			{{ t('spreed', 'Chat messages can be expired after a certain time. Note: Files shared in chat will not be deleted for the owner, but will no longer be shared in the conversation.') }}
 		</div>
-		<NcSelect :value="selectedOption"
-			:options="expirationOptions"
-			label="label"
-			close-on-select
-			:clearable="false"
-			@option:selected="changeExpiration" />
+
+		<template v-if="canFullModerate">
+			<label for="moderation_settings_message_expiration" class="app-settings-section__label">
+				{{ t('spreed', 'Set message expiration') }}
+			</label>
+			<NcSelect id="moderation_settings_message_expiration"
+				:value="selectedOption"
+				:options="expirationOptions"
+				label="label"
+				close-on-select
+				:clearable="false"
+				@option:selected="changeExpiration" />
+		</template>
+
+		<template v-else>
+			<h5 class="app-settings-section__subtitle">
+				{{ t('spreed', 'Current message expiration') }}
+			</h5>
+			<p>{{ selectedOption.label }}</p>
+		</template>
 	</div>
 </template>
 
@@ -53,6 +67,11 @@ export default {
 			type: String,
 			default: null,
 		},
+
+		canFullModerate: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	data() {
@@ -132,7 +151,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-:deep(.mx-input) {
-	margin: 0;
+.app-settings-section__label {
+  display: block;
 }
 </style>