From 441850dd217ca248aba9af152ec407069b008904 Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Sat, 25 Mar 2023 10:12:55 +0000
Subject: [PATCH] Allow emoji names containing hyphens

---
 CHANGELOG.md             | 4 ++++
 src/validators/emojis.rs | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e196afe..0752e57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Added `prune-remote-emojis` command.
 
+### Changed
+
+- Allow emoji names containing hyphens.
+
 ### Fixed
 
 - Fixed error in emoji update SQL query.
diff --git a/src/validators/emojis.rs b/src/validators/emojis.rs
index 440fe76..2269b6b 100644
--- a/src/validators/emojis.rs
+++ b/src/validators/emojis.rs
@@ -2,7 +2,7 @@ use regex::Regex;
 
 use crate::errors::ValidationError;
 
-const EMOJI_NAME_RE: &str = r"^[\w.]+$";
+const EMOJI_NAME_RE: &str = r"^[a-zA-Z0-9._-]+$";
 pub const EMOJI_MAX_SIZE: usize = 250 * 1000; // 250 kB
 pub const EMOJI_LOCAL_MAX_SIZE: usize = 50 * 1000; // 50 kB
 pub const EMOJI_MEDIA_TYPES: [&str; 3] = [
@@ -29,6 +29,10 @@ mod tests {
         let result = validate_emoji_name(valid_name);
         assert!(result.is_ok());
 
+        let valid_name = "01-emoji-name";
+        let result = validate_emoji_name(valid_name);
+        assert!(result.is_ok());
+
         let invalid_name = "emoji\"<script>";
         let result = validate_emoji_name(invalid_name);
         assert!(result.is_err());