Move websocket code into workspace (#107)

[lemmy.git] / lemmy_apub / src / lib.rs

diff --git a/src/apub/mod.rs b/lemmy_apub/src/lib.rs
similarity index 96%
rename from src/apub/mod.rs
rename to lemmy_apub/src/lib.rs
index 5fd5da36409426c37dfa8d1b523dd746f3fa35a3..22eb9fbe056548f9ec834ae330b4c50bf17f687e 100644 (file)
--- a/src/apub/mod.rs
+++ b/lemmy_apub/src/lib.rs
@@ -1,3 +1,6 @@
+#[macro_use]
+extern crate lazy_static;
+
 pub mod activities;
 pub mod activity_queue;
 pub mod comment;
@@ -9,16 +12,10 @@ pub mod post;
 pub mod private_message;
 pub mod user;
 
-use crate::{
-  apub::extensions::{
-    group_extensions::GroupExtension,
-    page_extension::PageExtension,
-    signatures::{PublicKey, PublicKeyExtension},
-  },
-  request::{retry, RecvError},
-  routes::webfinger::WebFingerResponse,
-  DbPool,
-  LemmyContext,
+use crate::extensions::{
+  group_extensions::GroupExtension,
+  page_extension::PageExtension,
+  signatures::{PublicKey, PublicKeyExtension},
 };
 use activitystreams::{
   activity::Follow,
@@ -32,15 +29,17 @@ use activitystreams_ext::{Ext1, Ext2};
 use actix_web::{body::Body, HttpResponse};
 use anyhow::{anyhow, Context};
 use chrono::NaiveDateTime;
-use lemmy_db::{activity::do_insert_activity, user::User_};
-use lemmy_structs::blocking;
+use lemmy_db::{activity::do_insert_activity, user::User_, DbPool};
+use lemmy_structs::{blocking, WebFingerResponse};
 use lemmy_utils::{
   apub::get_apub_protocol_string,
   location_info,
+  request::{retry, RecvError},
   settings::Settings,
   utils::{convert_datetime, MentionData},
   LemmyError,
 };
+use lemmy_websocket::LemmyContext;
 use log::debug;
 use reqwest::Client;
 use serde::Serialize;
@@ -191,7 +190,7 @@ pub trait ApubObjectType {
   async fn send_undo_remove(&self, mod_: &User_, context: &LemmyContext) -> Result<(), LemmyError>;
 }
 
-pub(in crate::apub) fn check_actor_domain<T, Kind>(
+pub(in crate) fn check_actor_domain<T, Kind>(
   apub: &T,
   expected_domain: Option<Url>,
 ) -> Result<String, LemmyError>