From 7681a78dc72ef9568d31c49920dab05f3ac805d3 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Fri, 12 Mar 2021 16:07:16 +0100 Subject: [PATCH] Update convesations policy --- .../js/components/conversations/chatWindows.js | 7 ++++--- assets/js/components/conversations/utils.js | 8 ++++---- .../components/conversations/writingNotifier.js | 2 +- assets/js/pages/conversations/conversation.js | 8 ++++---- assets/js/typings/ServerConfig.d.ts | 17 ++++++++++------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/assets/js/components/conversations/chatWindows.js b/assets/js/components/conversations/chatWindows.js index e3d43e10..63d52924 100644 --- a/assets/js/components/conversations/chatWindows.js +++ b/assets/js/components/conversations/chatWindows.js @@ -146,7 +146,7 @@ const ConvChatWindow = { class: "form-control", placeholder: tr("New message..."), }); - inputText.maxLength = ServerConfig.conf.max_conversation_message_len; + inputText.maxLength = ServerConfig.conf.conversations_policy.max_conversation_message_len; // Notify other users when this user is writing a message ConversationsUtils.listenToInputChangeEvents(inputText, infosBox.conversationID) @@ -164,7 +164,7 @@ const ConvChatWindow = { type: "input", elemType: "file", }); - fileInput.accept = ServerConfig.conf.allowed_conversation_files_type.join(", "); + fileInput.accept = ServerConfig.conf.conversations_policy.allowed_conversation_files_type.join(", "); //Create button group @@ -902,7 +902,8 @@ const ConvChatWindow = { if (message.length == 0) return; - if(message.length < ServerConfig.conf.min_conversation_message_len || message.length > ServerConfig.conf.max_conversation_message_len){ + if(message.length < ServerConfig.conf.conversations_policy.min_conversation_message_len + || message.length > ServerConfig.conf.conversations_policy.max_conversation_message_len){ notify(tr("Invalid message length!"), "danger", 2); return; } diff --git a/assets/js/components/conversations/utils.js b/assets/js/components/conversations/utils.js index 1db72af2..f52b47ec 100644 --- a/assets/js/components/conversations/utils.js +++ b/assets/js/components/conversations/utils.js @@ -241,14 +241,14 @@ const ConversationsUtils = { const file = fileInput.files[0]; - if (ServerConfig.conf.allowed_conversation_files_type.indexOf(file.type) < 0) { + if (ServerConfig.conf.conversations_policy.allowed_conversation_files_type.indexOf(file.type) < 0) { notify(tr("This file type is not allowed!"), "danger") return; } - if (file.size > ServerConfig.conf.conversation_files_max_size) { - notify(tr("This file is too big (max file size: %1%)", {"1": fileSizeToHuman(ServerConfig.conf.conversation_files_max_size)}), "danger"); + if (file.size > ServerConfig.conf.conversations_policy.conversation_files_max_size) { + notify(tr("This file is too big (max file size: %1%)", {"1": fileSizeToHuman(ServerConfig.conf.conversations_policy.conversation_files_max_size)}), "danger"); return; } @@ -301,7 +301,7 @@ const ConversationsUtils = { return; const t = ComunicDate.time(); - if (t - last_update < ServerConfig.conf.conversation_writing_event_interval) + if (t - last_update < ServerConfig.conf.conversations_policy.conversation_writing_event_interval) return; last_update = t; diff --git a/assets/js/components/conversations/writingNotifier.js b/assets/js/components/conversations/writingNotifier.js index c552b3d9..56071c8c 100644 --- a/assets/js/components/conversations/writingNotifier.js +++ b/assets/js/components/conversations/writingNotifier.js @@ -42,7 +42,7 @@ class ConversationWritingNotifier { setTimeout(() => { this.usersFifo.shift(); this.refreshText() - }, ServerConfig.conf.conversation_writing_event_lifetime * 1000) + }, ServerConfig.conf.conversations_policy.conversation_writing_event_lifetime * 1000) } /** diff --git a/assets/js/pages/conversations/conversation.js b/assets/js/pages/conversations/conversation.js index 2d2c266d..5e77360c 100644 --- a/assets/js/pages/conversations/conversation.js +++ b/assets/js/pages/conversations/conversation.js @@ -429,7 +429,7 @@ const ConversationPageConvPart = { //Create image input (for optionnal image) var fileInput = document.createElement("input"); fileInput.type = "file"; - fileInput.accept = ServerConfig.conf.allowed_conversation_files_type.join(", "); + fileInput.accept = ServerConfig.conf.conversations_policy.allowed_conversation_files_type.join(", "); // Send file button var fileButton = createElem2({ @@ -464,7 +464,7 @@ const ConversationPageConvPart = { class: "form-control", placeholder: "New message...", }); - inputText.maxLength = ServerConfig.conf.max_conversation_message_len; + inputText.maxLength = ServerConfig.conf.conversations_policy.max_conversation_message_len; inputText.focus(); // Notify other users when this user is writing a message @@ -536,8 +536,8 @@ const ConversationPageConvPart = { let message = inputText.value; //Check if message is empty - if(message.length > ServerConfig.conf.max_conversation_message_len - || message.length < ServerConfig.conf.min_conversation_message_len){ + if(message.length > ServerConfig.conf.conversations_policy.max_conversation_message_len + || message.length < ServerConfig.conf.conversations_policy.min_conversation_message_len){ notify(tr("Invalid message length!"), "danger", 2); return; } diff --git a/assets/js/typings/ServerConfig.d.ts b/assets/js/typings/ServerConfig.d.ts index 78dee31f..904b9067 100644 --- a/assets/js/typings/ServerConfig.d.ts +++ b/assets/js/typings/ServerConfig.d.ts @@ -24,6 +24,15 @@ declare interface DataConservationPolicySettings { min_likes_lifetime: number } +declare interface ConversationPolicy { + min_conversation_message_len: number, + max_conversation_message_len: number, + allowed_conversation_files_type: String[], + conversation_files_max_size: number, + conversation_writing_event_interval: number, + conversation_writing_event_lifetime: number, +} + declare interface StaticServerConfig { terms_url: string, privacy_policy_url: string, @@ -31,11 +40,5 @@ declare interface StaticServerConfig { android_direct_download_url: string, password_policy: PasswordPolicy, data_conservation_policy: DataConservationPolicySettings, - - min_conversation_message_len: number, - max_conversation_message_len: number, - allowed_conversation_files_type: String[], - conversation_files_max_size: number, - conversation_writing_event_interval: number, - conversation_writing_event_lifetime: number, + conversations_policy: ConversationPolicy, } \ No newline at end of file