mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-10 22:12:38 +00:00
375d9a2a3c
* persistent activity queue * fixes * fixes * make federation workers function callable from outside * log federation instances * dead instance detection not needed here * taplo fmt * split federate bin/lib * minor fix * better logging * log * create struct to hold cancellable task for readability * use boxfuture for readability * reset submodule * fix * fix lint * swap * remove json column, use separate array columns instead * some review comments * make worker a struct for readability * minor readability * add local filter to community follower view * remove separate lemmy_federate entry point * fix remaining duration * address review comments mostly * fix lint * upgrade actitypub-fed to simpler interface * fix sql format * increase delays a bit * fixes after merge * remove selectable * fix instance selectable * add comment * start federation based on latest id at the time * rename federate process args * dead instances in one query * filter follow+report activities by local * remove synchronous federation remove activity sender queue * lint * fix federation tests by waiting for results to change * fix fed test * fix comment report * wait some more * Apply suggestions from code review Co-authored-by: SorteKanin <sortekanin@gmail.com> * fix most remaining tests * wait until private messages * fix community tests * fix community tests * move arg parse * use instance_id instead of domain in federation_queue_state table --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: SorteKanin <sortekanin@gmail.com>
127 lines
3.5 KiB
Rust
127 lines
3.5 KiB
Rust
use crate::{
|
|
diesel::OptionalExtension,
|
|
newtypes::DbUrl,
|
|
source::activity::{ReceivedActivity, SentActivity, SentActivityForm},
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{
|
|
dsl::insert_into,
|
|
result::{DatabaseErrorKind, Error, Error::DatabaseError},
|
|
ExpressionMethods,
|
|
QueryDsl,
|
|
};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl SentActivity {
|
|
pub async fn create(pool: &mut DbPool<'_>, form: SentActivityForm) -> Result<Self, Error> {
|
|
use crate::schema::sent_activity::dsl::sent_activity;
|
|
let conn = &mut get_conn(pool).await?;
|
|
insert_into(sent_activity)
|
|
.values(form)
|
|
.get_result::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn read_from_apub_id(pool: &mut DbPool<'_>, object_id: &DbUrl) -> Result<Self, Error> {
|
|
use crate::schema::sent_activity::dsl::{ap_id, sent_activity};
|
|
let conn = &mut get_conn(pool).await?;
|
|
sent_activity
|
|
.filter(ap_id.eq(object_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
pub async fn read(pool: &mut DbPool<'_>, object_id: i64) -> Result<Self, Error> {
|
|
use crate::schema::sent_activity::dsl::sent_activity;
|
|
let conn = &mut get_conn(pool).await?;
|
|
sent_activity.find(object_id).first::<Self>(conn).await
|
|
}
|
|
}
|
|
|
|
impl ReceivedActivity {
|
|
pub async fn create(pool: &mut DbPool<'_>, ap_id_: &DbUrl) -> Result<(), Error> {
|
|
use crate::schema::received_activity::dsl::{ap_id, id, received_activity};
|
|
let conn = &mut get_conn(pool).await?;
|
|
let res = insert_into(received_activity)
|
|
.values(ap_id.eq(ap_id_))
|
|
.on_conflict_do_nothing()
|
|
.returning(id)
|
|
.get_result::<i64>(conn)
|
|
.await
|
|
.optional()?;
|
|
if res.is_some() {
|
|
// new activity inserted successfully
|
|
Ok(())
|
|
} else {
|
|
// duplicate activity
|
|
Err(DatabaseError(
|
|
DatabaseErrorKind::UniqueViolation,
|
|
Box::<String>::default(),
|
|
))
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#![allow(clippy::unwrap_used)]
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
use super::*;
|
|
use crate::{source::activity::ActorType, utils::build_db_pool_for_tests};
|
|
use serde_json::json;
|
|
use serial_test::serial;
|
|
use url::Url;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn receive_activity_duplicate() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
let ap_id: DbUrl = Url::parse("http://example.com/activity/531")
|
|
.unwrap()
|
|
.into();
|
|
|
|
// inserting activity for first time
|
|
let res = ReceivedActivity::create(pool, &ap_id).await;
|
|
assert!(res.is_ok());
|
|
|
|
let res = ReceivedActivity::create(pool, &ap_id).await;
|
|
assert!(res.is_err());
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn sent_activity_write_read() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
let ap_id: DbUrl = Url::parse("http://example.com/activity/412")
|
|
.unwrap()
|
|
.into();
|
|
let data = json!({
|
|
"key1": "0xF9BA143B95FF6D82",
|
|
"key2": "42",
|
|
});
|
|
let sensitive = false;
|
|
|
|
let form = SentActivityForm {
|
|
ap_id: ap_id.clone(),
|
|
data: data.clone(),
|
|
sensitive,
|
|
actor_apub_id: Url::parse("http://example.com/u/exampleuser")
|
|
.unwrap()
|
|
.into(),
|
|
actor_type: ActorType::Person,
|
|
send_all_instances: false,
|
|
send_community_followers_of: None,
|
|
send_inboxes: vec![],
|
|
};
|
|
|
|
SentActivity::create(pool, form).await.unwrap();
|
|
|
|
let res = SentActivity::read_from_apub_id(pool, &ap_id).await.unwrap();
|
|
assert_eq!(res.ap_id, ap_id);
|
|
assert_eq!(res.data, data);
|
|
assert_eq!(res.sensitive, sensitive);
|
|
}
|
|
}
|