Merge pull request #11 from timedin-de/main

ranfdev · web-flow · commit e87e2c24cc00 · 2023-11-27T18:47:12.000+01:00
Added dashes (-) to allowed topics
diff --git a/ntfy-daemon/src/models.rs b/ntfy-daemon/src/models.rs
@@ -18,7 +18,7 @@ fn emoji_map() -> &'static HashMap<String, String> {
 }
 
 pub fn validate_topic(topic: &str) -> Result<&str, Error> {
-    let re = Regex::new(r"^\w+$").unwrap();
+    let re = Regex::new(r"^[\w\-]+$").unwrap();
     if re.is_match(topic) {
         Ok(topic)
     } else {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ fn emoji_map() -> &'static HashMap<String, String> {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`pub fn validate_topic(topic: &str) -> Result<&str, Error> {`
`21`		`- let re = Regex::new(r"^\w+$").unwrap();`
	`21`	`+ let re = Regex::new(r"^[\w\-]+$").unwrap();`
`22`	`22`	`if re.is_match(topic) {`
`23`	`23`	`Ok(topic)`
`24`	`24`	`} else {`