2022-11-09 10:05:00 +00:00
|
|
|
use crate::{
|
2023-07-14 15:17:06 +00:00
|
|
|
diesel::OptionalExtension,
|
2023-11-06 21:07:04 +00:00
|
|
|
newtypes::{ActivityId, DbUrl},
|
2023-07-14 15:17:06 +00:00
|
|
|
source::activity::{ReceivedActivity, SentActivity, SentActivityForm},
|
2022-11-09 10:05:00 +00:00
|
|
|
utils::{get_conn, DbPool},
|
|
|
|
};
|
2023-07-14 15:17:06 +00:00
|
|
|
use diesel::{
|
|
|
|
dsl::insert_into,
|
|
|
|
result::{DatabaseErrorKind, Error, Error::DatabaseError},
|
|
|
|
ExpressionMethods,
|
|
|
|
QueryDsl,
|
|
|
|
};
|
2022-11-09 10:05:00 +00:00
|
|
|
use diesel_async::RunQueryDsl;
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2023-07-14 15:17:06 +00:00
|
|
|
impl SentActivity {
|
|
|
|
pub async fn create(pool: &mut DbPool<'_>, form: SentActivityForm) -> Result<Self, Error> {
|
|
|
|
use crate::schema::sent_activity::dsl::sent_activity;
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2023-07-14 15:17:06 +00:00
|
|
|
insert_into(sent_activity)
|
|
|
|
.values(form)
|
2020-04-27 22:17:02 +00:00
|
|
|
.get_result::<Self>(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2020-04-27 22:17:02 +00:00
|
|
|
}
|
|
|
|
|
2024-04-16 12:48:15 +00:00
|
|
|
pub async fn read_from_apub_id(
|
|
|
|
pool: &mut DbPool<'_>,
|
|
|
|
object_id: &DbUrl,
|
|
|
|
) -> Result<Option<Self>, Error> {
|
2023-07-14 15:17:06 +00:00
|
|
|
use crate::schema::sent_activity::dsl::{ap_id, sent_activity};
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2023-07-14 15:17:06 +00:00
|
|
|
sent_activity
|
|
|
|
.filter(ap_id.eq(object_id))
|
2024-04-16 12:48:15 +00:00
|
|
|
.first(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.optional()
|
2020-11-10 16:11:08 +00:00
|
|
|
}
|
2024-04-16 12:48:15 +00:00
|
|
|
pub async fn read(pool: &mut DbPool<'_>, object_id: ActivityId) -> Result<Option<Self>, Error> {
|
2023-09-09 16:25:03 +00:00
|
|
|
use crate::schema::sent_activity::dsl::sent_activity;
|
|
|
|
let conn = &mut get_conn(pool).await?;
|
2024-04-16 12:48:15 +00:00
|
|
|
sent_activity.find(object_id).first(conn).await.optional()
|
2023-09-09 16:25:03 +00:00
|
|
|
}
|
2020-04-27 22:17:02 +00:00
|
|
|
}
|
|
|
|
|
2023-07-14 15:17:06 +00:00
|
|
|
impl ReceivedActivity {
|
|
|
|
pub async fn create(pool: &mut DbPool<'_>, ap_id_: &DbUrl) -> Result<(), Error> {
|
Remove id column and use different primary key on some tables (#4093)
* 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>
2023-11-13 13:14:07 +00:00
|
|
|
use crate::schema::received_activity::dsl::{ap_id, received_activity};
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
Remove id column and use different primary key on some tables (#4093)
* 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>
2023-11-13 13:14:07 +00:00
|
|
|
let rows_affected = insert_into(received_activity)
|
2023-07-14 15:17:06 +00:00
|
|
|
.values(ap_id.eq(ap_id_))
|
|
|
|
.on_conflict_do_nothing()
|
Remove id column and use different primary key on some tables (#4093)
* 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>
2023-11-13 13:14:07 +00:00
|
|
|
.execute(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2023-07-14 15:17:06 +00:00
|
|
|
.optional()?;
|
Remove id column and use different primary key on some tables (#4093)
* 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>
2023-11-13 13:14:07 +00:00
|
|
|
if rows_affected == Some(1) {
|
2023-07-14 15:17:06 +00:00
|
|
|
// new activity inserted successfully
|
|
|
|
Ok(())
|
|
|
|
} else {
|
|
|
|
// duplicate activity
|
|
|
|
Err(DatabaseError(
|
|
|
|
DatabaseErrorKind::UniqueViolation,
|
|
|
|
Box::<String>::default(),
|
|
|
|
))
|
|
|
|
}
|
2021-01-29 16:38:27 +00:00
|
|
|
}
|
2020-05-14 12:26:44 +00:00
|
|
|
}
|
|
|
|
|
2020-04-27 22:17:02 +00:00
|
|
|
#[cfg(test)]
|
2024-03-26 09:17:42 +00:00
|
|
|
#[allow(clippy::unwrap_used)]
|
|
|
|
#[allow(clippy::indexing_slicing)]
|
2020-04-27 22:17:02 +00:00
|
|
|
mod tests {
|
2023-07-17 15:04:14 +00:00
|
|
|
|
2021-03-02 12:41:48 +00:00
|
|
|
use super::*;
|
2023-09-09 16:25:03 +00:00
|
|
|
use crate::{source::activity::ActorType, utils::build_db_pool_for_tests};
|
2024-01-04 09:47:18 +00:00
|
|
|
use pretty_assertions::assert_eq;
|
2023-07-14 15:17:06 +00:00
|
|
|
use serde_json::json;
|
2021-02-25 19:43:39 +00:00
|
|
|
use serial_test::serial;
|
2021-03-02 12:41:48 +00:00
|
|
|
use url::Url;
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2021-02-25 19:43:39 +00:00
|
|
|
#[serial]
|
2023-07-14 15:17:06 +00:00
|
|
|
async fn receive_activity_duplicate() {
|
2022-11-09 10:05:00 +00:00
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2023-07-14 15:17:06 +00:00
|
|
|
let ap_id: DbUrl = Url::parse("http://example.com/activity/531")
|
|
|
|
.unwrap()
|
|
|
|
.into();
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2024-04-18 00:58:44 +00:00
|
|
|
// inserting activity should only work once
|
|
|
|
ReceivedActivity::create(pool, &ap_id).await.unwrap();
|
|
|
|
ReceivedActivity::create(pool, &ap_id).await.unwrap_err();
|
2023-07-14 15:17:06 +00:00
|
|
|
}
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2023-07-14 15:17:06 +00:00
|
|
|
#[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;
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2023-07-14 15:17:06 +00:00
|
|
|
let form = SentActivityForm {
|
|
|
|
ap_id: ap_id.clone(),
|
|
|
|
data: data.clone(),
|
|
|
|
sensitive,
|
2023-09-09 16:25:03 +00:00
|
|
|
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![],
|
2020-04-27 22:17:02 +00:00
|
|
|
};
|
|
|
|
|
2023-07-14 15:17:06 +00:00
|
|
|
SentActivity::create(pool, form).await.unwrap();
|
2020-04-27 22:17:02 +00:00
|
|
|
|
2024-04-16 12:48:15 +00:00
|
|
|
let res = SentActivity::read_from_apub_id(pool, &ap_id)
|
|
|
|
.await
|
|
|
|
.unwrap()
|
|
|
|
.unwrap();
|
2023-07-14 15:17:06 +00:00
|
|
|
assert_eq!(res.ap_id, ap_id);
|
|
|
|
assert_eq!(res.data, data);
|
|
|
|
assert_eq!(res.sensitive, sensitive);
|
2020-04-27 22:17:02 +00:00
|
|
|
}
|
|
|
|
}
|