add: hide_from_social_lists user setting
This commit is contained in:
parent
4e152b07be
commit
bdd8f9a869
5 changed files with 64 additions and 21 deletions
|
@ -143,8 +143,7 @@
|
|||
(text "{% endfor %}"))
|
||||
(span
|
||||
("class" "fade")
|
||||
(text "This represents the timeline the home button takes you
|
||||
to."))))
|
||||
(text "This represents the timeline the home button takes you to."))))
|
||||
(div
|
||||
("class" "card-nest desktop")
|
||||
("ui_ident" "notifications")
|
||||
|
@ -1540,6 +1539,14 @@
|
|||
\"{{ profile.settings.hide_associated_blocked_users }}\",
|
||||
\"checkbox\",
|
||||
],
|
||||
[
|
||||
[
|
||||
\"hide_from_social_lists\",
|
||||
\"Hide my profile from social lists (followers/following)\",
|
||||
],
|
||||
\"{{ profile.settings.hide_from_social_lists }}\",
|
||||
\"checkbox\",
|
||||
],
|
||||
[[], \"Questions\", \"title\"],
|
||||
[
|
||||
[
|
||||
|
|
|
@ -278,7 +278,10 @@ pub async fn followers_request(
|
|||
Ok(f) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Success".to_string(),
|
||||
payload: match data.fill_userfollows_with_initiator(f).await {
|
||||
payload: match data
|
||||
.fill_userfollows_with_initiator(f, &Some(user.clone()), id == user.id)
|
||||
.await
|
||||
{
|
||||
Ok(f) => Some(data.userfollows_user_filter(&f)),
|
||||
Err(e) => return Json(e.into()),
|
||||
},
|
||||
|
@ -310,7 +313,10 @@ pub async fn following_request(
|
|||
Ok(f) => Json(ApiReturn {
|
||||
ok: true,
|
||||
message: "Success".to_string(),
|
||||
payload: match data.fill_userfollows_with_receiver(f).await {
|
||||
payload: match data
|
||||
.fill_userfollows_with_receiver(f, &Some(user.clone()), id == user.id)
|
||||
.await
|
||||
{
|
||||
Ok(f) => Some(data.userfollows_user_filter(&f)),
|
||||
Err(e) => return Json(e.into()),
|
||||
},
|
||||
|
|
|
@ -70,6 +70,8 @@ pub async fn settings_request(
|
|||
.get_userfollows_by_initiator_all(profile.id)
|
||||
.await
|
||||
.unwrap_or(Vec::new()),
|
||||
&None,
|
||||
false,
|
||||
)
|
||||
.await
|
||||
{
|
||||
|
@ -718,7 +720,7 @@ pub async fn following_request(
|
|||
.get_userfollows_by_initiator(other_user.id, 12, props.page)
|
||||
.await
|
||||
{
|
||||
Ok(l) => match data.0.fill_userfollows_with_receiver(l).await {
|
||||
Ok(l) => match data.0.fill_userfollows_with_receiver(l, &user, true).await {
|
||||
Ok(l) => l,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
|
@ -813,7 +815,7 @@ pub async fn followers_request(
|
|||
.get_userfollows_by_receiver(other_user.id, 12, props.page)
|
||||
.await
|
||||
{
|
||||
Ok(l) => match data.0.fill_userfollows_with_initiator(l).await {
|
||||
Ok(l) => match data.0.fill_userfollows_with_initiator(l, &user, true).await {
|
||||
Ok(l) => l,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &user).await)),
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue