#[cfg(feature = "full")]
+use activitypub_federation::{core::object_id::ObjectId, traits::ApubObject};
+#[cfg(feature = "full")]
use diesel_ltree::Ltree;
use serde::{Deserialize, Serialize};
use std::{
#[cfg_attr(feature = "full", derive(DieselNewType))]
pub struct LocalSiteId(i32);
+#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
+#[cfg_attr(feature = "full", derive(DieselNewType))]
+pub struct CustomEmojiId(i32);
+
#[repr(transparent)]
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
#[cfg_attr(feature = "full", derive(AsExpression, FromSqlRow))]
#[cfg_attr(feature = "full", diesel(sql_type = diesel::sql_types::Text))]
-pub struct DbUrl(pub(crate) Url);
+pub struct DbUrl(pub(crate) Box<Url>);
#[cfg(feature = "full")]
#[derive(Serialize, Deserialize)]
impl Display for DbUrl {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
- self.to_owned().0.fmt(f)
+ self.clone().0.fmt(f)
}
}
#[allow(clippy::from_over_into)]
impl Into<DbUrl> for Url {
fn into(self) -> DbUrl {
- DbUrl(self)
+ DbUrl(Box::new(self))
}
}
#[allow(clippy::from_over_into)]
impl Into<Url> for DbUrl {
fn into(self) -> Url {
- self.0
+ *self.0
+ }
+}
+#[cfg(feature = "full")]
+impl<T> From<DbUrl> for ObjectId<T>
+where
+ T: ApubObject + Send,
+ for<'de2> <T as ApubObject>::ApubType: Deserialize<'de2>,
+{
+ fn from(value: DbUrl) -> Self {
+ ObjectId::new(value)
}
}