1 files changed, 24 insertions, 35 deletions

diff --git a/filamento/src/presence.rs b/filamento/src/presence.rs
index a7a8965..de4dd7c 100644
--- a/filamento/src/presence.rs
+++ b/filamento/src/presence.rs
@@ -1,19 +1,20 @@
 use chrono::{DateTime, Utc};
-use sqlx::Sqlite;
+use rusqlite::{
+    ToSql,
+    types::{FromSql, ToSqlOutput, Value},
+};
 use stanza::{client::presence::String1024, xep_0203::Delay};
 
 use crate::caps;
 
-#[derive(Debug, Default, sqlx::FromRow, Clone)]
+#[derive(Debug, Default, Clone)]
 pub struct Online {
     pub show: Option<Show>,
-    #[sqlx(rename = "message")]
     pub status: Option<String>,
-    #[sqlx(skip)]
     pub priority: Option<i8>,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Show {
     Away,
     Chat,
@@ -21,39 +22,27 @@ pub enum Show {
     ExtendedAway,
 }
 
-impl sqlx::Type<Sqlite> for Show {
-    fn type_info() -> <Sqlite as sqlx::Database>::TypeInfo {
-        <&str as sqlx::Type<Sqlite>>::type_info()
-    }
-}
-
-impl sqlx::Decode<'_, Sqlite> for Show {
-    fn decode(
-        value: <Sqlite as sqlx::Database>::ValueRef<'_>,
-    ) -> Result<Self, sqlx::error::BoxDynError> {
-        let value = <&str as sqlx::Decode<Sqlite>>::decode(value)?;
-        match value {
-            "away" => Ok(Self::Away),
-            "chat" => Ok(Self::Chat),
-            "do-not-disturb" => Ok(Self::DoNotDisturb),
-            "extended-away" => Ok(Self::ExtendedAway),
-            _ => unreachable!(),
-        }
+impl ToSql for Show {
+    fn to_sql(&self) -> rusqlite::Result<rusqlite::types::ToSqlOutput<'_>> {
+        Ok(match self {
+            Show::Away => ToSqlOutput::Owned(Value::Text("away".to_string())),
+            Show::Chat => ToSqlOutput::Owned(Value::Text("chat".to_string())),
+            Show::DoNotDisturb => ToSqlOutput::Owned(Value::Text("do-not-disturb".to_string())),
+            Show::ExtendedAway => ToSqlOutput::Owned(Value::Text("extended-away".to_string())),
+        })
     }
 }
 
-impl sqlx::Encode<'_, Sqlite> for Show {
-    fn encode_by_ref(
-        &self,
-        buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'_>,
-    ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
-        let value = match self {
-            Show::Away => "away",
-            Show::Chat => "chat",
-            Show::DoNotDisturb => "do-not-disturb",
-            Show::ExtendedAway => "extended-away",
-        };
-        <&str as sqlx::Encode<Sqlite>>::encode(value, buf)
+impl FromSql for Show {
+    fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult<Self> {
+        Ok(match value.as_str()? {
+            "away" => Self::Away,
+            "chat" => Self::Chat,
+            "do-not-disturb" => Self::DoNotDisturb,
+            "extended-away" => Self::ExtendedAway,
+            // TODO: horrible
+            value => panic!("unexpected {value}"),
+        })
     }
 }