mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-28 22:01:33 +00:00
8e2cbc9a0f
* post_saved * fmt * remove unique and not null * put person_id first in primary key and remove index * use post_saved.find * change captcha_answer * remove removal of not null * comment_aggregates * comment_like * comment_saved * aggregates * remove "\" * deduplicate site_aggregates * person_post_aggregates * community_moderator * community_block * community_person_ban * custom_emoji_keyword * federation allow/block list * federation_queue_state * instance_block * local_site_rate_limit, local_user_language, login_token * person_ban, person_block, person_follower, post_like, post_read, received_activity * community_follower, community_language, site_language * fmt * image_upload * remove unused newtypes * remove more indexes * use .find * merge * fix site_aggregates_site function * fmt * Primary keys dess (#17) * Also order reports by oldest first (ref #4123) (#4129) * Support signed fetch for federation (fixes #868) (#4125) * Support signed fetch for federation (fixes #868) * taplo * add federation queue state to get_federated_instances api (#4104) * add federation queue state to get_federated_instances api * feature gate * move retry sleep function * move stuff around * Add UI setting for collapsing bot comments. Fixes #3838 (#4098) * Add UI setting for collapsing bot comments. Fixes #3838 * Fixing clippy check. * Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131) * Only check auth secure on release mode. (#4127) * Only check auth secure on release mode. * Fixing wrong js-client. * Adding is_debug_mode var. * Fixing the desktop image on the README. (#4135) * Delete dupes and add possibly missing unique constraint on person_aggregates. * Fixing clippy lints. --------- Co-authored-by: Nutomic <me@nutomic.com> Co-authored-by: phiresky <phireskyde+git@gmail.com> * fmt * Update community_block.rs * Update instance_block.rs * Update person_block.rs * Update person_block.rs --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: Nutomic <me@nutomic.com> Co-authored-by: phiresky <phireskyde+git@gmail.com>
125 lines
3.5 KiB
Rust
125 lines
3.5 KiB
Rust
use crate::{
|
|
diesel::OptionalExtension,
|
|
newtypes::{ActivityId, 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: ActivityId) -> 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, received_activity};
|
|
let conn = &mut get_conn(pool).await?;
|
|
let rows_affected = insert_into(received_activity)
|
|
.values(ap_id.eq(ap_id_))
|
|
.on_conflict_do_nothing()
|
|
.execute(conn)
|
|
.await
|
|
.optional()?;
|
|
if rows_affected == Some(1) {
|
|
// 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);
|
|
}
|
|
}
|