t/tetratto
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

add: move new block feature to a setting

Browse source
This commit is contained in:
trisua 2025-06-30 18:10:00 -04:00
parent d6348f7d67
commit d90b08720a
4 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/app/src/macros.rs
View file

@ -354,7 +354,11 @@ macro_rules! ignore_users_gen {
[ [
$data $data
.0 .0
.get_userblocks_receivers(ua.id, &ua.associated) .get_userblocks_receivers(
ua.id,
&ua.associated,
ua.settings.hide_associated_blocked_users,
)
.await, .await,
$data.0.get_userblocks_initiator_by_receivers(ua.id).await, $data.0.get_userblocks_initiator_by_receivers(ua.id).await,
$data.0.get_user_stack_blocked_users(ua.id).await, $data.0.get_user_stack_blocked_users(ua.id).await,
@ -369,7 +373,11 @@ macro_rules! ignore_users_gen {
[ [
$data $data
.0 .0
.get_userblocks_receivers($user.id, &$user.associated) .get_userblocks_receivers(
$user.id,
&$user.associated,
$user.settings.hide_associated_blocked_users,
)
.await, .await,
$data $data
.0 .0
@ -383,7 +391,11 @@ macro_rules! ignore_users_gen {
($user:ident!, #$data:ident) => { ($user:ident!, #$data:ident) => {
[ [
$data $data
.get_userblocks_receivers($user.id, &$user.associated) .get_userblocks_receivers(
$user.id,
&$user.associated,
$user.settings.hide_associated_blocked_users,
)
.await, .await,
$data.get_userblocks_initiator_by_receivers($user.id).await, $data.get_userblocks_initiator_by_receivers($user.id).await,
] ]

8
crates/app/src/public/html/profile/settings.lisp
View file

@ -1519,6 +1519,14 @@
\"{{ profile.settings.all_timeline_hide_answers }}\", \"{{ profile.settings.all_timeline_hide_answers }}\",
\"checkbox\", \"checkbox\",
], ],
[
[
\"hide_associated_blocked_users\",
\"Hide users that you've blocked on your other accounts from timelines.\",
],
\"{{ profile.settings.hide_associated_blocked_users }}\",
\"checkbox\",
],
[[], \"Questions\", \"title\"], [[], \"Questions\", \"title\"],
[ [
[ [

7
crates/core/src/database/userblocks.rs
View file

@ -89,11 +89,14 @@ impl DataManager {
&self, &self,
initiator: usize, initiator: usize,
associated: &Vec<usize>, associated: &Vec<usize>,
do_associated: bool,
) -> Vec<usize> { ) -> Vec<usize> {
let mut associated_str = String::new(); let mut associated_str = String::new();
for id in associated { if do_associated {
associated_str.push_str(&(" OR initiator = ".to_string() + &id.to_string())); for id in associated {
associated_str.push_str(&(" OR initiator = ".to_string() + &id.to_string()));
}
} }
// ... // ...

5
crates/core/src/model/auth.rs
View file

@ -273,6 +273,9 @@ pub struct UserSettings {
/// Disable achievements. /// Disable achievements.
#[serde(default)] #[serde(default)]
pub disable_achievements: bool, pub disable_achievements: bool,
/// Automatically hide users that you've blocked on your other accounts from your timelines.
#[serde(default)]
pub hide_associated_blocked_users: bool,
} }
fn mime_avif() -> String { fn mime_avif() -> String {
@ -561,7 +564,7 @@ impl AchievementName {
Self::Enable2fa => "Locked in", Self::Enable2fa => "Locked in",
Self::EditNote => "I take it back!", Self::EditNote => "I take it back!",
Self::CreatePostWithTitle => "Must declutter", Self::CreatePostWithTitle => "Must declutter",
Self::CreateRepost => "More than a like or a comment...", Self::CreateRepost => "More than a like or comment...",
} }
} }