mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-11 22:42:39 +00:00
375d9a2a3c
* persistent activity queue * fixes * fixes * make federation workers function callable from outside * log federation instances * dead instance detection not needed here * taplo fmt * split federate bin/lib * minor fix * better logging * log * create struct to hold cancellable task for readability * use boxfuture for readability * reset submodule * fix * fix lint * swap * remove json column, use separate array columns instead * some review comments * make worker a struct for readability * minor readability * add local filter to community follower view * remove separate lemmy_federate entry point * fix remaining duration * address review comments mostly * fix lint * upgrade actitypub-fed to simpler interface * fix sql format * increase delays a bit * fixes after merge * remove selectable * fix instance selectable * add comment * start federation based on latest id at the time * rename federate process args * dead instances in one query * filter follow+report activities by local * remove synchronous federation remove activity sender queue * lint * fix federation tests by waiting for results to change * fix fed test * fix comment report * wait some more * Apply suggestions from code review Co-authored-by: SorteKanin <sortekanin@gmail.com> * fix most remaining tests * wait until private messages * fix community tests * fix community tests * move arg parse * use instance_id instead of domain in federation_queue_state table --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: SorteKanin <sortekanin@gmail.com>
264 lines
7.7 KiB
Rust
264 lines
7.7 KiB
Rust
#[cfg(feature = "full")]
|
|
use activitypub_federation::{
|
|
fetch::collection_id::CollectionId,
|
|
fetch::object_id::ObjectId,
|
|
traits::Collection,
|
|
traits::Object,
|
|
};
|
|
#[cfg(feature = "full")]
|
|
use diesel_ltree::Ltree;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::{
|
|
fmt,
|
|
fmt::{Display, Formatter},
|
|
ops::Deref,
|
|
};
|
|
#[cfg(feature = "full")]
|
|
use ts_rs::TS;
|
|
use url::Url;
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The post id.
|
|
pub struct PostId(pub i32);
|
|
|
|
impl fmt::Display for PostId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The person id.
|
|
pub struct PersonId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The comment id.
|
|
pub struct CommentId(pub i32);
|
|
|
|
impl fmt::Display for CommentId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The community id.
|
|
pub struct CommunityId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Default, Serialize, Deserialize)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The local user id.
|
|
pub struct LocalUserId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The private message id.
|
|
pub struct PrivateMessageId(i32);
|
|
|
|
impl fmt::Display for PrivateMessageId {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The person mention id.
|
|
pub struct PersonMentionId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The person block id.
|
|
pub struct PersonBlockId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The community block id.
|
|
pub struct CommunityBlockId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The comment report id.
|
|
pub struct CommentReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The post report id.
|
|
pub struct PostReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The private message report id.
|
|
pub struct PrivateMessageReportId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The site id.
|
|
pub struct SiteId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The language id.
|
|
pub struct LanguageId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct LocalUserLanguageId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct SiteLanguageId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType))]
|
|
pub struct CommunityLanguageId(pub i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The comment reply id.
|
|
pub struct CommentReplyId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The Image Upload id.
|
|
pub struct ImageUploadId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The instance id.
|
|
pub struct InstanceId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The local site id.
|
|
pub struct LocalSiteId(i32);
|
|
|
|
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize, Default)]
|
|
#[cfg_attr(feature = "full", derive(DieselNewType, TS))]
|
|
#[cfg_attr(feature = "full", ts(export))]
|
|
/// The custom emoji id.
|
|
pub struct CustomEmojiId(i32);
|
|
|
|
#[cfg(feature = "full")]
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(remote = "Ltree")]
|
|
/// Do remote derivation for the Ltree struct
|
|
pub struct LtreeDef(pub String);
|
|
|
|
#[repr(transparent)]
|
|
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug, Hash)]
|
|
#[cfg_attr(feature = "full", derive(AsExpression, FromSqlRow))]
|
|
#[cfg_attr(feature = "full", diesel(sql_type = diesel::sql_types::Text))]
|
|
pub struct DbUrl(pub(crate) Box<Url>);
|
|
|
|
impl DbUrl {
|
|
pub fn inner(&self) -> &Url {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl Display for DbUrl {
|
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
|
self.clone().0.fmt(f)
|
|
}
|
|
}
|
|
|
|
// the project doesnt compile with From
|
|
#[allow(clippy::from_over_into)]
|
|
impl Into<DbUrl> for Url {
|
|
fn into(self) -> DbUrl {
|
|
DbUrl(Box::new(self))
|
|
}
|
|
}
|
|
#[allow(clippy::from_over_into)]
|
|
impl Into<Url> for DbUrl {
|
|
fn into(self) -> Url {
|
|
*self.0
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "full")]
|
|
impl<T> From<DbUrl> for ObjectId<T>
|
|
where
|
|
T: Object + Send + 'static,
|
|
for<'de2> <T as Object>::Kind: Deserialize<'de2>,
|
|
{
|
|
fn from(value: DbUrl) -> Self {
|
|
let url: Url = value.into();
|
|
ObjectId::from(url)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "full")]
|
|
impl<T> From<DbUrl> for CollectionId<T>
|
|
where
|
|
T: Collection + Send + 'static,
|
|
for<'de2> <T as Collection>::Kind: Deserialize<'de2>,
|
|
{
|
|
fn from(value: DbUrl) -> Self {
|
|
let url: Url = value.into();
|
|
CollectionId::from(url)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "full")]
|
|
impl<T> From<CollectionId<T>> for DbUrl
|
|
where
|
|
T: Collection,
|
|
for<'de2> <T as Collection>::Kind: Deserialize<'de2>,
|
|
{
|
|
fn from(value: CollectionId<T>) -> Self {
|
|
let url: Url = value.into();
|
|
url.into()
|
|
}
|
|
}
|
|
|
|
impl Deref for DbUrl {
|
|
type Target = Url;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "full")]
|
|
impl TS for DbUrl {
|
|
fn name() -> String {
|
|
"string".to_string()
|
|
}
|
|
fn dependencies() -> Vec<ts_rs::Dependency> {
|
|
Vec::new()
|
|
}
|
|
fn transparent() -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
impl InstanceId {
|
|
pub fn inner(self) -> i32 {
|
|
self.0
|
|
}
|
|
}
|