Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2024-11-26 15:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Expose to on server configuration max conversation images width

Browse Source
This commit is contained in:
Pierre HUBERT 2021-03-12 19:17:53 +01:00
parent e09da912c4
commit e10402b587
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api_data/server_config.rs
View File

@ -4,7 +4,7 @@
use serde::Serialize; use serde::Serialize;
use crate::constants::{conservation_policy, MIN_SUPPORTED_MOBILE_VERSION, password_policy}; use crate::constants::{conservation_policy, MIN_SUPPORTED_MOBILE_VERSION, password_policy};
use crate::constants::conversations::{ALLOWED_CONVERSATION_FILES_TYPES, CONVERSATION_FILES_MAX_SIZE, CONVERSATION_WRITING_EVENT_INTERVAL, CONVERSATION_WRITING_EVENT_LIFETIME, MAX_CONVERSATION_MESSAGE_LENGTH, MIN_CONVERSATION_MESSAGE_LENGTH}; use crate::constants::conversations::{ALLOWED_CONVERSATION_FILES_TYPES, CONVERSATION_FILES_MAX_SIZE, CONVERSATION_WRITING_EVENT_INTERVAL, CONVERSATION_WRITING_EVENT_LIFETIME, MAX_CONV_IMAGE_MESSAGE_WIDTH, MAX_CONV_MESSAGE_THUMBNAIL_HEIGHT, MAX_CONV_MESSAGE_THUMBNAIL_WIDTH, MAX_CONVERSATION_MESSAGE_LENGTH, MIN_CONVERSATION_MESSAGE_LENGTH};
use crate::data::config::conf; use crate::data::config::conf;
#[derive(Serialize)] #[derive(Serialize)]
@ -37,6 +37,10 @@ struct ConversationsPolicy {
files_max_size: usize, files_max_size: usize,
writing_event_interval: u64, writing_event_interval: u64,
writing_event_lifetime: u64, writing_event_lifetime: u64,
max_message_image_width: u32,
max_message_image_height: u32,
max_thumbnail_width: u32,
max_thumbnail_height: u32,
} }
#[derive(Serialize)] #[derive(Serialize)]
@ -87,6 +91,10 @@ impl ServerConfig {
files_max_size: CONVERSATION_FILES_MAX_SIZE, files_max_size: CONVERSATION_FILES_MAX_SIZE,
writing_event_interval: CONVERSATION_WRITING_EVENT_INTERVAL, writing_event_interval: CONVERSATION_WRITING_EVENT_INTERVAL,
writing_event_lifetime: CONVERSATION_WRITING_EVENT_LIFETIME, writing_event_lifetime: CONVERSATION_WRITING_EVENT_LIFETIME,
max_message_image_width: MAX_CONV_IMAGE_MESSAGE_WIDTH,
max_message_image_height: MAX_CONV_IMAGE_MESSAGE_WIDTH,
max_thumbnail_width: MAX_CONV_MESSAGE_THUMBNAIL_WIDTH,
max_thumbnail_height: MAX_CONV_MESSAGE_THUMBNAIL_HEIGHT,
}, },
} }
} }

8
src/constants.rs
View File

@ -200,4 +200,12 @@ pub mod conversations {
/// Lifetime of conversation writing event /// Lifetime of conversation writing event
pub const CONVERSATION_WRITING_EVENT_LIFETIME: u64 = 3; pub const CONVERSATION_WRITING_EVENT_LIFETIME: u64 = 3;
/// Image size
pub const MAX_CONV_IMAGE_MESSAGE_WIDTH: u32 = 2000;
pub const MAX_CONV_IMAGE_MESSAGE_HEIGHT: u32 = 2000;
/// Thumbnail size
pub const MAX_CONV_MESSAGE_THUMBNAIL_WIDTH: u32 = 300;
pub const MAX_CONV_MESSAGE_THUMBNAIL_HEIGHT: u32 = 300;
} }

6
src/controllers/conversations_controller.rs
View File

@ -12,7 +12,7 @@ use crate::api_data::res_count_unread_conversations::ResultCountUnreadConversati
use crate::api_data::res_create_conversation::ResCreateConversation; use crate::api_data::res_create_conversation::ResCreateConversation;
use crate::api_data::res_find_private_conversations::ResFindPrivateConversations; use crate::api_data::res_find_private_conversations::ResFindPrivateConversations;
use crate::api_data::user_is_writing_message_in_conversation::UserIsWritingMessageInConversation; use crate::api_data::user_is_writing_message_in_conversation::UserIsWritingMessageInConversation;
use crate::constants::conversations::{ALLOWED_CONVERSATION_FILES_TYPES, CONVERSATION_FILES_MAX_SIZE, MAX_CONVERSATION_MESSAGE_LENGTH, MIN_CONVERSATION_MESSAGE_LENGTH}; use crate::constants::conversations::{ALLOWED_CONVERSATION_FILES_TYPES, CONVERSATION_FILES_MAX_SIZE, MAX_CONV_IMAGE_MESSAGE_HEIGHT, MAX_CONV_IMAGE_MESSAGE_WIDTH, MAX_CONV_MESSAGE_THUMBNAIL_HEIGHT, MAX_CONV_MESSAGE_THUMBNAIL_WIDTH, MAX_CONVERSATION_MESSAGE_LENGTH, MIN_CONVERSATION_MESSAGE_LENGTH};
use crate::controllers::user_ws_controller; use crate::controllers::user_ws_controller;
use crate::data::base_request_handler::{BaseRequestHandler, RequestValue}; use crate::data::base_request_handler::{BaseRequestHandler, RequestValue};
use crate::data::conversation::NewConversationSettings; use crate::data::conversation::NewConversationSettings;
@ -313,7 +313,7 @@ pub fn send_message(r: &mut HttpRequestHandler) -> RequestResult {
thumbnail = Some("file".to_string()); thumbnail = Some("file".to_string());
} }
path = r.save_post_image("file", "conversation", 2000, 2000)?; path = r.save_post_image("file", "conversation", MAX_CONV_IMAGE_MESSAGE_WIDTH, MAX_CONV_IMAGE_MESSAGE_HEIGHT)?;
mime_type = "image/png".to_string(); mime_type = "image/png".to_string();
name = "picture.png".to_string(); name = "picture.png".to_string();
} }
@ -352,7 +352,7 @@ pub fn send_message(r: &mut HttpRequestHandler) -> RequestResult {
// Attempt to save thumbnail, if it fails we can not save message // Attempt to save thumbnail, if it fails we can not save message
let thumbnail = match thumbnail { let thumbnail = match thumbnail {
None => None, None => None,
Some(f) => Some(match r.save_post_image(&f, "conversations-thumb", 300, 300) { Some(f) => Some(match r.save_post_image(&f, "conversations-thumb", MAX_CONV_MESSAGE_THUMBNAIL_WIDTH, MAX_CONV_MESSAGE_THUMBNAIL_HEIGHT) {
Ok(s) => Ok(s), Ok(s) => Ok(s),
Err(e) => { Err(e) => {
eprintln!("Failed to save conversation thumbnail! {:#?}", e); eprintln!("Failed to save conversation thumbnail! {:#?}", e);