Move frontend module to web_client::urls

src/activitypub/actors/attachments.rs

@@ -7,7 +7,6 @@ use crate::activitypub::vocabulary::{
 };
 use crate::errors::ValidationError;
 use crate::ethereum::identity::verify_eip191_identity_proof;
-use crate::frontend::get_subscription_page_url;
 use crate::identity::{
     claims::create_identity_claim,
     did::Did,
@@ -20,6 +19,7 @@ use crate::models::profiles::types::{
     PaymentOption,
     ProofType,
 };
+use crate::web_client::urls::get_subscription_page_url;
 use super::types::ActorAttachment;
 
 pub fn attach_identity_proof(

src/activitypub/builders/create_note.rs

@@ -17,12 +17,12 @@ use crate::activitypub::{
 };
 use crate::config::Instance;
 use crate::database::DatabaseError;
-use crate::frontend::get_tag_page_url;
 use crate::models::posts::queries::get_post_author;
 use crate::models::posts::types::{Post, Visibility};
 use crate::models::relationships::queries::{get_followers, get_subscribers};
 use crate::models::users::types::User;
 use crate::utils::files::get_file_url;
+use crate::web_client::urls::get_tag_page_url;
 
 #[derive(Serialize)]
 #[serde(rename_all = "camelCase")]

src/activitypub/views.rs

@@ -12,10 +12,10 @@ use uuid::Uuid;
 use crate::config::Config;
 use crate::database::{get_database_client, DbPool};
 use crate::errors::HttpError;
-use crate::frontend::{get_post_page_url, get_profile_page_url};
 use crate::models::posts::helpers::{add_related_posts, can_view_post};
 use crate::models::posts::queries::{get_post_by_id, get_posts_by_author};
 use crate::models::users::queries::{get_user_by_id, get_user_by_name};
+use crate::web_client::urls::{get_post_page_url, get_profile_page_url};
 use super::actors::types::{get_local_actor, get_instance_actor};
 use super::builders::create_note::{build_note, build_create_note};
 use super::collections::{

src/lib.rs

@@ -5,7 +5,6 @@ pub mod config;
 pub mod database;
 mod errors;
 pub mod ethereum;
-mod frontend;
 pub mod http;
 mod http_signatures;
 mod identity;
@@ -19,3 +18,4 @@ mod monero;
 pub mod nodeinfo;
 mod utils;
 pub mod webfinger;
+mod web_client;

src/models/posts/hashtags.rs

@@ -1,7 +1,7 @@
 use regex::{Captures, Regex};
 
 use crate::errors::ValidationError;
-use crate::frontend::get_tag_page_url;
+use crate::web_client::urls::get_tag_page_url;
 use super::links::is_inside_code_block;
 
 const HASHTAG_RE: &str = r"(?m)(?P<before>^|\s|>|[\(])#(?P<tag>[^\s<]+)";

src/web_client/mod.rs

@@ -0,0 +1 @@
+pub mod urls;