From d423044b608f1c9f0bfb375e30033a6a57619bc2 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 28 Nov 2022 15:29:33 +0100 Subject: [PATCH] Add SendActivity trait so that api crates compile in parallel with lemmy_apub --- crates/api/Cargo.toml | 1 - crates/api/src/comment/like.rs | 9 --- crates/api/src/comment/save.rs | 1 - crates/api/src/comment_report/create.rs | 1 - crates/api/src/comment_report/list.rs | 1 - crates/api/src/comment_report/resolve.rs | 1 - crates/api/src/community/add_mod.rs | 5 -- crates/api/src/community/ban.rs | 6 -- crates/api/src/community/block.rs | 1 - crates/api/src/community/follow.rs | 1 - crates/api/src/community/hide.rs | 1 - crates/api/src/community/transfer.rs | 1 - crates/api/src/lib.rs | 75 +------------------ crates/api/src/local_user/add_admin.rs | 1 - crates/api/src/local_user/ban_person.rs | 5 -- crates/api/src/local_user/block.rs | 1 - crates/api/src/local_user/change_password.rs | 1 - .../local_user/change_password_after_reset.rs | 1 - crates/api/src/local_user/get_captcha.rs | 2 +- crates/api/src/local_user/list_banned.rs | 1 - crates/api/src/local_user/login.rs | 1 - .../local_user/notifications/list_mentions.rs | 1 - .../local_user/notifications/list_replies.rs | 1 - .../local_user/notifications/mark_all_read.rs | 1 - .../notifications/mark_mention_read.rs | 1 - .../notifications/mark_reply_read.rs | 1 - .../local_user/notifications/unread_count.rs | 1 - crates/api/src/local_user/report_count.rs | 1 - crates/api/src/local_user/reset_password.rs | 1 - crates/api/src/local_user/save_settings.rs | 1 - crates/api/src/local_user/verify_email.rs | 1 - crates/api/src/post/get_link_metadata.rs | 1 - crates/api/src/post/like.rs | 9 --- crates/api/src/post/lock.rs | 5 -- crates/api/src/post/mark_read.rs | 1 - crates/api/src/post/save.rs | 1 - crates/api/src/post/sticky.rs | 5 -- crates/api/src/post_report/create.rs | 1 - crates/api/src/post_report/list.rs | 1 - crates/api/src/post_report/resolve.rs | 1 - crates/api/src/private_message/mark_read.rs | 1 - .../api/src/private_message_report/create.rs | 1 - crates/api/src/private_message_report/list.rs | 1 - .../api/src/private_message_report/resolve.rs | 1 - crates/api/src/site/leave_admin.rs | 1 - crates/api/src/site/mod_log.rs | 1 - crates/api/src/site/purge/comment.rs | 1 - crates/api/src/site/purge/community.rs | 1 - crates/api/src/site/purge/person.rs | 1 - crates/api/src/site/purge/post.rs | 1 - .../site/registration_applications/approve.rs | 1 - .../site/registration_applications/list.rs | 1 - .../registration_applications/unread_count.rs | 1 - crates/api/src/websocket.rs | 1 - crates/api_common/src/lib.rs | 69 ----------------- crates/api_common/src/utils.rs | 62 +++++++++++++++ .../api_common/src/websocket/chat_server.rs | 3 +- crates/api_common/src/websocket/routes.rs | 2 +- crates/api_common/src/websocket/send.rs | 1 - crates/api_crud/src/comment/create.rs | 11 --- crates/api_crud/src/comment/delete.rs | 1 - crates/api_crud/src/comment/read.rs | 1 - crates/api_crud/src/comment/remove.rs | 1 - crates/api_crud/src/comment/update.rs | 5 -- crates/api_crud/src/community/create.rs | 21 +++--- crates/api_crud/src/community/delete.rs | 1 - crates/api_crud/src/community/list.rs | 1 - crates/api_crud/src/community/remove.rs | 1 - crates/api_crud/src/community/update.rs | 1 - crates/api_crud/src/lib.rs | 26 +------ crates/api_crud/src/post/create.rs | 7 -- crates/api_crud/src/post/delete.rs | 1 - crates/api_crud/src/post/read.rs | 1 - crates/api_crud/src/post/remove.rs | 1 - crates/api_crud/src/post/update.rs | 5 -- crates/api_crud/src/private_message/create.rs | 9 --- crates/api_crud/src/private_message/delete.rs | 1 - crates/api_crud/src/private_message/read.rs | 1 - crates/api_crud/src/private_message/update.rs | 5 -- crates/api_crud/src/site/create.rs | 1 - crates/api_crud/src/site/read.rs | 1 - crates/api_crud/src/site/update.rs | 1 - crates/api_crud/src/user/create.rs | 1 - crates/api_crud/src/user/delete.rs | 3 +- .../apub/src/activities/block/block_user.rs | 2 +- crates/apub/src/activities/block/mod.rs | 16 +++- .../src/activities/block/undo_block_user.rs | 2 +- .../apub/src/activities/community/add_mod.rs | 6 +- .../apub/src/activities/community/announce.rs | 2 +- crates/apub/src/activities/community/mod.rs | 2 +- .../src/activities/community/remove_mod.rs | 2 +- .../apub/src/activities/community/report.rs | 7 +- .../apub/src/activities/community/update.rs | 4 +- .../activities/create_or_update/comment.rs | 3 +- .../src/activities/create_or_update/mod.rs | 2 +- .../src/activities/create_or_update/post.rs | 4 +- .../create_or_update/private_message.rs | 9 ++- crates/apub/src/activities/deletion/delete.rs | 2 +- .../src/activities/deletion/delete_user.rs | 6 +- crates/apub/src/activities/deletion/mod.rs | 7 +- .../src/activities/deletion/undo_delete.rs | 2 +- .../apub/src/activities/following/accept.rs | 2 +- .../apub/src/activities/following/follow.rs | 6 +- .../src/activities/following/undo_follow.rs | 2 +- crates/apub/src/activities/mod.rs | 2 +- crates/apub/src/activities/voting/mod.rs | 7 -- .../apub/src/activities/voting/undo_vote.rs | 3 +- crates/apub/src/activities/voting/vote.rs | 8 +- crates/apub/src/activity_lists.rs | 2 +- crates/apub/src/api/list_comments.rs | 1 - crates/apub/src/api/list_posts.rs | 1 - crates/apub/src/api/read_community.rs | 5 -- crates/apub/src/api/read_person.rs | 1 - crates/apub/src/api/resolve_object.rs | 1 - crates/apub/src/api/search.rs | 1 - crates/apub/src/collections/mod.rs | 2 +- crates/apub/src/fetcher/mod.rs | 2 +- crates/apub/src/fetcher/post_or_comment.rs | 2 +- crates/apub/src/fetcher/search.rs | 2 +- crates/apub/src/fetcher/user_or_community.rs | 2 +- crates/apub/src/fetcher/webfinger.rs | 2 +- crates/apub/src/http/comment.rs | 2 +- crates/apub/src/http/community.rs | 2 +- crates/apub/src/http/mod.rs | 2 +- crates/apub/src/http/person.rs | 2 +- crates/apub/src/http/post.rs | 2 +- crates/apub/src/http/site.rs | 2 +- crates/apub/src/lib.rs | 2 +- crates/apub/src/mentions.rs | 2 +- crates/apub/src/objects/comment.rs | 2 +- crates/apub/src/objects/community.rs | 5 +- crates/apub/src/objects/instance.rs | 2 +- crates/apub/src/objects/mod.rs | 2 +- crates/apub/src/objects/person.rs | 5 +- crates/apub/src/objects/post.rs | 2 +- crates/apub/src/objects/private_message.rs | 2 +- .../protocol/activities/block/block_user.rs | 2 +- .../activities/block/undo_block_user.rs | 2 +- .../protocol/activities/community/add_mod.rs | 2 +- .../activities/community/remove_mod.rs | 2 +- .../protocol/activities/community/report.rs | 2 +- .../protocol/activities/community/update.rs | 2 +- .../activities/create_or_update/note.rs | 2 +- .../activities/create_or_update/page.rs | 2 +- .../protocol/activities/deletion/delete.rs | 2 +- .../activities/deletion/undo_delete.rs | 2 +- .../protocol/activities/voting/undo_vote.rs | 2 +- .../src/protocol/activities/voting/vote.rs | 2 +- .../protocol/collections/group_followers.rs | 2 +- crates/apub/src/protocol/mod.rs | 2 +- crates/apub/src/protocol/objects/group.rs | 2 +- crates/apub/src/protocol/objects/note.rs | 2 +- crates/apub/src/protocol/objects/page.rs | 2 +- crates/routes/src/feeds.rs | 2 +- crates/routes/src/images.rs | 2 +- crates/routes/src/nodeinfo.rs | 2 +- crates/routes/src/webfinger.rs | 3 +- src/api_routes.rs | 8 +- src/main.rs | 1 - 159 files changed, 203 insertions(+), 428 deletions(-) diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 925a73c8c..f7f1b0bf3 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -20,7 +20,6 @@ lemmy_db_views = { workspace = true, features = ["full"] } lemmy_db_views_moderator = { workspace = true, features = ["full"] } lemmy_db_views_actor = { workspace = true, features = ["full"] } lemmy_api_common = { workspace = true, features = ["full"] } -activitypub_federation = { workspace = true } diesel = { workspace = true } bcrypt = { workspace = true } chrono = { workspace = true } diff --git a/crates/api/src/comment/like.rs b/crates/api/src/comment/like.rs index 9cc179c12..fba61ed13 100644 --- a/crates/api/src/comment/like.rs +++ b/crates/api/src/comment/like.rs @@ -5,14 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{check_community_ban, check_downvotes_enabled, get_local_user_view_from_jwt}, websocket::{send::send_comment_ws_message, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - fetcher::post_or_comment::PostOrComment, - protocol::activities::voting::{ - undo_vote::UndoVote, - vote::{Vote, VoteType}, - }, }; use lemmy_db_schema::{ newtypes::LocalUserId, @@ -25,7 +17,6 @@ use lemmy_db_schema::{ }; use lemmy_db_views::structs::{CommentView, LocalUserView}; use lemmy_utils::{error::LemmyError, ConnectionId}; -use std::convert::TryInto; #[async_trait::async_trait(?Send)] impl Perform for CreateCommentLike { diff --git a/crates/api/src/comment/save.rs b/crates/api/src/comment/save.rs index 15df83ac6..03051f6cc 100644 --- a/crates/api/src/comment/save.rs +++ b/crates/api/src/comment/save.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ comment::{CommentResponse, SaveComment}, context::LemmyContext, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::{ source::comment::{CommentSaved, CommentSavedForm}, diff --git a/crates/api/src/comment_report/create.rs b/crates/api/src/comment_report/create.rs index be7f37f54..bf3fec0a1 100644 --- a/crates/api/src/comment_report/create.rs +++ b/crates/api/src/comment_report/create.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{check_community_ban, get_local_user_view_from_jwt}, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/comment_report/list.rs b/crates/api/src/comment_report/list.rs index d3366018f..8aa3fcbcd 100644 --- a/crates/api/src/comment_report/list.rs +++ b/crates/api/src/comment_report/list.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ comment::{ListCommentReports, ListCommentReportsResponse}, context::LemmyContext, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_views::comment_report_view::CommentReportQuery; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/comment_report/resolve.rs b/crates/api/src/comment_report/resolve.rs index 5e80e2ccf..9df11fc23 100644 --- a/crates/api/src/comment_report/resolve.rs +++ b/crates/api/src/comment_report/resolve.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{get_local_user_view_from_jwt, is_mod_or_admin}, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{source::comment_report::CommentReport, traits::Reportable}; use lemmy_db_views::structs::CommentReportView; diff --git a/crates/api/src/community/add_mod.rs b/crates/api/src/community/add_mod.rs index f75cc1973..ce3082f71 100644 --- a/crates/api/src/community/add_mod.rs +++ b/crates/api/src/community/add_mod.rs @@ -5,11 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{get_local_user_view_from_jwt, is_mod_or_admin}, websocket::{messages::SendCommunityRoomMessage, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - objects::{community::ApubCommunity, person::ApubPerson}, - protocol::activities::community::{add_mod::AddMod, remove_mod::RemoveMod}, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/community/ban.rs b/crates/api/src/community/ban.rs index 2e38d1cea..fb5e7fcfe 100644 --- a/crates/api/src/community/ban.rs +++ b/crates/api/src/community/ban.rs @@ -5,12 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{get_local_user_view_from_jwt, is_mod_or_admin, remove_user_data_in_community}, websocket::{messages::SendCommunityRoomMessage, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - activities::block::SiteOrCommunity, - objects::{community::ApubCommunity, person::ApubPerson}, - protocol::activities::block::{block_user::BlockUser, undo_block_user::UndoBlockUser}, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/community/block.rs b/crates/api/src/community/block.rs index 2cb71046a..914b5238e 100644 --- a/crates/api/src/community/block.rs +++ b/crates/api/src/community/block.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ community::{BlockCommunity, BlockCommunityResponse}, context::LemmyContext, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/community/follow.rs b/crates/api/src/community/follow.rs index 53083fd97..dedfc9712 100644 --- a/crates/api/src/community/follow.rs +++ b/crates/api/src/community/follow.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ community::{CommunityResponse, FollowCommunity}, context::LemmyContext, utils::{check_community_ban, check_community_deleted_or_removed, get_local_user_view_from_jwt}, - LemmyContext, }; use lemmy_db_schema::{ source::community::{Community, CommunityFollower, CommunityFollowerForm}, diff --git a/crates/api/src/community/hide.rs b/crates/api/src/community/hide.rs index 2e39678ff..94ce7d745 100644 --- a/crates/api/src/community/hide.rs +++ b/crates/api/src/community/hide.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{get_local_user_view_from_jwt, is_admin}, websocket::{send::send_community_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/community/transfer.rs b/crates/api/src/community/transfer.rs index 224d9f1b6..7ca174e4c 100644 --- a/crates/api/src/community/transfer.rs +++ b/crates/api/src/community/transfer.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ community::{GetCommunityResponse, TransferCommunity}, context::LemmyContext, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs index 6f69db132..5904a9b9b 100644 --- a/crates/api/src/lib.rs +++ b/crates/api/src/lib.rs @@ -1,81 +1,8 @@ use actix_web::web::Data; use captcha::Captcha; -use lemmy_api_common::{ - comment::{ - CreateCommentLike, - CreateCommentReport, - ListCommentReports, - ResolveCommentReport, - SaveComment, - }, - community::{ - AddModToCommunity, - BanFromCommunity, - BlockCommunity, - FollowCommunity, - TransferCommunity, - }, - person::{ - AddAdmin, - BanPerson, - BlockPerson, - ChangePassword, - GetBannedPersons, - GetCaptcha, - GetPersonMentions, - GetReplies, - GetReportCount, - GetUnreadCount, - Login, - MarkAllAsRead, - MarkCommentReplyAsRead, - MarkPersonMentionAsRead, - PasswordChangeAfterReset, - PasswordReset, - SaveUserSettings, - VerifyEmail, - }, - post::{ - CreatePostLike, - CreatePostReport, - GetSiteMetadata, - ListPostReports, - LockPost, - MarkPostAsRead, - ResolvePostReport, - SavePost, - StickyPost, - }, - private_message::{ - CreatePrivateMessageReport, - ListPrivateMessageReports, - MarkPrivateMessageAsRead, - ResolvePrivateMessageReport, - }, - site::{ - ApproveRegistrationApplication, - GetModlog, - GetUnreadRegistrationApplicationCount, - LeaveAdmin, - ListRegistrationApplications, - PurgeComment, - PurgeCommunity, - PurgePerson, - PurgePost, - ResolveObject, - Search, - }, - utils::local_site_to_slur_regex, - websocket::{ - serialize_websocket_message, - structs::{CommunityJoin, ModJoin, PostJoin, UserJoin}, - UserOperation, - }, - LemmyContext, -}; +use lemmy_api_common::{context::LemmyContext, utils::local_site_to_slur_regex}; use lemmy_db_schema::source::local_site::LocalSite; use lemmy_utils::{error::LemmyError, utils::check_slurs, ConnectionId}; -use serde::Deserialize; mod comment; mod comment_report; diff --git a/crates/api/src/local_user/add_admin.rs b/crates/api/src/local_user/add_admin.rs index 4dea658a6..78357f0c5 100644 --- a/crates/api/src/local_user/add_admin.rs +++ b/crates/api/src/local_user/add_admin.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ person::{AddAdmin, AddAdminResponse}, utils::{get_local_user_view_from_jwt, is_admin}, websocket::{messages::SendAllMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/local_user/ban_person.rs b/crates/api/src/local_user/ban_person.rs index 150ba281b..0bb252349 100644 --- a/crates/api/src/local_user/ban_person.rs +++ b/crates/api/src/local_user/ban_person.rs @@ -5,11 +5,6 @@ use lemmy_api_common::{ person::{BanPerson, BanPersonResponse}, utils::{get_local_user_view_from_jwt, is_admin, remove_user_data}, websocket::{messages::SendAllMessage, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - activities::block::SiteOrCommunity, - protocol::activities::block::{block_user::BlockUser, undo_block_user::UndoBlockUser}, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/local_user/block.rs b/crates/api/src/local_user/block.rs index a7c1251cf..b57ecd551 100644 --- a/crates/api/src/local_user/block.rs +++ b/crates/api/src/local_user/block.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{BlockPerson, BlockPersonResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::{ source::person_block::{PersonBlock, PersonBlockForm}, diff --git a/crates/api/src/local_user/change_password.rs b/crates/api/src/local_user/change_password.rs index aae092059..2d0fd30e5 100644 --- a/crates/api/src/local_user/change_password.rs +++ b/crates/api/src/local_user/change_password.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{ChangePassword, LoginResponse}, utils::{get_local_user_view_from_jwt, password_length_check}, - LemmyContext, }; use lemmy_db_schema::source::local_user::LocalUser; use lemmy_utils::{claims::Claims, error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/change_password_after_reset.rs b/crates/api/src/local_user/change_password_after_reset.rs index 75eb05ae2..c6de10d7a 100644 --- a/crates/api/src/local_user/change_password_after_reset.rs +++ b/crates/api/src/local_user/change_password_after_reset.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{LoginResponse, PasswordChangeAfterReset}, utils::password_length_check, - LemmyContext, }; use lemmy_db_schema::source::{ local_user::LocalUser, diff --git a/crates/api/src/local_user/get_captcha.rs b/crates/api/src/local_user/get_captcha.rs index 5eacc4fd8..50a2bdba2 100644 --- a/crates/api/src/local_user/get_captcha.rs +++ b/crates/api/src/local_user/get_captcha.rs @@ -3,9 +3,9 @@ use actix_web::web::Data; use captcha::{gen, Difficulty}; use chrono::Duration; use lemmy_api_common::{ + context::LemmyContext, person::{CaptchaResponse, GetCaptcha, GetCaptchaResponse}, websocket::messages::CaptchaItem, - LemmyContext, }; use lemmy_db_schema::{source::local_site::LocalSite, utils::naive_now}; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/list_banned.rs b/crates/api/src/local_user/list_banned.rs index 1375f981f..60eb32b35 100644 --- a/crates/api/src/local_user/list_banned.rs +++ b/crates/api/src/local_user/list_banned.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{BannedPersonsResponse, GetBannedPersons}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_views_actor::structs::PersonViewSafe; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/login.rs b/crates/api/src/local_user/login.rs index 21f707d04..c60c0dcdf 100644 --- a/crates/api/src/local_user/login.rs +++ b/crates/api/src/local_user/login.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{Login, LoginResponse}, utils::{check_registration_application, check_user_valid}, - LemmyContext, }; use lemmy_db_schema::source::local_site::LocalSite; use lemmy_db_views::structs::LocalUserView; diff --git a/crates/api/src/local_user/notifications/list_mentions.rs b/crates/api/src/local_user/notifications/list_mentions.rs index 9814fb187..c03e9d167 100644 --- a/crates/api/src/local_user/notifications/list_mentions.rs +++ b/crates/api/src/local_user/notifications/list_mentions.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{GetPersonMentions, GetPersonMentionsResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_views_actor::person_mention_view::PersonMentionQuery; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/notifications/list_replies.rs b/crates/api/src/local_user/notifications/list_replies.rs index 4d0e9450f..585db5e95 100644 --- a/crates/api/src/local_user/notifications/list_replies.rs +++ b/crates/api/src/local_user/notifications/list_replies.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{GetReplies, GetRepliesResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_views_actor::comment_reply_view::CommentReplyQuery; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/notifications/mark_all_read.rs b/crates/api/src/local_user/notifications/mark_all_read.rs index 760ff316d..2515715bd 100644 --- a/crates/api/src/local_user/notifications/mark_all_read.rs +++ b/crates/api/src/local_user/notifications/mark_all_read.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{GetRepliesResponse, MarkAllAsRead}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::source::{ comment_reply::CommentReply, diff --git a/crates/api/src/local_user/notifications/mark_mention_read.rs b/crates/api/src/local_user/notifications/mark_mention_read.rs index f7416bbfd..a3a75d929 100644 --- a/crates/api/src/local_user/notifications/mark_mention_read.rs +++ b/crates/api/src/local_user/notifications/mark_mention_read.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{MarkPersonMentionAsRead, PersonMentionResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::{ source::person_mention::{PersonMention, PersonMentionUpdateForm}, diff --git a/crates/api/src/local_user/notifications/mark_reply_read.rs b/crates/api/src/local_user/notifications/mark_reply_read.rs index 77ba7f454..3921e769d 100644 --- a/crates/api/src/local_user/notifications/mark_reply_read.rs +++ b/crates/api/src/local_user/notifications/mark_reply_read.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{CommentReplyResponse, MarkCommentReplyAsRead}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::{ source::comment_reply::{CommentReply, CommentReplyUpdateForm}, diff --git a/crates/api/src/local_user/notifications/unread_count.rs b/crates/api/src/local_user/notifications/unread_count.rs index 99c0a8ea1..715ccd286 100644 --- a/crates/api/src/local_user/notifications/unread_count.rs +++ b/crates/api/src/local_user/notifications/unread_count.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{GetUnreadCount, GetUnreadCountResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_views::structs::PrivateMessageView; use lemmy_db_views_actor::structs::{CommentReplyView, PersonMentionView}; diff --git a/crates/api/src/local_user/report_count.rs b/crates/api/src/local_user/report_count.rs index f6d2d7935..b59a06490 100644 --- a/crates/api/src/local_user/report_count.rs +++ b/crates/api/src/local_user/report_count.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{GetReportCount, GetReportCountResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_views::structs::{CommentReportView, PostReportView, PrivateMessageReportView}; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/reset_password.rs b/crates/api/src/local_user/reset_password.rs index 2c65132bf..5d0e9d88b 100644 --- a/crates/api/src/local_user/reset_password.rs +++ b/crates/api/src/local_user/reset_password.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{PasswordReset, PasswordResetResponse}, utils::send_password_reset_email, - LemmyContext, }; use lemmy_db_views::structs::LocalUserView; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/local_user/save_settings.rs b/crates/api/src/local_user/save_settings.rs index 758b727dd..6672a67b0 100644 --- a/crates/api/src/local_user/save_settings.rs +++ b/crates/api/src/local_user/save_settings.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{LoginResponse, SaveUserSettings}, utils::{get_local_user_view_from_jwt, send_verification_email}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/local_user/verify_email.rs b/crates/api/src/local_user/verify_email.rs index a444465c8..fb82b716b 100644 --- a/crates/api/src/local_user/verify_email.rs +++ b/crates/api/src/local_user/verify_email.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{VerifyEmail, VerifyEmailResponse}, utils::send_email_verification_success, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/post/get_link_metadata.rs b/crates/api/src/post/get_link_metadata.rs index b0d79b9ca..eaf111eba 100644 --- a/crates/api/src/post/get_link_metadata.rs +++ b/crates/api/src/post/get_link_metadata.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, post::{GetSiteMetadata, GetSiteMetadataResponse}, request::fetch_site_metadata, - LemmyContext, }; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/post/like.rs b/crates/api/src/post/like.rs index 84e1eaaf9..59135ff21 100644 --- a/crates/api/src/post/like.rs +++ b/crates/api/src/post/like.rs @@ -11,15 +11,6 @@ use lemmy_api_common::{ mark_post_as_read, }, websocket::{send::send_post_ws_message, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - fetcher::post_or_comment::PostOrComment, - objects::post::ApubPost, - protocol::activities::voting::{ - undo_vote::UndoVote, - vote::{Vote, VoteType}, - }, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/post/lock.rs b/crates/api/src/post/lock.rs index 8c502204b..c5fa2a0f5 100644 --- a/crates/api/src/post/lock.rs +++ b/crates/api/src/post/lock.rs @@ -10,11 +10,6 @@ use lemmy_api_common::{ is_mod_or_admin, }, websocket::{send::send_post_ws_message, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - objects::post::ApubPost, - protocol::activities::{create_or_update::page::CreateOrUpdatePage, CreateOrUpdateType}, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/post/mark_read.rs b/crates/api/src/post/mark_read.rs index 2a2744782..9fdf01b12 100644 --- a/crates/api/src/post/mark_read.rs +++ b/crates/api/src/post/mark_read.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, post::{MarkPostAsRead, PostResponse}, utils::{get_local_user_view_from_jwt, mark_post_as_read, mark_post_as_unread}, - LemmyContext, }; use lemmy_db_views::structs::PostView; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/post/save.rs b/crates/api/src/post/save.rs index 9168f6aee..b36f844b6 100644 --- a/crates/api/src/post/save.rs +++ b/crates/api/src/post/save.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, post::{PostResponse, SavePost}, utils::{get_local_user_view_from_jwt, mark_post_as_read}, - LemmyContext, }; use lemmy_db_schema::{ source::post::{PostSaved, PostSavedForm}, diff --git a/crates/api/src/post/sticky.rs b/crates/api/src/post/sticky.rs index e590bc13c..3a8aee7ab 100644 --- a/crates/api/src/post/sticky.rs +++ b/crates/api/src/post/sticky.rs @@ -10,11 +10,6 @@ use lemmy_api_common::{ is_mod_or_admin, }, websocket::{send::send_post_ws_message, UserOperation}, - LemmyContext, -}; -use lemmy_apub::{ - objects::post::ApubPost, - protocol::activities::{create_or_update::page::CreateOrUpdatePage, CreateOrUpdateType}, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/post_report/create.rs b/crates/api/src/post_report/create.rs index d991d6b11..71be43623 100644 --- a/crates/api/src/post_report/create.rs +++ b/crates/api/src/post_report/create.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ post::{CreatePostReport, PostReportResponse}, utils::{check_community_ban, get_local_user_view_from_jwt}, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/post_report/list.rs b/crates/api/src/post_report/list.rs index dc933bdf4..2feed7ed2 100644 --- a/crates/api/src/post_report/list.rs +++ b/crates/api/src/post_report/list.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, post::{ListPostReports, ListPostReportsResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_views::post_report_view::PostReportQuery; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/post_report/resolve.rs b/crates/api/src/post_report/resolve.rs index 1be62d509..0e2b9e16a 100644 --- a/crates/api/src/post_report/resolve.rs +++ b/crates/api/src/post_report/resolve.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ post::{PostReportResponse, ResolvePostReport}, utils::{get_local_user_view_from_jwt, is_mod_or_admin}, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{source::post_report::PostReport, traits::Reportable}; use lemmy_db_views::structs::PostReportView; diff --git a/crates/api/src/private_message/mark_read.rs b/crates/api/src/private_message/mark_read.rs index 0563814e8..9c3c3d8ae 100644 --- a/crates/api/src/private_message/mark_read.rs +++ b/crates/api/src/private_message/mark_read.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ private_message::{MarkPrivateMessageAsRead, PrivateMessageResponse}, utils::get_local_user_view_from_jwt, websocket::{send::send_pm_ws_message, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ source::private_message::{PrivateMessage, PrivateMessageUpdateForm}, diff --git a/crates/api/src/private_message_report/create.rs b/crates/api/src/private_message_report/create.rs index 01beb3063..66875c614 100644 --- a/crates/api/src/private_message_report/create.rs +++ b/crates/api/src/private_message_report/create.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ private_message::{CreatePrivateMessageReport, PrivateMessageReportResponse}, utils::get_local_user_view_from_jwt, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ newtypes::CommunityId, diff --git a/crates/api/src/private_message_report/list.rs b/crates/api/src/private_message_report/list.rs index ba775be67..98c2d9269 100644 --- a/crates/api/src/private_message_report/list.rs +++ b/crates/api/src/private_message_report/list.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, private_message::{ListPrivateMessageReports, ListPrivateMessageReportsResponse}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_views::private_message_report_view::PrivateMessageReportQuery; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api/src/private_message_report/resolve.rs b/crates/api/src/private_message_report/resolve.rs index 4b0ad38e5..2a3f677ad 100644 --- a/crates/api/src/private_message_report/resolve.rs +++ b/crates/api/src/private_message_report/resolve.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ private_message::{PrivateMessageReportResponse, ResolvePrivateMessageReport}, utils::{get_local_user_view_from_jwt, is_admin}, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ newtypes::CommunityId, diff --git a/crates/api/src/site/leave_admin.rs b/crates/api/src/site/leave_admin.rs index b2c3cafc5..7a75db51d 100644 --- a/crates/api/src/site/leave_admin.rs +++ b/crates/api/src/site/leave_admin.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{GetSiteResponse, LeaveAdmin}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/site/mod_log.rs b/crates/api/src/site/mod_log.rs index 0af987524..5e1c71a70 100644 --- a/crates/api/src/site/mod_log.rs +++ b/crates/api/src/site/mod_log.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{GetModlog, GetModlogResponse}, utils::{check_private_instance, get_local_user_view_from_jwt_opt, is_admin, is_mod_or_admin}, - LemmyContext, }; use lemmy_db_schema::{ newtypes::{CommunityId, PersonId}, diff --git a/crates/api/src/site/purge/comment.rs b/crates/api/src/site/purge/comment.rs index fd968df1e..71d2c7889 100644 --- a/crates/api/src/site/purge/comment.rs +++ b/crates/api/src/site/purge/comment.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{PurgeComment, PurgeItemResponse}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/site/purge/community.rs b/crates/api/src/site/purge/community.rs index 9c6c7f2a5..e3a673b74 100644 --- a/crates/api/src/site/purge/community.rs +++ b/crates/api/src/site/purge/community.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ request::purge_image_from_pictrs, site::{PurgeCommunity, PurgeItemResponse}, utils::{get_local_user_view_from_jwt, is_admin, purge_image_posts_for_community}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/site/purge/person.rs b/crates/api/src/site/purge/person.rs index 43ab30ab2..658e50b6d 100644 --- a/crates/api/src/site/purge/person.rs +++ b/crates/api/src/site/purge/person.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ request::purge_image_from_pictrs, site::{PurgeItemResponse, PurgePerson}, utils::{get_local_user_view_from_jwt, is_admin, purge_image_posts_for_person}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/site/purge/post.rs b/crates/api/src/site/purge/post.rs index ff8531a21..aa2e74839 100644 --- a/crates/api/src/site/purge/post.rs +++ b/crates/api/src/site/purge/post.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ request::purge_image_from_pictrs, site::{PurgeItemResponse, PurgePost}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/site/registration_applications/approve.rs b/crates/api/src/site/registration_applications/approve.rs index 451c9b865..61a686899 100644 --- a/crates/api/src/site/registration_applications/approve.rs +++ b/crates/api/src/site/registration_applications/approve.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{ApproveRegistrationApplication, RegistrationApplicationResponse}, utils::{get_local_user_view_from_jwt, is_admin, send_application_approved_email}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api/src/site/registration_applications/list.rs b/crates/api/src/site/registration_applications/list.rs index c1c89b4f9..7be2e2e8e 100644 --- a/crates/api/src/site/registration_applications/list.rs +++ b/crates/api/src/site/registration_applications/list.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{ListRegistrationApplications, ListRegistrationApplicationsResponse}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_schema::source::local_site::LocalSite; use lemmy_db_views::registration_application_view::RegistrationApplicationQuery; diff --git a/crates/api/src/site/registration_applications/unread_count.rs b/crates/api/src/site/registration_applications/unread_count.rs index bd1a6f223..fe33d17c8 100644 --- a/crates/api/src/site/registration_applications/unread_count.rs +++ b/crates/api/src/site/registration_applications/unread_count.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{GetUnreadRegistrationApplicationCount, GetUnreadRegistrationApplicationCountResponse}, utils::{get_local_user_view_from_jwt, is_admin}, - LemmyContext, }; use lemmy_db_schema::source::local_site::LocalSite; use lemmy_db_views::structs::RegistrationApplicationView; diff --git a/crates/api/src/websocket.rs b/crates/api/src/websocket.rs index 7a7494e59..ca755bde9 100644 --- a/crates/api/src/websocket.rs +++ b/crates/api/src/websocket.rs @@ -16,7 +16,6 @@ use lemmy_api_common::{ UserJoinResponse, }, }, - LemmyContext, }; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/api_common/src/lib.rs b/crates/api_common/src/lib.rs index d1a2d8dce..29686aba6 100644 --- a/crates/api_common/src/lib.rs +++ b/crates/api_common/src/lib.rs @@ -20,72 +20,3 @@ pub extern crate lemmy_db_schema; pub extern crate lemmy_db_views; pub extern crate lemmy_db_views_actor; pub extern crate lemmy_db_views_moderator; - -use crate::websocket::chat_server::ChatServer; -use actix::Addr; -use lemmy_db_schema::{source::secret::Secret, utils::DbPool}; -use lemmy_utils::{ - rate_limit::RateLimitCell, - settings::{structs::Settings, SETTINGS}, -}; -use reqwest_middleware::ClientWithMiddleware; - -pub struct LemmyContext { - pool: DbPool, - chat_server: Addr, - client: ClientWithMiddleware, - settings: Settings, - secret: Secret, - rate_limit_cell: RateLimitCell, -} - -impl LemmyContext { - pub fn create( - pool: DbPool, - chat_server: Addr, - client: ClientWithMiddleware, - settings: Settings, - secret: Secret, - settings_updated_channel: RateLimitCell, - ) -> LemmyContext { - LemmyContext { - pool, - chat_server, - client, - settings, - secret, - rate_limit_cell: settings_updated_channel, - } - } - pub fn pool(&self) -> &DbPool { - &self.pool - } - pub fn chat_server(&self) -> &Addr { - &self.chat_server - } - pub fn client(&self) -> &ClientWithMiddleware { - &self.client - } - pub fn settings(&self) -> &'static Settings { - &SETTINGS - } - pub fn secret(&self) -> &Secret { - &self.secret - } - pub fn settings_updated_channel(&self) -> &RateLimitCell { - &self.rate_limit_cell - } -} - -impl Clone for LemmyContext { - fn clone(&self) -> Self { - LemmyContext { - pool: self.pool.clone(), - chat_server: self.chat_server.clone(), - client: self.client.clone(), - settings: self.settings.clone(), - secret: self.secret.clone(), - rate_limit_cell: self.rate_limit_cell.clone(), - } - } -} diff --git a/crates/api_common/src/utils.rs b/crates/api_common/src/utils.rs index c85344992..9a7b98b63 100644 --- a/crates/api_common/src/utils.rs +++ b/crates/api_common/src/utils.rs @@ -808,3 +808,65 @@ pub fn generate_outbox_url(actor_id: &DbUrl) -> Result { pub fn generate_moderators_url(community_id: &DbUrl) -> Result { Ok(Url::parse(&format!("{}/moderators", community_id))?.into()) } + +pub enum EndpointType { + Community, + Person, + Post, + Comment, + PrivateMessage, +} + +/// Generates an apub endpoint for a given domain, IE xyz.tld +pub fn generate_local_apub_endpoint( + endpoint_type: EndpointType, + name: &str, + domain: &str, +) -> Result { + let point = match endpoint_type { + EndpointType::Community => "c", + EndpointType::Person => "u", + EndpointType::Post => "post", + EndpointType::Comment => "comment", + EndpointType::PrivateMessage => "private_message", + }; + + Ok(Url::parse(&format!("{}/{}/{}", domain, point, name))?.into()) +} + +pub fn generate_followers_url(actor_id: &DbUrl) -> Result { + Ok(Url::parse(&format!("{}/followers", actor_id))?.into()) +} + +pub fn generate_inbox_url(actor_id: &DbUrl) -> Result { + Ok(Url::parse(&format!("{}/inbox", actor_id))?.into()) +} + +pub fn generate_site_inbox_url(actor_id: &DbUrl) -> Result { + let mut actor_id: Url = actor_id.clone().into(); + actor_id.set_path("site_inbox"); + Ok(actor_id.into()) +} + +pub fn generate_shared_inbox_url(actor_id: &DbUrl) -> Result { + let actor_id: Url = actor_id.clone().into(); + let url = format!( + "{}://{}{}/inbox", + &actor_id.scheme(), + &actor_id.host_str().context(location_info!())?, + if let Some(port) = actor_id.port() { + format!(":{}", port) + } else { + String::new() + }, + ); + Ok(Url::parse(&url)?.into()) +} + +pub fn generate_outbox_url(actor_id: &DbUrl) -> Result { + Ok(Url::parse(&format!("{}/outbox", actor_id))?.into()) +} + +pub fn generate_moderators_url(community_id: &DbUrl) -> Result { + Ok(Url::parse(&format!("{}/moderators", community_id))?.into()) +} diff --git a/crates/api_common/src/websocket/chat_server.rs b/crates/api_common/src/websocket/chat_server.rs index 50bcc96dc..b669a4fd3 100644 --- a/crates/api_common/src/websocket/chat_server.rs +++ b/crates/api_common/src/websocket/chat_server.rs @@ -1,14 +1,15 @@ use crate::{ comment::CommentResponse, + context::LemmyContext, post::PostResponse, websocket::{ messages::{CaptchaItem, StandardMessage, WsMessage}, serialize_websocket_message, OperationType, UserOperation, + UserOperationApub, UserOperationCrud, }, - LemmyContext, }; use actix::prelude::*; use anyhow::Context as acontext; diff --git a/crates/api_common/src/websocket/routes.rs b/crates/api_common/src/websocket/routes.rs index 7b500ce4c..936dc9998 100644 --- a/crates/api_common/src/websocket/routes.rs +++ b/crates/api_common/src/websocket/routes.rs @@ -1,9 +1,9 @@ use crate::{ + context::LemmyContext, websocket::{ chat_server::ChatServer, messages::{Connect, Disconnect, StandardMessage, WsMessage}, }, - LemmyContext, }; use actix::prelude::*; use actix_web::{web, Error, HttpRequest, HttpResponse}; diff --git a/crates/api_common/src/websocket/send.rs b/crates/api_common/src/websocket/send.rs index 14c75f165..cd53955f9 100644 --- a/crates/api_common/src/websocket/send.rs +++ b/crates/api_common/src/websocket/send.rs @@ -9,7 +9,6 @@ use crate::{ messages::{SendComment, SendCommunityRoomMessage, SendPost, SendUserRoomMessage}, OperationType, }, - LemmyContext, }; use lemmy_db_schema::{ newtypes::{CommentId, CommunityId, LocalUserId, PersonId, PostId, PrivateMessageId}, diff --git a/crates/api_crud/src/comment/create.rs b/crates/api_crud/src/comment/create.rs index d373edceb..8c61a0444 100644 --- a/crates/api_crud/src/comment/create.rs +++ b/crates/api_crud/src/comment/create.rs @@ -17,17 +17,6 @@ use lemmy_api_common::{ send::{send_comment_ws_message, send_local_notifs}, UserOperationCrud, }, - websocket::{ - send::{send_comment_ws_message, send_local_notifs}, - UserOperationCrud, - }, - LemmyContext, -}; -use lemmy_apub::{ - generate_local_apub_endpoint, - objects::comment::ApubComment, - protocol::activities::{create_or_update::note::CreateOrUpdateNote, CreateOrUpdateType}, - EndpointType, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/comment/delete.rs b/crates/api_crud/src/comment/delete.rs index fb2a2df4f..211d04776 100644 --- a/crates/api_crud/src/comment/delete.rs +++ b/crates/api_crud/src/comment/delete.rs @@ -8,7 +8,6 @@ use lemmy_api_common::{ send::{send_comment_ws_message, send_local_notifs}, UserOperationCrud, }, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/comment/read.rs b/crates/api_crud/src/comment/read.rs index 62eb0a955..c0136f06c 100644 --- a/crates/api_crud/src/comment/read.rs +++ b/crates/api_crud/src/comment/read.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ comment::{CommentResponse, GetComment}, context::LemmyContext, utils::{check_private_instance, get_local_user_view_from_jwt_opt}, - LemmyContext, }; use lemmy_db_schema::source::local_site::LocalSite; use lemmy_db_views::structs::CommentView; diff --git a/crates/api_crud/src/comment/remove.rs b/crates/api_crud/src/comment/remove.rs index 6dc6ca041..1032f54c9 100644 --- a/crates/api_crud/src/comment/remove.rs +++ b/crates/api_crud/src/comment/remove.rs @@ -8,7 +8,6 @@ use lemmy_api_common::{ send::{send_comment_ws_message, send_local_notifs}, UserOperationCrud, }, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/comment/update.rs b/crates/api_crud/src/comment/update.rs index 2c4b46899..88de41158 100644 --- a/crates/api_crud/src/comment/update.rs +++ b/crates/api_crud/src/comment/update.rs @@ -15,11 +15,6 @@ use lemmy_api_common::{ send::{send_comment_ws_message, send_local_notifs}, UserOperationCrud, }, - LemmyContext, -}; -use lemmy_apub::protocol::activities::{ - create_or_update::note::CreateOrUpdateNote, - CreateOrUpdateType, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/community/create.rs b/crates/api_crud/src/community/create.rs index d63b72d46..cf894edbd 100644 --- a/crates/api_crud/src/community/create.rs +++ b/crates/api_crud/src/community/create.rs @@ -3,16 +3,17 @@ use activitypub_federation::core::signatures::generate_actor_keypair; use actix_web::web::Data; use lemmy_api_common::{ community::{CommunityResponse, CreateCommunity}, - utils::{get_local_user_view_from_jwt, is_admin, local_site_to_slur_regex}, - LemmyContext, -}; -use lemmy_apub::{ - generate_followers_url, - generate_inbox_url, - generate_local_apub_endpoint, - generate_shared_inbox_url, - objects::community::ApubCommunity, - EndpointType, + context::LemmyContext, + utils::{ + generate_followers_url, + generate_inbox_url, + generate_local_apub_endpoint, + generate_shared_inbox_url, + get_local_user_view_from_jwt, + is_admin, + local_site_to_slur_regex, + EndpointType, + }, }; use lemmy_db_schema::{ source::community::{ diff --git a/crates/api_crud/src/community/delete.rs b/crates/api_crud/src/community/delete.rs index 159e96c6b..84de55477 100644 --- a/crates/api_crud/src/community/delete.rs +++ b/crates/api_crud/src/community/delete.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::get_local_user_view_from_jwt, websocket::{send::send_community_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::community::{Community, CommunityUpdateForm}, diff --git a/crates/api_crud/src/community/list.rs b/crates/api_crud/src/community/list.rs index 77c3f7463..4d2e7046f 100644 --- a/crates/api_crud/src/community/list.rs +++ b/crates/api_crud/src/community/list.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ community::{ListCommunities, ListCommunitiesResponse}, context::LemmyContext, utils::{check_private_instance, get_local_user_view_from_jwt_opt}, - LemmyContext, }; use lemmy_db_schema::{source::local_site::LocalSite, traits::DeleteableOrRemoveable}; use lemmy_db_views_actor::community_view::CommunityQuery; diff --git a/crates/api_crud/src/community/remove.rs b/crates/api_crud/src/community/remove.rs index 1d03e6fc6..215b39cf4 100644 --- a/crates/api_crud/src/community/remove.rs +++ b/crates/api_crud/src/community/remove.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{get_local_user_view_from_jwt, is_admin}, websocket::{send::send_community_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/community/update.rs b/crates/api_crud/src/community/update.rs index 572fcc888..9059a4a6f 100644 --- a/crates/api_crud/src/community/update.rs +++ b/crates/api_crud/src/community/update.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{get_local_user_view_from_jwt, local_site_to_slur_regex}, websocket::{send::send_community_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ newtypes::PersonId, diff --git a/crates/api_crud/src/lib.rs b/crates/api_crud/src/lib.rs index caee573de..d37dfbee2 100644 --- a/crates/api_crud/src/lib.rs +++ b/crates/api_crud/src/lib.rs @@ -1,28 +1,6 @@ -use actix_web::{web, web::Data}; -use lemmy_api_common::{ - comment::{CreateComment, DeleteComment, EditComment, GetComment, GetComments, RemoveComment}, - community::{ - CreateCommunity, - DeleteCommunity, - EditCommunity, - GetCommunity, - ListCommunities, - RemoveCommunity, - }, - person::{DeleteAccount, GetPersonDetails, Register}, - post::{CreatePost, DeletePost, EditPost, GetPost, GetPosts, RemovePost}, - private_message::{ - CreatePrivateMessage, - DeletePrivateMessage, - EditPrivateMessage, - GetPrivateMessages, - }, - site::{CreateSite, EditSite, GetSite}, - websocket::{serialize_websocket_message, UserOperationCrud}, - LemmyContext, -}; +use actix_web::web::Data; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::{error::LemmyError, ConnectionId}; -use serde::Deserialize; mod comment; mod community; diff --git a/crates/api_crud/src/post/create.rs b/crates/api_crud/src/post/create.rs index af8f9b4e6..af62135e2 100644 --- a/crates/api_crud/src/post/create.rs +++ b/crates/api_crud/src/post/create.rs @@ -15,13 +15,6 @@ use lemmy_api_common::{ EndpointType, }, websocket::{send::send_post_ws_message, UserOperationCrud}, - LemmyContext, -}; -use lemmy_apub::{ - generate_local_apub_endpoint, - objects::post::ApubPost, - protocol::activities::{create_or_update::page::CreateOrUpdatePage, CreateOrUpdateType}, - EndpointType, }; use lemmy_db_schema::{ impls::actor_language::default_post_language, diff --git a/crates/api_crud/src/post/delete.rs b/crates/api_crud/src/post/delete.rs index da25b120f..57e5adb15 100644 --- a/crates/api_crud/src/post/delete.rs +++ b/crates/api_crud/src/post/delete.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ post::{DeletePost, PostResponse}, utils::{check_community_ban, check_community_deleted_or_removed, get_local_user_view_from_jwt}, websocket::{send::send_post_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::post::{Post, PostUpdateForm}, diff --git a/crates/api_crud/src/post/read.rs b/crates/api_crud/src/post/read.rs index c2e5b8f8b..c6747c5e8 100644 --- a/crates/api_crud/src/post/read.rs +++ b/crates/api_crud/src/post/read.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ post::{GetPost, GetPostResponse}, utils::{check_private_instance, get_local_user_view_from_jwt_opt, mark_post_as_read}, websocket::messages::GetPostUsersOnline, - LemmyContext, }; use lemmy_db_schema::{ aggregates::structs::{PersonPostAggregates, PersonPostAggregatesForm}, diff --git a/crates/api_crud/src/post/remove.rs b/crates/api_crud/src/post/remove.rs index 62bf20fe6..66af2ca95 100644 --- a/crates/api_crud/src/post/remove.rs +++ b/crates/api_crud/src/post/remove.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ post::{PostResponse, RemovePost}, utils::{check_community_ban, get_local_user_view_from_jwt, is_mod_or_admin}, websocket::{send::send_post_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/post/update.rs b/crates/api_crud/src/post/update.rs index e95ec369d..9337c5952 100644 --- a/crates/api_crud/src/post/update.rs +++ b/crates/api_crud/src/post/update.rs @@ -11,11 +11,6 @@ use lemmy_api_common::{ local_site_to_slur_regex, }, websocket::{send::send_post_ws_message, UserOperationCrud}, - LemmyContext, -}; -use lemmy_apub::protocol::activities::{ - create_or_update::page::CreateOrUpdatePage, - CreateOrUpdateType, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/private_message/create.rs b/crates/api_crud/src/private_message/create.rs index 4c1ad6091..25c7be467 100644 --- a/crates/api_crud/src/private_message/create.rs +++ b/crates/api_crud/src/private_message/create.rs @@ -13,15 +13,6 @@ use lemmy_api_common::{ EndpointType, }, websocket::{send::send_pm_ws_message, UserOperationCrud}, - LemmyContext, -}; -use lemmy_apub::{ - generate_local_apub_endpoint, - protocol::activities::{ - create_or_update::chat_message::CreateOrUpdateChatMessage, - CreateOrUpdateType, - }, - EndpointType, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/private_message/delete.rs b/crates/api_crud/src/private_message/delete.rs index 3d625c020..4f58065a3 100644 --- a/crates/api_crud/src/private_message/delete.rs +++ b/crates/api_crud/src/private_message/delete.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ private_message::{DeletePrivateMessage, PrivateMessageResponse}, utils::get_local_user_view_from_jwt, websocket::{send::send_pm_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::private_message::{PrivateMessage, PrivateMessageUpdateForm}, diff --git a/crates/api_crud/src/private_message/read.rs b/crates/api_crud/src/private_message/read.rs index 25b9eba0b..286802745 100644 --- a/crates/api_crud/src/private_message/read.rs +++ b/crates/api_crud/src/private_message/read.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, private_message::{GetPrivateMessages, PrivateMessagesResponse}, utils::get_local_user_view_from_jwt, - LemmyContext, }; use lemmy_db_schema::traits::DeleteableOrRemoveable; use lemmy_db_views::private_message_view::PrivateMessageQuery; diff --git a/crates/api_crud/src/private_message/update.rs b/crates/api_crud/src/private_message/update.rs index d0c1fc3e5..f6f8c8f03 100644 --- a/crates/api_crud/src/private_message/update.rs +++ b/crates/api_crud/src/private_message/update.rs @@ -5,11 +5,6 @@ use lemmy_api_common::{ private_message::{EditPrivateMessage, PrivateMessageResponse}, utils::{get_local_user_view_from_jwt, local_site_to_slur_regex}, websocket::{send::send_pm_ws_message, UserOperationCrud}, - LemmyContext, -}; -use lemmy_apub::protocol::activities::{ - create_or_update::chat_message::CreateOrUpdateChatMessage, - CreateOrUpdateType, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/site/create.rs b/crates/api_crud/src/site/create.rs index fc09f34a7..d04343b0c 100644 --- a/crates/api_crud/src/site/create.rs +++ b/crates/api_crud/src/site/create.rs @@ -12,7 +12,6 @@ use lemmy_api_common::{ local_site_to_slur_regex, site_description_length_check, }, - LemmyContext, }; use lemmy_db_schema::{ newtypes::DbUrl, diff --git a/crates/api_crud/src/site/read.rs b/crates/api_crud/src/site/read.rs index 7033d5e9e..55dcd8fb2 100644 --- a/crates/api_crud/src/site/read.rs +++ b/crates/api_crud/src/site/read.rs @@ -5,7 +5,6 @@ use lemmy_api_common::{ site::{GetSite, GetSiteResponse, MyUserInfo}, utils::{build_federated_instances, get_local_user_settings_view_from_jwt_opt}, websocket::messages::GetUsersOnline, - LemmyContext, }; use lemmy_db_schema::source::{actor_language::SiteLanguage, language::Language, tagline::Tagline}; use lemmy_db_views::structs::{LocalUserDiscussionLanguageView, SiteView}; diff --git a/crates/api_crud/src/site/update.rs b/crates/api_crud/src/site/update.rs index 4fd256e1c..4a96925ed 100644 --- a/crates/api_crud/src/site/update.rs +++ b/crates/api_crud/src/site/update.rs @@ -11,7 +11,6 @@ use lemmy_api_common::{ site_description_length_check, }, websocket::{messages::SendAllMessage, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/api_crud/src/user/create.rs b/crates/api_crud/src/user/create.rs index 55963d413..9c5054bf6 100644 --- a/crates/api_crud/src/user/create.rs +++ b/crates/api_crud/src/user/create.rs @@ -16,7 +16,6 @@ use lemmy_api_common::{ EndpointType, }, websocket::messages::CheckCaptcha, - LemmyContext, }; use lemmy_apub::{ generate_inbox_url, diff --git a/crates/api_crud/src/user/delete.rs b/crates/api_crud/src/user/delete.rs index 45cca3346..b49695eac 100644 --- a/crates/api_crud/src/user/delete.rs +++ b/crates/api_crud/src/user/delete.rs @@ -4,8 +4,7 @@ use bcrypt::verify; use lemmy_api_common::{ context::LemmyContext, person::{DeleteAccount, DeleteAccountResponse}, - utils::{delete_user_account, get_local_user_view_from_jwt}, - LemmyContext, + utils::get_local_user_view_from_jwt, }; use lemmy_utils::{error::LemmyError, ConnectionId}; diff --git a/crates/apub/src/activities/block/block_user.rs b/crates/apub/src/activities/block/block_user.rs index c77bfde35..b5f03eaf1 100644 --- a/crates/apub/src/activities/block/block_user.rs +++ b/crates/apub/src/activities/block/block_user.rs @@ -24,8 +24,8 @@ use activitystreams_kinds::{activity::BlockType, public}; use anyhow::anyhow; use chrono::NaiveDateTime; use lemmy_api_common::{ + context::LemmyContext, utils::{remove_user_data, remove_user_data_in_community}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/apub/src/activities/block/mod.rs b/crates/apub/src/activities/block/mod.rs index 98a797a80..8adc25012 100644 --- a/crates/apub/src/activities/block/mod.rs +++ b/crates/apub/src/activities/block/mod.rs @@ -9,9 +9,19 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, traits::ApubObject}; use chrono::NaiveDateTime; -use lemmy_api_common::LemmyContext; -use lemmy_db_schema::{source::site::Site, utils::DbPool}; -use lemmy_utils::error::LemmyError; +use lemmy_api_common::{ + community::{BanFromCommunity, BanFromCommunityResponse}, + context::LemmyContext, + person::{BanPerson, BanPersonResponse}, + utils::get_local_user_view_from_jwt, +}; +use lemmy_db_schema::{ + source::{community::Community, person::Person, site::Site}, + traits::Crud, + utils::DbPool, +}; +use lemmy_db_views::structs::SiteView; +use lemmy_utils::{error::LemmyError, utils::naive_from_unix}; use serde::Deserialize; use url::Url; diff --git a/crates/apub/src/activities/block/undo_block_user.rs b/crates/apub/src/activities/block/undo_block_user.rs index 56f794dc1..315667ac6 100644 --- a/crates/apub/src/activities/block/undo_block_user.rs +++ b/crates/apub/src/activities/block/undo_block_user.rs @@ -19,7 +19,7 @@ use activitypub_federation::{ utils::verify_domains_match, }; use activitystreams_kinds::{activity::UndoType, public}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{ community::{CommunityPersonBan, CommunityPersonBanForm}, diff --git a/crates/apub/src/activities/community/add_mod.rs b/crates/apub/src/activities/community/add_mod.rs index b72bcf9ea..1bc31b48c 100644 --- a/crates/apub/src/activities/community/add_mod.rs +++ b/crates/apub/src/activities/community/add_mod.rs @@ -23,7 +23,11 @@ use activitypub_federation::{ traits::{ActivityHandler, Actor}, }; use activitystreams_kinds::{activity::AddType, public}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{ + community::{AddModToCommunity, AddModToCommunityResponse}, + context::LemmyContext, + utils::{generate_moderators_url, get_local_user_view_from_jwt}, +}; use lemmy_db_schema::{ source::{ community::{Community, CommunityModerator, CommunityModeratorForm}, diff --git a/crates/apub/src/activities/community/announce.rs b/crates/apub/src/activities/community/announce.rs index 1ca1aa848..306913aa6 100644 --- a/crates/apub/src/activities/community/announce.rs +++ b/crates/apub/src/activities/community/announce.rs @@ -18,7 +18,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; use activitystreams_kinds::{activity::AnnounceType, public}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde_json::Value; use tracing::debug; diff --git a/crates/apub/src/activities/community/mod.rs b/crates/apub/src/activities/community/mod.rs index 3d0bb4c3d..4d35c9d56 100644 --- a/crates/apub/src/activities/community/mod.rs +++ b/crates/apub/src/activities/community/mod.rs @@ -6,7 +6,7 @@ use crate::{ protocol::activities::community::announce::AnnounceActivity, }; use activitypub_federation::{core::object_id::ObjectId, traits::Actor}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::source::person::PersonFollower; use lemmy_utils::error::LemmyError; use url::Url; diff --git a/crates/apub/src/activities/community/remove_mod.rs b/crates/apub/src/activities/community/remove_mod.rs index fca7d5df1..9bd8c4ec2 100644 --- a/crates/apub/src/activities/community/remove_mod.rs +++ b/crates/apub/src/activities/community/remove_mod.rs @@ -19,7 +19,7 @@ use activitypub_federation::{ traits::{ActivityHandler, Actor}, }; use activitystreams_kinds::{activity::RemoveType, public}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{context::LemmyContext, utils::generate_moderators_url}; use lemmy_db_schema::{ source::{ community::{CommunityModerator, CommunityModeratorForm}, diff --git a/crates/apub/src/activities/community/report.rs b/crates/apub/src/activities/community/report.rs index 045026896..57b1244d1 100644 --- a/crates/apub/src/activities/community/report.rs +++ b/crates/apub/src/activities/community/report.rs @@ -14,10 +14,11 @@ use activitypub_federation::{ }; use activitystreams_kinds::activity::FlagType; use lemmy_api_common::{ - comment::CommentReportResponse, - post::PostReportResponse, + comment::{CommentReportResponse, CreateCommentReport}, + context::LemmyContext, + post::{CreatePostReport, PostReportResponse}, + utils::get_local_user_view_from_jwt, websocket::{messages::SendModRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/apub/src/activities/community/update.rs b/crates/apub/src/activities/community/update.rs index 863680093..969741ef6 100644 --- a/crates/apub/src/activities/community/update.rs +++ b/crates/apub/src/activities/community/update.rs @@ -19,8 +19,10 @@ use activitypub_federation::{ }; use activitystreams_kinds::{activity::UpdateType, public}; use lemmy_api_common::{ + community::{CommunityResponse, EditCommunity, HideCommunity}, + context::LemmyContext, + utils::get_local_user_view_from_jwt, websocket::{send::send_community_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{source::community::Community, traits::Crud}; use lemmy_utils::error::LemmyError; diff --git a/crates/apub/src/activities/create_or_update/comment.rs b/crates/apub/src/activities/create_or_update/comment.rs index 530f0b223..54df09ce6 100644 --- a/crates/apub/src/activities/create_or_update/comment.rs +++ b/crates/apub/src/activities/create_or_update/comment.rs @@ -26,9 +26,10 @@ use activitypub_federation::{ }; use activitystreams_kinds::public; use lemmy_api_common::{ + comment::{CommentResponse, CreateComment, EditComment}, + context::LemmyContext, utils::check_post_deleted_or_removed, websocket::{send::send_comment_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ newtypes::PersonId, diff --git a/crates/apub/src/activities/create_or_update/mod.rs b/crates/apub/src/activities/create_or_update/mod.rs index b53dd2eb8..60ce6ea34 100644 --- a/crates/apub/src/activities/create_or_update/mod.rs +++ b/crates/apub/src/activities/create_or_update/mod.rs @@ -1,6 +1,6 @@ use crate::{local_instance, objects::person::ApubPerson}; use activitypub_federation::core::object_id::ObjectId; -use lemmy_api_common::{websocket::send::send_local_notifs, LemmyContext}; +use lemmy_api_common::{context::LemmyContext, websocket::send::send_local_notifs}; use lemmy_db_schema::{ newtypes::LocalUserId, source::{comment::Comment, post::Post}, diff --git a/crates/apub/src/activities/create_or_update/post.rs b/crates/apub/src/activities/create_or_update/post.rs index f6b6ce725..92cc70877 100644 --- a/crates/apub/src/activities/create_or_update/post.rs +++ b/crates/apub/src/activities/create_or_update/post.rs @@ -24,8 +24,10 @@ use activitypub_federation::{ }; use activitystreams_kinds::public; use lemmy_api_common::{ + context::LemmyContext, + post::{CreatePost, EditPost, LockPost, PostResponse, StickyPost}, + utils::get_local_user_view_from_jwt, websocket::{send::send_post_ws_message, UserOperationCrud}, - LemmyContext, }; use lemmy_db_schema::{ newtypes::PersonId, diff --git a/crates/apub/src/activities/create_or_update/private_message.rs b/crates/apub/src/activities/create_or_update/private_message.rs index 1875200db..071209c34 100644 --- a/crates/apub/src/activities/create_or_update/private_message.rs +++ b/crates/apub/src/activities/create_or_update/private_message.rs @@ -15,10 +15,15 @@ use activitypub_federation::{ utils::verify_domains_match, }; use lemmy_api_common::{ + context::LemmyContext, + private_message::{CreatePrivateMessage, EditPrivateMessage, PrivateMessageResponse}, websocket::{send::send_pm_ws_message, UserOperationCrud}, - LemmyContext, }; -use lemmy_db_schema::{source::person::Person, traits::Crud}; +use lemmy_db_schema::{ + newtypes::PersonId, + source::{person::Person, private_message::PrivateMessage}, + traits::Crud, +}; use lemmy_utils::error::LemmyError; use url::Url; diff --git a/crates/apub/src/activities/deletion/delete.rs b/crates/apub/src/activities/deletion/delete.rs index ae93d6e09..138a1fae1 100644 --- a/crates/apub/src/activities/deletion/delete.rs +++ b/crates/apub/src/activities/deletion/delete.rs @@ -10,11 +10,11 @@ use crate::{ use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; use activitystreams_kinds::activity::DeleteType; use lemmy_api_common::{ + context::LemmyContext, websocket::{ send::{send_comment_ws_message_simple, send_community_ws_message, send_post_ws_message}, UserOperationCrud, }, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/apub/src/activities/deletion/delete_user.rs b/crates/apub/src/activities/deletion/delete_user.rs index 0252225d8..4ace431e6 100644 --- a/crates/apub/src/activities/deletion/delete_user.rs +++ b/crates/apub/src/activities/deletion/delete_user.rs @@ -12,7 +12,11 @@ use activitypub_federation::{ utils::verify_urls_match, }; use activitystreams_kinds::{activity::DeleteType, public}; -use lemmy_api_common::{utils::delete_user_account, LemmyContext}; +use lemmy_api_common::{ + context::LemmyContext, + person::{DeleteAccount, DeleteAccountResponse}, + utils::{delete_user_account, get_local_user_view_from_jwt}, +}; use lemmy_utils::error::LemmyError; use url::Url; diff --git a/crates/apub/src/activities/deletion/mod.rs b/crates/apub/src/activities/deletion/mod.rs index de2535c1a..dae70dc3d 100644 --- a/crates/apub/src/activities/deletion/mod.rs +++ b/crates/apub/src/activities/deletion/mod.rs @@ -30,6 +30,12 @@ use activitypub_federation::{ }; use activitystreams_kinds::public; use lemmy_api_common::{ + comment::{CommentResponse, DeleteComment, RemoveComment}, + community::{CommunityResponse, DeleteCommunity, RemoveCommunity}, + context::LemmyContext, + post::{DeletePost, PostResponse, RemovePost}, + private_message::{DeletePrivateMessage, PrivateMessageResponse}, + utils::get_local_user_view_from_jwt, websocket::{ send::{ send_comment_ws_message_simple, @@ -39,7 +45,6 @@ use lemmy_api_common::{ }, UserOperationCrud, }, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/apub/src/activities/deletion/undo_delete.rs b/crates/apub/src/activities/deletion/undo_delete.rs index bc6f9fd14..b3cef3858 100644 --- a/crates/apub/src/activities/deletion/undo_delete.rs +++ b/crates/apub/src/activities/deletion/undo_delete.rs @@ -10,11 +10,11 @@ use crate::{ use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; use activitystreams_kinds::activity::UndoType; use lemmy_api_common::{ + context::LemmyContext, websocket::{ send::{send_comment_ws_message_simple, send_community_ws_message, send_post_ws_message}, UserOperationCrud, }, - LemmyContext, }; use lemmy_db_schema::{ source::{ diff --git a/crates/apub/src/activities/following/accept.rs b/crates/apub/src/activities/following/accept.rs index 880db0d99..6702c8c95 100644 --- a/crates/apub/src/activities/following/accept.rs +++ b/crates/apub/src/activities/following/accept.rs @@ -13,8 +13,8 @@ use activitypub_federation::{ use activitystreams_kinds::activity::AcceptType; use lemmy_api_common::{ community::CommunityResponse, + context::LemmyContext, websocket::{messages::SendUserRoomMessage, UserOperation}, - LemmyContext, }; use lemmy_db_schema::{source::community::CommunityFollower, traits::Followable}; use lemmy_db_views::structs::LocalUserView; diff --git a/crates/apub/src/activities/following/follow.rs b/crates/apub/src/activities/following/follow.rs index 8404317f9..62bd24157 100644 --- a/crates/apub/src/activities/following/follow.rs +++ b/crates/apub/src/activities/following/follow.rs @@ -22,7 +22,11 @@ use activitypub_federation::{ traits::{ActivityHandler, Actor}, }; use activitystreams_kinds::activity::FollowType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{ + community::{BlockCommunity, BlockCommunityResponse}, + context::LemmyContext, + utils::get_local_user_view_from_jwt, +}; use lemmy_db_schema::{ source::{ community::{Community, CommunityFollower, CommunityFollowerForm}, diff --git a/crates/apub/src/activities/following/undo_follow.rs b/crates/apub/src/activities/following/undo_follow.rs index 7d48f9f3c..436d8a02e 100644 --- a/crates/apub/src/activities/following/undo_follow.rs +++ b/crates/apub/src/activities/following/undo_follow.rs @@ -13,7 +13,7 @@ use activitypub_federation::{ utils::verify_urls_match, }; use activitystreams_kinds::activity::UndoType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{ community::{CommunityFollower, CommunityFollowerForm}, diff --git a/crates/apub/src/activities/mod.rs b/crates/apub/src/activities/mod.rs index 28f4e93d5..2fb5808b7 100644 --- a/crates/apub/src/activities/mod.rs +++ b/crates/apub/src/activities/mod.rs @@ -12,7 +12,7 @@ use activitypub_federation::{ }; use activitystreams_kinds::public; use anyhow::anyhow; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{context::LemmyContext, utils::generate_moderators_url}; use lemmy_db_schema::{ newtypes::CommunityId, source::{community::Community, local_site::LocalSite}, diff --git a/crates/apub/src/activities/voting/mod.rs b/crates/apub/src/activities/voting/mod.rs index 0a6274c9f..4471fbd92 100644 --- a/crates/apub/src/activities/voting/mod.rs +++ b/crates/apub/src/activities/voting/mod.rs @@ -21,13 +21,6 @@ use lemmy_api_common::{ UserOperation, }, }; -use lemmy_api_common::{ - websocket::{ - send::{send_comment_ws_message_simple, send_post_ws_message}, - UserOperation, - }, - LemmyContext, -}; use lemmy_db_schema::{ newtypes::CommunityId, source::{ diff --git a/crates/apub/src/activities/voting/undo_vote.rs b/crates/apub/src/activities/voting/undo_vote.rs index fe5cdc54e..7a419e879 100644 --- a/crates/apub/src/activities/voting/undo_vote.rs +++ b/crates/apub/src/activities/voting/undo_vote.rs @@ -20,8 +20,7 @@ use activitypub_federation::{ utils::verify_urls_match, }; use activitystreams_kinds::activity::UndoType; -use lemmy_api_common::LemmyContext; -use lemmy_db_schema::{newtypes::CommunityId, source::community::Community, traits::Crud}; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use url::Url; diff --git a/crates/apub/src/activities/voting/vote.rs b/crates/apub/src/activities/voting/vote.rs index f19f91df2..e435b6823 100644 --- a/crates/apub/src/activities/voting/vote.rs +++ b/crates/apub/src/activities/voting/vote.rs @@ -15,12 +15,8 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; use anyhow::anyhow; -use lemmy_api_common::LemmyContext; -use lemmy_db_schema::{ - newtypes::CommunityId, - source::{community::Community, local_site::LocalSite}, - traits::Crud, -}; +use lemmy_api_common::context::LemmyContext; +use lemmy_db_schema::source::local_site::LocalSite; use lemmy_utils::error::LemmyError; use url::Url; diff --git a/crates/apub/src/activity_lists.rs b/crates/apub/src/activity_lists.rs index fa343d8ae..6e1771127 100644 --- a/crates/apub/src/activity_lists.rs +++ b/crates/apub/src/activity_lists.rs @@ -24,7 +24,7 @@ use crate::{ }, }; use activitypub_federation::{data::Data, deser::context::WithContext, traits::ActivityHandler}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/api/list_comments.rs b/crates/apub/src/api/list_comments.rs index 7cfbc3eda..c4af6900a 100644 --- a/crates/apub/src/api/list_comments.rs +++ b/crates/apub/src/api/list_comments.rs @@ -12,7 +12,6 @@ use lemmy_api_common::{ get_local_user_view_from_jwt_opt, listing_type_with_site_default, }, - LemmyContext, }; use lemmy_db_schema::{ source::{comment::Comment, community::Community, local_site::LocalSite}, diff --git a/crates/apub/src/api/list_posts.rs b/crates/apub/src/api/list_posts.rs index ce9a8a175..7a1f815c7 100644 --- a/crates/apub/src/api/list_posts.rs +++ b/crates/apub/src/api/list_posts.rs @@ -12,7 +12,6 @@ use lemmy_api_common::{ get_local_user_view_from_jwt_opt, listing_type_with_site_default, }, - LemmyContext, }; use lemmy_db_schema::{ source::{community::Community, local_site::LocalSite}, diff --git a/crates/apub/src/api/read_community.rs b/crates/apub/src/api/read_community.rs index 20623ec30..b1615d7d7 100644 --- a/crates/apub/src/api/read_community.rs +++ b/crates/apub/src/api/read_community.rs @@ -9,11 +9,6 @@ use lemmy_api_common::{ context::LemmyContext, utils::{check_private_instance, get_local_user_view_from_jwt_opt}, websocket::messages::GetCommunityUsersOnline, - LemmyContext, -}; -use lemmy_apub::{ - fetcher::resolve_actor_identifier, - objects::{community::ApubCommunity, instance::instance_actor_id_from_url}, }; use lemmy_db_schema::{ impls::actor_language::default_post_language, diff --git a/crates/apub/src/api/read_person.rs b/crates/apub/src/api/read_person.rs index 0cc65567f..514bcfccc 100644 --- a/crates/apub/src/api/read_person.rs +++ b/crates/apub/src/api/read_person.rs @@ -4,7 +4,6 @@ use lemmy_api_common::{ context::LemmyContext, person::{GetPersonDetails, GetPersonDetailsResponse}, utils::{check_private_instance, get_local_user_view_from_jwt_opt}, - LemmyContext, }; use lemmy_db_schema::{ source::{local_site::LocalSite, person::Person}, diff --git a/crates/apub/src/api/resolve_object.rs b/crates/apub/src/api/resolve_object.rs index 5fa4bca12..c179ed582 100644 --- a/crates/apub/src/api/resolve_object.rs +++ b/crates/apub/src/api/resolve_object.rs @@ -8,7 +8,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{ResolveObject, ResolveObjectResponse}, utils::{check_private_instance, get_local_user_view_from_jwt_opt}, - LemmyContext, }; use lemmy_db_schema::{newtypes::PersonId, source::local_site::LocalSite, utils::DbPool}; use lemmy_db_views::structs::{CommentView, PostView}; diff --git a/crates/apub/src/api/search.rs b/crates/apub/src/api/search.rs index 3e88fc1ef..cad41c549 100644 --- a/crates/apub/src/api/search.rs +++ b/crates/apub/src/api/search.rs @@ -8,7 +8,6 @@ use lemmy_api_common::{ context::LemmyContext, site::{Search, SearchResponse}, utils::{check_private_instance, get_local_user_view_from_jwt_opt}, - LemmyContext, }; use lemmy_db_schema::{ source::{community::Community, local_site::LocalSite}, diff --git a/crates/apub/src/collections/mod.rs b/crates/apub/src/collections/mod.rs index 4c27beb41..40bdf1206 100644 --- a/crates/apub/src/collections/mod.rs +++ b/crates/apub/src/collections/mod.rs @@ -1,5 +1,5 @@ use crate::objects::community::ApubCommunity; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; pub(crate) mod community_moderators; pub(crate) mod community_outbox; diff --git a/crates/apub/src/fetcher/mod.rs b/crates/apub/src/fetcher/mod.rs index 563989241..0ce4dd8f6 100644 --- a/crates/apub/src/fetcher/mod.rs +++ b/crates/apub/src/fetcher/mod.rs @@ -1,7 +1,7 @@ use crate::{fetcher::webfinger::webfinger_resolve_actor, ActorType}; use activitypub_federation::traits::ApubObject; use itertools::Itertools; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::traits::ApubActor; use lemmy_utils::error::LemmyError; diff --git a/crates/apub/src/fetcher/post_or_comment.rs b/crates/apub/src/fetcher/post_or_comment.rs index e4b983639..68e176b01 100644 --- a/crates/apub/src/fetcher/post_or_comment.rs +++ b/crates/apub/src/fetcher/post_or_comment.rs @@ -7,7 +7,7 @@ use crate::{ }; use activitypub_federation::traits::ApubObject; use chrono::NaiveDateTime; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{community::Community, post::Post}, traits::Crud, diff --git a/crates/apub/src/fetcher/search.rs b/crates/apub/src/fetcher/search.rs index 65a986356..ffc2c9611 100644 --- a/crates/apub/src/fetcher/search.rs +++ b/crates/apub/src/fetcher/search.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, traits::ApubObject}; use chrono::NaiveDateTime; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::Deserialize; use url::Url; diff --git a/crates/apub/src/fetcher/user_or_community.rs b/crates/apub/src/fetcher/user_or_community.rs index 14fc5c344..3af86be1a 100644 --- a/crates/apub/src/fetcher/user_or_community.rs +++ b/crates/apub/src/fetcher/user_or_community.rs @@ -5,7 +5,7 @@ use crate::{ }; use activitypub_federation::traits::{Actor, ApubObject}; use chrono::NaiveDateTime; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/fetcher/webfinger.rs b/crates/apub/src/fetcher/webfinger.rs index 10aa9abca..d58df8282 100644 --- a/crates/apub/src/fetcher/webfinger.rs +++ b/crates/apub/src/fetcher/webfinger.rs @@ -2,7 +2,7 @@ use crate::{local_instance, ActorType, FEDERATION_HTTP_FETCH_LIMIT}; use activitypub_federation::{core::object_id::ObjectId, traits::ApubObject}; use anyhow::anyhow; use itertools::Itertools; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::newtypes::DbUrl; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; diff --git a/crates/apub/src/http/comment.rs b/crates/apub/src/http/comment.rs index fbadd42ba..5e7de7e25 100644 --- a/crates/apub/src/http/comment.rs +++ b/crates/apub/src/http/comment.rs @@ -5,7 +5,7 @@ use crate::{ use activitypub_federation::traits::ApubObject; use actix_web::{web, web::Path, HttpResponse}; use diesel::result::Error::NotFound; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{newtypes::CommentId, source::comment::Comment, traits::Crud}; use lemmy_utils::error::LemmyError; use serde::Deserialize; diff --git a/crates/apub/src/http/community.rs b/crates/apub/src/http/community.rs index 5e8856aa1..74809509f 100644 --- a/crates/apub/src/http/community.rs +++ b/crates/apub/src/http/community.rs @@ -16,7 +16,7 @@ use activitypub_federation::{ traits::ApubObject, }; use actix_web::{web, HttpRequest, HttpResponse}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{context::LemmyContext, utils::generate_outbox_url}; use lemmy_db_schema::{source::community::Community, traits::ApubActor}; use lemmy_utils::error::LemmyError; use serde::Deserialize; diff --git a/crates/apub/src/http/mod.rs b/crates/apub/src/http/mod.rs index c4602c337..726834c00 100644 --- a/crates/apub/src/http/mod.rs +++ b/crates/apub/src/http/mod.rs @@ -15,7 +15,7 @@ use activitypub_federation::{ }; use actix_web::{web, HttpRequest, HttpResponse}; use http::StatusCode; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::source::activity::Activity; use lemmy_utils::error::LemmyError; use once_cell::sync::OnceCell; diff --git a/crates/apub/src/http/person.rs b/crates/apub/src/http/person.rs index 2a7dfdc40..6a1bc5b35 100644 --- a/crates/apub/src/http/person.rs +++ b/crates/apub/src/http/person.rs @@ -7,7 +7,7 @@ use crate::{ }; use activitypub_federation::{deser::context::WithContext, traits::ApubObject}; use actix_web::{web, HttpRequest, HttpResponse}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{context::LemmyContext, utils::generate_outbox_url}; use lemmy_db_schema::{source::person::Person, traits::ApubActor}; use lemmy_utils::error::LemmyError; use serde::Deserialize; diff --git a/crates/apub/src/http/post.rs b/crates/apub/src/http/post.rs index 85a4406f5..bea5da3a4 100644 --- a/crates/apub/src/http/post.rs +++ b/crates/apub/src/http/post.rs @@ -5,7 +5,7 @@ use crate::{ use activitypub_federation::traits::ApubObject; use actix_web::{web, HttpResponse}; use diesel::result::Error::NotFound; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{newtypes::PostId, source::post::Post, traits::Crud}; use lemmy_utils::error::LemmyError; use serde::Deserialize; diff --git a/crates/apub/src/http/site.rs b/crates/apub/src/http/site.rs index 7a945ac72..fe6c34f63 100644 --- a/crates/apub/src/http/site.rs +++ b/crates/apub/src/http/site.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{deser::context::WithContext, traits::ApubObject}; use actix_web::{web, HttpRequest, HttpResponse}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_views::structs::SiteView; use lemmy_utils::error::LemmyError; use url::Url; diff --git a/crates/apub/src/lib.rs b/crates/apub/src/lib.rs index 39f9d8df2..121beef62 100644 --- a/crates/apub/src/lib.rs +++ b/crates/apub/src/lib.rs @@ -7,7 +7,7 @@ use activitypub_federation::{ UrlVerifier, }; use async_trait::async_trait; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{activity::Activity, instance::Instance, local_site::LocalSite}, utils::DbPool, diff --git a/crates/apub/src/mentions.rs b/crates/apub/src/mentions.rs index ae7d9b6c1..559078942 100644 --- a/crates/apub/src/mentions.rs +++ b/crates/apub/src/mentions.rs @@ -5,7 +5,7 @@ use crate::{ }; use activitypub_federation::core::object_id::ObjectId; use activitystreams_kinds::link::MentionType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{comment::Comment, person::Person, post::Post}, traits::Crud, diff --git a/crates/apub/src/objects/comment.rs b/crates/apub/src/objects/comment.rs index affdd8434..ab11b00d8 100644 --- a/crates/apub/src/objects/comment.rs +++ b/crates/apub/src/objects/comment.rs @@ -20,7 +20,7 @@ use activitypub_federation::{ }; use activitystreams_kinds::{object::NoteType, public}; use chrono::NaiveDateTime; -use lemmy_api_common::{utils::local_site_opt_to_slur_regex, LemmyContext}; +use lemmy_api_common::{context::LemmyContext, utils::local_site_opt_to_slur_regex}; use lemmy_db_schema::{ source::{ comment::{Comment, CommentInsertForm, CommentUpdateForm}, diff --git a/crates/apub/src/objects/community.rs b/crates/apub/src/objects/community.rs index 4a62f3da1..b309d25fc 100644 --- a/crates/apub/src/objects/community.rs +++ b/crates/apub/src/objects/community.rs @@ -18,7 +18,10 @@ use activitypub_federation::{ use activitystreams_kinds::actor::GroupType; use chrono::NaiveDateTime; use itertools::Itertools; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{ + context::LemmyContext, + utils::{generate_moderators_url, generate_outbox_url}, +}; use lemmy_db_schema::{ source::{ actor_language::CommunityLanguage, diff --git a/crates/apub/src/objects/instance.rs b/crates/apub/src/objects/instance.rs index 68f1d3e15..5ec4fe909 100644 --- a/crates/apub/src/objects/instance.rs +++ b/crates/apub/src/objects/instance.rs @@ -20,7 +20,7 @@ use activitypub_federation::{ utils::verify_domains_match, }; use chrono::NaiveDateTime; -use lemmy_api_common::{utils::local_site_opt_to_slur_regex, LemmyContext}; +use lemmy_api_common::{context::LemmyContext, utils::local_site_opt_to_slur_regex}; use lemmy_db_schema::{ source::{ actor_language::SiteLanguage, diff --git a/crates/apub/src/objects/mod.rs b/crates/apub/src/objects/mod.rs index dd76e293e..58e1f23f5 100644 --- a/crates/apub/src/objects/mod.rs +++ b/crates/apub/src/objects/mod.rs @@ -57,9 +57,9 @@ pub(crate) mod tests { use actix::Actor; use anyhow::anyhow; use lemmy_api_common::{ + context::LemmyContext, request::build_user_agent, websocket::chat_server::ChatServer, - LemmyContext, }; use lemmy_db_schema::{source::secret::Secret, utils::build_db_pool_for_tests}; use lemmy_utils::{ diff --git a/crates/apub/src/objects/person.rs b/crates/apub/src/objects/person.rs index fda8b035c..2017b605c 100644 --- a/crates/apub/src/objects/person.rs +++ b/crates/apub/src/objects/person.rs @@ -18,7 +18,10 @@ use activitypub_federation::{ utils::verify_domains_match, }; use chrono::NaiveDateTime; -use lemmy_api_common::{utils::local_site_opt_to_slur_regex, LemmyContext}; +use lemmy_api_common::{ + context::LemmyContext, + utils::{generate_outbox_url, local_site_opt_to_slur_regex}, +}; use lemmy_db_schema::{ source::{ instance::Instance, diff --git a/crates/apub/src/objects/post.rs b/crates/apub/src/objects/post.rs index 999a54469..afe025ce2 100644 --- a/crates/apub/src/objects/post.rs +++ b/crates/apub/src/objects/post.rs @@ -23,9 +23,9 @@ use activitypub_federation::{ use activitystreams_kinds::public; use chrono::NaiveDateTime; use lemmy_api_common::{ + context::LemmyContext, request::fetch_site_data, utils::local_site_opt_to_slur_regex, - LemmyContext, }; use lemmy_db_schema::{ self, diff --git a/crates/apub/src/objects/private_message.rs b/crates/apub/src/objects/private_message.rs index 6b9ab043e..4d8c70076 100644 --- a/crates/apub/src/objects/private_message.rs +++ b/crates/apub/src/objects/private_message.rs @@ -15,7 +15,7 @@ use activitypub_federation::{ utils::verify_domains_match, }; use chrono::NaiveDateTime; -use lemmy_api_common::{utils::check_person_block, LemmyContext}; +use lemmy_api_common::{context::LemmyContext, utils::check_person_block}; use lemmy_db_schema::{ source::{ person::Person, diff --git a/crates/apub/src/protocol/activities/block/block_user.rs b/crates/apub/src/protocol/activities/block/block_user.rs index 364fe9b9f..3ac040ced 100644 --- a/crates/apub/src/protocol/activities/block/block_user.rs +++ b/crates/apub/src/protocol/activities/block/block_user.rs @@ -8,7 +8,7 @@ use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserial use activitystreams_kinds::activity::BlockType; use anyhow::anyhow; use chrono::{DateTime, FixedOffset}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use serde_with::skip_serializing_none; diff --git a/crates/apub/src/protocol/activities/block/undo_block_user.rs b/crates/apub/src/protocol/activities/block/undo_block_user.rs index 9646315ff..d818af9de 100644 --- a/crates/apub/src/protocol/activities/block/undo_block_user.rs +++ b/crates/apub/src/protocol/activities/block/undo_block_user.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; use activitystreams_kinds::activity::UndoType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use serde_with::skip_serializing_none; diff --git a/crates/apub/src/protocol/activities/community/add_mod.rs b/crates/apub/src/protocol/activities/community/add_mod.rs index c8ea5daa9..22fc07fcb 100644 --- a/crates/apub/src/protocol/activities/community/add_mod.rs +++ b/crates/apub/src/protocol/activities/community/add_mod.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; use activitystreams_kinds::activity::AddType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/protocol/activities/community/remove_mod.rs b/crates/apub/src/protocol/activities/community/remove_mod.rs index 57d9c1bca..ce46fb920 100644 --- a/crates/apub/src/protocol/activities/community/remove_mod.rs +++ b/crates/apub/src/protocol/activities/community/remove_mod.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; use activitystreams_kinds::activity::RemoveType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/protocol/activities/community/report.rs b/crates/apub/src/protocol/activities/community/report.rs index a66e08b05..0a1ef650f 100644 --- a/crates/apub/src/protocol/activities/community/report.rs +++ b/crates/apub/src/protocol/activities/community/report.rs @@ -7,7 +7,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one}; use activitystreams_kinds::activity::FlagType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/protocol/activities/community/update.rs b/crates/apub/src/protocol/activities/community/update.rs index 8bf39a826..9a2f1f481 100644 --- a/crates/apub/src/protocol/activities/community/update.rs +++ b/crates/apub/src/protocol/activities/community/update.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; use activitystreams_kinds::activity::UpdateType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/protocol/activities/create_or_update/note.rs b/crates/apub/src/protocol/activities/create_or_update/note.rs index a952811be..dfa1dbe9f 100644 --- a/crates/apub/src/protocol/activities/create_or_update/note.rs +++ b/crates/apub/src/protocol/activities/create_or_update/note.rs @@ -6,7 +6,7 @@ use crate::{ protocol::{activities::CreateOrUpdateType, objects::note::Note, InCommunity}, }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{source::community::Community, traits::Crud}; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; diff --git a/crates/apub/src/protocol/activities/create_or_update/page.rs b/crates/apub/src/protocol/activities/create_or_update/page.rs index 9d45ae0bf..2c15d9f90 100644 --- a/crates/apub/src/protocol/activities/create_or_update/page.rs +++ b/crates/apub/src/protocol/activities/create_or_update/page.rs @@ -5,7 +5,7 @@ use crate::{ protocol::{activities::CreateOrUpdateType, objects::page::Page, InCommunity}, }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/protocol/activities/deletion/delete.rs b/crates/apub/src/protocol/activities/deletion/delete.rs index 8a0c1b0bd..d92ac2456 100644 --- a/crates/apub/src/protocol/activities/deletion/delete.rs +++ b/crates/apub/src/protocol/activities/deletion/delete.rs @@ -7,7 +7,7 @@ use crate::{ use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; use activitystreams_kinds::activity::DeleteType; use anyhow::anyhow; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{community::Community, post::Post}, traits::Crud, diff --git a/crates/apub/src/protocol/activities/deletion/undo_delete.rs b/crates/apub/src/protocol/activities/deletion/undo_delete.rs index 0e2c0f982..d5249ba9a 100644 --- a/crates/apub/src/protocol/activities/deletion/undo_delete.rs +++ b/crates/apub/src/protocol/activities/deletion/undo_delete.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many}; use activitystreams_kinds::activity::UndoType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use serde_with::skip_serializing_none; diff --git a/crates/apub/src/protocol/activities/voting/undo_vote.rs b/crates/apub/src/protocol/activities/voting/undo_vote.rs index 7c23036c6..0973c76a8 100644 --- a/crates/apub/src/protocol/activities/voting/undo_vote.rs +++ b/crates/apub/src/protocol/activities/voting/undo_vote.rs @@ -6,7 +6,7 @@ use crate::{ }; use activitypub_federation::core::object_id::ObjectId; use activitystreams_kinds::activity::UndoType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use url::Url; diff --git a/crates/apub/src/protocol/activities/voting/vote.rs b/crates/apub/src/protocol/activities/voting/vote.rs index a88aa3da9..2a09a45ea 100644 --- a/crates/apub/src/protocol/activities/voting/vote.rs +++ b/crates/apub/src/protocol/activities/voting/vote.rs @@ -6,7 +6,7 @@ use crate::{ protocol::InCommunity, }; use activitypub_federation::core::object_id::ObjectId; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; use std::convert::TryFrom; diff --git a/crates/apub/src/protocol/collections/group_followers.rs b/crates/apub/src/protocol/collections/group_followers.rs index bd813cc59..b9cf85182 100644 --- a/crates/apub/src/protocol/collections/group_followers.rs +++ b/crates/apub/src/protocol/collections/group_followers.rs @@ -1,5 +1,5 @@ use activitystreams_kinds::collection::CollectionType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::{context::LemmyContext, utils::generate_followers_url}; use lemmy_db_schema::source::community::Community; use lemmy_db_views_actor::structs::CommunityFollowerView; use lemmy_utils::error::LemmyError; diff --git a/crates/apub/src/protocol/mod.rs b/crates/apub/src/protocol/mod.rs index 16bdb1b29..ef0f2a875 100644 --- a/crates/apub/src/protocol/mod.rs +++ b/crates/apub/src/protocol/mod.rs @@ -1,7 +1,7 @@ use crate::{local_instance, objects::community::ApubCommunity}; use activitypub_federation::{deser::values::MediaTypeMarkdown, utils::fetch_object_http}; use activitystreams_kinds::object::ImageType; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::newtypes::DbUrl; use lemmy_utils::error::LemmyError; use serde::{de::DeserializeOwned, Deserialize, Serialize}; diff --git a/crates/apub/src/protocol/objects/group.rs b/crates/apub/src/protocol/objects/group.rs index 316af1a8d..03f71a348 100644 --- a/crates/apub/src/protocol/objects/group.rs +++ b/crates/apub/src/protocol/objects/group.rs @@ -19,7 +19,7 @@ use activitypub_federation::{ }; use activitystreams_kinds::actor::GroupType; use chrono::{DateTime, FixedOffset}; -use lemmy_api_common::{utils::local_site_opt_to_slur_regex, LemmyContext}; +use lemmy_api_common::{context::LemmyContext, utils::local_site_opt_to_slur_regex}; use lemmy_db_schema::{ newtypes::InstanceId, source::community::{CommunityInsertForm, CommunityUpdateForm}, diff --git a/crates/apub/src/protocol/objects/note.rs b/crates/apub/src/protocol/objects/note.rs index f8263d874..f561c313d 100644 --- a/crates/apub/src/protocol/objects/note.rs +++ b/crates/apub/src/protocol/objects/note.rs @@ -15,7 +15,7 @@ use activitypub_federation::{ }; use activitystreams_kinds::object::NoteType; use chrono::{DateTime, FixedOffset}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{community::Community, post::Post}, traits::Crud, diff --git a/crates/apub/src/protocol/objects/page.rs b/crates/apub/src/protocol/objects/page.rs index 1ff12bc29..a62fb8e57 100644 --- a/crates/apub/src/protocol/objects/page.rs +++ b/crates/apub/src/protocol/objects/page.rs @@ -20,7 +20,7 @@ use activitystreams_kinds::{ }; use chrono::{DateTime, FixedOffset}; use itertools::Itertools; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::newtypes::DbUrl; use lemmy_utils::error::LemmyError; use serde::{Deserialize, Serialize}; diff --git a/crates/routes/src/feeds.rs b/crates/routes/src/feeds.rs index 72181bf6a..594bf1153 100644 --- a/crates/routes/src/feeds.rs +++ b/crates/routes/src/feeds.rs @@ -1,7 +1,7 @@ use actix_web::{error::ErrorBadRequest, web, Error, HttpRequest, HttpResponse, Result}; use anyhow::anyhow; use chrono::{DateTime, NaiveDateTime, Utc}; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ newtypes::LocalUserId, source::{community::Community, local_user::LocalUser, person::Person}, diff --git a/crates/routes/src/images.rs b/crates/routes/src/images.rs index 6e839e214..0b1f6fbdd 100644 --- a/crates/routes/src/images.rs +++ b/crates/routes/src/images.rs @@ -11,7 +11,7 @@ use actix_web::{ HttpResponse, }; use futures::stream::{Stream, StreamExt}; -use lemmy_api_common::{utils::get_local_user_view_from_jwt, LemmyContext}; +use lemmy_api_common::{context::LemmyContext, utils::get_local_user_view_from_jwt}; use lemmy_db_schema::source::local_site::LocalSite; use lemmy_utils::{claims::Claims, rate_limit::RateLimitCell, REQWEST_TIMEOUT}; use reqwest::Body; diff --git a/crates/routes/src/nodeinfo.rs b/crates/routes/src/nodeinfo.rs index 3a8b41859..13786e3b6 100644 --- a/crates/routes/src/nodeinfo.rs +++ b/crates/routes/src/nodeinfo.rs @@ -1,6 +1,6 @@ use actix_web::{error::ErrorBadRequest, web, Error, HttpResponse, Result}; use anyhow::anyhow; -use lemmy_api_common::LemmyContext; +use lemmy_api_common::context::LemmyContext; use lemmy_db_views::structs::SiteView; use lemmy_utils::{error::LemmyError, version}; use serde::{Deserialize, Serialize}; diff --git a/crates/routes/src/webfinger.rs b/crates/routes/src/webfinger.rs index 7d9ff2bfe..9879039bb 100644 --- a/crates/routes/src/webfinger.rs +++ b/crates/routes/src/webfinger.rs @@ -1,7 +1,6 @@ use actix_web::{web, web::Query, HttpResponse}; use anyhow::Context; -use lemmy_api_common::LemmyContext; -use lemmy_apub::fetcher::webfinger::{WebfingerLink, WebfingerResponse}; +use lemmy_api_common::context::LemmyContext; use lemmy_db_schema::{ source::{community::Community, person::Person}, traits::ApubActor, diff --git a/src/api_routes.rs b/src/api_routes.rs index 076eb9dcf..77e5c27d7 100644 --- a/src/api_routes.rs +++ b/src/api_routes.rs @@ -97,12 +97,16 @@ use lemmy_api_common::{ }, websocket::{ routes::chat_route, + serialize_websocket_message, structs::{CommunityJoin, ModJoin, PostJoin, UserJoin}, + UserOperation, + UserOperationApub, + UserOperationCrud, }, - LemmyContext, }; use lemmy_api_crud::PerformCrud; -use lemmy_utils::rate_limit::RateLimitCell; +use lemmy_apub::{api::PerformApub, SendActivity}; +use lemmy_utils::{error::LemmyError, rate_limit::RateLimitCell, ConnectionId}; use serde::Deserialize; use std::result; diff --git a/src/main.rs b/src/main.rs index caf4903a8..c60c1823a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,7 +14,6 @@ use lemmy_api_common::{ local_site_rate_limit_to_rate_limit_config, }, websocket::chat_server::ChatServer, - LemmyContext, }; use lemmy_db_schema::{ source::secret::Secret,