mirror of https://github.com/LemmyNet/lemmy
Split lemmy_apub crate into two parts apub and apub_receive
parent
36a79e18cd
commit
722cdb78ba
@ -1,2 +1 @@
|
|||||||
pub(crate) mod receive;
|
|
||||||
pub mod send;
|
pub mod send;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
pub(crate) mod context;
|
pub mod context;
|
||||||
pub(crate) mod group_extension;
|
pub(crate) mod group_extension;
|
||||||
pub(crate) mod page_extension;
|
pub(crate) mod page_extension;
|
||||||
pub(crate) mod person_extension;
|
pub(crate) mod person_extension;
|
||||||
pub(crate) mod signatures;
|
pub mod signatures;
|
||||||
|
@ -0,0 +1,45 @@
|
|||||||
|
[package]
|
||||||
|
name = "lemmy_apub_receive"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2018"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
lemmy_utils = { path = "../utils" }
|
||||||
|
lemmy_apub = { path = "../apub" }
|
||||||
|
lemmy_db_queries = { path = "../db_queries" }
|
||||||
|
lemmy_db_schema = { path = "../db_schema" }
|
||||||
|
lemmy_db_views = { path = "../db_views" }
|
||||||
|
lemmy_db_views_actor = { path = "../db_views_actor" }
|
||||||
|
lemmy_api_common = { path = "../api_common" }
|
||||||
|
lemmy_websocket = { path = "../websocket" }
|
||||||
|
diesel = "1.4.5"
|
||||||
|
activitystreams = "0.7.0-alpha.11"
|
||||||
|
activitystreams-ext = "0.1.0-alpha.2"
|
||||||
|
bcrypt = "0.9.0"
|
||||||
|
chrono = { version = "0.4.19", features = ["serde"] }
|
||||||
|
serde_json = { version = "1.0.61", features = ["preserve_order"] }
|
||||||
|
serde = { version = "1.0.123", features = ["derive"] }
|
||||||
|
actix = "0.10.0"
|
||||||
|
actix-web = { version = "3.3.2", default-features = false }
|
||||||
|
actix-rt = { version = "1.1.1", default-features = false }
|
||||||
|
awc = { version = "2.0.3", default-features = false }
|
||||||
|
log = "0.4.14"
|
||||||
|
rand = "0.8.3"
|
||||||
|
strum = "0.20.0"
|
||||||
|
strum_macros = "0.20.1"
|
||||||
|
url = { version = "2.2.1", features = ["serde"] }
|
||||||
|
percent-encoding = "2.1.0"
|
||||||
|
openssl = "0.10.32"
|
||||||
|
http = "0.2.3"
|
||||||
|
http-signature-normalization-actix = { version = "0.4.1", default-features = false, features = ["sha-2"] }
|
||||||
|
http-signature-normalization-reqwest = { version = "0.1.3", default-features = false, features = ["sha-2"] }
|
||||||
|
base64 = "0.13.0"
|
||||||
|
tokio = "0.3.6"
|
||||||
|
futures = "0.3.12"
|
||||||
|
itertools = "0.10.0"
|
||||||
|
sha2 = "0.9.3"
|
||||||
|
async-trait = "0.1.42"
|
||||||
|
anyhow = "1.0.38"
|
||||||
|
thiserror = "1.0.23"
|
||||||
|
backtrace = "0.3.56"
|
||||||
|
|
@ -0,0 +1 @@
|
|||||||
|
pub(crate) mod receive;
|
@ -1,10 +1,11 @@
|
|||||||
use crate::{activities::receive::get_actor_as_person, objects::FromApub, ActorType, NoteExt};
|
use crate::activities::receive::get_actor_as_person;
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
activity::{ActorAndObjectRefExt, Create, Dislike, Like, Update},
|
activity::{ActorAndObjectRefExt, Create, Dislike, Like, Update},
|
||||||
base::ExtendsExt,
|
base::ExtendsExt,
|
||||||
};
|
};
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use lemmy_api_common::{blocking, comment::CommentResponse, send_local_notifs};
|
use lemmy_api_common::{blocking, comment::CommentResponse, send_local_notifs};
|
||||||
|
use lemmy_apub::{objects::FromApub, ActorType, NoteExt};
|
||||||
use lemmy_db_queries::{source::comment::Comment_, Crud, Likeable};
|
use lemmy_db_queries::{source::comment::Comment_, Crud, Likeable};
|
||||||
use lemmy_db_schema::source::{
|
use lemmy_db_schema::source::{
|
||||||
comment::{Comment, CommentLike, CommentLikeForm},
|
comment::{Comment, CommentLike, CommentLikeForm},
|
@ -1,10 +1,10 @@
|
|||||||
use crate::fetcher::person::get_or_fetch_and_upsert_person;
|
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
activity::{ActorAndObjectRef, ActorAndObjectRefExt},
|
activity::{ActorAndObjectRef, ActorAndObjectRefExt},
|
||||||
base::{AsBase, BaseExt},
|
base::{AsBase, BaseExt},
|
||||||
error::DomainError,
|
error::DomainError,
|
||||||
};
|
};
|
||||||
use anyhow::{anyhow, Context};
|
use anyhow::{anyhow, Context};
|
||||||
|
use lemmy_apub::fetcher::person::get_or_fetch_and_upsert_person;
|
||||||
use lemmy_db_schema::source::person::Person;
|
use lemmy_db_schema::source::person::Person;
|
||||||
use lemmy_utils::{location_info, LemmyError};
|
use lemmy_utils::{location_info, LemmyError};
|
||||||
use lemmy_websocket::LemmyContext;
|
use lemmy_websocket::LemmyContext;
|
@ -1,10 +1,8 @@
|
|||||||
use crate::{
|
use crate::http::{create_apub_response, create_apub_tombstone_response};
|
||||||
http::{create_apub_response, create_apub_tombstone_response},
|
|
||||||
objects::ToApub,
|
|
||||||
};
|
|
||||||
use actix_web::{body::Body, web, web::Path, HttpResponse};
|
use actix_web::{body::Body, web, web::Path, HttpResponse};
|
||||||
use diesel::result::Error::NotFound;
|
use diesel::result::Error::NotFound;
|
||||||
use lemmy_api_common::blocking;
|
use lemmy_api_common::blocking;
|
||||||
|
use lemmy_apub::objects::ToApub;
|
||||||
use lemmy_db_queries::Crud;
|
use lemmy_db_queries::Crud;
|
||||||
use lemmy_db_schema::{source::comment::Comment, CommentId};
|
use lemmy_db_schema::{source::comment::Comment, CommentId};
|
||||||
use lemmy_utils::LemmyError;
|
use lemmy_utils::LemmyError;
|
@ -1,7 +1,7 @@
|
|||||||
use crate::APUB_JSON_CONTENT_TYPE;
|
|
||||||
use actix_web::{body::Body, web, HttpResponse};
|
use actix_web::{body::Body, web, HttpResponse};
|
||||||
use http::StatusCode;
|
use http::StatusCode;
|
||||||
use lemmy_api_common::blocking;
|
use lemmy_api_common::blocking;
|
||||||
|
use lemmy_apub::APUB_JSON_CONTENT_TYPE;
|
||||||
use lemmy_db_queries::source::activity::Activity_;
|
use lemmy_db_queries::source::activity::Activity_;
|
||||||
use lemmy_db_schema::source::activity::Activity;
|
use lemmy_db_schema::source::activity::Activity;
|
||||||
use lemmy_utils::{settings::structs::Settings, LemmyError};
|
use lemmy_utils::{settings::structs::Settings, LemmyError};
|
@ -1,15 +1,11 @@
|
|||||||
use crate::{
|
use crate::http::{create_apub_response, create_apub_tombstone_response};
|
||||||
extensions::context::lemmy_context,
|
|
||||||
http::{create_apub_response, create_apub_tombstone_response},
|
|
||||||
objects::ToApub,
|
|
||||||
ActorType,
|
|
||||||
};
|
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
base::BaseExt,
|
base::BaseExt,
|
||||||
collection::{CollectionExt, OrderedCollection},
|
collection::{CollectionExt, OrderedCollection},
|
||||||
};
|
};
|
||||||
use actix_web::{body::Body, web, HttpResponse};
|
use actix_web::{body::Body, web, HttpResponse};
|
||||||
use lemmy_api_common::blocking;
|
use lemmy_api_common::blocking;
|
||||||
|
use lemmy_apub::{extensions::context::lemmy_context, objects::ToApub, ActorType};
|
||||||
use lemmy_db_queries::source::person::Person_;
|
use lemmy_db_queries::source::person::Person_;
|
||||||
use lemmy_db_schema::source::person::Person;
|
use lemmy_db_schema::source::person::Person;
|
||||||
use lemmy_utils::LemmyError;
|
use lemmy_utils::LemmyError;
|
@ -1,10 +1,8 @@
|
|||||||
use crate::{
|
use crate::http::{create_apub_response, create_apub_tombstone_response};
|
||||||
http::{create_apub_response, create_apub_tombstone_response},
|
|
||||||
objects::ToApub,
|
|
||||||
};
|
|
||||||
use actix_web::{body::Body, web, HttpResponse};
|
use actix_web::{body::Body, web, HttpResponse};
|
||||||
use diesel::result::Error::NotFound;
|
use diesel::result::Error::NotFound;
|
||||||
use lemmy_api_common::blocking;
|
use lemmy_api_common::blocking;
|
||||||
|
use lemmy_apub::objects::ToApub;
|
||||||
use lemmy_db_queries::Crud;
|
use lemmy_db_queries::Crud;
|
||||||
use lemmy_db_schema::{source::post::Post, PostId};
|
use lemmy_db_schema::{source::post::Post, PostId};
|
||||||
use lemmy_utils::LemmyError;
|
use lemmy_utils::LemmyError;
|
@ -1,21 +1,18 @@
|
|||||||
use crate::{
|
use crate::inbox::{
|
||||||
inbox::{
|
|
||||||
assert_activity_not_local,
|
assert_activity_not_local,
|
||||||
community_inbox::{community_receive_message, CommunityAcceptedActivities},
|
community_inbox::{community_receive_message, CommunityAcceptedActivities},
|
||||||
get_activity_id,
|
get_activity_id,
|
||||||
get_activity_to_and_cc,
|
|
||||||
inbox_verify_http_signature,
|
inbox_verify_http_signature,
|
||||||
is_activity_already_known,
|
is_activity_already_known,
|
||||||
is_addressed_to_community_followers,
|
is_addressed_to_community_followers,
|
||||||
is_addressed_to_local_person,
|
is_addressed_to_local_person,
|
||||||
person_inbox::{person_receive_message, PersonAcceptedActivities},
|
person_inbox::{person_receive_message, PersonAcceptedActivities},
|
||||||
},
|
|
||||||
insert_activity,
|
|
||||||
};
|
};
|
||||||
use activitystreams::{activity::ActorAndObject, prelude::*};
|
use activitystreams::{activity::ActorAndObject, prelude::*};
|
||||||
use actix_web::{web, HttpRequest, HttpResponse};
|
use actix_web::{web, HttpRequest, HttpResponse};
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use lemmy_api_common::blocking;
|
use lemmy_api_common::blocking;
|
||||||
|
use lemmy_apub::{get_activity_to_and_cc, insert_activity};
|
||||||
use lemmy_db_queries::{ApubObject, DbPool};
|
use lemmy_db_queries::{ApubObject, DbPool};
|
||||||
use lemmy_db_schema::source::community::Community;
|
use lemmy_db_schema::source::community::Community;
|
||||||
use lemmy_utils::{location_info, LemmyError};
|
use lemmy_utils::{location_info, LemmyError};
|
@ -0,0 +1,4 @@
|
|||||||
|
mod activities;
|
||||||
|
mod http;
|
||||||
|
mod inbox;
|
||||||
|
pub mod routes;
|
Loading…
Reference in New Issue