Integrate mention parsing

bindings/wysiwyg-ffi/src/ffi_composer_model.rs

@@ -258,6 +258,25 @@ impl ComposerModel {
         ))
     }
 
+    /// Creates an at-room mention node and inserts it into the composer at the current selection
+    pub fn insert_at_room_mention(
+        self: &Arc<Self>,
+        attributes: Vec<Attribute>,
+    ) -> Arc<ComposerUpdate> {
+        let attrs = attributes
+            .iter()
+            .map(|attr| {
+                (
+                    Utf16String::from_str(&attr.key),
+                    Utf16String::from_str(&attr.value),
+                )
+            })
+            .collect();
+        Arc::new(ComposerUpdate::from(
+            self.inner.lock().unwrap().insert_at_room_mention(attrs),
+        ))
+    }
+
     /// Creates a mention node and inserts it into the composer at the current selection
     pub fn insert_mention(
         self: &Arc<Self>,
@@ -281,6 +300,31 @@ impl ComposerModel {
         ))
     }
 
+    /// Creates an at-room mention node and inserts it into the composer, replacing the
+    /// text content defined by the suggestion
+    pub fn insert_at_room_mention_at_suggestion(
+        self: &Arc<Self>,
+        suggestion: SuggestionPattern,
+        attributes: Vec<Attribute>,
+    ) -> Arc<ComposerUpdate> {
+        let suggestion = wysiwyg::SuggestionPattern::from(suggestion);
+        let attrs = attributes
+            .iter()
+            .map(|attr| {
+                (
+                    Utf16String::from_str(&attr.key),
+                    Utf16String::from_str(&attr.value),
+                )
+            })
+            .collect();
+        Arc::new(ComposerUpdate::from(
+            self.inner
+                .lock()
+                .unwrap()
+                .insert_at_room_mention_at_suggestion(suggestion, attrs),
+        ))
+    }
+
     /// Creates a mention node and inserts it into the composer, replacing the
     /// text content defined by the suggestion
     pub fn insert_mention_at_suggestion(

bindings/wysiwyg-ffi/src/wysiwyg_composer.udl

@@ -48,7 +48,9 @@ interface ComposerModel {
     ComposerUpdate set_link(string url, sequence<Attribute> attributes);
     ComposerUpdate set_link_with_text(string url, string text, sequence<Attribute> attributes);
     ComposerUpdate remove_links();
+    ComposerUpdate insert_at_room_mention(sequence<Attribute> attributes);
     ComposerUpdate insert_mention(string url, string text, sequence<Attribute> attributes);
+    ComposerUpdate insert_at_room_mention_at_suggestion(SuggestionPattern suggestion, sequence<Attribute> attributes);
     ComposerUpdate insert_mention_at_suggestion(string url, string text, SuggestionPattern suggestion, sequence<Attribute> attributes);
     ComposerUpdate code_block();
     ComposerUpdate quote();

bindings/wysiwyg-wasm/src/lib.rs

@@ -312,6 +312,16 @@ impl ComposerModel {
         ))
     }
 
+    /// Creates an at-room mention node and inserts it into the composer at the current selection
+    pub fn insert_at_room_mention(
+        &mut self,
+        attributes: js_sys::Map,
+    ) -> ComposerUpdate {
+        ComposerUpdate::from(
+            self.inner.insert_at_room_mention(attributes.into_vec()),
+        )
+    }
+
     /// Creates a mention node and inserts it into the composer at the current selection
     pub fn insert_mention(
         &mut self,
@@ -326,6 +336,19 @@ impl ComposerModel {
         ))
     }
 
