add: allow mods to view user notifications
This commit is contained in:
parent
d44004e86b
commit
0983a3bb84
5 changed files with 44 additions and 15 deletions
|
@ -219,11 +219,5 @@
|
||||||
("href" "/@{{ profile.username }}/outbox")
|
("href" "/@{{ profile.username }}/outbox")
|
||||||
("class" "{% if selected == 'outbox' -%}active{%- endif %}")
|
("class" "{% if selected == 'outbox' -%}active{%- endif %}")
|
||||||
(str (text "auth:label.outbox")))
|
(str (text "auth:label.outbox")))
|
||||||
(text "{%- endif %}")
|
|
||||||
|
|
||||||
(text "{% if is_helper -%}")
|
|
||||||
(a
|
|
||||||
("href" "/requests?id={{ profile.id }}")
|
|
||||||
(str (text "requests:label.requests")))
|
|
||||||
(text "{%- endif %} {%- endif %}"))
|
(text "{%- endif %} {%- endif %}"))
|
||||||
(text "{%- endmacro %}")
|
(text "{%- endmacro %}")
|
||||||
|
|
|
@ -5,6 +5,17 @@
|
||||||
(text "{% endblock %} {% block body %} {{ macros::nav(selected=\"notifications\") }}")
|
(text "{% endblock %} {% block body %} {{ macros::nav(selected=\"notifications\") }}")
|
||||||
(main
|
(main
|
||||||
("class" "flex flex-col gap-2")
|
("class" "flex flex-col gap-2")
|
||||||
|
|
||||||
|
; viewing other user's notifications warning
|
||||||
|
(text "{% if profile.id != user.id -%}")
|
||||||
|
(div
|
||||||
|
("class" "card w-full red flex gap-2 items-center")
|
||||||
|
(text "{{ icon \"skull\" }}")
|
||||||
|
(b
|
||||||
|
(text "Viewing other user's notifications! Please be careful.")))
|
||||||
|
(text "{%- endif %}")
|
||||||
|
|
||||||
|
; ...
|
||||||
(div
|
(div
|
||||||
("class" "card-nest")
|
("class" "card-nest")
|
||||||
(div
|
(div
|
||||||
|
|
|
@ -32,6 +32,18 @@
|
||||||
(text "{{ icon \"shield-alert\" }}")
|
(text "{{ icon \"shield-alert\" }}")
|
||||||
(span
|
(span
|
||||||
(text "View warnings")))
|
(text "View warnings")))
|
||||||
|
(a
|
||||||
|
("href" "/notifs?id={{ profile.id }}")
|
||||||
|
("class" "button quaternary")
|
||||||
|
(text "{{ icon \"bell\" }}")
|
||||||
|
(span
|
||||||
|
(text "Notifications")))
|
||||||
|
(a
|
||||||
|
("href" "/requests?id={{ profile.id }}")
|
||||||
|
("class" "button quaternary")
|
||||||
|
(text "{{ icon \"inbox\" }}")
|
||||||
|
(span
|
||||||
|
(text "Requests")))
|
||||||
(button
|
(button
|
||||||
("class" "red quaternary")
|
("class" "red quaternary")
|
||||||
("onclick" "delete_account(event)")
|
("onclick" "delete_account(event)")
|
||||||
|
|
|
@ -638,7 +638,7 @@
|
||||||
("id" "banner_file")
|
("id" "banner_file")
|
||||||
("name" "file")
|
("name" "file")
|
||||||
("type" "file")
|
("type" "file")
|
||||||
("accept" "image/png,image/jpeg,image/avif,image/webp")
|
("accept" "image/png,image/jpeg,image/avif,image/webp,image/gif")
|
||||||
("class" "w-content"))
|
("class" "w-content"))
|
||||||
(button
|
(button
|
||||||
("class" "primary")
|
("class" "primary")
|
||||||
|
|
|
@ -357,10 +357,17 @@ pub async fn all_questions_request(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
pub struct NotificationsProps {
|
||||||
|
#[serde(default)]
|
||||||
|
pub id: usize,
|
||||||
|
}
|
||||||
|
|
||||||
/// `/notifs`
|
/// `/notifs`
|
||||||
pub async fn notifications_request(
|
pub async fn notifications_request(
|
||||||
jar: CookieJar,
|
jar: CookieJar,
|
||||||
Extension(data): Extension<State>,
|
Extension(data): Extension<State>,
|
||||||
|
Query(props): Query<NotificationsProps>,
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let data = data.read().await;
|
let data = data.read().await;
|
||||||
let user = match get_user_from_token!(jar, data.0) {
|
let user = match get_user_from_token!(jar, data.0) {
|
||||||
|
@ -372,13 +379,24 @@ pub async fn notifications_request(
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let notifications = match data.0.get_notifications_by_owner(user.id).await {
|
let profile = if props.id != 0 {
|
||||||
|
match data.0.get_user_by_id(props.id).await {
|
||||||
|
Ok(p) => p,
|
||||||
|
Err(e) => return Err(Html(render_error(e, &jar, &data, &None).await)),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
user.clone()
|
||||||
|
};
|
||||||
|
|
||||||
|
let notifications = match data.0.get_notifications_by_owner(profile.id).await {
|
||||||
Ok(p) => p,
|
Ok(p) => p,
|
||||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||||
};
|
};
|
||||||
|
|
||||||
let lang = get_lang!(jar, data.0);
|
let lang = get_lang!(jar, data.0);
|
||||||
let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
|
let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
|
||||||
|
|
||||||
|
context.insert("profile", &profile);
|
||||||
context.insert("notifications", ¬ifications);
|
context.insert("notifications", ¬ifications);
|
||||||
|
|
||||||
// return
|
// return
|
||||||
|
@ -387,17 +405,11 @@ pub async fn notifications_request(
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct RequestsProps {
|
|
||||||
#[serde(default)]
|
|
||||||
pub id: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// `/requests`
|
/// `/requests`
|
||||||
pub async fn requests_request(
|
pub async fn requests_request(
|
||||||
jar: CookieJar,
|
jar: CookieJar,
|
||||||
Extension(data): Extension<State>,
|
Extension(data): Extension<State>,
|
||||||
Query(props): Query<RequestsProps>,
|
Query(props): Query<NotificationsProps>,
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let data = data.read().await;
|
let data = data.read().await;
|
||||||
let user = match get_user_from_token!(jar, data.0) {
|
let user = match get_user_from_token!(jar, data.0) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue