2 files changed, 14 insertions, 1 deletions
diff --git a/src/message/app.rs b/src/message/app.rs
index af87553..852b958 100644
--- a/src/message/app.rs
+++ b/src/message/app.rs
@@ -9,6 +9,7 @@ use crate::{
     db::NotFound as _,
     event::{repo::Provider as _, Broadcaster, Event, Sequence},
     login::Login,
+    name,
 };
 
 pub struct Messages<'a> {
@@ -119,6 +120,18 @@ pub enum SendError {
     ChannelNotFound(channel::Id),
     #[error(transparent)]
     Database(#[from] sqlx::Error),
+    #[error(transparent)]
+    Name(#[from] name::Error),
+}
+
+impl From<channel::repo::LoadError> for SendError {
+    fn from(error: channel::repo::LoadError) -> Self {
+        use channel::repo::LoadError;
+        match error {
+            LoadError::Database(error) => error.into(),
+            LoadError::Name(error) => error.into(),
+        }
+    }
 }
 
 #[derive(Debug, thiserror::Error)]
diff --git a/src/message/body.rs b/src/message/body.rs
index a415f85..6dd224c 100644
--- a/src/message/body.rs
+++ b/src/message/body.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::nfc;
+use crate::normalize::nfc;
 
 #[derive(
     Clone, Debug, Default, Eq, PartialEq, serde::Deserialize, serde::Serialize, sqlx::Type,