fix: only show draft in message info if self is in chat #6234
Conversation
This PR adds a check to `get_info` so that `draft` is only added if self is part of the group determined by `can_send`. close #6229
Septias
force-pushed
the
sk/hide_draft
branch
from
e6b554c to
e04c444
Compare
src/chat.rs
Outdated
| @@ -1839,7 +1840,7 @@ impl Chat { | |||
| /// deltachat, and the data returned is still subject to change. | |||
| pub async fn get_info(&self, context: &Context) -> Result<ChatInfo> { | |||
| let draft = match self.id.get_draft(context).await? { | |||
| Some(message) => message.text, | |||
| Some(message) if self.can_send(context).await? => message.text, | |||
There was a problem hiding this comment.
With this line you can not set a draft while we are still waiting for securejoin and if chat is still in contact request phase. Also you can not set it if protection status is broken. Maybe this is too restrictive and we should only check is_contact_in_chat here aswell.
|
Maybe disabling draft setting when one is not in a chat is a bit much and should rather be enforced by UI, I don't know how they use our internal API, and disabling it might be too restrictive. That's why we return Ok() but emit a warning and not more. |
| let draft = match self.id.get_draft(context).await? { | ||
| Some(message) => message.text, | ||
| Some(message) if self_in_chat => message.text, |
There was a problem hiding this comment.
if we don't check that drafts are only set when one is part of the chat, the PR reduces to this line only and its test
| .sql | ||
| .query_get_value("SELECT type FROM chats WHERE id=?;", (self,)) | ||
| .await | ||
| .map(|res| res.ok_or(anyhow!("Can't get type for char"))) |
There was a problem hiding this comment.
This should use .context(), otherwise you lose underlying error.
Something like .await.context("Failed to get chat type")?.context("Chat does not exist")
| async fn get_chat_type(self, context: &Context) -> Result<Chattype> { | ||
| context | ||
| .sql | ||
| .query_get_value("SELECT type FROM chats WHERE id=?;", (self,)) |
| @@ -1838,8 +1862,9 @@ impl Chat { | |||
| /// This is somewhat experimental, even more so than the rest of | |||
| /// deltachat, and the data returned is still subject to change. | |||
| pub async fn get_info(&self, context: &Context) -> Result<ChatInfo> { | |||
There was a problem hiding this comment.
Is this function called by any UI? Seems it has been added in #1068
If it is not used after 5 years of being experimental, looks like it should be deprecated.
Chatlist::get_summary that is actually used by the UI does not seem to call it.
|
This very small bug created a lot of discussions without any fix (which I wouldn't have expected when I brought it up), so, doing some issue gardening 🌱, let's move it to project resurrection. |
This PR adds a check to
get_infoso thatdraftis only added if self is part of the group. It also implements a check that stops setting a draft if self is not part of the chat. The function does not fail but only emit an error in this case.close #6229