+    /// Creates an at-room mention node and inserts it into the composer, replacing the
+    /// text content defined by the suggestion
+    pub fn insert_at_room_mention_at_suggestion(
+        &mut self,
+        suggestion: &SuggestionPattern,
+        attributes: js_sys::Map,
+    ) -> ComposerUpdate {
+        ComposerUpdate::from(self.inner.insert_at_room_mention_at_suggestion(
+            wysiwyg::SuggestionPattern::from(suggestion.clone()),
+            attributes.into_vec(),
+        ))
+    }
+
     /// Creates a mention node and inserts it into the composer, replacing the
     /// text content defined by the suggestion
     pub fn insert_mention_at_suggestion(

crates/matrix_mentions/Cargo.toml

@@ -9,6 +9,10 @@ name = "matrix_mentions"
 version = "0.1.0"
 edition = "2021"
 
-[dependencies]
+[features]
+default = ["custom-matrix-urls"]
+custom-matrix-urls = []
 
+[dependencies]
+cfg-if = "1.0.0"
 ruma-common = "0.11.3"

crates/matrix_mentions/src/lib.rs

@@ -14,4 +14,4 @@
 
 mod mention;
 
-pub use crate::mention::Mention;
+pub use crate::mention::{Mention, MentionKind};

crates/matrix_mentions/src/mention.rs

@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use ruma_common::{matrix_uri::MatrixId, MatrixToUri, MatrixUri};
+use ruma_common::{matrix_uri::MatrixId, IdParseError, MatrixToUri, MatrixUri};
+
+const MATRIX_TO_BASE_URL: &str = "https://matrix.to/#/";
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Mention {
@@ -59,6 +61,11 @@ impl Mention {
         &self.kind
     }
 
+    /// Determine if a uri is a valid matrix uri
+    pub fn is_valid_uri(uri: &str) -> bool {
+        parse_matrix_id(uri).is_some()
+    }
+
     /// Create a mention from a URI
     ///
     /// If the URI is a valid room or user, it creates a mention using the
@@ -142,14 +149,51 @@ impl Mention {
     }
 }
 
+/// Determines if a uri can be parsed for a matrix id. Attempts to treat the uri in three
+/// ways when parsing:
+/// 1 - As a matrix uri
+/// 2 - As a matrix to uri
+/// 3 - As a custom uri
+///  
+/// If any of the above succeed, return Some<MatrixIdI. Else return None.
 fn parse_matrix_id(uri: &str) -> Option<MatrixId> {
     if let Ok(matrix_uri) = MatrixUri::parse(uri) {
-        Some(matrix_uri.id().to_owned())
+        return Some(matrix_uri.id().to_owned());
     } else if let Ok(matrix_to_uri) = MatrixToUri::parse(uri) {
-        Some(matrix_to_uri.id().to_owned())
-    } else {
-        None
+        return Some(matrix_to_uri.id().to_owned());
+    }
+
+    cfg_if::cfg_if! {
+        if #[cfg(any(test, feature = "custom-matrix-urls"))] {
+             if let Ok(matrix_to_uri) = parse_external_id(uri) {
+            return Some(matrix_to_uri.id().to_owned());
+        }
+        }
+    }
+
+    None
+}
+
+/// Attempts to split an external id on `/#/`, rebuild as a matrix to style permalink then parse
+/// using ruma.
+///
+/// Returns the result of calling `parse` in ruma.
+
+#[cfg(any(test, feature = "custom-matrix-urls"))]
+fn parse_external_id(uri: &str) -> Result<MatrixToUri, IdParseError> {
+    // first split the string into the parts we need
+    let parts: Vec<&str> = uri.split("/#/").collect();
+
+    // we expect this to split the uri into exactly two parts, if it's anything else, return early
+    if parts.len() != 2 {
+        return Err(IdParseError::Empty);
     }
+    let after_hash = parts[1];
+
+    // now rebuild the string as if it were a matrix to type link, then use ruma to parse
+    let uri_for_ruma = format!("{}{}", MATRIX_TO_BASE_URL, after_hash);
+
+    MatrixToUri::parse(&uri_for_ruma)
 }
 
 #[cfg(test)]
@@ -255,6 +299,29 @@ mod test {
         assert!(Mention::from_uri("hello").is_none());
     }
 
+    #[test]
+    fn parse_uri_external_user() {
+        let uri = "https://custom.custom.com/?secretstuff/#/@alice:example.org";
+        let parsed = Mention::from_uri(uri).unwrap();
+
+        assert_eq!(parsed.uri(), uri);
+        assert_eq!(parsed.mx_id(), "@alice:example.org");
+        assert_eq!(parsed.display_text(), "@alice:example.org");
+        assert_eq!(parsed.kind(), &MentionKind::User);
+    }
+
+    #[test]
+    fn parse_uri_external_room() {
+        let uri =
+            "https://custom.custom.com/?secretstuff/#/!roomid:example.org";
+        let parsed = Mention::from_uri(uri).unwrap();
+
+        assert_eq!(parsed.uri(), uri);
+        assert_eq!(parsed.mx_id(), "!roomid:example.org");
+        assert_eq!(parsed.display_text(), "!roomid:example.org");
+        assert_eq!(parsed.kind(), &MentionKind::Room);
+    }
+
     #[test]
     fn parse_link_user_text() {
         let uri = "https://matrix.to/#/@alice:example.org";