From 7dc38ada9a2655bdf4c8cad78fc5277b6b8db90f Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Sun, 29 Oct 2023 12:52:20 +0100
Subject: [PATCH] MMM: Fixed hashtag serialization

---
 ext_calckey_model/src/lib.rs   |  4 ++--
 magnetar_mmm_parser/src/lib.rs | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ext_calckey_model/src/lib.rs b/ext_calckey_model/src/lib.rs
index 7273d74..29ff648 100644
--- a/ext_calckey_model/src/lib.rs
+++ b/ext_calckey_model/src/lib.rs
@@ -12,8 +12,8 @@ use redis::IntoConnectionInfo;
 use sea_orm::sea_query::IntoIden;
 use sea_orm::ActiveValue::Set;
 use sea_orm::{
-    ColumnTrait, ConnectOptions, DatabaseConnection, DbErr, EntityTrait, JoinType, QueryFilter,
-    QueryOrder, RelationDef, RelationTrait, TransactionTrait,
+    ColumnTrait, ConnectOptions, DatabaseConnection, DbErr, EntityTrait, QueryFilter, QueryOrder,
+    RelationDef, RelationTrait, TransactionTrait,
 };
 use serde::{Deserialize, Serialize};
 use std::future::Future;
diff --git a/magnetar_mmm_parser/src/lib.rs b/magnetar_mmm_parser/src/lib.rs
index 0631cc7..02f170c 100644
--- a/magnetar_mmm_parser/src/lib.rs
+++ b/magnetar_mmm_parser/src/lib.rs
@@ -414,7 +414,7 @@ impl Token {
             Token::Hashtag(tag) => {
                 writer
                     .create_element("hashtag")
-                    .with_attribute(("tag", tag.as_str()));
+                    .write_text_content(BytesText::new(tag.as_str()))?;
             }
         }
 
@@ -2325,6 +2325,16 @@ text</center>"#
             r#"<mmm><mention name="natty" type="user"/> <fn name="spin" arg-speed="0.5s"><ue>🥺</ue></fn><ee>cat_attack</ee> test</mmm>"#
         );
 
+        assert_eq!(
+            &to_xml_string(&parse_full(
+                "Ring Galaxy AM 0644 741 from Hubble\nCredits: AURA, STScI, J. Higdon, Cornell, ESA, #NASA\n#nature #space #astrophotography"
+            ))
+            .unwrap(),
+            r#"<mmm>Ring Galaxy AM 0644 741 from Hubble
+Credits: AURA, STScI, J. Higdon, Cornell, ESA, <hashtag>NASA</hashtag>
+<hashtag>nature</hashtag> <hashtag>space</hashtag> <hashtag>astrophotography</hashtag></mmm>"#
+        );
+
         assert_eq!(
             &to_xml_string(&parse_full(
                 r#"