add chat_get_media to jsonrpc

also add viewtype wrapper enum and use it in `MessageObject`,
additionally to using it in `chat_get_media`

deltachat-jsonrpc/src/api/mod.rs

@@ -1,6 +1,6 @@
 use anyhow::{anyhow, bail, Context, Result};
 use deltachat::{
-    chat::{get_chat_msgs, ChatId},
+    chat::{get_chat_media, get_chat_msgs, ChatId},
     chatlist::Chatlist,
     config::Config,
     contact::{may_be_valid_addr, Contact, ContactId},
@@ -31,6 +31,8 @@ use types::message::MessageObject;
 use types::provider_info::ProviderInfo;
 use types::webxdc::WebxdcMessageInfo;
 
+use self::types::message::MessageViewtype;
+
 #[derive(Clone, Debug)]
 pub struct CommandApi {
     pub(crate) accounts: Arc<RwLock<Accounts>>,
@@ -557,6 +559,40 @@ impl CommandApi {
         }
         Ok(contacts)
     }
+    // ---------------------------------------------
+    //                   chat
+    // ---------------------------------------------
+
+    /// Returns all message IDs of the given types in a chat.
+    /// Typically used to show a gallery.
+    ///
+    /// The list is already sorted and starts with the oldest message.
+    /// Clients should not try to re-sort the list as this would be an expensive action
+    /// and would result in inconsistencies between clients.
+    async fn chat_get_media(
+        &self,
+        account_id: u32,
+        chat_id: u32,
+        message_type: MessageViewtype,
+        or_message_type2: Option<MessageViewtype>,
+        or_message_type3: Option<MessageViewtype>,
+    ) -> Result<Vec<u32>> {
+        let ctx = self.get_context(account_id).await?;
+
+        let msg_type = message_type.into();
+        let or_msg_type2 = or_message_type2.map_or(Viewtype::Unknown, |v| v.into());
+        let or_msg_type3 = or_message_type3.map_or(Viewtype::Unknown, |v| v.into());
+
+        let media = get_chat_media(
+            &ctx,
+            ChatId::new(chat_id),
+            msg_type,
+            or_msg_type2,
+            or_msg_type3,
+        )
+        .await?;
+        Ok(media.iter().map(|msg_id| msg_id.to_u32()).collect())
+    }
 
     // ---------------------------------------------
     //                   webxdc

deltachat-jsonrpc/src/api/types/message.rs

@@ -3,7 +3,9 @@ use deltachat::contact::Contact;
 use deltachat::context::Context;
 use deltachat::message::Message;
 use deltachat::message::MsgId;
+use deltachat::message::Viewtype;
 use num_traits::cast::ToPrimitive;
+use serde::Deserialize;
 use serde::Serialize;
 use typescript_type_def::TypeDef;
 
@@ -20,7 +22,7 @@ pub struct MessageObject {
     text: Option<String>,
     has_location: bool,
     has_html: bool,
-    view_type: u32,
+    view_type: MessageViewtype,
     state: u32,
 
     timestamp: i64,
@@ -77,10 +79,7 @@ impl MessageObject {
             text: message.get_text(),
             has_location: message.has_location(),
             has_html: message.has_html(),
-            view_type: message
-                .get_viewtype()
-                .to_u32()
-                .ok_or_else(|| anyhow!("viewtype conversion to number failed"))?,
+            view_type: message.get_viewtype().into(),
             state: message
                 .get_state()
                 .to_u32()
@@ -125,3 +124,79 @@ impl MessageObject {
         })
     }
 }
+
+#[derive(Serialize, Deserialize, TypeDef)]
+#[serde(rename = "Viewtype")]
+pub enum MessageViewtype {
+    Unknown,
+
+    /// Text message.
+    Text,
+
+    /// Image message.
+    /// If the image is an animated GIF, the type `Viewtype.Gif` should be used.
+    Image,
+
+    /// Animated GIF message.
+    Gif,
+
+    /// Message containing a sticker, similar to image.
+    /// If possible, the ui should display the image without borders in a transparent way.
+    /// A click on a sticker will offer to install the sticker set in some future.
+    Sticker,
+
+    /// Message containing an Audio file.
+    Audio,
+
+    /// A voice message that was directly recorded by the user.
+    /// For all other audio messages, the type `Viewtype.Audio` should be used.
+    Voice,
+
+    /// Video messages.
+    Video,
+
+    /// Message containing any file, eg. a PDF.
+    File,
+
+    /// Message is an invitation to a videochat.
+    VideochatInvitation,
+
+    /// Message is an webxdc instance.
+    Webxdc,
+}
+
+impl From<Viewtype> for MessageViewtype {
+    fn from(viewtype: Viewtype) -> Self {
+        match viewtype {
+            Viewtype::Unknown => MessageViewtype::Unknown,
+            Viewtype::Text => MessageViewtype::Text,
+            Viewtype::Image => MessageViewtype::Image,
+            Viewtype::Gif => MessageViewtype::Gif,
+            Viewtype::Sticker => MessageViewtype::Sticker,
+            Viewtype::Audio => MessageViewtype::Audio,
+            Viewtype::Voice => MessageViewtype::Voice,
+            Viewtype::Video => MessageViewtype::Video,
+            Viewtype::File => MessageViewtype::File,
+            Viewtype::VideochatInvitation => MessageViewtype::VideochatInvitation,
+            Viewtype::Webxdc => MessageViewtype::Webxdc,
+        }
+    }
+}
+
+impl From<MessageViewtype> for Viewtype {
+    fn from(viewtype: MessageViewtype) -> Self {
+        match viewtype {
+            MessageViewtype::Unknown => Viewtype::Unknown,
+            MessageViewtype::Text => Viewtype::Text,
+            MessageViewtype::Image => Viewtype::Image,
+            MessageViewtype::Gif => Viewtype::Gif,
+            MessageViewtype::Sticker => Viewtype::Sticker,
+            MessageViewtype::Audio => Viewtype::Audio,
+            MessageViewtype::Voice => Viewtype::Voice,
+            MessageViewtype::Video => Viewtype::Video,
+            MessageViewtype::File => Viewtype::File,
+            MessageViewtype::VideochatInvitation => Viewtype::VideochatInvitation,
+            MessageViewtype::Webxdc => Viewtype::Webxdc,
+        }
+    }
+}