nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2024-11-25 19:21:09 +00:00
Code Projects Releases Packages Activity

Merge branch 'master' into ci-release

Browse source
This commit is contained in:
Felix Ableitner 2024-03-06 16:49:40 +01:00
commit f7c5d0d28c
57 changed files with 910 additions and 522 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.rustfmt.toml Normal file
View file

@ -0,0 +1,4 @@
edition = "2021"
imports_layout = "HorizontalVertical"
imports_granularity = "Crate"
group_imports = "One"

5
.woodpecker.yml
View file

@ -4,13 +4,14 @@ variables:
steps:
cargo_fmt:
image: *rust_image
image: rustlang/rust:nightly
environment:
# store cargo data in repo folder so that it gets cached between steps
CARGO_HOME: .cargo_home
commands:
- rustup component add rustfmt
- cargo fmt -- --check
- cargo +nightly fmt -- --check
check_config_defaults_updated:
image: *rust_image

3
migrations/2023-11-28-150402_ibis_setup/up.sql
View file

@ -43,7 +43,8 @@ create table article (
text text not null,
ap_id varchar(255) not null unique,
instance_id int REFERENCES instance ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
local bool not null
local bool not null,
protected bool not null
);
create table edit (

87
src/backend/api/article.rs
View file

@ -1,27 +1,38 @@
use crate::backend::database::article::DbArticleForm;
use crate::backend::database::conflict::{DbConflict, DbConflictForm};
use crate::backend::database::edit::DbEditForm;
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::activities::create_article::CreateArticle;
use crate::backend::federation::activities::submit_article_update;
use crate::backend::utils::generate_article_version;
use crate::common::utils::extract_domain;
use crate::common::utils::http_protocol_str;
use crate::common::validation::can_edit_article;
use crate::common::LocalUserView;
use crate::common::{ApiConflict, ResolveObject};
use crate::common::{ArticleView, DbArticle, DbEdit};
use crate::common::{CreateArticleData, EditArticleData, EditVersion, ForkArticleData};
use crate::common::{DbInstance, SearchArticleData};
use crate::common::{GetArticleData, ListArticlesData};
use activitypub_federation::config::Data;
use activitypub_federation::fetch::object_id::ObjectId;
use crate::{
backend::{
database::{
article::DbArticleForm,
conflict::{DbConflict, DbConflictForm},
edit::DbEditForm,
IbisData,
},
error::MyResult,
federation::activities::{create_article::CreateArticle, submit_article_update},
utils::generate_article_version,
},
common::{
utils::{extract_domain, http_protocol_str},
validation::can_edit_article,
ApiConflict,
ArticleView,
CreateArticleForm,
DbArticle,
DbEdit,
DbInstance,
EditArticleForm,
EditVersion,
ForkArticleForm,
GetArticleForm,
ListArticlesForm,
LocalUserView,
ProtectArticleForm,
ResolveObject,
SearchArticleForm,
},
};
use activitypub_federation::{config::Data, fetch::object_id::ObjectId};
use anyhow::anyhow;
use axum::extract::Query;
use axum::Extension;
use axum::Form;
use axum::Json;
use axum::{extract::Query, Extension, Form, Json};
use axum_macros::debug_handler;
use chrono::Utc;
use diffy::create_patch;
@ -31,7 +42,7 @@ use diffy::create_patch;
pub(in crate::backend::api) async fn create_article(
Extension(user): Extension<LocalUserView>,
data: Data<IbisData>,
Form(create_article): Form<CreateArticleData>,
Form(create_article): Form<CreateArticleForm>,
) -> MyResult<Json<ArticleView>> {
if create_article.title.is_empty() {
return Err(anyhow!("Title must not be empty").into());
@ -50,10 +61,11 @@ pub(in crate::backend::api) async fn create_article(
ap_id,
instance_id: local_instance.id,
local: true,
protected: false,
};
let article = DbArticle::create(form, &data)?;
let edit_data = EditArticleData {
let edit_data = EditArticleForm {
article_id: article.id,
new_text: create_article.text,
summary: create_article.summary,
@ -81,7 +93,7 @@ pub(in crate::backend::api) async fn create_article(
pub(in crate::backend::api) async fn edit_article(
Extension(user): Extension<LocalUserView>,
data: Data<IbisData>,
Form(mut edit_form): Form<EditArticleData>,
Form(mut edit_form): Form<EditArticleForm>,
) -> MyResult<Json<Option<ApiConflict>>> {
// resolve conflict if any
if let Some(resolve_conflict_id) = edit_form.resolve_conflict_id {
@ -136,7 +148,7 @@ pub(in crate::backend::api) async fn edit_article(
/// Retrieve an article by ID. It must already be stored in the local database.
#[debug_handler]
pub(in crate::backend::api) async fn get_article(
Query(query): Query<GetArticleData>,
Query(query): Query<GetArticleForm>,
data: Data<IbisData>,
) -> MyResult<Json<ArticleView>> {
match (query.title, query.id) {
@ -157,7 +169,7 @@ pub(in crate::backend::api) async fn get_article(
#[debug_handler]
pub(in crate::backend::api) async fn list_articles(
Query(query): Query<ListArticlesData>,
Query(query): Query<ListArticlesForm>,
data: Data<IbisData>,
) -> MyResult<Json<Vec<DbArticle>>> {
let only_local = query.only_local.unwrap_or(false);
@ -170,7 +182,7 @@ pub(in crate::backend::api) async fn list_articles(
pub(in crate::backend::api) async fn fork_article(
Extension(_user): Extension<LocalUserView>,
data: Data<IbisData>,
Form(fork_form): Form<ForkArticleData>,
Form(fork_form): Form<ForkArticleForm>,
) -> MyResult<Json<ArticleView>> {
// TODO: lots of code duplicated from create_article(), can move it into helper
let original_article = DbArticle::read(fork_form.article_id, &data)?;
@ -188,6 +200,7 @@ pub(in crate::backend::api) async fn fork_article(
ap_id,
instance_id: local_instance.id,
local: true,
protected: false,
};
let article = DbArticle::create(form, &data)?;
@ -242,7 +255,7 @@ pub(super) async fn resolve_article(
/// Search articles for matching title or body text.
#[debug_handler]
pub(super) async fn search_article(
Query(query): Query<SearchArticleData>,
Query(query): Query<SearchArticleForm>,
data: Data<IbisData>,
) -> MyResult<Json<Vec<DbArticle>>> {
if query.query.is_empty() {
@ -251,3 +264,17 @@ pub(super) async fn search_article(
let article = DbArticle::search(&query.query, &data)?;
Ok(Json(article))
}
#[debug_handler]
pub(in crate::backend::api) async fn protect_article(
Extension(user): Extension<LocalUserView>,
data: Data<IbisData>,
Form(lock_params): Form<ProtectArticleForm>,
) -> MyResult<Json<DbArticle>> {
if !user.local_user.admin {
return Err(anyhow!("Only admin can lock articles").into());
}
let article =
DbArticle::update_protected(lock_params.article_id, lock_params.protected, &data)?;
Ok(Json(article))
}

16
src/backend/api/instance.rs
View file

@ -1,13 +1,9 @@
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::activities::follow::Follow;
use crate::common::{DbInstance, InstanceView, ResolveObject};
use crate::common::{FollowInstance, LocalUserView};
use activitypub_federation::config::Data;
use activitypub_federation::fetch::object_id::ObjectId;
use axum::extract::Query;
use axum::Extension;
use axum::{Form, Json};
use crate::{
backend::{database::IbisData, error::MyResult, federation::activities::follow::Follow},
common::{DbInstance, FollowInstance, InstanceView, LocalUserView, ResolveObject},
};
use activitypub_federation::{config::Data, fetch::object_id::ObjectId};
use axum::{extract::Query, Extension, Form, Json};
use axum_macros::debug_handler;
/// Retrieve the local instance info.

51
src/backend/api/mod.rs
View file

@ -1,28 +1,42 @@
use crate::backend::api::article::{
create_article, list_articles, resolve_article, search_article,
use crate::{
backend::{
api::{
article::{
create_article,
edit_article,
fork_article,
get_article,
list_articles,
protect_article,
resolve_article,
search_article,
},
instance::{follow_instance, get_local_instance, resolve_instance},
user::{
get_user,
login_user,
logout_user,
my_profile,
register_user,
validate,
AUTH_COOKIE,
},
},
database::{conflict::DbConflict, IbisData},
error::MyResult,
},
common::{ApiConflict, LocalUserView},
};
use crate::backend::api::article::{edit_article, fork_article, get_article};
use crate::backend::api::instance::get_local_instance;
use crate::backend::api::instance::{follow_instance, resolve_instance};
use crate::backend::api::user::validate;
use crate::backend::api::user::{get_user, register_user};
use crate::backend::api::user::{login_user, logout_user};
use crate::backend::api::user::{my_profile, AUTH_COOKIE};
use crate::backend::database::conflict::DbConflict;
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::common::ApiConflict;
use crate::common::LocalUserView;
use activitypub_federation::config::Data;
use axum::routing::{get, post};
use axum::{
http::Request,
http::StatusCode,
http::{Request, StatusCode},
middleware::{self, Next},
response::Response,
routing::{get, post},
Extension,
Json,
Router,
};
use axum::{Json, Router};
use axum_extra::extract::CookieJar;
use axum_macros::debug_handler;
use futures::future::try_join_all;
@ -40,6 +54,7 @@ pub fn api_routes() -> Router {
.route("/article/list", get(list_articles))
.route("/article/fork", post(fork_article))
.route("/article/resolve", get(resolve_article))
.route("/article/protect", post(protect_article))
.route("/edit_conflicts", get(edit_conflicts))
.route("/instance", get(get_local_instance))
.route("/instance/follow", post(follow_instance))

32
src/backend/api/user.rs
View file

@ -1,18 +1,26 @@
use crate::backend::database::{read_jwt_secret, IbisData};
use crate::backend::error::MyResult;
use crate::common::{DbPerson, GetUserData, LocalUserView, LoginUserData, RegisterUserData};
use crate::{
backend::{
database::{read_jwt_secret, IbisData},
error::MyResult,
},
common::{DbPerson, GetUserForm, LocalUserView, LoginUserForm, RegisterUserForm},
};
use activitypub_federation::config::Data;
use anyhow::anyhow;
use axum::extract::Query;
use axum::{Form, Json};
use axum::{extract::Query, Form, Json};
use axum_extra::extract::cookie::{Cookie, CookieJar, Expiration, SameSite};
use axum_macros::debug_handler;
use bcrypt::verify;
use chrono::Utc;
use jsonwebtoken::DecodingKey;
use jsonwebtoken::Validation;
use jsonwebtoken::{decode, get_current_timestamp};
use jsonwebtoken::{encode, EncodingKey, Header};
use jsonwebtoken::{
decode,
encode,
get_current_timestamp,
DecodingKey,
EncodingKey,
Header,
Validation,
};
use serde::{Deserialize, Serialize};
use time::{Duration, OffsetDateTime};
@ -57,7 +65,7 @@ pub async fn validate(jwt: &str, data: &Data<IbisData>) -> MyResult<LocalUserVie
pub(in crate::backend::api) async fn register_user(
data: Data<IbisData>,
jar: CookieJar,
Form(form): Form<RegisterUserData>,
Form(form): Form<RegisterUserForm>,
) -> MyResult<(CookieJar, Json<LocalUserView>)> {
if !data.config.registration_open {
return Err(anyhow!("Registration is closed").into());
@ -72,7 +80,7 @@ pub(in crate::backend::api) async fn register_user(
pub(in crate::backend::api) async fn login_user(
data: Data<IbisData>,
jar: CookieJar,
Form(form): Form<LoginUserData>,
Form(form): Form<LoginUserForm>,
) -> MyResult<(CookieJar, Json<LocalUserView>)> {
let user = DbPerson::read_local_from_name(&form.username, &data)?;
let valid = verify(&form.password, &user.local_user.password_encrypted)?;
@ -126,7 +134,7 @@ pub(in crate::backend::api) async fn logout_user(
#[debug_handler]
pub(in crate::backend::api) async fn get_user(
params: Query<GetUserData>,
params: Query<GetUserForm>,
data: Data<IbisData>,
) -> MyResult<Json<DbPerson>> {
Ok(Json(DbPerson::read_from_name(

41
src/backend/database/article.rs
View file

@ -1,17 +1,24 @@
use crate::backend::database::schema::{article, edit, instance};
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::objects::edits_collection::DbEditCollection;
use crate::common::DbEdit;
use crate::common::EditVersion;
use crate::common::{ArticleView, DbArticle};
use activitypub_federation::fetch::collection_id::CollectionId;
use activitypub_federation::fetch::object_id::ObjectId;
use diesel::dsl::max;
use diesel::ExpressionMethods;
use crate::{
backend::{
database::{
schema::{article, edit, instance},
IbisData,
},
error::MyResult,
federation::objects::edits_collection::DbEditCollection,
},
common::{ArticleView, DbArticle, DbEdit, EditVersion},
};
use activitypub_federation::fetch::{collection_id::CollectionId, object_id::ObjectId};
use diesel::{
insert_into, AsChangeset, BoolExpressionMethods, Insertable, PgTextExpressionMethods, QueryDsl,
dsl::max,
insert_into,
AsChangeset,
BoolExpressionMethods,
ExpressionMethods,
Insertable,
PgTextExpressionMethods,
QueryDsl,
RunQueryDsl,
};
use std::ops::DerefMut;
@ -24,6 +31,7 @@ pub struct DbArticleForm {
pub ap_id: ObjectId<DbArticle>,
pub instance_id: i32,
pub local: bool,
pub protected: bool,
}
// TODO: get rid of unnecessary methods
@ -58,6 +66,13 @@ impl DbArticle {
.get_result::<Self>(conn.deref_mut())?)
}
pub fn update_protected(id: i32, locked: bool, data: &IbisData) -> MyResult<Self> {
let mut conn = data.db_pool.get()?;
Ok(diesel::update(article::dsl::article.find(id))
.set(article::dsl::protected.eq(locked))
.get_result::<Self>(conn.deref_mut())?)
}
pub fn read(id: i32, data: &IbisData) -> MyResult<Self> {
let mut conn = data.db_pool.get()?;
Ok(article::table.find(id).get_result(conn.deref_mut())?)

29
src/backend/database/conflict.rs
View file

@ -1,16 +1,23 @@
use crate::backend::database::schema::conflict;
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::activities::submit_article_update;
use crate::backend::utils::generate_article_version;
use crate::common::DbEdit;
use crate::common::DbLocalUser;
use crate::common::EditVersion;
use crate::common::{ApiConflict, DbArticle};
use crate::{
backend::{
database::{schema::conflict, IbisData},
error::MyResult,
federation::activities::submit_article_update,
utils::generate_article_version,
},
common::{ApiConflict, DbArticle, DbEdit, DbLocalUser, EditVersion},
};
use activitypub_federation::config::Data;
use diesel::ExpressionMethods;
use diesel::{
delete, insert_into, Identifiable, Insertable, QueryDsl, Queryable, RunQueryDsl, Selectable,
delete,
insert_into,
ExpressionMethods,
Identifiable,
Insertable,
QueryDsl,
Queryable,
RunQueryDsl,
Selectable,
};
use diffy::{apply, merge, Patch};
use serde::{Deserialize, Serialize};

16
src/backend/database/edit.rs
View file

@ -1,12 +1,14 @@
use crate::backend::database::schema::{edit, person};
use crate::backend::error::MyResult;
use crate::backend::IbisData;
use crate::common::{DbArticle, DbEdit};
use crate::common::{EditVersion, EditView};
use crate::{
backend::{
database::schema::{edit, person},
error::MyResult,
IbisData,
},
common::{DbArticle, DbEdit, EditVersion, EditView},
};
use activitypub_federation::fetch::object_id::ObjectId;
use chrono::{DateTime, Utc};
use diesel::ExpressionMethods;
use diesel::{insert_into, AsChangeset, Insertable, QueryDsl, RunQueryDsl};
use diesel::{insert_into, AsChangeset, ExpressionMethods, Insertable, QueryDsl, RunQueryDsl};
use diffy::create_patch;
use std::ops::DerefMut;

37
src/backend/database/instance.rs
View file

@ -1,16 +1,29 @@
use crate::backend::database::schema::{instance, instance_follow};
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::objects::articles_collection::DbArticleCollection;
use crate::common::{DbInstance, DbPerson, InstanceView};
use activitypub_federation::config::Data;
use activitypub_federation::fetch::collection_id::CollectionId;
use activitypub_federation::fetch::object_id::ObjectId;
use crate::{
backend::{
database::{
schema::{instance, instance_follow},
IbisData,
},
error::MyResult,
federation::objects::articles_collection::DbArticleCollection,
},
common::{DbInstance, DbPerson, InstanceView},
};
use activitypub_federation::{
config::Data,
fetch::{collection_id::CollectionId, object_id::ObjectId},
};
use chrono::{DateTime, Utc};
use diesel::ExpressionMethods;
use diesel::{insert_into, AsChangeset, Insertable, JoinOnDsl, QueryDsl, RunQueryDsl};
use std::fmt::Debug;
use std::ops::DerefMut;
use diesel::{
insert_into,
AsChangeset,
ExpressionMethods,
Insertable,
JoinOnDsl,
QueryDsl,
RunQueryDsl,
};
use std::{fmt::Debug, ops::DerefMut};
#[derive(Debug, Clone, Insertable, AsChangeset)]
#[diesel(table_name = instance, check_for_backend(diesel::pg::Pg))]

15
src/backend/database/mod.rs
View file

@ -1,11 +1,10 @@
use crate::backend::config::IbisConfig;
use crate::backend::database::schema::jwt_secret;
use crate::backend::error::MyResult;
use diesel::r2d2::ConnectionManager;
use diesel::r2d2::Pool;
use diesel::PgConnection;
use diesel::{QueryDsl, RunQueryDsl};
use crate::backend::{config::IbisConfig, database::schema::jwt_secret, error::MyResult};
use diesel::{
r2d2::{ConnectionManager, Pool},
PgConnection,
QueryDsl,
RunQueryDsl,
};
use std::ops::DerefMut;
pub mod article;

1
src/backend/database/schema.rs
View file

@ -9,6 +9,7 @@ diesel::table! {
ap_id -> Varchar,
instance_id -> Int4,
local -> Bool,
protected -> Bool,
}
}

40
src/backend/database/user.rs
View file

@ -1,18 +1,30 @@
use crate::backend::database::schema::{instance, instance_follow};
use crate::backend::database::schema::{local_user, person};
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::common::utils::http_protocol_str;
use crate::common::{DbInstance, DbLocalUser, DbPerson, LocalUserView};
use activitypub_federation::config::Data;
use activitypub_federation::fetch::object_id::ObjectId;
use activitypub_federation::http_signatures::generate_actor_keypair;
use bcrypt::hash;
use bcrypt::DEFAULT_COST;
use crate::{
backend::{
database::{
schema::{instance, instance_follow, local_user, person},
IbisData,
},
error::MyResult,
},
common::{utils::http_protocol_str, DbInstance, DbLocalUser, DbPerson, LocalUserView},
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
http_signatures::generate_actor_keypair,
};
use bcrypt::{hash, DEFAULT_COST};
use chrono::{DateTime, Local, Utc};
use diesel::{insert_into, AsChangeset, Insertable, RunQueryDsl};
use diesel::{ExpressionMethods, JoinOnDsl};
use diesel::{PgTextExpressionMethods, QueryDsl};
use diesel::{
insert_into,
AsChangeset,
ExpressionMethods,
Insertable,
JoinOnDsl,
PgTextExpressionMethods,
QueryDsl,
RunQueryDsl,
};
use std::ops::DerefMut;
#[derive(Debug, Clone, Insertable, AsChangeset)]

20
src/backend/federation/activities/accept.rs
View file

@ -1,11 +1,17 @@
use crate::backend::error::MyResult;
use crate::backend::federation::send_activity;
use crate::backend::utils::generate_activity_id;
use crate::backend::{database::IbisData, federation::activities::follow::Follow};
use crate::common::DbInstance;
use activitypub_federation::traits::Actor;
use crate::{
backend::{
database::IbisData,
error::MyResult,
federation::{activities::follow::Follow, send_activity},
utils::generate_activity_id,
},
common::DbInstance,
};
use activitypub_federation::{
config::Data, fetch::object_id::ObjectId, kinds::activity::AcceptType, traits::ActivityHandler,
config::Data,
fetch::object_id::ObjectId,
kinds::activity::AcceptType,
traits::{ActivityHandler, Actor},
};
use serde::{Deserialize, Serialize};
use url::Url;

17
src/backend/federation/activities/create_article.rs
View file

@ -1,13 +1,16 @@
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::objects::article::ApubArticle;
use crate::backend::utils::generate_activity_id;
use crate::common::DbArticle;
use crate::common::DbInstance;
use activitypub_federation::kinds::activity::CreateType;
use crate::{
backend::{
database::IbisData,
error::MyResult,
federation::objects::article::ApubArticle,
utils::generate_activity_id,
},
common::{DbArticle, DbInstance},
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
kinds::activity::CreateType,
protocol::helpers::deserialize_one_or_many,
traits::{ActivityHandler, Object},
};

16
src/backend/federation/activities/follow.rs
View file

@ -1,15 +1,17 @@
use crate::backend::error::MyResult;
use crate::backend::federation::send_activity;
use crate::backend::{
database::IbisData, federation::activities::accept::Accept, generate_activity_id,
use crate::{
backend::{
database::IbisData,
error::MyResult,
federation::{activities::accept::Accept, send_activity},
generate_activity_id,
},
common::{DbInstance, DbPerson},
};
use crate::common::DbInstance;
use crate::common::DbPerson;
use activitypub_federation::protocol::verification::verify_urls_match;
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
kinds::activity::FollowType,
protocol::verification::verify_urls_match,
traits::{ActivityHandler, Actor},
};
use serde::{Deserialize, Serialize};

19
src/backend/federation/activities/mod.rs
View file

@ -1,11 +1,14 @@
use crate::backend::database::edit::DbEditForm;
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::federation::activities::update_local_article::UpdateLocalArticle;
use crate::backend::federation::activities::update_remote_article::UpdateRemoteArticle;
use crate::common::DbInstance;
use crate::common::EditVersion;
use crate::common::{DbArticle, DbEdit};
use crate::{
backend::{
database::{edit::DbEditForm, IbisData},
error::Error,
federation::activities::{
update_local_article::UpdateLocalArticle,
update_remote_article::UpdateRemoteArticle,
},
},
common::{DbArticle, DbEdit, DbInstance, EditVersion},
};
use activitypub_federation::config::Data;
use chrono::Utc;

27
src/backend/federation/activities/reject.rs
View file

@ -1,17 +1,22 @@
use crate::backend::database::conflict::{DbConflict, DbConflictForm};
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::objects::edit::ApubEdit;
use crate::backend::utils::generate_activity_id;
use crate::common::DbInstance;
use crate::common::EditVersion;
use activitypub_federation::kinds::activity::RejectType;
use crate::{
backend::{
database::{
conflict::{DbConflict, DbConflictForm},
IbisData,
},
error::MyResult,
federation::{objects::edit::ApubEdit, send_activity},
utils::generate_activity_id,
},
common::{DbInstance, EditVersion},
};
use activitypub_federation::{
config::Data, fetch::object_id::ObjectId, protocol::helpers::deserialize_one_or_many,
config::Data,
fetch::object_id::ObjectId,
kinds::activity::RejectType,
protocol::helpers::deserialize_one_or_many,
traits::ActivityHandler,
};
use crate::backend::federation::send_activity;
use serde::{Deserialize, Serialize};
use url::Url;

18
src/backend/federation/activities/update_local_article.rs
View file

@ -1,14 +1,16 @@
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::objects::article::ApubArticle;
use crate::backend::utils::generate_activity_id;
use crate::common::DbArticle;
use crate::common::DbInstance;
use activitypub_federation::kinds::activity::UpdateType;
use crate::{
backend::{
database::IbisData,
error::MyResult,
federation::objects::article::ApubArticle,
utils::generate_activity_id,
},
common::{DbArticle, DbInstance},
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
kinds::activity::UpdateType,
protocol::helpers::deserialize_one_or_many,
traits::{ActivityHandler, Object},
};

27
src/backend/federation/activities/update_remote_article.rs
View file

@ -1,19 +1,20 @@
use crate::backend::database::IbisData;
use crate::backend::error::MyResult;
use crate::backend::federation::activities::reject::RejectEdit;
use crate::backend::federation::activities::update_local_article::UpdateLocalArticle;
use crate::backend::federation::objects::edit::ApubEdit;
use crate::backend::federation::send_activity;
use crate::backend::utils::generate_activity_id;
use crate::common::validation::can_edit_article;
use crate::common::DbArticle;
use crate::common::DbEdit;
use crate::common::DbInstance;
use activitypub_federation::kinds::activity::UpdateType;
use crate::{
backend::{
database::IbisData,
error::MyResult,
federation::{
activities::{reject::RejectEdit, update_local_article::UpdateLocalArticle},
objects::edit::ApubEdit,
send_activity,
},
utils::generate_activity_id,
},
common::{validation::can_edit_article, DbArticle, DbEdit, DbInstance},
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
kinds::activity::UpdateType,
protocol::helpers::deserialize_one_or_many,
traits::{ActivityHandler, Object},
};

15
src/backend/federation/mod.rs
View file

@ -1,10 +1,11 @@
use crate::backend::config::IbisConfig;
use crate::backend::database::IbisData;
use activitypub_federation::activity_queue::queue_activity;
use activitypub_federation::config::{Data, UrlVerifier};
use activitypub_federation::error::Error as ActivityPubError;
use activitypub_federation::protocol::context::WithContext;
use activitypub_federation::traits::{ActivityHandler, Actor};
use crate::backend::{config::IbisConfig, database::IbisData};
use activitypub_federation::{
activity_queue::queue_activity,
config::{Data, UrlVerifier},
error::Error as ActivityPubError,
protocol::context::WithContext,
traits::{ActivityHandler, Actor},
};
use async_trait::async_trait;
use serde::Serialize;
use std::fmt::Debug;

29
src/backend/federation/objects/article.rs
View file

@ -1,17 +1,17 @@
use crate::backend::database::article::DbArticleForm;
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::federation::objects::edits_collection::DbEditCollection;
use crate::common::DbArticle;
use crate::common::DbInstance;
use crate::common::EditVersion;
use activitypub_federation::config::Data;
use activitypub_federation::fetch::collection_id::CollectionId;
use activitypub_federation::kinds::object::ArticleType;
use activitypub_federation::kinds::public;
use activitypub_federation::protocol::verification::verify_domains_match;
use crate::{
backend::{
database::{article::DbArticleForm, IbisData},
error::Error,
federation::objects::edits_collection::DbEditCollection,
},
common::{DbArticle, DbInstance, EditVersion},
};
use activitypub_federation::{
fetch::object_id::ObjectId, protocol::helpers::deserialize_one_or_many, traits::Object,
config::Data,
fetch::{collection_id::CollectionId, object_id::ObjectId},
kinds::{object::ArticleType, public},
protocol::{helpers::deserialize_one_or_many, verification::verify_domains_match},
traits::Object,
};
use serde::{Deserialize, Serialize};
use url::Url;
@ -29,6 +29,7 @@ pub struct ApubArticle {
latest_version: EditVersion,
content: String,
name: String,
protected: bool,
}
#[async_trait::async_trait]
@ -56,6 +57,7 @@ impl Object for DbArticle {
latest_version: self.latest_edit_version(data)?,
content: self.text,
name: self.title,
protected: self.protected,
})
}
@ -76,6 +78,7 @@ impl Object for DbArticle {
ap_id: json.id,
local: false,
instance_id: instance.id,
protected: json.protected,
};
let article = DbArticle::create_or_update(form, data)?;

17
src/backend/federation/objects/articles_collection.rs
View file

@ -1,17 +1,14 @@
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::federation::objects::article::ApubArticle;
use crate::common::DbInstance;
use crate::common::DbArticle;
use activitypub_federation::kinds::collection::CollectionType;
use activitypub_federation::protocol::verification::verify_domains_match;
use crate::{
backend::{database::IbisData, error::Error, federation::objects::article::ApubArticle},
common::{DbArticle, DbInstance},
};
use activitypub_federation::{
config::Data,
kinds::collection::CollectionType,
protocol::verification::verify_domains_match,
traits::{Collection, Object},
};
use futures::future;
use futures::future::try_join_all;
use futures::{future, future::try_join_all};
use serde::{Deserialize, Serialize};
use url::Url;

23
src/backend/federation/objects/edit.rs
View file

@ -1,13 +1,16 @@
use crate::backend::database::edit::DbEditForm;
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::common::DbPerson;
use crate::common::EditVersion;
use crate::common::{DbArticle, DbEdit};
use activitypub_federation::config::Data;
use activitypub_federation::fetch::object_id::ObjectId;
use activitypub_federation::protocol::verification::verify_domains_match;
use activitypub_federation::traits::Object;
use crate::{
backend::{
database::{edit::DbEditForm, IbisData},
error::Error,
},
common::{DbArticle, DbEdit, DbPerson, EditVersion},
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
protocol::verification::verify_domains_match,
traits::Object,
};
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
use url::Url;

18
src/backend/federation/objects/edits_collection.rs
View file

@ -1,18 +1,14 @@
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::federation::objects::edit::ApubEdit;
use crate::common::DbArticle;
use crate::common::DbEdit;
use crate::common::DbInstance;
use activitypub_federation::kinds::collection::OrderedCollectionType;
use activitypub_federation::protocol::verification::verify_domains_match;
use crate::{
backend::{database::IbisData, error::Error, federation::objects::edit::ApubEdit},
common::{DbArticle, DbEdit, DbInstance},
};
use activitypub_federation::{
config::Data,
kinds::collection::OrderedCollectionType,
protocol::verification::verify_domains_match,
traits::{Collection, Object},
};
use futures::future;
use futures::future::try_join_all;
use futures::{future, future::try_join_all};
use serde::{Deserialize, Serialize};
use url::Url;

24
src/backend/federation/objects/instance.rs
View file

@ -1,19 +1,17 @@
use crate::backend::database::instance::DbInstanceForm;
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::error::MyResult;
use crate::backend::federation::objects::articles_collection::DbArticleCollection;
use crate::backend::federation::send_activity;
use crate::common::utils::extract_domain;
use crate::common::DbInstance;
use activitypub_federation::fetch::collection_id::CollectionId;
use activitypub_federation::kinds::actor::ServiceType;
use activitypub_federation::traits::ActivityHandler;
use crate::{
backend::{
database::{instance::DbInstanceForm, IbisData},
error::{Error, MyResult},
federation::{objects::articles_collection::DbArticleCollection, send_activity},
},
common::{utils::extract_domain, DbInstance},
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
fetch::{collection_id::CollectionId, object_id::ObjectId},
kinds::actor::ServiceType,
protocol::{public_key::PublicKey, verification::verify_domains_match},
traits::{Actor, Object},
traits::{ActivityHandler, Actor, Object},
};
use chrono::{DateTime, Local, Utc};
use serde::{Deserialize, Serialize};

13
src/backend/federation/objects/user.rs
View file

@ -1,11 +1,14 @@
use crate::backend::database::user::DbPersonForm;
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::common::DbPerson;
use activitypub_federation::kinds::actor::PersonType;
use crate::{
backend::{
database::{user::DbPersonForm, IbisData},
error::Error,
},
common::DbPerson,
};
use activitypub_federation::{
config::Data,
fetch::object_id::ObjectId,
kinds::actor::PersonType,
protocol::{public_key::PublicKey, verification::verify_domains_match},
traits::{Actor, Object},
};

67
src/backend/federation/routes.rs
View file

@ -1,33 +1,42 @@
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::error::MyResult;
use crate::backend::federation::activities::accept::Accept;
use crate::backend::federation::activities::create_article::CreateArticle;
use crate::backend::federation::activities::follow::Follow;
use crate::backend::federation::activities::reject::RejectEdit;
use crate::backend::federation::activities::update_local_article::UpdateLocalArticle;
use crate::backend::federation::activities::update_remote_article::UpdateRemoteArticle;
use crate::backend::federation::objects::article::ApubArticle;
use crate::backend::federation::objects::articles_collection::{
ArticleCollection, DbArticleCollection,
use crate::{
backend::{
database::IbisData,
error::{Error, MyResult},
federation::{
activities::{
accept::Accept,
create_article::CreateArticle,
follow::Follow,
reject::RejectEdit,
update_local_article::UpdateLocalArticle,
update_remote_article::UpdateRemoteArticle,
},
objects::{
article::ApubArticle,
articles_collection::{ArticleCollection, DbArticleCollection},
edits_collection::{ApubEditCollection, DbEditCollection},
instance::ApubInstance,
user::ApubUser,
},
},
},
common::{DbArticle, DbInstance, DbPerson},
};
use activitypub_federation::{
axum::{
inbox::{receive_activity, ActivityData},
json::FederationJson,
},
config::Data,
protocol::context::WithContext,
traits::{ActivityHandler, Actor, Collection, Object},
};
use axum::{
extract::Path,
response::IntoResponse,
routing::{get, post},
Router,
};
use crate::backend::federation::objects::edits_collection::{ApubEditCollection, DbEditCollection};
use crate::backend::federation::objects::instance::ApubInstance;
use crate::backend::federation::objects::user::ApubUser;
use crate::common::DbArticle;
use crate::common::DbInstance;
use crate::common::DbPerson;
use activitypub_federation::axum::inbox::{receive_activity, ActivityData};
use activitypub_federation::axum::json::FederationJson;
use activitypub_federation::config::Data;
use activitypub_federation::protocol::context::WithContext;
use activitypub_federation::traits::Actor;
use activitypub_federation::traits::Object;
use activitypub_federation::traits::{ActivityHandler, Collection};
use axum::extract::Path;
use axum::response::IntoResponse;
use axum::routing::{get, post};
use axum::Router;
use axum_macros::debug_handler;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};

74
src/backend/mod.rs
View file

@ -1,38 +1,45 @@
use crate::backend::config::IbisConfig;
use crate::backend::database::article::DbArticleForm;
use crate::backend::database::instance::DbInstanceForm;
use crate::backend::database::IbisData;
use crate::backend::error::Error;
use crate::backend::error::MyResult;
use crate::backend::federation::activities::submit_article_update;
use crate::backend::federation::routes::federation_routes;
use crate::backend::federation::VerifyUrlData;
use crate::backend::utils::generate_activity_id;
use crate::common::utils::http_protocol_str;
use crate::common::{DbArticle, DbInstance, DbPerson, EditVersion, MAIN_PAGE_NAME};
use crate::frontend::app::App;
use activitypub_federation::config::{Data, FederationConfig, FederationMiddleware};
use activitypub_federation::fetch::collection_id::CollectionId;
use activitypub_federation::fetch::object_id::ObjectId;
use activitypub_federation::http_signatures::generate_actor_keypair;
use crate::{
backend::{
config::IbisConfig,
database::{article::DbArticleForm, instance::DbInstanceForm, IbisData},
error::{Error, MyResult},
federation::{activities::submit_article_update, routes::federation_routes, VerifyUrlData},
utils::generate_activity_id,
},
common::{
utils::http_protocol_str,
DbArticle,
DbInstance,
DbPerson,
EditVersion,
MAIN_PAGE_NAME,
},
frontend::app::App,
};
use activitypub_federation::{
config::{Data, FederationConfig, FederationMiddleware},
fetch::{collection_id::CollectionId, object_id::ObjectId},
http_signatures::generate_actor_keypair,
};
use api::api_routes;
use axum::debug_handler;
use axum::headers::HeaderMap;
use axum::http::{HeaderValue, Request};
use axum::response::IntoResponse;
use axum::routing::get;
use axum::Server;
use axum::ServiceExt;
use axum::{middleware::Next, response::Response, Router};
use axum::{
debug_handler,
headers::HeaderMap,
http::{HeaderValue, Request},
middleware::Next,
response::{IntoResponse, Response},
routing::get,
Router,
Server,
ServiceExt,
};
use chrono::Local;
use diesel::r2d2::ConnectionManager;
use diesel::r2d2::Pool;
use diesel::PgConnection;
use diesel_migrations::embed_migrations;
use diesel_migrations::EmbeddedMigrations;
use diesel_migrations::MigrationHarness;
use leptos::leptos_config::get_config_from_str;
use leptos::*;
use diesel::{
r2d2::{ConnectionManager, Pool},
PgConnection,
};
use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
use leptos::{leptos_config::get_config_from_str, *};
use leptos_axum::{generate_route_list, LeptosRoutes};
use log::info;
use tower::Layer;
@ -179,6 +186,7 @@ async fn setup(data: &Data<IbisData>) -> Result<(), Error> {
))?,
instance_id: instance.id,
local: true,
protected: true,
};
let article = DbArticle::create(form, data)?;
// also create an article so its included in most recently edited list

12
src/backend/utils.rs
View file

@ -1,14 +1,12 @@
use crate::backend::error::MyResult;
use crate::common::EditView;
use crate::common::{utils, EditVersion};
use activitypub_federation::fetch::object_id::ObjectId;
use activitypub_federation::traits::Object;
use crate::{
backend::error::MyResult,
common::{utils, utils::extract_domain, EditVersion, EditView},
};
use activitypub_federation::{fetch::object_id::ObjectId, traits::Object};
use anyhow::anyhow;
use diffy::{apply, Patch};
use rand::{distributions::Alphanumeric, thread_rng, Rng};
use serde::Deserialize;
use crate::common::utils::extract_domain;
use url::{ParseError, Url};
pub fn generate_activity_id<T>(for_url: &ObjectId<T>) -> Result<Url, ParseError>

25
src/common/mod.rs
View file

@ -20,14 +20,14 @@ pub const MAIN_PAGE_NAME: &str = "Main_Page";
/// Should be an enum Title/Id but fails due to https://github.com/nox/serde_urlencoded/issues/66
#[derive(Deserialize, Serialize, Clone, Debug)]
pub struct GetArticleData {
pub struct GetArticleForm {
pub title: Option<String>,
pub domain: Option<String>,
pub id: Option<i32>,
}
#[derive(Deserialize, Serialize, Clone)]
pub struct ListArticlesData {
pub struct ListArticlesForm {
pub only_local: Option<bool>,
}
@ -53,6 +53,7 @@ pub struct DbArticle {
pub ap_id: String,
pub instance_id: i32,
pub local: bool,
pub protected: bool,
}
/// Represents a single change to the article.
@ -115,13 +116,13 @@ impl Default for EditVersion {
}
#[derive(Deserialize, Serialize, Clone)]
pub struct RegisterUserData {
pub struct RegisterUserForm {
pub username: String,
pub password: String,
}
#[derive(Deserialize, Serialize)]
pub struct LoginUserData {
pub struct LoginUserForm {
pub username: String,
pub password: String,
}
@ -175,14 +176,14 @@ impl DbPerson {
}
#[derive(Deserialize, Serialize)]
pub struct CreateArticleData {
pub struct CreateArticleForm {
pub title: String,
pub text: String,
pub summary: String,
}
#[derive(Deserialize, Serialize, Debug)]
pub struct EditArticleData {
pub struct EditArticleForm {
/// Id of the article to edit
pub article_id: i32,
/// Full, new text of the article. A diff against `previous_version` is generated on the backend
@ -197,8 +198,14 @@ pub struct EditArticleData {
pub resolve_conflict_id: Option<i32>,
}
#[derive(Deserialize, Serialize, Debug)]
pub struct ProtectArticleForm {
pub article_id: i32,
pub protected: bool,
}
#[derive(Deserialize, Serialize)]
pub struct ForkArticleData {
pub struct ForkArticleForm {
pub article_id: i32,
pub new_title: String,
}
@ -209,7 +216,7 @@ pub struct FollowInstance {
}
#[derive(Deserialize, Serialize, Clone)]
pub struct SearchArticleData {
pub struct SearchArticleForm {
pub query: String,
}
@ -269,7 +276,7 @@ pub struct InstanceView {
}
#[derive(Deserialize, Serialize, Clone, Debug)]
pub struct GetUserData {
pub struct GetUserForm {
pub name: String,
pub domain: Option<String>,
}

14
src/common/validation.rs
View file

@ -1,14 +1,14 @@
use crate::common::{DbArticle, MAIN_PAGE_NAME};
use anyhow::anyhow;
use anyhow::Result;
use crate::common::DbArticle;
use anyhow::{anyhow, Result};
pub fn can_edit_article(article: &DbArticle, is_admin: bool) -> Result<()> {
if article.title == MAIN_PAGE_NAME {
let err = anyhow!("Article is protected, only admins on origin instance can edit");
if article.protected {
if !article.local {
return Err(anyhow!("Cannot edit main page of remote instance"));
return Err(err);
}
if article.local && !is_admin {
return Err(anyhow!("Only admin can edit main page"));
if !is_admin {
return Err(err);
}
}
Ok(())

117
src/database/schema.rs Normal file
View file

@ -0,0 +1,117 @@
// @generated automatically by Diesel CLI.
diesel::table! {
article (id) {
id -> Int4,
title -> Text,
text -> Text,
#[max_length = 255]
ap_id -> Varchar,
instance_id -> Int4,
local -> Bool,
protected -> Bool,
}
}
diesel::table! {
conflict (id) {
id -> Int4,
hash -> Uuid,
diff -> Text,
summary -> Text,
creator_id -> Int4,
article_id -> Int4,
previous_version_id -> Uuid,
}
}
diesel::table! {
edit (id) {
id -> Int4,
creator_id -> Int4,
hash -> Uuid,
#[max_length = 255]
ap_id -> Varchar,
diff -> Text,
summary -> Text,
article_id -> Int4,
previous_version_id -> Uuid,
created -> Timestamptz,
}
}
diesel::table! {
instance (id) {
id -> Int4,
domain -> Text,
#[max_length = 255]
ap_id -> Varchar,
description -> Nullable<Text>,
inbox_url -> Text,
#[max_length = 255]
articles_url -> Varchar,
public_key -> Text,
private_key -> Nullable<Text>,
last_refreshed_at -> Timestamptz,
local -> Bool,
}
}
diesel::table! {
instance_follow (id) {
id -> Int4,
instance_id -> Int4,
follower_id -> Int4,
pending -> Bool,
}
}
diesel::table! {
jwt_secret (id) {
id -> Int4,
secret -> Varchar,
}
}
diesel::table! {
local_user (id) {
id -> Int4,
password_encrypted -> Text,
person_id -> Int4,
admin -> Bool,
}
}
diesel::table! {
person (id) {
id -> Int4,
username -> Text,
#[max_length = 255]
ap_id -> Varchar,
inbox_url -> Text,
public_key -> Text,
private_key -> Nullable<Text>,
last_refreshed_at -> Timestamptz,
local -> Bool,
}
}
diesel::joinable!(article -> instance (instance_id));
diesel::joinable!(conflict -> article (article_id));
diesel::joinable!(conflict -> local_user (creator_id));
diesel::joinable!(edit -> article (article_id));
diesel::joinable!(edit -> person (creator_id));
diesel::joinable!(instance_follow -> instance (instance_id));
diesel::joinable!(instance_follow -> person (follower_id));
diesel::joinable!(local_user -> person (person_id));
diesel::allow_tables_to_appear_in_same_query!(
article,
conflict,
edit,
instance,
instance_follow,
jwt_secret,
local_user,
person,
);

63
src/frontend/api.rs
View file

@ -1,11 +1,28 @@
use crate::common::utils::http_protocol_str;
use crate::common::{ApiConflict, ListArticlesData};
use crate::common::{ArticleView, LoginUserData, RegisterUserData};
use crate::common::{CreateArticleData, EditArticleData, ForkArticleData, LocalUserView};
use crate::common::{DbArticle, GetArticleData};
use crate::common::{DbInstance, FollowInstance, InstanceView, SearchArticleData};
use crate::common::{DbPerson, GetUserData, ResolveObject};
use crate::frontend::error::MyResult;
use crate::{
common::{
utils::http_protocol_str,
ApiConflict,
ArticleView,
CreateArticleForm,
DbArticle,
DbInstance,
DbPerson,
EditArticleForm,
FollowInstance,
ForkArticleForm,
GetArticleForm,
GetUserForm,
InstanceView,
ListArticlesForm,
LocalUserView,
LoginUserForm,
ProtectArticleForm,
RegisterUserForm,
ResolveObject,
SearchArticleForm,
},
frontend::error::MyResult,
};
use anyhow::anyhow;
use reqwest::{Client, RequestBuilder, StatusCode};
use serde::{Deserialize, Serialize};
@ -34,15 +51,15 @@ impl ApiClient {
handle_json_res::<T>(req).await
}
pub async fn get_article(&self, data: GetArticleData) -> MyResult<ArticleView> {
pub async fn get_article(&self, data: GetArticleForm) -> MyResult<ArticleView> {
self.get_query("/api/v1/article", Some(data)).await
}
pub async fn list_articles(&self, data: ListArticlesData) -> MyResult<Vec<DbArticle>> {
pub async fn list_articles(&self, data: ListArticlesForm) -> MyResult<Vec<DbArticle>> {
self.get_query("/api/v1/article/list", Some(data)).await
}
pub async fn register(&self, register_form: RegisterUserData) -> MyResult<LocalUserView> {
pub async fn register(&self, register_form: RegisterUserForm) -> MyResult<LocalUserView> {
let req = self
.client
.post(self.request_endpoint("/api/v1/account/register"))
@ -50,7 +67,7 @@ impl ApiClient {
handle_json_res::<LocalUserView>(req).await
}
pub async fn login(&self, login_form: LoginUserData) -> MyResult<LocalUserView> {
pub async fn login(&self, login_form: LoginUserForm) -> MyResult<LocalUserView> {
let req = self
.client
.post(self.request_endpoint("/api/v1/account/login"))
@ -58,7 +75,7 @@ impl ApiClient {
handle_json_res::<LocalUserView>(req).await
}
pub async fn create_article(&self, data: &CreateArticleData) -> MyResult<ArticleView> {
pub async fn create_article(&self, data: &CreateArticleForm) -> MyResult<ArticleView> {
let req = self
.client
.post(self.request_endpoint("/api/v1/article"))
@ -68,7 +85,7 @@ impl ApiClient {
pub async fn edit_article_with_conflict(
&self,
edit_form: &EditArticleData,
edit_form: &EditArticleForm,
) -> MyResult<Option<ApiConflict>> {
let req = self
.client
@ -77,11 +94,11 @@ impl ApiClient {
handle_json_res(req).await
}
pub async fn edit_article(&self, edit_form: &EditArticleData) -> MyResult<ArticleView> {
pub async fn edit_article(&self, edit_form: &EditArticleForm) -> MyResult<ArticleView> {
let edit_res = self.edit_article_with_conflict(edit_form).await?;
assert!(edit_res.is_none());
self.get_article(GetArticleData {
self.get_article(GetArticleForm {
title: None,
domain: None,
id: Some(edit_form.article_id),
@ -89,7 +106,7 @@ impl ApiClient {
.await
}
pub async fn search(&self, search_form: &SearchArticleData) -> MyResult<Vec<DbArticle>> {
pub async fn search(&self, search_form: &SearchArticleForm) -> MyResult<Vec<DbArticle>> {
self.get_query("/api/v1/search", Some(search_form)).await
}
@ -147,7 +164,7 @@ impl ApiClient {
Ok(())
}
pub async fn fork_article(&self, form: &ForkArticleData) -> MyResult<ArticleView> {
pub async fn fork_article(&self, form: &ForkArticleForm) -> MyResult<ArticleView> {
let req = self
.client
.post(self.request_endpoint("/api/v1/article/fork"))
@ -155,6 +172,14 @@ impl ApiClient {
Ok(handle_json_res(req).await.unwrap())
}
pub async fn protect_article(&self, params: &ProtectArticleForm) -> MyResult<DbArticle> {
let req = self
.client
.post(self.request_endpoint("/api/v1/article/protect"))
.form(params);
handle_json_res(req).await
}
pub async fn get_conflicts(&self) -> MyResult<Vec<ApiConflict>> {
let req = self
.client
@ -173,7 +198,7 @@ impl ApiClient {
self.get_query("/api/v1/instance/resolve", Some(resolve_object))
.await
}
pub async fn get_user(&self, data: GetUserData) -> MyResult<DbPerson> {
pub async fn get_user(&self, data: GetUserForm) -> MyResult<DbPerson> {
self.get_query("/api/v1/user", Some(data)).await
}

65
src/frontend/app.rs
View file

@ -1,29 +1,44 @@
use crate::common::LocalUserView;
use crate::frontend::api::ApiClient;
use crate::frontend::backend_hostname;
use crate::frontend::components::nav::Nav;
use crate::frontend::pages::article::actions::ArticleActions;
use crate::frontend::pages::article::create::CreateArticle;
use crate::frontend::pages::article::edit::EditArticle;
use crate::frontend::pages::article::history::ArticleHistory;
use crate::frontend::pages::article::list::ListArticles;
use crate::frontend::pages::article::read::ReadArticle;
use crate::frontend::pages::conflicts::Conflicts;
use crate::frontend::pages::diff::EditDiff;
use crate::frontend::pages::instance_details::InstanceDetails;
use crate::frontend::pages::login::Login;
use crate::frontend::pages::register::Register;
use crate::frontend::pages::search::Search;
use crate::frontend::pages::user_profile::UserProfile;
use leptos::{
component, create_local_resource, create_rw_signal, expect_context, provide_context,
use_context, view, IntoView, RwSignal, SignalGet, SignalGetUntracked, SignalUpdate,
use crate::{
common::LocalUserView,
frontend::{
api::ApiClient,
backend_hostname,
components::nav::Nav,
pages::{
article::{
actions::ArticleActions,
create::CreateArticle,
edit::EditArticle,
history::ArticleHistory,
list::ListArticles,
read::ReadArticle,
},
conflicts::Conflicts,
diff::EditDiff,
instance_details::InstanceDetails,
login::Login,
register::Register,
search::Search,
user_profile::UserProfile,
},
},
};
use leptos_meta::provide_meta_context;
use leptos_meta::*;
use leptos_router::Route;
use leptos_router::Router;
use leptos_router::Routes;
use leptos::{
component,
create_local_resource,
create_rw_signal,
expect_context,
provide_context,
use_context,
view,
IntoView,
RwSignal,
SignalGet,
SignalGetUntracked,
SignalUpdate,
};
use leptos_meta::{provide_meta_context, *};
use leptos_router::{Route, Router, Routes};
use reqwest::Client;
// https://book.leptos.dev/15_global_state.html

12
src/frontend/components/article_nav.rs
View file

@ -1,7 +1,7 @@
use crate::common::validation::can_edit_article;
use crate::common::ArticleView;
use crate::frontend::app::GlobalState;
use crate::frontend::article_link;
use crate::{
common::{validation::can_edit_article, ArticleView},
frontend::{app::GlobalState, article_link},
};
use leptos::*;
use leptos_router::*;
@ -13,6 +13,7 @@ pub fn ArticleNav(article: Resource<Option<String>, ArticleView>) -> impl IntoVi
{move || article.get().map(|article| {
let article_link = article_link(&article.article);
let article_link_ = article_link.clone();
let protected = article.article.protected;
view!{
<nav class="inner">
<A href=article_link.clone()>"Read"</A>
@ -26,6 +27,9 @@ pub fn ArticleNav(article: Resource<Option<String>, ArticleView>) -> impl IntoVi
<Show when=move || global_state.with(|state| state.my_profile.is_some())>
<A href={format!("{article_link_}/actions")}>"Actions"</A>
</Show>
<Show when=move || protected>
<span title="Article can only be edited by local admins">"Protected"</span>
</Show>
</nav>
}})}
</Suspense>

3
src/frontend/components/nav.rs
View file

@ -1,6 +1,5 @@
use crate::frontend::app::GlobalState;
use leptos::*;
use leptos::{component, use_context, view, IntoView, RwSignal, SignalWith};
use leptos::{component, use_context, view, IntoView, RwSignal, SignalWith, *};
use leptos_router::*;
#[component]

9
src/frontend/markdown.rs
View file

@ -1,6 +1,11 @@
use crate::frontend::backend_hostname;
use markdown_it::parser::inline::{InlineRule, InlineState};
use markdown_it::{MarkdownIt, Node, NodeValue, Renderer};
use markdown_it::{
parser::inline::{InlineRule, InlineState},
MarkdownIt,
Node,
NodeValue,
Renderer,
};
pub fn markdown_parser() -> MarkdownIt {
let mut parser = MarkdownIt::new();

3
src/frontend/mod.rs
View file

@ -1,5 +1,4 @@
use crate::common::utils::extract_domain;
use crate::common::{DbArticle, DbPerson};
use crate::common::{utils::extract_domain, DbArticle, DbPerson};
use leptos::*;
pub mod api;

20
src/frontend/pages/article/actions.rs
View file

@ -1,10 +1,14 @@
use crate::common::ForkArticleData;
use crate::frontend::app::GlobalState;
use crate::frontend::article_link;
use crate::frontend::article_title;
use crate::frontend::components::article_nav::ArticleNav;
use crate::frontend::pages::article_resource;
use crate::frontend::DbArticle;
use crate::{
common::ForkArticleForm,
frontend::{
app::GlobalState,
article_link,
article_title,
components::article_nav::ArticleNav,
pages::article_resource,
DbArticle,
},
};
use leptos::*;
use leptos_router::Redirect;
@ -15,7 +19,7 @@ pub fn ArticleActions() -> impl IntoView {
let (fork_response, set_fork_response) = create_signal(Option::<DbArticle>::None);
let (error, set_error) = create_signal(None::<String>);
let fork_action = create_action(move |(article_id, new_title): &(i32, String)| {
let params = ForkArticleData {
let params = ForkArticleForm {
article_id: *article_id,
new_title: new_title.to_string(),
};

5
src/frontend/pages/article/create.rs
View file

@ -1,5 +1,4 @@
use crate::common::CreateArticleData;
use crate::frontend::app::GlobalState;
use crate::{common::CreateArticleForm, frontend::app::GlobalState};
use leptos::*;
use leptos_router::Redirect;
@ -18,7 +17,7 @@ pub fn CreateArticle() -> impl IntoView {
let text = text.clone();
let summary = summary.clone();
async move {
let form = CreateArticleData {
let form = CreateArticleForm {
title,
text,
summary,

16
src/frontend/pages/article/edit.rs
View file

@ -1,8 +1,12 @@
use crate::common::{ApiConflict, ArticleView, EditArticleData};
use crate::frontend::app::GlobalState;
use crate::frontend::article_title;
use crate::frontend::components::article_nav::ArticleNav;
use crate::frontend::pages::article_resource;
use crate::{
common::{ApiConflict, ArticleView, EditArticleForm},
frontend::{
app::GlobalState,
article_title,
components::article_nav::ArticleNav,
pages::article_resource,
},
};
use leptos::*;
use leptos_router::use_params_map;
@ -65,7 +69,7 @@ pub fn EditArticle() -> impl IntoView {
};
async move {
set_edit_error.update(|e| *e = None);
let form = EditArticleData {
let form = EditArticleForm {
article_id: article.article.id,
new_text,
summary,

9
src/frontend/pages/article/history.rs
View file

@ -1,6 +1,9 @@
use crate::frontend::components::article_nav::ArticleNav;
use crate::frontend::pages::article_resource;
use crate::frontend::{article_title, user_link};
use crate::frontend::{
article_title,
components::article_nav::ArticleNav,
pages::article_resource,
user_link,
};
use leptos::*;
#[component]

9
src/frontend/pages/article/list.rs
View file

@ -1,6 +1,7 @@
use crate::common::ListArticlesData;
use crate::frontend::app::GlobalState;
use crate::frontend::{article_link, article_title};
use crate::{
common::ListArticlesForm,
frontend::{app::GlobalState, article_link, article_title},
};
use leptos::*;
use web_sys::wasm_bindgen::JsCast;
@ -11,7 +12,7 @@ pub fn ListArticles() -> impl IntoView {
move || only_local.get(),
|only_local| async move {
GlobalState::api_client()
.list_articles(ListArticlesData {
.list_articles(ListArticlesForm {
only_local: Some(only_local),
})
.await

10
src/frontend/pages/article/read.rs
View file

@ -1,7 +1,9 @@
use crate::frontend::article_title;
use crate::frontend::components::article_nav::ArticleNav;
use crate::frontend::markdown::markdown_parser;
use crate::frontend::pages::article_resource;
use crate::frontend::{
article_title,
components::article_nav::ArticleNav,
markdown::markdown_parser,
pages::article_resource,
};
use leptos::*;
#[component]

4
src/frontend/pages/conflicts.rs
View file

@ -1,6 +1,4 @@
use crate::frontend::app::GlobalState;
use crate::frontend::article_link;
use crate::frontend::article_title;
use crate::frontend::{app::GlobalState, article_link, article_title};
use leptos::*;
#[component]

4
src/frontend/pages/diff.rs
View file

@ -1,6 +1,4 @@
use crate::frontend::components::article_nav::ArticleNav;
use crate::frontend::pages::article_resource;
use crate::frontend::user_link;
use crate::frontend::{components::article_nav::ArticleNav, pages::article_resource, user_link};
use leptos::*;
use leptos_router::*;

7
src/frontend/pages/instance_details.rs
View file

@ -1,6 +1,7 @@
use crate::common::utils::http_protocol_str;
use crate::common::{DbInstance, FollowInstance};
use crate::frontend::app::GlobalState;
use crate::{
common::{utils::http_protocol_str, DbInstance, FollowInstance},
frontend::app::GlobalState,
};
use leptos::*;
use leptos_router::use_params_map;
use url::Url;

9
src/frontend/pages/login.rs
View file

@ -1,6 +1,7 @@
use crate::common::LoginUserData;
use crate::frontend::app::GlobalState;
use crate::frontend::components::credentials::*;
use crate::{
common::LoginUserForm,
frontend::{app::GlobalState, components::credentials::*},
};
use leptos::*;
use leptos_router::Redirect;
@ -13,7 +14,7 @@ pub fn Login() -> impl IntoView {
let login_action = create_action(move |(email, password): &(String, String)| {
let username = email.to_string();
let password = password.to_string();
let credentials = LoginUserData { username, password };
let credentials = LoginUserForm { username, password };
async move {
set_wait_for_response.update(|w| *w = true);
let result = GlobalState::api_client().login(credentials).await;

8
src/frontend/pages/mod.rs
View file

@ -1,5 +1,7 @@
use crate::common::{ArticleView, GetArticleData, MAIN_PAGE_NAME};
use crate::frontend::app::GlobalState;
use crate::{
common::{ArticleView, GetArticleForm, MAIN_PAGE_NAME},
frontend::app::GlobalState,
};
use leptos::{create_resource, Resource, SignalGet};
use leptos_router::use_params_map;
@ -23,7 +25,7 @@ fn article_resource() -> Resource<Option<String>, ArticleView> {
domain = Some(domain_.to_string());
}
GlobalState::api_client()
.get_article(GetArticleData {
.get_article(GetArticleForm {
title: Some(title),
domain,
id: None,

10
src/frontend/pages/register.rs
View file

@ -1,7 +1,7 @@
use crate::common::{LocalUserView, RegisterUserData};
use crate::frontend::app::GlobalState;
use crate::frontend::components::credentials::*;
use crate::frontend::error::MyResult;
use crate::{
common::{LocalUserView, RegisterUserForm},
frontend::{app::GlobalState, components::credentials::*, error::MyResult},
};
use leptos::{logging::log, *};
#[component]
@ -13,7 +13,7 @@ pub fn Register() -> impl IntoView {
let register_action = create_action(move |(email, password): &(String, String)| {
let username = email.to_string();
let password = password.to_string();
let credentials = RegisterUserData { username, password };
let credentials = RegisterUserForm { username, password };
log!("Try to register new account for {}", credentials.username);
async move {
set_wait_for_response.update(|w| *w = true);

9
src/frontend/pages/search.rs
View file

@ -1,6 +1,7 @@
use crate::common::{DbArticle, DbInstance, SearchArticleData};
use crate::frontend::app::GlobalState;
use crate::frontend::{article_link, article_title};
use crate::{
common::{DbArticle, DbInstance, SearchArticleForm},
frontend::{app::GlobalState, article_link, article_title},
};
use leptos::*;
use leptos_router::use_query_map;
use serde::{Deserialize, Serialize};
@ -28,7 +29,7 @@ pub fn Search() -> impl IntoView {
let mut search_results = SearchResults::default();
let api_client = GlobalState::api_client();
let url = Url::parse(&query);
let search_data = SearchArticleData { query };
let search_data = SearchArticleForm { query };
let search = api_client.search(&search_data);
match search.await {

9
src/frontend/pages/user_profile.rs
View file

@ -1,6 +1,7 @@
use crate::common::{DbPerson, GetUserData};
use crate::frontend::app::GlobalState;
use crate::frontend::user_title;
use crate::{
common::{DbPerson, GetUserForm},
frontend::{app::GlobalState, user_title},
};
use leptos::*;
use leptos_router::use_params_map;
@ -16,7 +17,7 @@ pub fn UserProfile() -> impl IntoView {
name = title_.to_string();
domain = Some(domain_.to_string());
}
let params = GetUserData { name, domain };
let params = GetUserForm { name, domain };
GlobalState::api_client().get_user(params).await.unwrap()
});

3
src/main.rs
View file

@ -23,8 +23,7 @@ pub async fn main() -> ibis_lib::backend::error::MyResult<()> {
#[cfg(not(feature = "ssr"))]
fn main() {
use ibis_lib::frontend::app::App;
use leptos::mount_to_body;
use leptos::view;
use leptos::{mount_to_body, view};
_ = console_log::init_with_level(log::Level::Debug);
console_error_panic_hook::set_once();

35
tests/common.rs
View file

@ -1,19 +1,26 @@
#![allow(clippy::unwrap_used)]
use ibis_lib::backend::config::{IbisConfig, IbisConfigDatabase, IbisConfigFederation};
use ibis_lib::backend::start;
use ibis_lib::common::RegisterUserData;
use ibis_lib::frontend::api::ApiClient;
use ibis_lib::frontend::error::MyResult;
use ibis_lib::{
backend::{
config::{IbisConfig, IbisConfigDatabase, IbisConfigFederation},
start,
},
common::RegisterUserForm,
frontend::{api::ApiClient, error::MyResult},
};
use reqwest::ClientBuilder;
use std::env::current_dir;
use std::fs::{create_dir_all, remove_dir_all};
use std::ops::Deref;
use std::process::{Command, Stdio};
use std::sync::atomic::{AtomicI32, Ordering};
use std::sync::Once;
use std::thread::{sleep, spawn};
use std::time::Duration;
use std::{
env::current_dir,
fs::{create_dir_all, remove_dir_all},
ops::Deref,
process::{Command, Stdio},
sync::{
atomic::{AtomicI32, Ordering},
Once,
},
thread::{sleep, spawn},
time::Duration,
};
use tokio::task::JoinHandle;
use tracing::log::LevelFilter;
@ -128,7 +135,7 @@ impl IbisInstance {
});
// wait a moment for the backend to start
tokio::time::sleep(Duration::from_millis(5000)).await;
let form = RegisterUserData {
let form = RegisterUserForm {
username: username.to_string(),
password: "hunter2".to_string(),
};

141
tests/test.rs
View file

@ -5,13 +5,23 @@ extern crate ibis_lib;
mod common;
use crate::common::{TestData, TEST_ARTICLE_DEFAULT_TEXT};
use ibis_lib::common::utils::extract_domain;
use ibis_lib::common::{
ArticleView, EditArticleData, ForkArticleData, GetArticleData, GetUserData, ListArticlesData,
use ibis_lib::{
common::{
utils::extract_domain,
ArticleView,
CreateArticleForm,
EditArticleForm,
ForkArticleForm,
GetArticleForm,
GetUserForm,
ListArticlesForm,
LoginUserForm,
ProtectArticleForm,
RegisterUserForm,
SearchArticleForm,
},
frontend::error::MyResult,
};
use ibis_lib::common::{CreateArticleData, SearchArticleData};
use ibis_lib::common::{LoginUserData, RegisterUserData};
use ibis_lib::frontend::error::MyResult;
use pretty_assertions::{assert_eq, assert_ne};
use url::Url;
@ -20,7 +30,7 @@ async fn test_create_read_and_edit_local_article() -> MyResult<()> {
let data = TestData::start().await;
// create article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -30,7 +40,7 @@ async fn test_create_read_and_edit_local_article() -> MyResult<()> {
assert!(create_res.article.local);
// now article can be read
let get_article_data = GetArticleData {
let get_article_data = GetArticleForm {
title: Some(create_res.article.title.clone()),
domain: None,
id: None,
@ -45,7 +55,7 @@ async fn test_create_read_and_edit_local_article() -> MyResult<()> {
assert!(not_found.is_err());
// edit article
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "Lorem Ipsum 2\n".to_string(),
summary: "summary".to_string(),
@ -57,7 +67,7 @@ async fn test_create_read_and_edit_local_article() -> MyResult<()> {
assert_eq!(2, edit_res.edits.len());
assert_eq!(edit_form.summary, edit_res.edits[1].edit.summary);
let search_form = SearchArticleData {
let search_form = SearchArticleForm {
query: create_form.title.clone(),
};
let search_res = data.alpha.search(&search_form).await?;
@ -66,7 +76,7 @@ async fn test_create_read_and_edit_local_article() -> MyResult<()> {
let list_articles = data
.alpha
.list_articles(ListArticlesData {
.list_articles(ListArticlesForm {
only_local: Some(false),
})
.await?;
@ -81,7 +91,7 @@ async fn test_create_duplicate_article() -> MyResult<()> {
let data = TestData::start().await;
// create article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -127,7 +137,7 @@ async fn test_synchronize_articles() -> MyResult<()> {
let data = TestData::start().await;
// create article on alpha
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -138,7 +148,7 @@ async fn test_synchronize_articles() -> MyResult<()> {
assert!(create_res.article.local);
// edit the article
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "Lorem Ipsum 2\n".to_string(),
summary: "summary".to_string(),
@ -153,7 +163,7 @@ async fn test_synchronize_articles() -> MyResult<()> {
.resolve_instance(Url::parse(&format!("http://{}", &data.alpha.hostname))?)
.await?;
let mut get_article_data = GetArticleData {
let mut get_article_data = GetArticleForm {
title: Some(create_res.article.title),
domain: None,
id: None,
@ -185,7 +195,7 @@ async fn test_edit_local_article() -> MyResult<()> {
.await?;
// create new article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -195,7 +205,7 @@ async fn test_edit_local_article() -> MyResult<()> {
assert!(create_res.article.local);
// article should be federated to alpha
let get_article_data = GetArticleData {
let get_article_data = GetArticleForm {
title: Some(create_res.article.title.to_string()),
domain: Some(beta_instance.domain),
id: None,
@ -207,7 +217,7 @@ async fn test_edit_local_article() -> MyResult<()> {
assert_eq!(create_res.article.text, get_res.article.text);
// edit the article
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "Lorem Ipsum 2\n".to_string(),
summary: "summary".to_string(),
@ -246,7 +256,7 @@ async fn test_edit_remote_article() -> MyResult<()> {
.await?;
// create new article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -256,7 +266,7 @@ async fn test_edit_remote_article() -> MyResult<()> {
assert!(create_res.article.local);
// article should be federated to alpha and gamma
let get_article_data_alpha = GetArticleData {
let get_article_data_alpha = GetArticleForm {
title: Some(create_res.article.title.to_string()),
domain: Some(beta_id_on_alpha.domain),
id: None,
@ -269,7 +279,7 @@ async fn test_edit_remote_article() -> MyResult<()> {
assert_eq!(1, get_res.edits.len());
assert!(!get_res.article.local);
let get_article_data_gamma = GetArticleData {
let get_article_data_gamma = GetArticleForm {
title: Some(create_res.article.title.to_string()),
domain: Some(beta_id_on_gamma.domain),
id: None,
@ -281,7 +291,7 @@ async fn test_edit_remote_article() -> MyResult<()> {
assert_eq!(create_res.article.title, get_res.article.title);
assert_eq!(create_res.article.text, get_res.article.text);
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: get_res.article.id,
new_text: "Lorem Ipsum 2\n".to_string(),
summary: "summary".to_string(),
@ -317,7 +327,7 @@ async fn test_local_edit_conflict() -> MyResult<()> {
let data = TestData::start().await;
// create new article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -327,7 +337,7 @@ async fn test_local_edit_conflict() -> MyResult<()> {
assert!(create_res.article.local);
// one user edits article
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "Lorem Ipsum\n".to_string(),
summary: "summary".to_string(),
@ -339,7 +349,7 @@ async fn test_local_edit_conflict() -> MyResult<()> {
assert_eq!(2, edit_res.edits.len());
// another user edits article, without being aware of previous edit
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "Ipsum Lorem\n".to_string(),
summary: "summary".to_string(),
@ -357,7 +367,7 @@ async fn test_local_edit_conflict() -> MyResult<()> {
assert_eq!(1, conflicts.len());
assert_eq!(conflicts[0], edit_res);
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "Lorem Ipsum and Ipsum Lorem\n".to_string(),
summary: "summary".to_string(),
@ -383,7 +393,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
.await?;
// create new article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -400,7 +410,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
assert_eq!(create_res.article.text, resolve_res.article.text);
// alpha edits article
let get_article_data = GetArticleData {
let get_article_data = GetArticleForm {
title: Some(create_form.title.to_string()),
domain: Some(beta_id_on_alpha.domain),
id: None,
@ -408,7 +418,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
let get_res = data.alpha.get_article(get_article_data).await?;
assert_eq!(&create_res.edits.len(), &get_res.edits.len());
assert_eq!(&create_res.edits[0].edit.hash, &get_res.edits[0].edit.hash);
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: get_res.article.id,
new_text: "Lorem Ipsum\n".to_string(),
summary: "summary".to_string(),
@ -427,7 +437,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
// gamma also edits, as its not the latest version there is a conflict. local version should
// not be updated with this conflicting version, instead user needs to handle the conflict
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: resolve_res.article.id,
new_text: "aaaa\n".to_string(),
summary: "summary".to_string(),
@ -443,7 +453,7 @@ async fn test_federated_edit_conflict() -> MyResult<()> {
assert_eq!(1, conflicts.len());
// resolve the conflict
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: resolve_res.article.id,
new_text: "aaaa\n".to_string(),
summary: "summary".to_string(),
@ -465,7 +475,7 @@ async fn test_overlapping_edits_no_conflict() -> MyResult<()> {
let data = TestData::start().await;
// create new article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -475,7 +485,7 @@ async fn test_overlapping_edits_no_conflict() -> MyResult<()> {
assert!(create_res.article.local);
// one user edits article
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "my\nexample\ntext\n".to_string(),
summary: "summary".to_string(),
@ -487,7 +497,7 @@ async fn test_overlapping_edits_no_conflict() -> MyResult<()> {
assert_eq!(2, edit_res.edits.len());
// another user edits article, without being aware of previous edit
let edit_form = EditArticleData {
let edit_form = EditArticleForm {
article_id: create_res.article.id,
new_text: "some\nexample\narticle\n".to_string(),
summary: "summary".to_string(),
@ -508,7 +518,7 @@ async fn test_fork_article() -> MyResult<()> {
let data = TestData::start().await;
// create article
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -526,7 +536,7 @@ async fn test_fork_article() -> MyResult<()> {
assert_eq!(create_res.edits.len(), resolve_res.edits.len());
// fork the article to local instance
let fork_form = ForkArticleData {
let fork_form = ForkArticleForm {
article_id: resolved_article.id,
new_title: resolved_article.title.clone(),
};
@ -546,7 +556,7 @@ async fn test_fork_article() -> MyResult<()> {
assert_eq!(forked_article.instance_id, beta_instance.instance.id);
// now search returns two articles for this title (original and forked)
let search_form = SearchArticleData {
let search_form = SearchArticleForm {
query: create_form.title.clone(),
};
let search_res = data.beta.search(&search_form).await?;
@ -560,20 +570,20 @@ async fn test_user_registration_login() -> MyResult<()> {
let data = TestData::start().await;
let username = "my_user";
let password = "hunter2";
let register_data = RegisterUserData {
let register_data = RegisterUserForm {
username: username.to_string(),
password: password.to_string(),
};
data.alpha.register(register_data).await?;
let login_data = LoginUserData {
let login_data = LoginUserForm {
username: username.to_string(),
password: "asd123".to_string(),
};
let invalid_login = data.alpha.login(login_data).await;
assert!(invalid_login.is_err());
let login_data = LoginUserData {
let login_data = LoginUserForm {
username: username.to_string(),
password: password.to_string(),
};
@ -595,7 +605,7 @@ async fn test_user_profile() -> MyResult<()> {
let data = TestData::start().await;
// Create an article and federate it, in order to federate the user who created it
let create_form = CreateArticleData {
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
@ -607,7 +617,7 @@ async fn test_user_profile() -> MyResult<()> {
let domain = extract_domain(&data.alpha.my_profile().await?.person.ap_id);
// Now we can fetch the remote user from local api
let params = GetUserData {
let params = GetUserForm {
name: "alpha".to_string(),
domain: Some(domain),
};
@ -617,3 +627,50 @@ async fn test_user_profile() -> MyResult<()> {
data.stop()
}
#[tokio::test]
async fn test_lock_article() -> MyResult<()> {
let data = TestData::start().await;
// create article
let create_form = CreateArticleForm {
title: "Manu_Chao".to_string(),
text: TEST_ARTICLE_DEFAULT_TEXT.to_string(),
summary: "create article".to_string(),
};
let create_res = data.alpha.create_article(&create_form).await?;
assert!(!create_res.article.protected);
// lock from normal user fails
let lock_form = ProtectArticleForm {
article_id: create_res.article.id,
protected: true,
};
let lock_res = data.alpha.protect_article(&lock_form).await;
assert!(lock_res.is_err());
// login as admin to lock article
let form = LoginUserForm {
username: "ibis".to_string(),
password: "ibis".to_string(),
};
data.alpha.login(form).await?;
let lock_res = data.alpha.protect_article(&lock_form).await?;
assert!(lock_res.protected);
let resolve_res: ArticleView = data
.gamma
.resolve_article(create_res.article.ap_id.inner().clone())
.await?;
let edit_form = EditArticleForm {
article_id: resolve_res.article.id,
new_text: "test".to_string(),
summary: "test".to_string(),
previous_version_id: resolve_res.latest_version,
resolve_conflict_id: None,
};
let edit_res = data.gamma.edit_article(&edit_form).await;
assert!(edit_res.is_err());
data.stop()
}