mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-09-09 16:08:49 -06:00
persistent activity queue
This commit is contained in:
parent
102124b6d2
commit
4506309d83
75
Cargo.lock
generated
75
Cargo.lock
generated
@ -24,12 +24,14 @@ dependencies = [
|
|||||||
"derive_builder",
|
"derive_builder",
|
||||||
"dyn-clone",
|
"dyn-clone",
|
||||||
"enum_delegate",
|
"enum_delegate",
|
||||||
|
"futures",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"http",
|
"http",
|
||||||
"http-signature-normalization",
|
"http-signature-normalization",
|
||||||
"http-signature-normalization-reqwest",
|
"http-signature-normalization-reqwest",
|
||||||
"httpdate",
|
"httpdate",
|
||||||
"itertools 0.10.5",
|
"itertools 0.10.5",
|
||||||
|
"moka",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"openssl",
|
"openssl",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
@ -1334,15 +1336,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dashmap"
|
name = "dashmap"
|
||||||
version = "5.4.0"
|
version = "5.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
|
checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"hashbrown 0.12.3",
|
"hashbrown 0.14.0",
|
||||||
"lock_api",
|
"lock_api",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"parking_lot_core 0.9.4",
|
"parking_lot_core 0.9.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2765,6 +2767,7 @@ dependencies = [
|
|||||||
name = "lemmy_db_views_actor"
|
name = "lemmy_db_views_actor"
|
||||||
version = "0.18.1"
|
version = "0.18.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
"diesel",
|
"diesel",
|
||||||
"diesel-async",
|
"diesel-async",
|
||||||
"lemmy_db_schema",
|
"lemmy_db_schema",
|
||||||
@ -2785,6 +2788,39 @@ dependencies = [
|
|||||||
"ts-rs",
|
"ts-rs",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lemmy_federate"
|
||||||
|
version = "0.18.1"
|
||||||
|
dependencies = [
|
||||||
|
"activitypub_federation",
|
||||||
|
"anyhow",
|
||||||
|
"async-trait",
|
||||||
|
"bytes",
|
||||||
|
"chrono",
|
||||||
|
"dashmap",
|
||||||
|
"diesel",
|
||||||
|
"diesel-async",
|
||||||
|
"enum_delegate",
|
||||||
|
"futures",
|
||||||
|
"lemmy_api_common",
|
||||||
|
"lemmy_apub",
|
||||||
|
"lemmy_db_schema",
|
||||||
|
"lemmy_db_views_actor",
|
||||||
|
"lemmy_utils",
|
||||||
|
"moka",
|
||||||
|
"once_cell",
|
||||||
|
"openssl",
|
||||||
|
"reqwest",
|
||||||
|
"reqwest-middleware",
|
||||||
|
"reqwest-tracing",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lemmy_routes"
|
name = "lemmy_routes"
|
||||||
version = "0.18.1"
|
version = "0.18.1"
|
||||||
@ -3005,9 +3041,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lock_api"
|
name = "lock_api"
|
||||||
version = "0.4.9"
|
version = "0.4.10"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
|
checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"scopeguard",
|
"scopeguard",
|
||||||
@ -3615,7 +3651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lock_api",
|
"lock_api",
|
||||||
"parking_lot_core 0.9.4",
|
"parking_lot_core 0.9.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3627,22 +3663,22 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
"instant",
|
"instant",
|
||||||
"libc",
|
"libc",
|
||||||
"redox_syscall",
|
"redox_syscall 0.2.16",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "parking_lot_core"
|
name = "parking_lot_core"
|
||||||
version = "0.9.4"
|
version = "0.9.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
|
checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"libc",
|
"libc",
|
||||||
"redox_syscall",
|
"redox_syscall 0.3.5",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"windows-sys 0.42.0",
|
"windows-targets",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -4293,6 +4329,15 @@ dependencies = [
|
|||||||
"bitflags 1.3.2",
|
"bitflags 1.3.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
version = "0.3.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 1.3.2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.9.1"
|
version = "1.9.1"
|
||||||
@ -5164,7 +5209,7 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
"fastrand",
|
"fastrand",
|
||||||
"libc",
|
"libc",
|
||||||
"redox_syscall",
|
"redox_syscall 0.2.16",
|
||||||
"remove_dir_all",
|
"remove_dir_all",
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
@ -5393,9 +5438,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-util"
|
name = "tokio-util"
|
||||||
version = "0.7.4"
|
version = "0.7.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
|
checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
|
@ -54,6 +54,7 @@ members = [
|
|||||||
"crates/db_views_actor",
|
"crates/db_views_actor",
|
||||||
"crates/db_views_actor",
|
"crates/db_views_actor",
|
||||||
"crates/routes",
|
"crates/routes",
|
||||||
|
"crates/federate",
|
||||||
]
|
]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
@ -67,9 +68,7 @@ lemmy_routes = { version = "=0.18.1", path = "./crates/routes" }
|
|||||||
lemmy_db_views = { version = "=0.18.1", path = "./crates/db_views" }
|
lemmy_db_views = { version = "=0.18.1", path = "./crates/db_views" }
|
||||||
lemmy_db_views_actor = { version = "=0.18.1", path = "./crates/db_views_actor" }
|
lemmy_db_views_actor = { version = "=0.18.1", path = "./crates/db_views_actor" }
|
||||||
lemmy_db_views_moderator = { version = "=0.18.1", path = "./crates/db_views_moderator" }
|
lemmy_db_views_moderator = { version = "=0.18.1", path = "./crates/db_views_moderator" }
|
||||||
activitypub_federation = { version = "0.4.6", default-features = false, features = [
|
activitypub_federation = { version = "0.4.6", default-features = false, features = ["actix-web"], git= "https://github.com/phiresky/activitypub-federation-rust/", branch="raw-sending" }
|
||||||
"actix-web",
|
|
||||||
] }
|
|
||||||
diesel = "2.1.0"
|
diesel = "2.1.0"
|
||||||
diesel_migrations = "2.1.0"
|
diesel_migrations = "2.1.0"
|
||||||
diesel-async = "0.3.1"
|
diesel-async = "0.3.1"
|
||||||
@ -88,7 +87,6 @@ tracing-error = "0.2.0"
|
|||||||
tracing-log = "0.1.3"
|
tracing-log = "0.1.3"
|
||||||
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
|
||||||
url = { version = "2.4.0", features = ["serde"] }
|
url = { version = "2.4.0", features = ["serde"] }
|
||||||
url_serde = "0.2.0"
|
|
||||||
reqwest = { version = "0.11.18", features = ["json", "blocking"] }
|
reqwest = { version = "0.11.18", features = ["json", "blocking"] }
|
||||||
reqwest-middleware = "0.2.2"
|
reqwest-middleware = "0.2.2"
|
||||||
reqwest-tracing = "0.4.5"
|
reqwest-tracing = "0.4.5"
|
||||||
@ -120,7 +118,6 @@ futures = "0.3.28"
|
|||||||
http = "0.2.9"
|
http = "0.2.9"
|
||||||
percent-encoding = "2.3.0"
|
percent-encoding = "2.3.0"
|
||||||
rosetta-i18n = "0.1.3"
|
rosetta-i18n = "0.1.3"
|
||||||
rand = "0.8.5"
|
|
||||||
opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
|
opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
|
||||||
tracing-opentelemetry = { version = "0.19.0" }
|
tracing-opentelemetry = { version = "0.19.0" }
|
||||||
ts-rs = { version = "6.2", features = ["serde-compat", "chrono-impl"] }
|
ts-rs = { version = "6.2", features = ["serde-compat", "chrono-impl"] }
|
||||||
|
@ -27,6 +27,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::{
|
community::{
|
||||||
CommunityFollower,
|
CommunityFollower,
|
||||||
CommunityFollowerForm,
|
CommunityFollowerForm,
|
||||||
@ -97,12 +98,13 @@ impl BlockUser {
|
|||||||
|
|
||||||
match target {
|
match target {
|
||||||
SiteOrCommunity::Site(_) => {
|
SiteOrCommunity::Site(_) => {
|
||||||
let inboxes = remote_instance_inboxes(&mut context.pool()).await?;
|
let mut inboxes = ActivitySendTargets::empty();
|
||||||
|
inboxes.set_all_instances(true);
|
||||||
send_lemmy_activity(context, block, mod_, inboxes, false).await
|
send_lemmy_activity(context, block, mod_, inboxes, false).await
|
||||||
}
|
}
|
||||||
SiteOrCommunity::Community(c) => {
|
SiteOrCommunity::Community(c) => {
|
||||||
let activity = AnnouncableActivities::BlockUser(block);
|
let activity = AnnouncableActivities::BlockUser(block);
|
||||||
let inboxes = vec![user.shared_inbox_or_inbox()];
|
let inboxes = ActivitySendTargets::to_inbox(user.shared_inbox_or_inbox());
|
||||||
send_activity_in_community(activity, mod_, c, inboxes, true, context).await
|
send_activity_in_community(activity, mod_, c, inboxes, true, context).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@ use activitypub_federation::{
|
|||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::{CommunityPersonBan, CommunityPersonBanForm},
|
community::{CommunityPersonBan, CommunityPersonBanForm},
|
||||||
moderator::{ModBan, ModBanForm, ModBanFromCommunity, ModBanFromCommunityForm},
|
moderator::{ModBan, ModBanForm, ModBanFromCommunity, ModBanFromCommunityForm},
|
||||||
person::{Person, PersonUpdateForm},
|
person::{Person, PersonUpdateForm},
|
||||||
@ -59,10 +60,10 @@ impl UndoBlockUser {
|
|||||||
audience,
|
audience,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut inboxes = vec![user.shared_inbox_or_inbox()];
|
let mut inboxes = ActivitySendTargets::to_inbox(user.shared_inbox_or_inbox());
|
||||||
match target {
|
match target {
|
||||||
SiteOrCommunity::Site(_) => {
|
SiteOrCommunity::Site(_) => {
|
||||||
inboxes.append(&mut remote_instance_inboxes(&mut context.pool()).await?);
|
inboxes.set_all_instances(true);
|
||||||
send_lemmy_activity(context, undo, mod_, inboxes, false).await
|
send_lemmy_activity(context, undo, mod_, inboxes, false).await
|
||||||
}
|
}
|
||||||
SiteOrCommunity::Community(c) => {
|
SiteOrCommunity::Community(c) => {
|
||||||
|
@ -21,6 +21,7 @@ use activitypub_federation::{
|
|||||||
traits::{ActivityHandler, Actor},
|
traits::{ActivityHandler, Actor},
|
||||||
};
|
};
|
||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
|
use lemmy_db_schema::source::activity::ActivitySendTargets;
|
||||||
use lemmy_utils::error::{LemmyError, LemmyErrorType};
|
use lemmy_utils::error::{LemmyError, LemmyErrorType};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
@ -92,7 +93,7 @@ impl AnnounceActivity {
|
|||||||
context: &Data<LemmyContext>,
|
context: &Data<LemmyContext>,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
let announce = AnnounceActivity::new(object.clone(), community, context)?;
|
let announce = AnnounceActivity::new(object.clone(), community, context)?;
|
||||||
let inboxes = community.get_follower_inboxes(context).await?;
|
let inboxes = ActivitySendTargets::to_local_community_followers(community.id);
|
||||||
send_lemmy_activity(context, announce, community, inboxes.clone(), false).await?;
|
send_lemmy_activity(context, announce, community, inboxes.clone(), false).await?;
|
||||||
|
|
||||||
// Pleroma and Mastodon can't handle activities like Announce/Create/Page. So for
|
// Pleroma and Mastodon can't handle activities like Announce/Create/Page. So for
|
||||||
|
@ -30,6 +30,7 @@ use lemmy_api_common::{
|
|||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
impls::community::CollectionType,
|
impls::community::CollectionType,
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::{Community, CommunityModerator, CommunityModeratorForm},
|
community::{Community, CommunityModerator, CommunityModeratorForm},
|
||||||
moderator::{ModAddCommunity, ModAddCommunityForm},
|
moderator::{ModAddCommunity, ModAddCommunityForm},
|
||||||
person::Person,
|
person::Person,
|
||||||
@ -64,7 +65,7 @@ impl CollectionAdd {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let activity = AnnouncableActivities::CollectionAdd(add);
|
let activity = AnnouncableActivities::CollectionAdd(add);
|
||||||
let inboxes = vec![added_mod.shared_inbox_or_inbox()];
|
let inboxes = ActivitySendTargets::to_inbox(added_mod.shared_inbox_or_inbox());
|
||||||
send_activity_in_community(activity, actor, community, inboxes, true, context).await
|
send_activity_in_community(activity, actor, community, inboxes, true, context).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,7 +90,15 @@ impl CollectionAdd {
|
|||||||
audience: Some(community.id().into()),
|
audience: Some(community.id().into()),
|
||||||
};
|
};
|
||||||
let activity = AnnouncableActivities::CollectionAdd(add);
|
let activity = AnnouncableActivities::CollectionAdd(add);
|
||||||
send_activity_in_community(activity, actor, community, vec![], true, context).await
|
send_activity_in_community(
|
||||||
|
activity,
|
||||||
|
actor,
|
||||||
|
community,
|
||||||
|
ActivitySendTargets::empty(),
|
||||||
|
true,
|
||||||
|
context,
|
||||||
|
)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ use lemmy_api_common::{
|
|||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
impls::community::CollectionType,
|
impls::community::CollectionType,
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::{Community, CommunityModerator, CommunityModeratorForm},
|
community::{Community, CommunityModerator, CommunityModeratorForm},
|
||||||
moderator::{ModAddCommunity, ModAddCommunityForm},
|
moderator::{ModAddCommunity, ModAddCommunityForm},
|
||||||
post::{Post, PostUpdateForm},
|
post::{Post, PostUpdateForm},
|
||||||
@ -57,7 +58,7 @@ impl CollectionRemove {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let activity = AnnouncableActivities::CollectionRemove(remove);
|
let activity = AnnouncableActivities::CollectionRemove(remove);
|
||||||
let inboxes = vec![removed_mod.shared_inbox_or_inbox()];
|
let inboxes = ActivitySendTargets::to_inbox(removed_mod.shared_inbox_or_inbox());
|
||||||
send_activity_in_community(activity, actor, community, inboxes, true, context).await
|
send_activity_in_community(activity, actor, community, inboxes, true, context).await
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,7 +83,15 @@ impl CollectionRemove {
|
|||||||
audience: Some(community.id().into()),
|
audience: Some(community.id().into()),
|
||||||
};
|
};
|
||||||
let activity = AnnouncableActivities::CollectionRemove(remove);
|
let activity = AnnouncableActivities::CollectionRemove(remove);
|
||||||
send_activity_in_community(activity, actor, community, vec![], true, context).await
|
send_activity_in_community(
|
||||||
|
activity,
|
||||||
|
actor,
|
||||||
|
community,
|
||||||
|
ActivitySendTargets::empty(),
|
||||||
|
true,
|
||||||
|
context,
|
||||||
|
)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::Community,
|
community::Community,
|
||||||
post::{Post, PostUpdateForm},
|
post::{Post, PostUpdateForm},
|
||||||
},
|
},
|
||||||
@ -150,7 +151,7 @@ impl SendActivity for LockPost {
|
|||||||
activity,
|
activity,
|
||||||
&local_user_view.person.into(),
|
&local_user_view.person.into(),
|
||||||
&community.into(),
|
&community.into(),
|
||||||
vec![],
|
ActivitySendTargets::empty(),
|
||||||
true,
|
true,
|
||||||
context,
|
context,
|
||||||
)
|
)
|
||||||
|
@ -6,9 +6,8 @@ use crate::{
|
|||||||
};
|
};
|
||||||
use activitypub_federation::{config::Data, traits::Actor};
|
use activitypub_federation::{config::Data, traits::Actor};
|
||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
use lemmy_db_schema::source::person::PersonFollower;
|
use lemmy_db_schema::source::{activity::ActivitySendTargets, person::PersonFollower};
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::error::LemmyError;
|
||||||
use url::Url;
|
|
||||||
|
|
||||||
pub mod announce;
|
pub mod announce;
|
||||||
pub mod collection_add;
|
pub mod collection_add;
|
||||||
@ -34,7 +33,7 @@ pub(crate) async fn send_activity_in_community(
|
|||||||
activity: AnnouncableActivities,
|
activity: AnnouncableActivities,
|
||||||
actor: &ApubPerson,
|
actor: &ApubPerson,
|
||||||
community: &ApubCommunity,
|
community: &ApubCommunity,
|
||||||
extra_inboxes: Vec<Url>,
|
extra_inboxes: ActivitySendTargets,
|
||||||
is_mod_action: bool,
|
is_mod_action: bool,
|
||||||
context: &Data<LemmyContext>,
|
context: &Data<LemmyContext>,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
@ -43,8 +42,8 @@ pub(crate) async fn send_activity_in_community(
|
|||||||
|
|
||||||
// send to user followers
|
// send to user followers
|
||||||
if !is_mod_action {
|
if !is_mod_action {
|
||||||
inboxes.extend(
|
inboxes.add_inboxes(
|
||||||
&mut PersonFollower::list_followers(&mut context.pool(), actor.id)
|
PersonFollower::list_followers(&mut context.pool(), actor.id)
|
||||||
.await?
|
.await?
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|p| ApubPerson(p).shared_inbox_or_inbox()),
|
.map(|p| ApubPerson(p).shared_inbox_or_inbox()),
|
||||||
@ -56,7 +55,7 @@ pub(crate) async fn send_activity_in_community(
|
|||||||
AnnounceActivity::send(activity.clone().try_into()?, community, context).await?;
|
AnnounceActivity::send(activity.clone().try_into()?, community, context).await?;
|
||||||
} else {
|
} else {
|
||||||
// send to the community, which will then forward to followers
|
// send to the community, which will then forward to followers
|
||||||
inboxes.push(community.shared_inbox_or_inbox());
|
inboxes.add_inbox(community.shared_inbox_or_inbox());
|
||||||
}
|
}
|
||||||
|
|
||||||
send_lemmy_activity(context, activity.clone(), actor, inboxes, false).await?;
|
send_lemmy_activity(context, activity.clone(), actor, inboxes, false).await?;
|
||||||
|
@ -20,6 +20,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
comment_report::{CommentReport, CommentReportForm},
|
comment_report::{CommentReport, CommentReportForm},
|
||||||
post_report::{PostReport, PostReportForm},
|
post_report::{PostReport, PostReportForm},
|
||||||
},
|
},
|
||||||
@ -94,8 +95,8 @@ impl Report {
|
|||||||
id: id.clone(),
|
id: id.clone(),
|
||||||
audience: Some(community.id().into()),
|
audience: Some(community.id().into()),
|
||||||
};
|
};
|
||||||
|
// todo: this should probably filter and only send if the community is remote?
|
||||||
let inbox = vec![community.shared_inbox_or_inbox()];
|
let inbox = ActivitySendTargets::to_inbox(community.shared_inbox_or_inbox());
|
||||||
send_lemmy_activity(context, report, actor, inbox, false).await
|
send_lemmy_activity(context, report, actor, inbox, false).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,10 @@ use lemmy_api_common::{
|
|||||||
context::LemmyContext,
|
context::LemmyContext,
|
||||||
utils::local_user_view_from_jwt,
|
utils::local_user_view_from_jwt,
|
||||||
};
|
};
|
||||||
use lemmy_db_schema::{source::community::Community, traits::Crud};
|
use lemmy_db_schema::{
|
||||||
|
source::{activity::ActivitySendTargets, community::Community},
|
||||||
|
traits::Crud,
|
||||||
|
};
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::error::LemmyError;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
@ -63,7 +66,15 @@ impl UpdateCommunity {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let activity = AnnouncableActivities::UpdateCommunity(update);
|
let activity = AnnouncableActivities::UpdateCommunity(update);
|
||||||
send_activity_in_community(activity, actor, &community, vec![], true, context).await
|
send_activity_in_community(
|
||||||
|
activity,
|
||||||
|
actor,
|
||||||
|
&community,
|
||||||
|
ActivitySendTargets::empty(),
|
||||||
|
true,
|
||||||
|
context,
|
||||||
|
)
|
||||||
|
.await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ use lemmy_db_schema::{
|
|||||||
aggregates::structs::CommentAggregates,
|
aggregates::structs::CommentAggregates,
|
||||||
newtypes::PersonId,
|
newtypes::PersonId,
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
comment::{Comment, CommentLike, CommentLikeForm},
|
comment::{Comment, CommentLike, CommentLikeForm},
|
||||||
community::Community,
|
community::Community,
|
||||||
person::Person,
|
person::Person,
|
||||||
@ -128,10 +129,10 @@ impl CreateOrUpdateNote {
|
|||||||
.map(|t| t.href.clone())
|
.map(|t| t.href.clone())
|
||||||
.map(ObjectId::from)
|
.map(ObjectId::from)
|
||||||
.collect();
|
.collect();
|
||||||
let mut inboxes = vec![];
|
let mut inboxes = ActivitySendTargets::empty();
|
||||||
for t in tagged_users {
|
for t in tagged_users {
|
||||||
let person = t.dereference(context).await?;
|
let person = t.dereference(context).await?;
|
||||||
inboxes.push(person.shared_inbox_or_inbox());
|
inboxes.add_inbox(person.shared_inbox_or_inbox());
|
||||||
}
|
}
|
||||||
|
|
||||||
let activity = AnnouncableActivities::CreateOrUpdateComment(create_or_update);
|
let activity = AnnouncableActivities::CreateOrUpdateComment(create_or_update);
|
||||||
|
@ -30,6 +30,7 @@ use lemmy_db_schema::{
|
|||||||
aggregates::structs::PostAggregates,
|
aggregates::structs::PostAggregates,
|
||||||
newtypes::PersonId,
|
newtypes::PersonId,
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::Community,
|
community::Community,
|
||||||
person::Person,
|
person::Person,
|
||||||
post::{Post, PostLike, PostLikeForm},
|
post::{Post, PostLike, PostLikeForm},
|
||||||
@ -103,7 +104,7 @@ impl CreateOrUpdatePage {
|
|||||||
activity,
|
activity,
|
||||||
&person,
|
&person,
|
||||||
&community,
|
&community,
|
||||||
vec![],
|
ActivitySendTargets::empty(),
|
||||||
is_mod_action,
|
is_mod_action,
|
||||||
&context,
|
&context,
|
||||||
)
|
)
|
||||||
|
@ -19,7 +19,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
newtypes::PersonId,
|
newtypes::PersonId,
|
||||||
source::{person::Person, private_message::PrivateMessage},
|
source::{activity::ActivitySendTargets, person::Person, private_message::PrivateMessage},
|
||||||
traits::Crud,
|
traits::Crud,
|
||||||
};
|
};
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::error::LemmyError;
|
||||||
@ -89,7 +89,8 @@ impl CreateOrUpdateChatMessage {
|
|||||||
.await?,
|
.await?,
|
||||||
kind,
|
kind,
|
||||||
};
|
};
|
||||||
let inbox = vec![recipient.shared_inbox_or_inbox()];
|
let inbox = ActivitySendTargets::to_inbox(recipient.shared_inbox_or_inbox());
|
||||||
|
|
||||||
send_lemmy_activity(context, create_or_update, &sender, inbox, true).await
|
send_lemmy_activity(context, create_or_update, &sender, inbox, true).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,7 @@ use lemmy_api_common::{
|
|||||||
person::{DeleteAccount, DeleteAccountResponse},
|
person::{DeleteAccount, DeleteAccountResponse},
|
||||||
utils::{delete_user_account, local_user_view_from_jwt},
|
utils::{delete_user_account, local_user_view_from_jwt},
|
||||||
};
|
};
|
||||||
|
use lemmy_db_schema::source::activity::ActivitySendTargets;
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::error::LemmyError;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
@ -51,7 +52,9 @@ impl SendActivity for DeleteAccount {
|
|||||||
cc: vec![],
|
cc: vec![],
|
||||||
};
|
};
|
||||||
|
|
||||||
let inboxes = remote_instance_inboxes(&mut context.pool()).await?;
|
let mut inboxes = ActivitySendTargets::empty();
|
||||||
|
inboxes.set_all_instances(true);
|
||||||
|
|
||||||
send_lemmy_activity(context, delete, &actor, inboxes, true).await?;
|
send_lemmy_activity(context, delete, &actor, inboxes, true).await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -38,6 +38,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
comment::{Comment, CommentUpdateForm},
|
comment::{Comment, CommentUpdateForm},
|
||||||
community::{Community, CommunityUpdateForm},
|
community::{Community, CommunityUpdateForm},
|
||||||
person::Person,
|
person::Person,
|
||||||
@ -238,7 +239,7 @@ async fn send_apub_delete_in_community(
|
|||||||
activity,
|
activity,
|
||||||
&actor,
|
&actor,
|
||||||
&community.into(),
|
&community.into(),
|
||||||
vec![],
|
ActivitySendTargets::empty(),
|
||||||
is_mod_action,
|
is_mod_action,
|
||||||
context,
|
context,
|
||||||
)
|
)
|
||||||
@ -258,9 +259,9 @@ async fn send_apub_delete_private_message(
|
|||||||
.into();
|
.into();
|
||||||
|
|
||||||
let deletable = DeletableObjects::PrivateMessage(pm.into());
|
let deletable = DeletableObjects::PrivateMessage(pm.into());
|
||||||
let inbox = vec![recipient.shared_inbox_or_inbox()];
|
let inbox = ActivitySendTargets::to_inbox(recipient.shared_inbox_or_inbox());
|
||||||
if deleted {
|
if deleted {
|
||||||
let delete = Delete::new(actor, deletable, recipient.id(), None, None, context)?;
|
let delete: Delete = Delete::new(actor, deletable, recipient.id(), None, None, context)?;
|
||||||
send_lemmy_activity(context, delete, actor, inbox, true).await?;
|
send_lemmy_activity(context, delete, actor, inbox, true).await?;
|
||||||
} else {
|
} else {
|
||||||
let undo = UndoDelete::new(actor, deletable, recipient.id(), None, None, context)?;
|
let undo = UndoDelete::new(actor, deletable, recipient.id(), None, None, context)?;
|
||||||
|
@ -10,7 +10,10 @@ use activitypub_federation::{
|
|||||||
traits::{ActivityHandler, Actor},
|
traits::{ActivityHandler, Actor},
|
||||||
};
|
};
|
||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable};
|
use lemmy_db_schema::{
|
||||||
|
source::{activity::ActivitySendTargets, community::CommunityFollower},
|
||||||
|
traits::Followable,
|
||||||
|
};
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::error::LemmyError;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
@ -29,7 +32,7 @@ impl AcceptFollow {
|
|||||||
&context.settings().get_protocol_and_hostname(),
|
&context.settings().get_protocol_and_hostname(),
|
||||||
)?,
|
)?,
|
||||||
};
|
};
|
||||||
let inbox = vec![person.shared_inbox_or_inbox()];
|
let inbox = ActivitySendTargets::to_inbox(person.shared_inbox_or_inbox());
|
||||||
send_lemmy_activity(context, accept, &user_or_community, inbox, true).await
|
send_lemmy_activity(context, accept, &user_or_community, inbox, true).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::{Community, CommunityFollower, CommunityFollowerForm},
|
community::{Community, CommunityFollower, CommunityFollowerForm},
|
||||||
person::{PersonFollower, PersonFollowerForm},
|
person::{PersonFollower, PersonFollowerForm},
|
||||||
},
|
},
|
||||||
@ -70,7 +71,8 @@ impl Follow {
|
|||||||
.ok();
|
.ok();
|
||||||
|
|
||||||
let follow = Follow::new(actor, community, context)?;
|
let follow = Follow::new(actor, community, context)?;
|
||||||
let inbox = vec![community.shared_inbox_or_inbox()];
|
// todo: this should probably filter and only send if the community is remote?
|
||||||
|
let inbox = ActivitySendTargets::to_inbox(community.shared_inbox_or_inbox());
|
||||||
send_lemmy_activity(context, follow, actor, inbox, true).await
|
send_lemmy_activity(context, follow, actor, inbox, true).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,7 @@ use activitypub_federation::{
|
|||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
community::{CommunityFollower, CommunityFollowerForm},
|
community::{CommunityFollower, CommunityFollowerForm},
|
||||||
person::{PersonFollower, PersonFollowerForm},
|
person::{PersonFollower, PersonFollowerForm},
|
||||||
},
|
},
|
||||||
@ -40,7 +41,8 @@ impl UndoFollow {
|
|||||||
&context.settings().get_protocol_and_hostname(),
|
&context.settings().get_protocol_and_hostname(),
|
||||||
)?,
|
)?,
|
||||||
};
|
};
|
||||||
let inbox = vec![community.shared_inbox_or_inbox()];
|
// todo: this should probably filter and only send if the community is remote?
|
||||||
|
let inbox = ActivitySendTargets::to_inbox(community.shared_inbox_or_inbox());
|
||||||
send_lemmy_activity(context, undo, actor, inbox, true).await
|
send_lemmy_activity(context, undo, actor, inbox, true).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ use crate::{
|
|||||||
CONTEXT,
|
CONTEXT,
|
||||||
};
|
};
|
||||||
use activitypub_federation::{
|
use activitypub_federation::{
|
||||||
activity_queue::send_activity,
|
|
||||||
config::Data,
|
config::Data,
|
||||||
fetch::object_id::ObjectId,
|
fetch::object_id::ObjectId,
|
||||||
kinds::public,
|
kinds::public,
|
||||||
@ -12,17 +11,14 @@ use activitypub_federation::{
|
|||||||
traits::{ActivityHandler, Actor},
|
traits::{ActivityHandler, Actor},
|
||||||
};
|
};
|
||||||
use anyhow::anyhow;
|
use anyhow::anyhow;
|
||||||
use lemmy_api_common::{
|
use lemmy_api_common::context::LemmyContext;
|
||||||
context::LemmyContext,
|
|
||||||
send_activity::{ActivityChannel, SendActivityData},
|
|
||||||
};
|
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
newtypes::CommunityId,
|
newtypes::CommunityId,
|
||||||
source::{
|
source::{
|
||||||
activity::{SentActivity, SentActivityForm},
|
activity::{ActivityInsertForm, ActivitySendTargets, ActorType},
|
||||||
community::Community,
|
community::Community,
|
||||||
instance::Instance,
|
|
||||||
},
|
},
|
||||||
|
traits::Crud,
|
||||||
};
|
};
|
||||||
use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView};
|
use lemmy_db_views_actor::structs::{CommunityPersonBanView, CommunityView};
|
||||||
use lemmy_utils::{
|
use lemmy_utils::{
|
||||||
@ -163,17 +159,21 @@ where
|
|||||||
Url::parse(&id)
|
Url::parse(&id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) trait GetActorType {
|
||||||
|
fn actor_type(&self) -> ActorType;
|
||||||
|
}
|
||||||
|
|
||||||
#[tracing::instrument(skip_all)]
|
#[tracing::instrument(skip_all)]
|
||||||
async fn send_lemmy_activity<Activity, ActorT>(
|
async fn send_lemmy_activity<Activity, ActorT>(
|
||||||
data: &Data<LemmyContext>,
|
data: &Data<LemmyContext>,
|
||||||
activity: Activity,
|
activity: Activity,
|
||||||
actor: &ActorT,
|
actor: &ActorT,
|
||||||
mut inbox: Vec<Url>,
|
send_targets: ActivitySendTargets,
|
||||||
sensitive: bool,
|
sensitive: bool,
|
||||||
) -> Result<(), LemmyError>
|
) -> Result<(), LemmyError>
|
||||||
where
|
where
|
||||||
Activity: ActivityHandler + Serialize + Send + Sync + Clone,
|
Activity: ActivityHandler + Serialize + Send + Sync + Clone,
|
||||||
ActorT: Actor,
|
ActorT: Actor + GetActorType,
|
||||||
Activity: ActivityHandler<Error = LemmyError>,
|
Activity: ActivityHandler<Error = LemmyError>,
|
||||||
{
|
{
|
||||||
static CACHE: Lazy<Cache<(), Arc<Vec<String>>>> = Lazy::new(|| {
|
static CACHE: Lazy<Cache<(), Arc<Vec<String>>>> = Lazy::new(|| {
|
||||||
@ -199,6 +199,8 @@ where
|
|||||||
ap_id: activity.id().clone().into(),
|
ap_id: activity.id().clone().into(),
|
||||||
data: serde_json::to_value(activity.clone())?,
|
data: serde_json::to_value(activity.clone())?,
|
||||||
sensitive,
|
sensitive,
|
||||||
|
send_targets,
|
||||||
|
actor_apub_id: actor.id().into(),
|
||||||
};
|
};
|
||||||
SentActivity::create(&mut data.pool(), form).await?;
|
SentActivity::create(&mut data.pool(), form).await?;
|
||||||
send_activity(activity, actor, inbox, data).await?;
|
send_activity(activity, actor, inbox, data).await?;
|
||||||
|
@ -20,6 +20,7 @@ use lemmy_api_common::{
|
|||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
newtypes::CommunityId,
|
newtypes::CommunityId,
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActivitySendTargets,
|
||||||
comment::{CommentLike, CommentLikeForm},
|
comment::{CommentLike, CommentLikeForm},
|
||||||
community::Community,
|
community::Community,
|
||||||
person::Person,
|
person::Person,
|
||||||
@ -91,17 +92,18 @@ async fn send_activity(
|
|||||||
.await?
|
.await?
|
||||||
.into();
|
.into();
|
||||||
|
|
||||||
|
let empty = ActivitySendTargets::empty();
|
||||||
// score of 1 means upvote, -1 downvote, 0 undo a previous vote
|
// score of 1 means upvote, -1 downvote, 0 undo a previous vote
|
||||||
if score != 0 {
|
if score != 0 {
|
||||||
let vote = Vote::new(object_id, &actor, &community, score.try_into()?, context)?;
|
let vote = Vote::new(object_id, &actor, &community, score.try_into()?, context)?;
|
||||||
let activity = AnnouncableActivities::Vote(vote);
|
let activity = AnnouncableActivities::Vote(vote);
|
||||||
send_activity_in_community(activity, &actor, &community, vec![], false, context).await
|
send_activity_in_community(activity, &actor, &community, empty, false, context).await
|
||||||
} else {
|
} else {
|
||||||
// Lemmy API doesnt distinguish between Undo/Like and Undo/Dislike, so we hardcode it here.
|
// Lemmy API doesnt distinguish between Undo/Like and Undo/Dislike, so we hardcode it here.
|
||||||
let vote = Vote::new(object_id, &actor, &community, VoteType::Like, context)?;
|
let vote = Vote::new(object_id, &actor, &community, VoteType::Like, context)?;
|
||||||
let undo_vote = UndoVote::new(vote, &actor, &community, context)?;
|
let undo_vote = UndoVote::new(vote, &actor, &community, context)?;
|
||||||
let activity = AnnouncableActivities::UndoVote(undo_vote);
|
let activity = AnnouncableActivities::UndoVote(undo_vote);
|
||||||
send_activity_in_community(activity, &actor, &community, vec![], false, context).await
|
send_activity_in_community(activity, &actor, &community, empty, false, context).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,6 +12,7 @@ use lemmy_utils::error::LemmyError;
|
|||||||
|
|
||||||
pub mod post_or_comment;
|
pub mod post_or_comment;
|
||||||
pub mod search;
|
pub mod search;
|
||||||
|
pub mod site_or_community_or_user;
|
||||||
pub mod user_or_community;
|
pub mod user_or_community;
|
||||||
|
|
||||||
/// Resolve actor identifier like `!news@example.com` to user or community object.
|
/// Resolve actor identifier like `!news@example.com` to user or community object.
|
||||||
|
108
crates/apub/src/fetcher/site_or_community_or_user.rs
Normal file
108
crates/apub/src/fetcher/site_or_community_or_user.rs
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
use crate::{
|
||||||
|
fetcher::user_or_community::{PersonOrGroup, UserOrCommunity},
|
||||||
|
objects::instance::ApubSite,
|
||||||
|
protocol::objects::instance::Instance,
|
||||||
|
};
|
||||||
|
use activitypub_federation::{
|
||||||
|
config::Data,
|
||||||
|
traits::{Actor, Object},
|
||||||
|
};
|
||||||
|
use chrono::NaiveDateTime;
|
||||||
|
use lemmy_api_common::context::LemmyContext;
|
||||||
|
use lemmy_utils::error::LemmyError;
|
||||||
|
use reqwest::Url;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
// todo: maybe this enum should be somewhere else?
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum SiteOrCommunityOrUser {
|
||||||
|
Site(ApubSite),
|
||||||
|
UserOrCommunity(UserOrCommunity),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||||
|
#[serde(untagged)]
|
||||||
|
pub enum SiteOrPersonOrGroup {
|
||||||
|
Instance(Instance),
|
||||||
|
PersonOrGroup(PersonOrGroup),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait::async_trait]
|
||||||
|
impl Object for SiteOrCommunityOrUser {
|
||||||
|
type DataType = LemmyContext;
|
||||||
|
type Kind = SiteOrPersonOrGroup;
|
||||||
|
type Error = LemmyError;
|
||||||
|
|
||||||
|
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
|
||||||
|
Some(match self {
|
||||||
|
SiteOrCommunityOrUser::Site(p) => p.last_refreshed_at,
|
||||||
|
SiteOrCommunityOrUser::UserOrCommunity(p) => p.last_refreshed_at()?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip_all)]
|
||||||
|
async fn read_from_id(
|
||||||
|
object_id: Url,
|
||||||
|
data: &Data<Self::DataType>,
|
||||||
|
) -> Result<Option<Self>, LemmyError> {
|
||||||
|
unimplemented!();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip_all)]
|
||||||
|
async fn delete(self, data: &Data<Self::DataType>) -> Result<(), LemmyError> {
|
||||||
|
match self {
|
||||||
|
SiteOrCommunityOrUser::Site(p) => p.delete(data).await,
|
||||||
|
SiteOrCommunityOrUser::UserOrCommunity(p) => p.delete(data).await,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn into_json(self, _data: &Data<Self::DataType>) -> Result<Self::Kind, LemmyError> {
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip_all)]
|
||||||
|
async fn verify(
|
||||||
|
apub: &Self::Kind,
|
||||||
|
expected_domain: &Url,
|
||||||
|
data: &Data<Self::DataType>,
|
||||||
|
) -> Result<(), LemmyError> {
|
||||||
|
match apub {
|
||||||
|
SiteOrPersonOrGroup::Instance(a) => ApubSite::verify(a, expected_domain, data).await,
|
||||||
|
SiteOrPersonOrGroup::PersonOrGroup(a) => {
|
||||||
|
UserOrCommunity::verify(a, expected_domain, data).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tracing::instrument(skip_all)]
|
||||||
|
async fn from_json(apub: Self::Kind, data: &Data<Self::DataType>) -> Result<Self, LemmyError> {
|
||||||
|
unimplemented!();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Actor for SiteOrCommunityOrUser {
|
||||||
|
fn id(&self) -> Url {
|
||||||
|
match self {
|
||||||
|
SiteOrCommunityOrUser::Site(u) => u.id(),
|
||||||
|
SiteOrCommunityOrUser::UserOrCommunity(c) => c.id(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn public_key_pem(&self) -> &str {
|
||||||
|
match self {
|
||||||
|
SiteOrCommunityOrUser::Site(p) => p.public_key_pem(),
|
||||||
|
SiteOrCommunityOrUser::UserOrCommunity(p) => p.public_key_pem(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn private_key_pem(&self) -> Option<String> {
|
||||||
|
match self {
|
||||||
|
SiteOrCommunityOrUser::Site(p) => p.private_key_pem(),
|
||||||
|
SiteOrCommunityOrUser::UserOrCommunity(p) => p.private_key_pem(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn inbox(&self) -> Url {
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,5 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
|
activities::GetActorType,
|
||||||
objects::{community::ApubCommunity, person::ApubPerson},
|
objects::{community::ApubCommunity, person::ApubPerson},
|
||||||
protocol::objects::{group::Group, person::Person},
|
protocol::objects::{group::Group, person::Person},
|
||||||
};
|
};
|
||||||
@ -8,6 +9,7 @@ use activitypub_federation::{
|
|||||||
};
|
};
|
||||||
use chrono::NaiveDateTime;
|
use chrono::NaiveDateTime;
|
||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
|
use lemmy_db_schema::source::activity::ActorType;
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::error::LemmyError;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
@ -119,3 +121,12 @@ impl Actor for UserOrCommunity {
|
|||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl GetActorType for UserOrCommunity {
|
||||||
|
fn actor_type(&self) -> ActorType {
|
||||||
|
match self {
|
||||||
|
UserOrCommunity::User(p) => p.actor_type(),
|
||||||
|
UserOrCommunity::Community(p) => p.actor_type(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -13,7 +13,7 @@ use std::{sync::Arc, time::Duration};
|
|||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
pub mod activities;
|
pub mod activities;
|
||||||
pub(crate) mod activity_lists;
|
pub mod activity_lists;
|
||||||
pub mod api;
|
pub mod api;
|
||||||
pub(crate) mod collections;
|
pub(crate) mod collections;
|
||||||
pub mod fetcher;
|
pub mod fetcher;
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
|
activities::GetActorType,
|
||||||
check_apub_id_valid,
|
check_apub_id_valid,
|
||||||
local_site_data_cached,
|
local_site_data_cached,
|
||||||
objects::instance::fetch_instance_actor_for_object,
|
objects::instance::fetch_instance_actor_for_object,
|
||||||
@ -20,6 +21,7 @@ use lemmy_api_common::{
|
|||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActorType,
|
||||||
actor_language::CommunityLanguage,
|
actor_language::CommunityLanguage,
|
||||||
community::{Community, CommunityUpdateForm},
|
community::{Community, CommunityUpdateForm},
|
||||||
},
|
},
|
||||||
@ -178,6 +180,12 @@ impl Actor for ApubCommunity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl GetActorType for ApubCommunity {
|
||||||
|
fn actor_type(&self) -> ActorType {
|
||||||
|
ActorType::Community
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl ApubCommunity {
|
impl ApubCommunity {
|
||||||
/// For a given community, returns the inboxes of all followers.
|
/// For a given community, returns the inboxes of all followers.
|
||||||
#[tracing::instrument(skip_all)]
|
#[tracing::instrument(skip_all)]
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
|
activities::GetActorType,
|
||||||
check_apub_id_valid_with_strictness,
|
check_apub_id_valid_with_strictness,
|
||||||
local_site_data_cached,
|
local_site_data_cached,
|
||||||
objects::read_from_string_or_source_opt,
|
objects::read_from_string_or_source_opt,
|
||||||
@ -20,6 +21,7 @@ use lemmy_api_common::{context::LemmyContext, utils::local_site_opt_to_slur_rege
|
|||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
newtypes::InstanceId,
|
newtypes::InstanceId,
|
||||||
source::{
|
source::{
|
||||||
|
activity::ActorType,
|
||||||
actor_language::SiteLanguage,
|
actor_language::SiteLanguage,
|
||||||
instance::Instance as DbInstance,
|
instance::Instance as DbInstance,
|
||||||
site::{Site, SiteInsertForm},
|
site::{Site, SiteInsertForm},
|
||||||
@ -168,6 +170,11 @@ impl Actor for ApubSite {
|
|||||||
self.inbox_url.clone().into()
|
self.inbox_url.clone().into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
impl GetActorType for ApubSite {
|
||||||
|
fn actor_type(&self) -> ActorType {
|
||||||
|
ActorType::Site
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Try to fetch the instance actor (to make things like instance rules available).
|
/// Try to fetch the instance actor (to make things like instance rules available).
|
||||||
pub(in crate::objects) async fn fetch_instance_actor_for_object<T: Into<Url> + Clone>(
|
pub(in crate::objects) async fn fetch_instance_actor_for_object<T: Into<Url> + Clone>(
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
|
activities::GetActorType,
|
||||||
check_apub_id_valid_with_strictness,
|
check_apub_id_valid_with_strictness,
|
||||||
local_site_data_cached,
|
local_site_data_cached,
|
||||||
objects::{instance::fetch_instance_actor_for_object, read_from_string_or_source_opt},
|
objects::{instance::fetch_instance_actor_for_object, read_from_string_or_source_opt},
|
||||||
@ -22,7 +23,10 @@ use lemmy_api_common::{
|
|||||||
utils::{generate_outbox_url, local_site_opt_to_slur_regex},
|
utils::{generate_outbox_url, local_site_opt_to_slur_regex},
|
||||||
};
|
};
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
source::person::{Person as DbPerson, PersonInsertForm, PersonUpdateForm},
|
source::{
|
||||||
|
activity::ActorType,
|
||||||
|
person::{Person as DbPerson, PersonInsertForm, PersonUpdateForm},
|
||||||
|
},
|
||||||
traits::{ApubActor, Crud},
|
traits::{ApubActor, Crud},
|
||||||
utils::naive_now,
|
utils::naive_now,
|
||||||
};
|
};
|
||||||
@ -193,6 +197,12 @@ impl Actor for ApubPerson {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl GetActorType for ApubPerson {
|
||||||
|
fn actor_type(&self) -> ActorType {
|
||||||
|
ActorType::Person
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
pub(crate) mod tests {
|
pub(crate) mod tests {
|
||||||
#![allow(clippy::unwrap_used)]
|
#![allow(clippy::unwrap_used)]
|
||||||
|
@ -2,10 +2,7 @@ diff --git a/crates/db_schema/src/schema.rs b/crates/db_schema/src/schema.rs
|
|||||||
index 255c6422..f2ccf5e2 100644
|
index 255c6422..f2ccf5e2 100644
|
||||||
--- a/crates/db_schema/src/schema.rs
|
--- a/crates/db_schema/src/schema.rs
|
||||||
+++ b/crates/db_schema/src/schema.rs
|
+++ b/crates/db_schema/src/schema.rs
|
||||||
@@ -2,16 +2,12 @@
|
@@ -9,10 +9,6 @@ pub mod sql_types {
|
||||||
|
|
||||||
pub mod sql_types {
|
|
||||||
#[derive(diesel::sql_types::SqlType)]
|
|
||||||
#[diesel(postgres_type(name = "listing_type_enum"))]
|
#[diesel(postgres_type(name = "listing_type_enum"))]
|
||||||
pub struct ListingTypeEnum;
|
pub struct ListingTypeEnum;
|
||||||
|
|
||||||
@ -16,9 +13,6 @@ index 255c6422..f2ccf5e2 100644
|
|||||||
#[derive(diesel::sql_types::SqlType)]
|
#[derive(diesel::sql_types::SqlType)]
|
||||||
#[diesel(postgres_type(name = "registration_mode_enum"))]
|
#[diesel(postgres_type(name = "registration_mode_enum"))]
|
||||||
pub struct RegistrationModeEnum;
|
pub struct RegistrationModeEnum;
|
||||||
|
|
||||||
#[derive(diesel::sql_types::SqlType)]
|
|
||||||
#[diesel(postgres_type(name = "sort_type_enum"))]
|
|
||||||
@@ -76,13 +76,13 @@ diesel::table! {
|
@@ -76,13 +76,13 @@ diesel::table! {
|
||||||
published -> Timestamp,
|
published -> Timestamp,
|
||||||
}
|
}
|
||||||
|
@ -6,11 +6,13 @@ use crate::{
|
|||||||
utils::{get_conn, naive_now, DbPool},
|
utils::{get_conn, naive_now, DbPool},
|
||||||
};
|
};
|
||||||
use diesel::{
|
use diesel::{
|
||||||
dsl::{insert_into, now},
|
dsl::{count_star, insert_into, now},
|
||||||
result::Error,
|
result::Error,
|
||||||
sql_types::{Nullable, Timestamp},
|
sql_types::{Nullable, Timestamp},
|
||||||
ExpressionMethods,
|
ExpressionMethods,
|
||||||
|
NullableExpressionMethods,
|
||||||
QueryDsl,
|
QueryDsl,
|
||||||
|
SelectableHelper,
|
||||||
};
|
};
|
||||||
use diesel_async::RunQueryDsl;
|
use diesel_async::RunQueryDsl;
|
||||||
|
|
||||||
@ -94,6 +96,37 @@ impl Instance {
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// returns a list of all instances, each with a flag of whether the instance is allowed or not
|
||||||
|
/// ordered by id
|
||||||
|
pub async fn read_all_with_blocked(pool: &mut DbPool<'_>) -> Result<Vec<(Self, bool)>, Error> {
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
let use_allowlist = federation_allowlist::table
|
||||||
|
.select(count_star().gt(0))
|
||||||
|
.get_result::<bool>(conn)
|
||||||
|
.await?;
|
||||||
|
if use_allowlist {
|
||||||
|
instance::table
|
||||||
|
.left_join(federation_allowlist::table)
|
||||||
|
.select((
|
||||||
|
Self::as_select(),
|
||||||
|
federation_allowlist::id.nullable().is_not_null(),
|
||||||
|
))
|
||||||
|
.order_by(instance::id)
|
||||||
|
.get_results::<(Self, bool)>(conn)
|
||||||
|
.await
|
||||||
|
} else {
|
||||||
|
instance::table
|
||||||
|
.left_join(federation_blocklist::table)
|
||||||
|
.select((
|
||||||
|
Self::as_select(),
|
||||||
|
federation_blocklist::id.nullable().is_null(),
|
||||||
|
))
|
||||||
|
.order_by(instance::id)
|
||||||
|
.get_results::<(Self, bool)>(conn)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn linked(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
|
pub async fn linked(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
|
||||||
let conn = &mut get_conn(pool).await?;
|
let conn = &mut get_conn(pool).await?;
|
||||||
instance::table
|
instance::table
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
newtypes::{DbUrl, SiteId},
|
newtypes::{DbUrl, InstanceId, SiteId},
|
||||||
schema::site::dsl::{actor_id, id, site},
|
schema::site::dsl::{actor_id, id, instance_id, site},
|
||||||
source::{
|
source::{
|
||||||
actor_language::SiteLanguage,
|
actor_language::SiteLanguage,
|
||||||
site::{Site, SiteInsertForm, SiteUpdateForm},
|
site::{Site, SiteInsertForm, SiteUpdateForm},
|
||||||
@ -8,7 +8,7 @@ use crate::{
|
|||||||
traits::Crud,
|
traits::Crud,
|
||||||
utils::{get_conn, DbPool},
|
utils::{get_conn, DbPool},
|
||||||
};
|
};
|
||||||
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, QueryDsl};
|
use diesel::{dsl::insert_into, result::Error, ExpressionMethods, OptionalExtension, QueryDsl};
|
||||||
use diesel_async::RunQueryDsl;
|
use diesel_async::RunQueryDsl;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
@ -66,19 +66,29 @@ impl Crud for Site {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Site {
|
impl Site {
|
||||||
|
pub async fn read_from_instance_id(
|
||||||
|
pool: &mut DbPool<'_>,
|
||||||
|
_instance_id: InstanceId,
|
||||||
|
) -> Result<Option<Self>, Error> {
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
site
|
||||||
|
.filter(instance_id.eq(_instance_id))
|
||||||
|
.get_result(conn)
|
||||||
|
.await
|
||||||
|
.optional()
|
||||||
|
}
|
||||||
pub async fn read_from_apub_id(
|
pub async fn read_from_apub_id(
|
||||||
pool: &mut DbPool<'_>,
|
pool: &mut DbPool<'_>,
|
||||||
object_id: &DbUrl,
|
object_id: &DbUrl,
|
||||||
) -> Result<Option<Self>, Error> {
|
) -> Result<Option<Self>, Error> {
|
||||||
let conn = &mut get_conn(pool).await?;
|
let conn = &mut get_conn(pool).await?;
|
||||||
Ok(
|
|
||||||
site
|
site
|
||||||
.filter(actor_id.eq(object_id))
|
.filter(actor_id.eq(object_id))
|
||||||
.first::<Site>(conn)
|
.first::<Site>(conn)
|
||||||
.await
|
.await
|
||||||
.ok()
|
.optional()
|
||||||
.map(Into::into),
|
.map(Into::into)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn read_remote_sites(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
|
pub async fn read_remote_sites(pool: &mut DbPool<'_>) -> Result<Vec<Self>, Error> {
|
||||||
|
@ -249,3 +249,9 @@ impl TS for DbUrl {
|
|||||||
true
|
true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl InstanceId {
|
||||||
|
pub fn inner(self) -> i32 {
|
||||||
|
self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,17 +1,21 @@
|
|||||||
// @generated automatically by Diesel CLI.
|
// @generated automatically by Diesel CLI.
|
||||||
|
|
||||||
pub mod sql_types {
|
pub mod sql_types {
|
||||||
#[derive(diesel::sql_types::SqlType)]
|
#[derive(diesel::sql_types::SqlType)]
|
||||||
#[diesel(postgres_type(name = "listing_type_enum"))]
|
#[diesel(postgres_type(name = "actor_type_enum"))]
|
||||||
pub struct ListingTypeEnum;
|
pub struct ActorTypeEnum;
|
||||||
|
|
||||||
#[derive(diesel::sql_types::SqlType)]
|
#[derive(diesel::sql_types::SqlType)]
|
||||||
#[diesel(postgres_type(name = "registration_mode_enum"))]
|
#[diesel(postgres_type(name = "listing_type_enum"))]
|
||||||
pub struct RegistrationModeEnum;
|
pub struct ListingTypeEnum;
|
||||||
|
|
||||||
#[derive(diesel::sql_types::SqlType)]
|
#[derive(diesel::sql_types::SqlType)]
|
||||||
#[diesel(postgres_type(name = "sort_type_enum"))]
|
#[diesel(postgres_type(name = "registration_mode_enum"))]
|
||||||
pub struct SortTypeEnum;
|
pub struct RegistrationModeEnum;
|
||||||
|
|
||||||
|
#[derive(diesel::sql_types::SqlType)]
|
||||||
|
#[diesel(postgres_type(name = "sort_type_enum"))]
|
||||||
|
pub struct SortTypeEnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
diesel::table! {
|
diesel::table! {
|
||||||
@ -290,6 +294,15 @@ diesel::table! {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
diesel::table! {
|
||||||
|
federation_queue_state (domain) {
|
||||||
|
domain -> Text,
|
||||||
|
last_successful_id -> Int4,
|
||||||
|
fail_count -> Int4,
|
||||||
|
last_retry -> Timestamptz,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
diesel::table! {
|
diesel::table! {
|
||||||
instance (id) {
|
instance (id) {
|
||||||
id -> Int4,
|
id -> Int4,
|
||||||
@ -879,6 +892,7 @@ diesel::joinable!(custom_emoji_keyword -> custom_emoji (custom_emoji_id));
|
|||||||
diesel::joinable!(email_verification -> local_user (local_user_id));
|
diesel::joinable!(email_verification -> local_user (local_user_id));
|
||||||
diesel::joinable!(federation_allowlist -> instance (instance_id));
|
diesel::joinable!(federation_allowlist -> instance (instance_id));
|
||||||
diesel::joinable!(federation_blocklist -> instance (instance_id));
|
diesel::joinable!(federation_blocklist -> instance (instance_id));
|
||||||
|
diesel::joinable!(federation_queue_state -> activity (last_successful_id));
|
||||||
diesel::joinable!(local_site -> site (site_id));
|
diesel::joinable!(local_site -> site (site_id));
|
||||||
diesel::joinable!(local_site_rate_limit -> local_site (local_site_id));
|
diesel::joinable!(local_site_rate_limit -> local_site (local_site_id));
|
||||||
diesel::joinable!(local_user -> person (person_id));
|
diesel::joinable!(local_user -> person (person_id));
|
||||||
@ -930,68 +944,69 @@ diesel::joinable!(site_language -> site (site_id));
|
|||||||
diesel::joinable!(tagline -> local_site (local_site_id));
|
diesel::joinable!(tagline -> local_site (local_site_id));
|
||||||
|
|
||||||
diesel::allow_tables_to_appear_in_same_query!(
|
diesel::allow_tables_to_appear_in_same_query!(
|
||||||
admin_purge_comment,
|
admin_purge_comment,
|
||||||
admin_purge_community,
|
admin_purge_community,
|
||||||
admin_purge_person,
|
admin_purge_person,
|
||||||
admin_purge_post,
|
admin_purge_post,
|
||||||
captcha_answer,
|
captcha_answer,
|
||||||
comment,
|
comment,
|
||||||
comment_aggregates,
|
comment_aggregates,
|
||||||
comment_like,
|
comment_like,
|
||||||
comment_reply,
|
comment_reply,
|
||||||
comment_report,
|
comment_report,
|
||||||
comment_saved,
|
comment_saved,
|
||||||
community,
|
community,
|
||||||
community_aggregates,
|
community_aggregates,
|
||||||
community_block,
|
community_block,
|
||||||
community_follower,
|
community_follower,
|
||||||
community_language,
|
community_language,
|
||||||
community_moderator,
|
community_moderator,
|
||||||
community_person_ban,
|
community_person_ban,
|
||||||
custom_emoji,
|
custom_emoji,
|
||||||
custom_emoji_keyword,
|
custom_emoji_keyword,
|
||||||
email_verification,
|
email_verification,
|
||||||
federation_allowlist,
|
federation_allowlist,
|
||||||
federation_blocklist,
|
federation_blocklist,
|
||||||
instance,
|
federation_queue_state,
|
||||||
language,
|
instance,
|
||||||
local_site,
|
language,
|
||||||
local_site_rate_limit,
|
local_site,
|
||||||
local_user,
|
local_site_rate_limit,
|
||||||
local_user_language,
|
local_user,
|
||||||
mod_add,
|
local_user_language,
|
||||||
mod_add_community,
|
mod_add,
|
||||||
mod_ban,
|
mod_add_community,
|
||||||
mod_ban_from_community,
|
mod_ban,
|
||||||
mod_feature_post,
|
mod_ban_from_community,
|
||||||
mod_hide_community,
|
mod_feature_post,
|
||||||
mod_lock_post,
|
mod_hide_community,
|
||||||
mod_remove_comment,
|
mod_lock_post,
|
||||||
mod_remove_community,
|
mod_remove_comment,
|
||||||
mod_remove_post,
|
mod_remove_community,
|
||||||
mod_transfer_community,
|
mod_remove_post,
|
||||||
password_reset_request,
|
mod_transfer_community,
|
||||||
person,
|
password_reset_request,
|
||||||
person_aggregates,
|
person,
|
||||||
person_ban,
|
person_aggregates,
|
||||||
person_block,
|
person_ban,
|
||||||
person_follower,
|
person_block,
|
||||||
person_mention,
|
person_follower,
|
||||||
person_post_aggregates,
|
person_mention,
|
||||||
post,
|
person_post_aggregates,
|
||||||
post_aggregates,
|
post,
|
||||||
post_like,
|
post_aggregates,
|
||||||
post_read,
|
post_like,
|
||||||
post_report,
|
post_read,
|
||||||
post_saved,
|
post_report,
|
||||||
private_message,
|
post_saved,
|
||||||
private_message_report,
|
private_message,
|
||||||
received_activity,
|
private_message_report,
|
||||||
registration_application,
|
received_activity,
|
||||||
secret,
|
registration_application,
|
||||||
sent_activity,
|
secret,
|
||||||
site,
|
sent_activity,
|
||||||
site_aggregates,
|
site,
|
||||||
site_language,
|
site_aggregates,
|
||||||
tagline,
|
site_language,
|
||||||
|
tagline,
|
||||||
);
|
);
|
||||||
|
@ -1,6 +1,68 @@
|
|||||||
use crate::{newtypes::DbUrl, schema::sent_activity};
|
use crate::{
|
||||||
|
newtypes::{CommunityId, DbUrl},
|
||||||
|
schema::{activity, sent_activity},
|
||||||
|
};
|
||||||
|
use diesel::{
|
||||||
|
deserialize::FromSql,
|
||||||
|
pg::{Pg, PgValue},
|
||||||
|
serialize::{Output, ToSql},
|
||||||
|
sql_types::Jsonb,
|
||||||
|
};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::fmt::Debug;
|
use std::{collections::HashSet, fmt::Debug, io::Write};
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
#[derive(
|
||||||
|
FromSqlRow,
|
||||||
|
PartialEq,
|
||||||
|
Eq,
|
||||||
|
AsExpression,
|
||||||
|
serde::Serialize,
|
||||||
|
serde::Deserialize,
|
||||||
|
Debug,
|
||||||
|
Default,
|
||||||
|
Clone,
|
||||||
|
)]
|
||||||
|
#[diesel(sql_type = Jsonb)]
|
||||||
|
/// describes where an activity should be sent
|
||||||
|
pub struct ActivitySendTargets {
|
||||||
|
/// send to these inboxes explicitly
|
||||||
|
pub inboxes: HashSet<Url>,
|
||||||
|
/// send to all followers of these local communities
|
||||||
|
pub community_followers_of: HashSet<CommunityId>,
|
||||||
|
/// send to all remote instances
|
||||||
|
pub all_instances: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
// todo: in different file?
|
||||||
|
impl ActivitySendTargets {
|
||||||
|
pub fn empty() -> ActivitySendTargets {
|
||||||
|
ActivitySendTargets::default()
|
||||||
|
}
|
||||||
|
pub fn to_inbox(url: Url) -> ActivitySendTargets {
|
||||||
|
let mut a = ActivitySendTargets::empty();
|
||||||
|
a.inboxes.insert(url);
|
||||||
|
a
|
||||||
|
}
|
||||||
|
pub fn to_local_community_followers(id: CommunityId) -> ActivitySendTargets {
|
||||||
|
let mut a = ActivitySendTargets::empty();
|
||||||
|
a.add_local_community_followers(id);
|
||||||
|
a
|
||||||
|
}
|
||||||
|
pub fn add_local_community_followers(&mut self, id: CommunityId) {
|
||||||
|
self.community_followers_of.insert(id);
|
||||||
|
}
|
||||||
|
pub fn set_all_instances(&mut self, b: bool) {
|
||||||
|
self.all_instances = b;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_inbox(&mut self, inbox: Url) {
|
||||||
|
self.inboxes.insert(inbox);
|
||||||
|
}
|
||||||
|
pub fn add_inboxes(&mut self, inboxes: impl Iterator<Item = Url>) {
|
||||||
|
self.inboxes.extend(inboxes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, Debug, Queryable)]
|
#[derive(PartialEq, Eq, Debug, Queryable)]
|
||||||
#[diesel(table_name = sent_activity)]
|
#[diesel(table_name = sent_activity)]
|
||||||
@ -10,6 +72,9 @@ pub struct SentActivity {
|
|||||||
pub data: Value,
|
pub data: Value,
|
||||||
pub sensitive: bool,
|
pub sensitive: bool,
|
||||||
pub published: chrono::NaiveDateTime,
|
pub published: chrono::NaiveDateTime,
|
||||||
|
pub send_targets: ActivitySendTargets,
|
||||||
|
pub actor_type: ActorType,
|
||||||
|
pub actor_apub_id: DbUrl,
|
||||||
}
|
}
|
||||||
#[derive(Insertable)]
|
#[derive(Insertable)]
|
||||||
#[diesel(table_name = sent_activity)]
|
#[diesel(table_name = sent_activity)]
|
||||||
@ -17,6 +82,17 @@ pub struct SentActivityForm {
|
|||||||
pub ap_id: DbUrl,
|
pub ap_id: DbUrl,
|
||||||
pub data: Value,
|
pub data: Value,
|
||||||
pub sensitive: bool,
|
pub sensitive: bool,
|
||||||
|
pub send_targets: ActivitySendTargets,
|
||||||
|
pub actor_type: ActorType,
|
||||||
|
pub actor_apub_id: DbUrl,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, diesel_derive_enum::DbEnum, PartialEq, Eq)]
|
||||||
|
#[ExistingTypePath = "crate::schema::sql_types::ActorTypeEnum"]
|
||||||
|
pub enum ActorType {
|
||||||
|
Site,
|
||||||
|
Community,
|
||||||
|
Person,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, Debug, Queryable)]
|
#[derive(PartialEq, Eq, Debug, Queryable)]
|
||||||
@ -26,3 +102,20 @@ pub struct ReceivedActivity {
|
|||||||
pub ap_id: DbUrl,
|
pub ap_id: DbUrl,
|
||||||
pub published: chrono::NaiveDateTime,
|
pub published: chrono::NaiveDateTime,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://vasilakisfil.social/blog/2020/05/09/rust-diesel-jsonb/
|
||||||
|
impl FromSql<Jsonb, Pg> for ActivitySendTargets {
|
||||||
|
fn from_sql(bytes: PgValue) -> diesel::deserialize::Result<Self> {
|
||||||
|
let value = <serde_json::Value as FromSql<Jsonb, Pg>>::from_sql(bytes)?;
|
||||||
|
Ok(serde_json::from_value(value)?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ToSql<Jsonb, Pg> for ActivitySendTargets {
|
||||||
|
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> diesel::serialize::Result {
|
||||||
|
out.write_all(&[1])?;
|
||||||
|
serde_json::to_writer(out, self)
|
||||||
|
.map(|_| diesel::serialize::IsNull::No)
|
||||||
|
.map_err(Into::into)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -9,7 +9,7 @@ use ts_rs::TS;
|
|||||||
use typed_builder::TypedBuilder;
|
use typed_builder::TypedBuilder;
|
||||||
|
|
||||||
#[skip_serializing_none]
|
#[skip_serializing_none]
|
||||||
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
|
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize, Selectable)]
|
||||||
#[cfg_attr(feature = "full", derive(Queryable, Identifiable, TS))]
|
#[cfg_attr(feature = "full", derive(Queryable, Identifiable, TS))]
|
||||||
#[cfg_attr(feature = "full", diesel(table_name = instance))]
|
#[cfg_attr(feature = "full", diesel(table_name = instance))]
|
||||||
#[cfg_attr(feature = "full", ts(export))]
|
#[cfg_attr(feature = "full", ts(export))]
|
||||||
|
@ -374,6 +374,9 @@ pub mod functions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sql_function!(fn lower(x: Text) -> Text);
|
sql_function!(fn lower(x: Text) -> Text);
|
||||||
|
|
||||||
|
// really this function is variadic, this just adds the two-argument version
|
||||||
|
sql_function!(fn coalesce<T: diesel::sql_types::SqlType + diesel::sql_types::SingleValue>(x: diesel::sql_types::Nullable<T>, y: T) -> T);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub const DELETED_REPLACEMENT_TEXT: &str = "*Permanently Deleted*";
|
pub const DELETED_REPLACEMENT_TEXT: &str = "*Permanently Deleted*";
|
||||||
|
@ -27,4 +27,5 @@ diesel-async = { workspace = true, features = [
|
|||||||
], optional = true }
|
], optional = true }
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde_with = { workspace = true }
|
serde_with = { workspace = true }
|
||||||
ts-rs = { workspace = true, optional = true }
|
ts-rs = { workspace = true, optional = true }
|
||||||
|
chrono.workspace = true
|
||||||
|
@ -1,25 +1,45 @@
|
|||||||
use crate::structs::CommunityFollowerView;
|
use crate::structs::CommunityFollowerView;
|
||||||
|
use chrono::Utc;
|
||||||
use diesel::{
|
use diesel::{
|
||||||
dsl::{count_star, not},
|
dsl::{count_star, not},
|
||||||
result::Error,
|
result::Error,
|
||||||
sql_function,
|
|
||||||
ExpressionMethods,
|
ExpressionMethods,
|
||||||
QueryDsl,
|
QueryDsl,
|
||||||
};
|
};
|
||||||
use diesel_async::RunQueryDsl;
|
use diesel_async::RunQueryDsl;
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
newtypes::{CommunityId, DbUrl, PersonId},
|
newtypes::{CommunityId, DbUrl, InstanceId, PersonId},
|
||||||
schema::{community, community_follower, person},
|
schema::{community, community_follower, person},
|
||||||
source::{community::Community, person::Person},
|
source::{community::Community, person::Person},
|
||||||
traits::JoinView,
|
traits::JoinView,
|
||||||
utils::{get_conn, DbPool},
|
utils::{functions::coalesce, get_conn, DbPool},
|
||||||
};
|
};
|
||||||
|
|
||||||
type CommunityFollowerViewTuple = (Community, Person);
|
type CommunityFollowerViewTuple = (Community, Person);
|
||||||
|
|
||||||
sql_function!(fn coalesce(x: diesel::sql_types::Nullable<diesel::sql_types::Text>, y: diesel::sql_types::Text) -> diesel::sql_types::Text);
|
|
||||||
|
|
||||||
impl CommunityFollowerView {
|
impl CommunityFollowerView {
|
||||||
|
/// return a list of community ids and inboxes that at least one user of the given instance has followed
|
||||||
|
pub async fn get_instance_followed_community_inboxes(
|
||||||
|
pool: &mut DbPool<'_>,
|
||||||
|
instance_id: InstanceId,
|
||||||
|
published_since: chrono::DateTime<Utc>,
|
||||||
|
) -> Result<Vec<(CommunityId, DbUrl)>, Error> {
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
// todo: in most cases this will fetch the same url many times (the shared inbox url)
|
||||||
|
community_follower::table
|
||||||
|
.inner_join(community::table)
|
||||||
|
.inner_join(person::table)
|
||||||
|
.filter(person::instance_id.eq(instance_id))
|
||||||
|
.filter(not(person::local))
|
||||||
|
.filter(community_follower::published.gt(published_since.naive_utc()))
|
||||||
|
.select((
|
||||||
|
community::id,
|
||||||
|
coalesce(person::shared_inbox_url, person::inbox_url),
|
||||||
|
))
|
||||||
|
.distinct() // only need each community_id, inbox combination once
|
||||||
|
.load::<(CommunityId, DbUrl)>(conn)
|
||||||
|
.await
|
||||||
|
}
|
||||||
pub async fn get_community_follower_inboxes(
|
pub async fn get_community_follower_inboxes(
|
||||||
pool: &mut DbPool<'_>,
|
pool: &mut DbPool<'_>,
|
||||||
community_id: CommunityId,
|
community_id: CommunityId,
|
||||||
|
40
crates/federate/Cargo.toml
Normal file
40
crates/federate/Cargo.toml
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
[package]
|
||||||
|
name = "lemmy_federate"
|
||||||
|
version.workspace = true
|
||||||
|
edition.workspace = true
|
||||||
|
description.workspace = true
|
||||||
|
license.workspace = true
|
||||||
|
homepage.workspace = true
|
||||||
|
documentation.workspace = true
|
||||||
|
repository.workspace = true
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
activitypub_federation.workspace = true
|
||||||
|
anyhow.workspace = true
|
||||||
|
async-trait = "0.1.71"
|
||||||
|
bytes = "1.4.0"
|
||||||
|
chrono.workspace = true
|
||||||
|
dashmap = "5.5.0"
|
||||||
|
diesel = { workspace = true, features = ["postgres", "chrono", "serde_json"] }
|
||||||
|
diesel-async = { workspace = true, features = ["deadpool", "postgres"] }
|
||||||
|
enum_delegate = "0.2.0"
|
||||||
|
futures.workspace = true
|
||||||
|
lemmy_api_common.workspace = true
|
||||||
|
lemmy_apub.workspace = true
|
||||||
|
lemmy_db_schema = { workspace = true, features = ["full"] }
|
||||||
|
lemmy_db_views_actor.workspace = true
|
||||||
|
lemmy_utils.workspace = true
|
||||||
|
moka = { version = "0.11.2", features = ["future"] }
|
||||||
|
once_cell.workspace = true
|
||||||
|
openssl = "0.10.55"
|
||||||
|
reqwest.workspace = true
|
||||||
|
reqwest-middleware = "0.2.2"
|
||||||
|
reqwest-tracing = "0.4.5"
|
||||||
|
serde.workspace = true
|
||||||
|
serde_json.workspace = true
|
||||||
|
tokio = { workspace = true, features = ["full"] }
|
||||||
|
tokio-util = "0.7.8"
|
||||||
|
tracing.workspace = true
|
||||||
|
tracing-subscriber = "0.3.17"
|
52
crates/federate/src/federation_queue_state.rs
Normal file
52
crates/federate/src/federation_queue_state.rs
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
use crate::util::ActivityId;
|
||||||
|
use anyhow::Result;
|
||||||
|
use chrono::{DateTime, TimeZone, Utc};
|
||||||
|
use diesel::prelude::*;
|
||||||
|
use diesel_async::RunQueryDsl;
|
||||||
|
use lemmy_db_schema::utils::{get_conn, DbPool};
|
||||||
|
|
||||||
|
#[derive(Queryable, Selectable, Insertable, AsChangeset, Clone)]
|
||||||
|
#[diesel(table_name = lemmy_db_schema::schema::federation_queue_state)]
|
||||||
|
#[diesel(check_for_backend(diesel::pg::Pg))]
|
||||||
|
pub struct FederationQueueState {
|
||||||
|
/// domain of the instance (primary key)
|
||||||
|
pub domain: String,
|
||||||
|
pub last_successful_id: ActivityId, // todo: i64
|
||||||
|
pub fail_count: i32,
|
||||||
|
pub last_retry: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl FederationQueueState {
|
||||||
|
/// load or return a default empty value
|
||||||
|
pub async fn load(pool: &mut DbPool<'_>, domain_: &str) -> Result<FederationQueueState> {
|
||||||
|
use lemmy_db_schema::schema::federation_queue_state::dsl::*;
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
Ok(
|
||||||
|
federation_queue_state
|
||||||
|
.find(&domain_)
|
||||||
|
.select(FederationQueueState::as_select())
|
||||||
|
.get_result(conn)
|
||||||
|
.await
|
||||||
|
.optional()?
|
||||||
|
.unwrap_or(FederationQueueState {
|
||||||
|
domain: domain_.to_owned(),
|
||||||
|
fail_count: 0,
|
||||||
|
last_retry: Utc.timestamp_nanos(0),
|
||||||
|
last_successful_id: 0, // todo: start at current id not from beginning
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
pub async fn upsert(pool: &mut DbPool<'_>, state: &FederationQueueState) -> Result<()> {
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
use lemmy_db_schema::schema::federation_queue_state::dsl::*;
|
||||||
|
|
||||||
|
state
|
||||||
|
.insert_into(federation_queue_state)
|
||||||
|
.on_conflict(domain)
|
||||||
|
.do_update()
|
||||||
|
.set(state)
|
||||||
|
.execute(conn)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
174
crates/federate/src/main.rs
Normal file
174
crates/federate/src/main.rs
Normal file
@ -0,0 +1,174 @@
|
|||||||
|
use crate::{
|
||||||
|
util::{retry_sleep_duration, spawn_cancellable},
|
||||||
|
worker::instance_worker,
|
||||||
|
};
|
||||||
|
use activitypub_federation::config::FederationConfig;
|
||||||
|
use chrono::{Local, Timelike};
|
||||||
|
use federation_queue_state::FederationQueueState;
|
||||||
|
use lemmy_api_common::request::build_user_agent;
|
||||||
|
use lemmy_apub::{VerifyUrlData, FEDERATION_HTTP_FETCH_LIMIT};
|
||||||
|
use lemmy_db_schema::{
|
||||||
|
source::instance::Instance,
|
||||||
|
utils::{build_db_pool, DbPool},
|
||||||
|
};
|
||||||
|
use lemmy_utils::{error::LemmyErrorExt2, settings::SETTINGS, REQWEST_TIMEOUT};
|
||||||
|
use reqwest::Client;
|
||||||
|
use reqwest_middleware::ClientBuilder;
|
||||||
|
use reqwest_tracing::TracingMiddleware;
|
||||||
|
use std::{collections::HashMap, time::Duration};
|
||||||
|
use tokio::{
|
||||||
|
signal::unix::SignalKind,
|
||||||
|
sync::mpsc::{unbounded_channel, UnboundedReceiver},
|
||||||
|
time::sleep,
|
||||||
|
};
|
||||||
|
|
||||||
|
mod federation_queue_state;
|
||||||
|
mod util;
|
||||||
|
mod worker;
|
||||||
|
|
||||||
|
static WORKER_EXIT_TIMEOUT: Duration = Duration::from_secs(30);
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> anyhow::Result<()> {
|
||||||
|
tracing_subscriber::fmt::init();
|
||||||
|
let settings = SETTINGS.to_owned();
|
||||||
|
// TODO: wait until migrations are applied? or are they safe from race conditions and i can just call run_migrations here as well?
|
||||||
|
let pool = build_db_pool(&settings).await.into_anyhow()?;
|
||||||
|
let user_agent = build_user_agent(&settings);
|
||||||
|
let reqwest_client = Client::builder()
|
||||||
|
.user_agent(user_agent.clone())
|
||||||
|
.timeout(REQWEST_TIMEOUT)
|
||||||
|
.connect_timeout(REQWEST_TIMEOUT)
|
||||||
|
.build()?;
|
||||||
|
|
||||||
|
let client = ClientBuilder::new(reqwest_client.clone())
|
||||||
|
.with(TracingMiddleware::default())
|
||||||
|
.build();
|
||||||
|
|
||||||
|
let federation_config = FederationConfig::builder()
|
||||||
|
.domain(settings.hostname.clone())
|
||||||
|
.app_data(())
|
||||||
|
.client(client.clone())
|
||||||
|
.http_fetch_limit(FEDERATION_HTTP_FETCH_LIMIT)
|
||||||
|
.http_signature_compat(true)
|
||||||
|
.url_verifier(Box::new(VerifyUrlData(pool.clone())))
|
||||||
|
.build()
|
||||||
|
.await?;
|
||||||
|
let process_num = 1 - 1; // todo: pass these in via command line args
|
||||||
|
let process_count = 1;
|
||||||
|
let mut workers = HashMap::new();
|
||||||
|
let mut pool2 = DbPool::from(&pool);
|
||||||
|
|
||||||
|
let (stats_sender, stats_receiver) = unbounded_channel();
|
||||||
|
let exit_print = tokio::spawn(receive_print_stats(&mut pool2, stats_receiver));
|
||||||
|
let mut interrupt = tokio::signal::unix::signal(SignalKind::interrupt())?;
|
||||||
|
let mut terminate = tokio::signal::unix::signal(SignalKind::terminate())?;
|
||||||
|
loop {
|
||||||
|
for (instance, should_federate) in Instance::read_all_with_blocked(&mut pool2)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
{
|
||||||
|
if instance.id.inner() % process_count != process_num {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if !workers.contains_key(&instance.id) && should_federate {
|
||||||
|
let stats_sender = stats_sender.clone();
|
||||||
|
workers.insert(
|
||||||
|
instance.id,
|
||||||
|
spawn_cancellable(WORKER_EXIT_TIMEOUT, |stop| {
|
||||||
|
instance_worker(
|
||||||
|
pool2,
|
||||||
|
instance,
|
||||||
|
federation_config.to_request_data(),
|
||||||
|
stop,
|
||||||
|
stats_sender,
|
||||||
|
)
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
} else if !should_federate {
|
||||||
|
if let Some(worker) = workers.remove(&instance.id) {
|
||||||
|
if let Err(e) = worker.await {
|
||||||
|
tracing::error!("error stopping worker: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tokio::select! {
|
||||||
|
() = sleep(Duration::from_secs(60)) => {},
|
||||||
|
_ = tokio::signal::ctrl_c() => {
|
||||||
|
tracing::warn!("Received ctrl-c, shutting down gracefully...");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_ = interrupt.recv() => {
|
||||||
|
tracing::warn!("Received interrupt, shutting down gracefully...");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_ = terminate.recv() => {
|
||||||
|
tracing::warn!("Received terminate, shutting down gracefully...");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drop(stats_sender);
|
||||||
|
tracing::warn!(
|
||||||
|
"Waiting for {} workers ({:.2?} max)",
|
||||||
|
workers.len(),
|
||||||
|
WORKER_EXIT_TIMEOUT
|
||||||
|
);
|
||||||
|
futures::future::join_all(workers.into_values()).await;
|
||||||
|
exit_print.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// every 60s, print the state for every instance. exits if the receiver is done (all senders dropped)
|
||||||
|
async fn receive_print_stats(
|
||||||
|
mut pool: &mut DbPool<'_>,
|
||||||
|
mut receiver: UnboundedReceiver<FederationQueueState>,
|
||||||
|
) {
|
||||||
|
let mut printerval = tokio::time::interval(Duration::from_secs(60));
|
||||||
|
printerval.tick().await; // skip first
|
||||||
|
let mut stats = HashMap::new();
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
ele = receiver.recv() => {
|
||||||
|
let Some(ele) = ele else {
|
||||||
|
tracing::info!("done. quitting");
|
||||||
|
print_stats(&mut pool, &stats).await;
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
stats.insert(ele.domain.clone(), ele);
|
||||||
|
},
|
||||||
|
_ = printerval.tick() => {
|
||||||
|
print_stats(&mut pool, &stats).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
async fn print_stats(pool: &mut DbPool<'_>, stats: &HashMap<String, FederationQueueState>) {
|
||||||
|
let last_id = crate::util::get_latest_activity_id(pool).await;
|
||||||
|
let Ok(last_id) = last_id else {
|
||||||
|
tracing::error!("could not get last id");
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
// it's expected that the values are a bit out of date, everything < SAVE_STATE_EVERY should be considered up to date
|
||||||
|
tracing::info!(
|
||||||
|
"Federation state as of {}:",
|
||||||
|
Local::now().with_nanosecond(0).unwrap().to_rfc3339()
|
||||||
|
);
|
||||||
|
// todo: less noisy output (only output failing instances and summary for successful)
|
||||||
|
// todo: more stats (act/sec, avg http req duration)
|
||||||
|
for stat in stats.values() {
|
||||||
|
let behind = last_id - stat.last_successful_id;
|
||||||
|
if stat.fail_count > 0 {
|
||||||
|
tracing::info!(
|
||||||
|
"{}: Warning. {} behind, {} consecutive fails, current retry delay {:.2?}",
|
||||||
|
stat.domain,
|
||||||
|
behind,
|
||||||
|
stat.fail_count,
|
||||||
|
retry_sleep_duration(stat.fail_count)
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
tracing::info!("{}: Ok. {} behind", stat.domain, behind);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
190
crates/federate/src/util.rs
Normal file
190
crates/federate/src/util.rs
Normal file
@ -0,0 +1,190 @@
|
|||||||
|
use anyhow::{anyhow, Context, Result};
|
||||||
|
use dashmap::DashSet;
|
||||||
|
use diesel::{prelude::*, sql_types::Int8};
|
||||||
|
use diesel_async::RunQueryDsl;
|
||||||
|
use lemmy_apub::{
|
||||||
|
activity_lists::SharedInboxActivities,
|
||||||
|
fetcher::{site_or_community_or_user::SiteOrCommunityOrUser, user_or_community::UserOrCommunity},
|
||||||
|
};
|
||||||
|
use lemmy_db_schema::{
|
||||||
|
source::{
|
||||||
|
activity::{Activity, ActorType},
|
||||||
|
community::Community,
|
||||||
|
person::Person,
|
||||||
|
site::Site,
|
||||||
|
},
|
||||||
|
traits::{ApubActor, Crud},
|
||||||
|
utils::{get_conn, DbPool},
|
||||||
|
};
|
||||||
|
use moka::future::Cache;
|
||||||
|
use once_cell::sync::Lazy;
|
||||||
|
use reqwest::Url;
|
||||||
|
use serde_json::Value;
|
||||||
|
use std::{
|
||||||
|
borrow::{Borrow, Cow},
|
||||||
|
future::Future,
|
||||||
|
sync::Arc,
|
||||||
|
time::Duration,
|
||||||
|
};
|
||||||
|
use tokio::{task::JoinHandle, time::sleep};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
|
||||||
|
/// spawn a task but with graceful shutdown
|
||||||
|
///
|
||||||
|
/// only await the returned future when you want to cancel the task
|
||||||
|
pub fn spawn_cancellable<R: Send + 'static, F>(
|
||||||
|
timeout: Duration,
|
||||||
|
task: impl FnOnce(CancellationToken) -> F,
|
||||||
|
) -> impl Future<Output = Result<R>>
|
||||||
|
where
|
||||||
|
F: Future<Output = Result<R>> + Send + 'static,
|
||||||
|
{
|
||||||
|
let stop = CancellationToken::new();
|
||||||
|
let task = task(stop.clone());
|
||||||
|
let task: JoinHandle<Result<R>> = tokio::spawn(async move {
|
||||||
|
match task.await {
|
||||||
|
Ok(o) => Ok(o),
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("worker errored out: {e}");
|
||||||
|
// todo: if this error happens, requeue worker creation in main
|
||||||
|
Err(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let abort = task.abort_handle();
|
||||||
|
async move {
|
||||||
|
tracing::info!("Shutting down task");
|
||||||
|
stop.cancel();
|
||||||
|
tokio::select! {
|
||||||
|
r = task => {
|
||||||
|
Ok(r.context("could not join")??)
|
||||||
|
},
|
||||||
|
_ = sleep(timeout) => {
|
||||||
|
abort.abort();
|
||||||
|
tracing::warn!("Graceful shutdown timed out, aborting task");
|
||||||
|
Err(anyhow!("task aborted due to timeout"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// assuming apub priv key and ids are immutable, then we don't need to have TTL
|
||||||
|
/// TODO: capacity should be configurable maybe based on memory use
|
||||||
|
pub async fn get_actor_cached(
|
||||||
|
pool: &mut DbPool<'_>,
|
||||||
|
actor_type: ActorType,
|
||||||
|
actor_apub_id: &Url,
|
||||||
|
) -> Result<Arc<SiteOrCommunityOrUser>> {
|
||||||
|
static CACHE: Lazy<Cache<Url, Arc<SiteOrCommunityOrUser>>> =
|
||||||
|
Lazy::new(|| Cache::builder().max_capacity(10000).build());
|
||||||
|
CACHE
|
||||||
|
.try_get_with(actor_apub_id.clone(), async {
|
||||||
|
let url = actor_apub_id.clone().into();
|
||||||
|
let person = match actor_type {
|
||||||
|
ActorType::Site => SiteOrCommunityOrUser::Site(
|
||||||
|
Site::read_from_apub_id(pool, &url)
|
||||||
|
.await?
|
||||||
|
.context("apub site not found")?
|
||||||
|
.into(),
|
||||||
|
),
|
||||||
|
ActorType::Community => SiteOrCommunityOrUser::UserOrCommunity(UserOrCommunity::Community(
|
||||||
|
Community::read_from_apub_id(pool, &url)
|
||||||
|
.await?
|
||||||
|
.context("apub community not found")?
|
||||||
|
.into(),
|
||||||
|
)),
|
||||||
|
ActorType::Person => SiteOrCommunityOrUser::UserOrCommunity(UserOrCommunity::User(
|
||||||
|
Person::read_from_apub_id(pool, &url)
|
||||||
|
.await?
|
||||||
|
.context("apub person not found")?
|
||||||
|
.into(),
|
||||||
|
)),
|
||||||
|
};
|
||||||
|
Result::<_, anyhow::Error>::Ok(Arc::new(person))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("err getting actor: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// intern urls to reduce memory usage
|
||||||
|
/// not sure if worth it
|
||||||
|
pub fn intern_url<'a>(url: impl Into<Cow<'a, Url>>) -> Arc<Url> {
|
||||||
|
let url: Cow<'a, Url> = url.into();
|
||||||
|
static INTERNED_URLS: Lazy<DashSet<Arc<Url>>> = Lazy::new(DashSet::new);
|
||||||
|
return INTERNED_URLS
|
||||||
|
.get::<Url>(url.borrow())
|
||||||
|
.map(|e| e.clone())
|
||||||
|
.unwrap_or_else(|| {
|
||||||
|
let ret = Arc::new(url.into_owned());
|
||||||
|
INTERNED_URLS.insert(ret.clone());
|
||||||
|
ret
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// this should maybe be a newtype like all the other PersonId CommunityId etc.
|
||||||
|
/// also should be i64
|
||||||
|
pub type ActivityId = i32;
|
||||||
|
|
||||||
|
/// activities are immutable so cache does not need to have TTL
|
||||||
|
/// May return None if the corresponding id does not exist or is a received activity.
|
||||||
|
/// Holes in serials are expected behaviour in postgresql
|
||||||
|
/// todo: cache size should probably be configurable / dependent on desired memory usage
|
||||||
|
pub async fn get_activity_cached(
|
||||||
|
pool: &mut DbPool<'_>,
|
||||||
|
activity_id: ActivityId,
|
||||||
|
) -> Result<Option<Arc<(Activity, SharedInboxActivities)>>> {
|
||||||
|
static ACTIVITIES: Lazy<Cache<ActivityId, Option<Arc<(Activity, SharedInboxActivities)>>>> =
|
||||||
|
Lazy::new(|| Cache::builder().max_capacity(10000).build());
|
||||||
|
ACTIVITIES
|
||||||
|
.try_get_with(activity_id, async {
|
||||||
|
let row = Activity::read(pool, activity_id)
|
||||||
|
.await
|
||||||
|
.optional()
|
||||||
|
.context("could not read activity")?;
|
||||||
|
let Some(mut row) = row else { return anyhow::Result::<_, anyhow::Error>::Ok(None) };
|
||||||
|
if row.send_targets.is_none() {
|
||||||
|
// must be a received activity
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
// swap to avoid cloning
|
||||||
|
let mut data = Value::Null;
|
||||||
|
std::mem::swap(&mut row.data, &mut data);
|
||||||
|
let activity_actual: SharedInboxActivities = serde_json::from_value(data)?;
|
||||||
|
|
||||||
|
Ok(Some(Arc::new((row, activity_actual))))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("err getting activity: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// return the most current activity id (with 1 second cache)
|
||||||
|
pub async fn get_latest_activity_id(pool: &mut DbPool<'_>) -> Result<ActivityId> {
|
||||||
|
static CACHE: Lazy<Cache<(), ActivityId>> = Lazy::new(|| {
|
||||||
|
Cache::builder()
|
||||||
|
.time_to_live(Duration::from_secs(1))
|
||||||
|
.build()
|
||||||
|
});
|
||||||
|
CACHE
|
||||||
|
.try_get_with((), async {
|
||||||
|
let conn = &mut get_conn(pool).await?;
|
||||||
|
let Sequence {
|
||||||
|
last_value: latest_id,
|
||||||
|
} = diesel::sql_query("select last_value from activity_id_seq")
|
||||||
|
.get_result(conn)
|
||||||
|
.await?;
|
||||||
|
anyhow::Result::<_, anyhow::Error>::Ok(latest_id as ActivityId)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("err getting id: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// how long to sleep based on how many retries have already happened
|
||||||
|
pub fn retry_sleep_duration(retry_count: i32) -> Duration {
|
||||||
|
Duration::from_secs_f64(10.0 * 2.0_f64.powf(retry_count as f64))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(QueryableByName)]
|
||||||
|
struct Sequence {
|
||||||
|
#[diesel(sql_type = Int8)]
|
||||||
|
last_value: i64, // this value is bigint for some reason even if sequence is int4
|
||||||
|
}
|
218
crates/federate/src/worker.rs
Normal file
218
crates/federate/src/worker.rs
Normal file
@ -0,0 +1,218 @@
|
|||||||
|
use crate::{
|
||||||
|
federation_queue_state::FederationQueueState,
|
||||||
|
util::{
|
||||||
|
get_activity_cached,
|
||||||
|
get_actor_cached,
|
||||||
|
get_latest_activity_id,
|
||||||
|
intern_url,
|
||||||
|
retry_sleep_duration,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
use activitypub_federation::{
|
||||||
|
activity_queue::{prepare_raw, send_raw, sign_raw},
|
||||||
|
config::Data,
|
||||||
|
};
|
||||||
|
use anyhow::Result;
|
||||||
|
use chrono::{DateTime, TimeZone, Utc};
|
||||||
|
use lemmy_db_schema::{
|
||||||
|
newtypes::{CommunityId, InstanceId},
|
||||||
|
source::{activity::Activity, instance::Instance, site::Site},
|
||||||
|
utils::DbPool,
|
||||||
|
};
|
||||||
|
use lemmy_db_views_actor::structs::CommunityFollowerView;
|
||||||
|
use lemmy_utils::{error::LemmyErrorExt2, REQWEST_TIMEOUT};
|
||||||
|
use reqwest::Url;
|
||||||
|
use std::{
|
||||||
|
borrow::Cow,
|
||||||
|
collections::{HashMap, HashSet},
|
||||||
|
ops::Deref,
|
||||||
|
sync::Arc,
|
||||||
|
time::Duration,
|
||||||
|
};
|
||||||
|
use tokio::{sync::mpsc::UnboundedSender, time::sleep};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
/// save state to db every n sends if there's no failures (otherwise state is saved after every attempt)
|
||||||
|
static SAVE_STATE_EVERY_IT: i64 = 100;
|
||||||
|
static SAVE_STATE_EVERY_TIME: Duration = Duration::from_secs(10);
|
||||||
|
|
||||||
|
/// loop fetch new activities from db and send them to the inboxes of the given instances
|
||||||
|
/// this worker only returns if (a) there is an internal error or (b) the cancellation token is cancelled (graceful exit)
|
||||||
|
pub async fn instance_worker(
|
||||||
|
mut pool: DbPool<'_>,
|
||||||
|
instance: Instance,
|
||||||
|
data: Data<()>,
|
||||||
|
stop: CancellationToken,
|
||||||
|
stats_sender: UnboundedSender<FederationQueueState>,
|
||||||
|
) -> Result<(), anyhow::Error> {
|
||||||
|
let mut last_full_communities_fetch = Utc.timestamp_nanos(0);
|
||||||
|
let mut last_incremental_communities_fetch = Utc.timestamp_nanos(0);
|
||||||
|
let mut last_state_insert = Utc.timestamp_nanos(0);
|
||||||
|
let mut followed_communities: HashMap<CommunityId, HashSet<Arc<Url>>> = get_communities(
|
||||||
|
&mut pool,
|
||||||
|
instance.id,
|
||||||
|
&mut last_incremental_communities_fetch,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
let site = Site::read_from_instance_id(&mut pool, instance.id).await?;
|
||||||
|
|
||||||
|
let mut state = FederationQueueState::load(&mut pool, &instance.domain).await?;
|
||||||
|
if state.fail_count > 0 {
|
||||||
|
// before starting queue, sleep remaining duration
|
||||||
|
let elapsed = (Utc::now() - state.last_retry).to_std()?;
|
||||||
|
let remaining = retry_sleep_duration(state.fail_count) - elapsed;
|
||||||
|
tokio::select! {
|
||||||
|
() = sleep(remaining) => {},
|
||||||
|
() = stop.cancelled() => { return Ok(()); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while !stop.is_cancelled() {
|
||||||
|
let latest_id = get_latest_activity_id(&mut pool).await?;
|
||||||
|
let mut id = state.last_successful_id;
|
||||||
|
if id == latest_id {
|
||||||
|
// no more work to be done, wait before rechecking
|
||||||
|
tokio::select! {
|
||||||
|
() = sleep(Duration::from_secs(10)) => { continue; },
|
||||||
|
() = stop.cancelled() => { return Ok(()); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut processed_activities = 0;
|
||||||
|
'batch: while id < latest_id
|
||||||
|
&& processed_activities < SAVE_STATE_EVERY_IT
|
||||||
|
&& !stop.is_cancelled()
|
||||||
|
{
|
||||||
|
id += 1;
|
||||||
|
processed_activities += 1;
|
||||||
|
let Some(ele) = get_activity_cached(&mut pool, id).await? else {
|
||||||
|
state.last_successful_id = id;
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let (activity, object) = (&ele.0, &ele.1);
|
||||||
|
let inbox_urls = get_inbox_urls(&instance, &site, &followed_communities, activity);
|
||||||
|
if inbox_urls.is_empty() {
|
||||||
|
state.last_successful_id = id;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let actor = {
|
||||||
|
// these should always be set for sent activities
|
||||||
|
let (Some(actor_type), Some(apub_id)) = (activity.actor_type, &activity.actor_apub_id) else {
|
||||||
|
tracing::warn!("activity {id} does not have actor_type or actor_apub_id set");
|
||||||
|
state.last_successful_id = id;
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
get_actor_cached(&mut pool, actor_type, apub_id.deref()).await?
|
||||||
|
};
|
||||||
|
let inbox_urls = inbox_urls.into_iter().map(|e| (*e).clone()).collect();
|
||||||
|
let requests = prepare_raw(object, actor.as_ref(), inbox_urls, &data)
|
||||||
|
.await
|
||||||
|
.into_anyhow()?;
|
||||||
|
for task in requests {
|
||||||
|
// usually only one due to shared inbox
|
||||||
|
let mut req = sign_raw(&task, &data, REQWEST_TIMEOUT).await?;
|
||||||
|
tracing::info!("sending out {}", task);
|
||||||
|
while let Err(e) = send_raw(&task, &data, req).await {
|
||||||
|
tracing::info!("{task} failed: {e}");
|
||||||
|
state.fail_count += 1;
|
||||||
|
state.last_retry = Utc::now();
|
||||||
|
stats_sender.send(state.clone())?;
|
||||||
|
FederationQueueState::upsert(&mut pool, &state).await?;
|
||||||
|
req = sign_raw(&task, &data, REQWEST_TIMEOUT).await?; // resign request
|
||||||
|
tokio::select! {
|
||||||
|
() = sleep(retry_sleep_duration(state.fail_count)) => {},
|
||||||
|
() = stop.cancelled() => {
|
||||||
|
// save state to db and exit
|
||||||
|
break 'batch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// send success!
|
||||||
|
state.last_successful_id = id;
|
||||||
|
state.fail_count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if Utc::now() - last_state_insert > chrono::Duration::from_std(SAVE_STATE_EVERY_TIME).unwrap() {
|
||||||
|
last_state_insert = Utc::now();
|
||||||
|
FederationQueueState::upsert(&mut pool, &state).await?;
|
||||||
|
stats_sender.send(state.clone())?;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
// update communities
|
||||||
|
if (Utc::now() - last_incremental_communities_fetch) > chrono::Duration::seconds(10) {
|
||||||
|
// process additions every 10s
|
||||||
|
followed_communities.extend(
|
||||||
|
get_communities(
|
||||||
|
&mut pool,
|
||||||
|
instance.id,
|
||||||
|
&mut last_incremental_communities_fetch,
|
||||||
|
)
|
||||||
|
.await?,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (Utc::now() - last_full_communities_fetch) > chrono::Duration::seconds(300) {
|
||||||
|
// process removals every 5min
|
||||||
|
last_full_communities_fetch = Utc.timestamp_nanos(0);
|
||||||
|
followed_communities =
|
||||||
|
get_communities(&mut pool, instance.id, &mut last_full_communities_fetch).await?;
|
||||||
|
last_incremental_communities_fetch = last_full_communities_fetch.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// get inbox urls of sending the given activity to the given instance
|
||||||
|
/// most often this will return 0 values (if instance doesn't care about the activity)
|
||||||
|
/// or 1 value (the shared inbox)
|
||||||
|
/// > 1 values only happens for non-lemmy software
|
||||||
|
fn get_inbox_urls(
|
||||||
|
instance: &Instance,
|
||||||
|
site: &Option<Site>,
|
||||||
|
followed_communities: &HashMap<CommunityId, HashSet<Arc<Url>>>,
|
||||||
|
activity: &Activity,
|
||||||
|
) -> HashSet<Arc<Url>> {
|
||||||
|
let mut inbox_urls = HashSet::new();
|
||||||
|
let Some(targets) = &activity.send_targets else {
|
||||||
|
return inbox_urls;
|
||||||
|
};
|
||||||
|
if targets.all_instances {
|
||||||
|
if let Some(site) = &site {
|
||||||
|
// todo: when does an instance not have a site?
|
||||||
|
inbox_urls.insert(intern_url(Cow::Borrowed(site.inbox_url.deref())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for t in &targets.community_followers_of {
|
||||||
|
if let Some(urls) = followed_communities.get(t) {
|
||||||
|
inbox_urls.extend(urls.iter().map(|e| e.clone()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for inbox in &targets.inboxes {
|
||||||
|
if inbox.domain() != Some(&instance.domain) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
inbox_urls.insert(intern_url(Cow::Borrowed(inbox)));
|
||||||
|
}
|
||||||
|
inbox_urls
|
||||||
|
}
|
||||||
|
|
||||||
|
/// get a list of local communities with the remote inboxes on the given instance that cares about them
|
||||||
|
async fn get_communities(
|
||||||
|
pool: &mut DbPool<'_>,
|
||||||
|
instance_id: InstanceId,
|
||||||
|
last_fetch: &mut DateTime<Utc>,
|
||||||
|
) -> Result<HashMap<CommunityId, HashSet<Arc<Url>>>> {
|
||||||
|
let e = *last_fetch;
|
||||||
|
*last_fetch = Utc::now(); // update to time before fetch to ensure overlap
|
||||||
|
Ok(
|
||||||
|
CommunityFollowerView::get_instance_followed_community_inboxes(pool, instance_id, e)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
.fold(HashMap::new(), |mut map, (c, u)| {
|
||||||
|
map
|
||||||
|
.entry(c)
|
||||||
|
.or_insert_with(|| HashSet::new())
|
||||||
|
.insert(intern_url(Cow::Owned(u.into())));
|
||||||
|
map
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
@ -236,6 +236,7 @@ impl<T, E: Into<anyhow::Error>> LemmyErrorExt<T, E> for Result<T, E> {
|
|||||||
}
|
}
|
||||||
pub trait LemmyErrorExt2<T> {
|
pub trait LemmyErrorExt2<T> {
|
||||||
fn with_lemmy_type(self, error_type: LemmyErrorType) -> Result<T, LemmyError>;
|
fn with_lemmy_type(self, error_type: LemmyErrorType) -> Result<T, LemmyError>;
|
||||||
|
fn into_anyhow(self) -> Result<T, anyhow::Error>;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T> LemmyErrorExt2<T> for Result<T, LemmyError> {
|
impl<T> LemmyErrorExt2<T> for Result<T, LemmyError> {
|
||||||
@ -245,6 +246,10 @@ impl<T> LemmyErrorExt2<T> for Result<T, LemmyError> {
|
|||||||
e
|
e
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
// this function can't be an impl From or similar because it would conflict with one of the other broad Into<> implementations
|
||||||
|
fn into_anyhow(self) -> Result<T, anyhow::Error> {
|
||||||
|
self.map_err(|e| e.inner)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
@ -0,0 +1,11 @@
|
|||||||
|
ALTER TABLE activity
|
||||||
|
DROP COLUMN send_targets,
|
||||||
|
DROP COLUMN actor_apub_id,
|
||||||
|
DROP COLUMN actor_type;
|
||||||
|
|
||||||
|
DROP TYPE actor_type_enum;
|
||||||
|
|
||||||
|
DROP TABLE federation_queue_state;
|
||||||
|
|
||||||
|
DROP INDEX idx_community_follower_published;
|
||||||
|
|
@ -0,0 +1,21 @@
|
|||||||
|
CREATE TYPE actor_type_enum AS enum(
|
||||||
|
'site',
|
||||||
|
'community',
|
||||||
|
'person'
|
||||||
|
);
|
||||||
|
|
||||||
|
ALTER TABLE activity
|
||||||
|
ADD COLUMN send_targets jsonb DEFAULT NULL,
|
||||||
|
ADD COLUMN actor_type actor_type_enum DEFAULT NULL,
|
||||||
|
ADD COLUMN actor_apub_id text DEFAULT NULL;
|
||||||
|
|
||||||
|
CREATE TABLE federation_queue_state(
|
||||||
|
domain text PRIMARY KEY,
|
||||||
|
last_successful_id integer NOT NULL,
|
||||||
|
fail_count integer NOT NULL,
|
||||||
|
last_retry timestamptz NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
-- for incremental fetches of followers
|
||||||
|
CREATE INDEX idx_community_follower_published ON community_follower(published);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user