diff --git a/crates/app/src/assets.rs b/crates/app/src/assets.rs index 35c7398..c5b239d 100644 --- a/crates/app/src/assets.rs +++ b/crates/app/src/assets.rs @@ -58,8 +58,9 @@ pub const COMMUNITIES_CREATE_POST: &str = include_str!("./public/html/communities/create_post.html"); pub const TIMELINES_HOME: &str = include_str!("./public/html/timelines/home.html"); -pub const TIMELINES_FOLLOWING: &str = include_str!("./public/html/timelines/following.html"); pub const TIMELINES_POPULAR: &str = include_str!("./public/html/timelines/popular.html"); +pub const TIMELINES_FOLLOWING: &str = include_str!("./public/html/timelines/following.html"); +pub const TIMELINES_ALL: &str = include_str!("./public/html/timelines/all.html"); pub const MOD_AUDIT_LOG: &str = include_str!("./public/html/mod/audit_log.html"); pub const MOD_REPORTS: &str = include_str!("./public/html/mod/reports.html"); @@ -190,8 +191,9 @@ pub(crate) async fn write_assets(config: &Config) -> PathBufD { write_template!(html_path->"communities/create_post.html"(crate::assets::COMMUNITIES_CREATE_POST) --config=config); write_template!(html_path->"timelines/home.html"(crate::assets::TIMELINES_HOME) -d "timelines" --config=config); - write_template!(html_path->"timelines/following.html"(crate::assets::TIMELINES_FOLLOWING) --config=config); write_template!(html_path->"timelines/popular.html"(crate::assets::TIMELINES_POPULAR) --config=config); + write_template!(html_path->"timelines/following.html"(crate::assets::TIMELINES_FOLLOWING) --config=config); + write_template!(html_path->"timelines/all.html"(crate::assets::TIMELINES_ALL) --config=config); write_template!(html_path->"mod/audit_log.html"(crate::assets::MOD_AUDIT_LOG) -d "mod" --config=config); write_template!(html_path->"mod/reports.html"(crate::assets::MOD_REPORTS) --config=config); diff --git a/crates/app/src/langs/en-US.toml b/crates/app/src/langs/en-US.toml index 871f5d5..af1b60e 100644 --- a/crates/app/src/langs/en-US.toml +++ b/crates/app/src/langs/en-US.toml @@ -3,8 +3,9 @@ version = "1.0.0" [data] "general:link.home" = "Home" -"general:link.following" = "Following" "general:link.popular" = "Popular" +"general:link.following" = "Following" +"general:link.all" = "All" "general:link.communities" = "Communities" "general:link.next" = "Next" "general:link.previous" = "Previous" @@ -96,6 +97,7 @@ version = "1.0.0" "settings:tab.profile" = "Profile" "settings:tab.theme" = "Theme" "settings:tab.sessions" = "Sessions" +"settings:tab.images" = "Images" "settings:label.change_password" = "Change password" "settings:label.current_password" = "Current password" "settings:label.delete_account" = "Delete account" diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs index c0f472d..47e9636 100644 --- a/crates/app/src/main.rs +++ b/crates/app/src/main.rs @@ -5,6 +5,7 @@ mod routes; mod sanitize; use assets::{init_dirs, write_assets}; +use tetratto_core::model::permissions::FinePermission; pub use tetratto_core::*; use axum::{Extension, Router}; @@ -26,6 +27,13 @@ fn color_escape(value: &Value, _: &HashMap) -> tera::Result) -> tera::Result { + Ok(FinePermission::from_bits(value.as_u64().unwrap() as u32) + .unwrap() + .check(FinePermission::SUPPORTER) + .into()) +} + #[tokio::main] async fn main() { tracing_subscriber::fmt() @@ -46,6 +54,7 @@ async fn main() { let mut tera = Tera::new(&format!("{html_path}/**/*")).unwrap(); tera.register_filter("markdown", render_markdown); tera.register_filter("color", color_escape); + tera.register_filter("has_supporter", check_supporter); let client = Client::new(); diff --git a/crates/app/src/public/html/communities/create_post.html b/crates/app/src/public/html/communities/create_post.html index 153f435..f991b3a 100644 --- a/crates/app/src/public/html/communities/create_post.html +++ b/crates/app/src/public/html/communities/create_post.html @@ -1,6 +1,6 @@ {% extends "root.html" %} {% block head %} Create post - {{ config.name }} -{% endblock %} {% block body %} {{ macros::nav(selected="") }} +{% endblock %} {% block body %} {{ macros::nav() }}
diff --git a/crates/app/src/public/html/communities/settings.html b/crates/app/src/public/html/communities/settings.html index 4481e6d..55c8665 100644 --- a/crates/app/src/public/html/communities/settings.html +++ b/crates/app/src/public/html/communities/settings.html @@ -3,17 +3,20 @@ {% endblock %} {% block body %} {{ macros::nav() }}
@@ -159,7 +162,7 @@