Comunic/comunicapiv3
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2025-06-20 16:35:17 +00:00
Code Issues Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Pierre HUBERT
2021-03-05 11:58:31 +01:00
parent fbf4728347
commit 0ae6ffb814
5 changed files with 50 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/controllers/conversations_controller.rs
View File

@ -93,7 +93,7 @@ pub fn update_settings(r: &mut HttpRequestHandler) -> RequestResult {
if r.has_post_parameter("following") {
conversations_helper::set_following(
&r.user_id()?,
conv_membership.member_id,
conv_membership.conv_id,
r.post_bool("following")?,
)?;
}
@ -208,12 +208,20 @@ pub fn refresh_single(r: &mut HttpRequestHandler) -> RequestResult {
let messages = match last_message_id {
// Get latest messages of the conversation
0 => conversations_helper::get_last_messages(conv.member_id, 10)?,
0 => conversations_helper::get_last_messages(conv.conv_id, 10)?,
// Get new messages
_ => conversations_helper::get_new_messages(conv.member_id, last_message_id)?,
_ => conversations_helper::get_new_messages(conv.conv_id, last_message_id)?,
};
if messages.len() > 0 {
conversations_helper::mark_user_seen(
conv.conv_id,
r.user_id_ref()?,
messages.iter().map(|m| m.id).max().unwrap(),
)?;
}
r.set_response(ConversationMessageAPI::for_list(&messages))
}
@ -230,7 +238,7 @@ pub fn get_older_messages(r: &mut HttpRequestHandler) -> RequestResult {
_ => 60
};
let messages = conversations_helper::get_older_messages(conv.member_id, max_id, limit)?;
let messages = conversations_helper::get_older_messages(conv.conv_id, max_id, limit)?;
r.set_response(ConversationMessageAPI::for_list(&messages))
}
@ -284,7 +292,7 @@ pub fn count_unread(r: &mut HttpRequestHandler) -> RequestResult {
pub fn list_unread(r: &mut HttpRequestHandler) -> RequestResult {
let list = conversations_helper::get_list_unread(&r.user_id()?)?;
r.set_response(UnreadConversationAPI::for_list(&list))
r.set_response(UnreadConversationAPI::for_list(&list)?)
}
/// Delete a conversation