add: allow users to block users who have blocked them/private users
fix: anonymous post page panic add: allow users to select home timeline
This commit is contained in:
parent
2460e2f8c5
commit
d42375441f
15 changed files with 313 additions and 122 deletions
|
@ -6,7 +6,10 @@ use std::{
|
|||
sync::LazyLock,
|
||||
};
|
||||
use tera::Context;
|
||||
use tetratto_core::{config::Config, model::auth::User};
|
||||
use tetratto_core::{
|
||||
config::Config,
|
||||
model::auth::{DefaultTimelineChoice, User},
|
||||
};
|
||||
use tetratto_l10n::LangFile;
|
||||
use tetratto_shared::hash::salt;
|
||||
use tokio::sync::RwLock;
|
||||
|
@ -48,6 +51,7 @@ pub const PROFILE_FOLLOWING: &str = include_str!("./public/html/profile/followin
|
|||
pub const PROFILE_FOLLOWERS: &str = include_str!("./public/html/profile/followers.html");
|
||||
pub const PROFILE_WARNING: &str = include_str!("./public/html/profile/warning.html");
|
||||
pub const PROFILE_PRIVATE: &str = include_str!("./public/html/profile/private.html");
|
||||
pub const PROFILE_BLOCKED: &str = include_str!("./public/html/profile/blocked.html");
|
||||
|
||||
pub const COMMUNITIES_LIST: &str = include_str!("./public/html/communities/list.html");
|
||||
pub const COMMUNITIES_BASE: &str = include_str!("./public/html/communities/base.html");
|
||||
|
@ -197,6 +201,7 @@ pub(crate) async fn write_assets(config: &Config) -> PathBufD {
|
|||
write_template!(html_path->"profile/followers.html"(crate::assets::PROFILE_FOLLOWERS) --config=config);
|
||||
write_template!(html_path->"profile/warning.html"(crate::assets::PROFILE_WARNING) --config=config);
|
||||
write_template!(html_path->"profile/private.html"(crate::assets::PROFILE_PRIVATE) --config=config);
|
||||
write_template!(html_path->"profile/blocked.html"(crate::assets::PROFILE_BLOCKED) --config=config);
|
||||
|
||||
write_template!(html_path->"communities/list.html"(crate::assets::COMMUNITIES_LIST) -d "communities" --config=config);
|
||||
write_template!(html_path->"communities/base.html"(crate::assets::COMMUNITIES_BASE) --config=config);
|
||||
|
@ -284,9 +289,11 @@ pub(crate) async fn initial_context(
|
|||
if let Some(ua) = user {
|
||||
ctx.insert("is_helper", &ua.permissions.check_helper());
|
||||
ctx.insert("is_manager", &ua.permissions.check_manager());
|
||||
ctx.insert("home", ua.settings.default_timeline.relative_url());
|
||||
} else {
|
||||
ctx.insert("is_helper", &false);
|
||||
ctx.insert("is_manager", &false);
|
||||
ctx.insert("home", DefaultTimelineChoice::default().relative_url());
|
||||
}
|
||||
|
||||
ctx.insert("lang", &lang.data);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue