-use activitystreams::object::kind::ImageType;
+use crate::protocol::Source;
use html2md::parse_html;
-use lemmy_apub_lib::values::MediaTypeMarkdown;
-use serde::{Deserialize, Serialize};
-use url::Url;
pub mod comment;
pub mod community;
+pub mod instance;
pub mod person;
pub mod post;
pub mod private_message;
-pub mod tombstone;
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Source {
- content: String,
- media_type: MediaTypeMarkdown,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ImageObject {
- #[serde(rename = "type")]
- kind: ImageType,
- url: Url,
-}
-
-fn get_summary_from_string_or_source(
+pub(crate) fn get_summary_from_string_or_source(
raw: &Option<String>,
source: &Option<Source>,
) -> Option<String> {
}
#[cfg(test)]
-mod tests {
+pub(crate) mod tests {
use actix::Actor;
+ use background_jobs::QueueHandle;
use diesel::{
r2d2::{ConnectionManager, Pool},
PgConnection,
};
- use lemmy_apub_lib::activity_queue::create_activity_queue;
use lemmy_db_schema::{
establish_unpooled_connection,
get_database_url_from_env,
};
use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
use reqwest::Client;
+ use reqwest_middleware::ClientBuilder;
use serde::de::DeserializeOwned;
use std::{fs::File, io::BufReader, sync::Arc};
use tokio::sync::Mutex;
// TODO: would be nice if we didnt have to use a full context for tests.
// or at least write a helper function so this code is shared with main.rs
- pub(crate) fn init_context() -> LemmyContext {
+ pub(crate) fn init_context(activity_queue: QueueHandle) -> LemmyContext {
// call this to run migrations
establish_unpooled_connection();
let settings = Settings::init().unwrap();
.user_agent(build_user_agent(&settings))
.build()
.unwrap();
- let activity_queue = create_activity_queue();
+
+ let client = ClientBuilder::new(client).build();
let secret = Secret {
id: 0,
jwt_secret: "".to_string(),
LemmyContext::create(pool, chat_server, client, activity_queue, settings, secret)
}
- pub(crate) fn file_to_json_object<T: DeserializeOwned>(path: &str) -> T {
- let file = File::open(path).unwrap();
+ pub(crate) fn file_to_json_object<T: DeserializeOwned>(path: &str) -> Result<T, LemmyError> {
+ let file = File::open(path)?;
let reader = BufReader::new(file);
- serde_json::from_reader(reader).unwrap()
+ Ok(serde_json::from_reader(reader)?)
}
}