add: chat notifications
use sql_chanes/notifications_tag.sql; ignore first statement if you never used a preview commit
This commit is contained in:
parent
a009ef9e34
commit
59cfec4819
22 changed files with 267 additions and 136 deletions
|
@ -107,6 +107,7 @@ pub async fn app_request(
|
|||
context.insert("selected_channel", &selected_channel);
|
||||
context.insert("membership_role", &membership.role.bits());
|
||||
context.insert("page", &props.page);
|
||||
context.insert("message", &props.message);
|
||||
|
||||
context.insert(
|
||||
"can_manage_channels",
|
||||
|
@ -143,10 +144,10 @@ pub async fn stream_request(
|
|||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path((community, channel)): Path<(usize, usize)>,
|
||||
Query(props): Query<PaginatedQuery>,
|
||||
Query(props): Query<ChatsAppQuery>,
|
||||
) -> impl IntoResponse {
|
||||
let data = data.read().await;
|
||||
let mut user = match get_user_from_token!(jar, data.0) {
|
||||
let user = match get_user_from_token!(jar, data.0) {
|
||||
Some(ua) => ua,
|
||||
None => {
|
||||
return Err(Html(
|
||||
|
@ -156,32 +157,6 @@ pub async fn stream_request(
|
|||
};
|
||||
|
||||
let ignore_users = data.0.get_userblocks_receivers(user.id).await;
|
||||
let messages = match data
|
||||
.0
|
||||
.get_messages_by_channel(channel, 24, props.page)
|
||||
.await
|
||||
{
|
||||
Ok(p) => match data.0.fill_messages(p, &ignore_users).await {
|
||||
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)),
|
||||
};
|
||||
|
||||
if props.page == 0 {
|
||||
if let Some(ref last_message) = messages.get(messages.len() - 1) {
|
||||
user.subscriptions.insert(channel, last_message.0.id);
|
||||
|
||||
// maybe make update_user_subscriptions take a reference to avoid cloning
|
||||
if let Err(e) = data
|
||||
.0
|
||||
.update_user_subscriptions(user.id, user.subscriptions.clone())
|
||||
.await
|
||||
{
|
||||
return Err(Html(render_error(e, &jar, &data, &Some(user)).await));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let membership = match data
|
||||
.0
|
||||
|
@ -195,10 +170,48 @@ pub async fn stream_request(
|
|||
let can_manage_messages = membership.role.check(CommunityPermission::MANAGE_MESSAGES)
|
||||
| user.permissions.check(FinePermission::MANAGE_MESSAGES);
|
||||
|
||||
let messages = if props.message == 0 {
|
||||
match data
|
||||
.0
|
||||
.get_messages_by_channel(channel, 24, props.page)
|
||||
.await
|
||||
{
|
||||
Ok(p) => match data.0.fill_messages(p, &ignore_users).await {
|
||||
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)),
|
||||
}
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
|
||||
let message = if props.message == 0 {
|
||||
None
|
||||
} else {
|
||||
Some(match data.0.get_message_by_id(props.message).await {
|
||||
Ok(p) => p,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
})
|
||||
};
|
||||
|
||||
let message_owner = if let Some(ref message) = message {
|
||||
Some(match data.0.get_user_by_id(message.owner).await {
|
||||
Ok(p) => p,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
})
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let lang = get_lang!(jar, data.0);
|
||||
let mut context = initial_context(&data.0.0, lang, &Some(user)).await;
|
||||
|
||||
context.insert("messages", &messages);
|
||||
context.insert("message", &message);
|
||||
context.insert("message_owner", &message_owner);
|
||||
context.insert("can_manage_messages", &can_manage_messages);
|
||||
|
||||
context.insert("page", &props.page);
|
||||
|
@ -213,7 +226,7 @@ pub async fn stream_request(
|
|||
pub async fn message_request(
|
||||
jar: CookieJar,
|
||||
Extension(data): Extension<State>,
|
||||
Path((community, _)): Path<(usize, usize)>,
|
||||
Path((community, channel)): Path<(usize, usize)>,
|
||||
Json(req): Json<RenderMessage>,
|
||||
) -> impl IntoResponse {
|
||||
let data = data.read().await;
|
||||
|
@ -261,6 +274,9 @@ pub async fn message_request(
|
|||
context.insert("message", &message);
|
||||
context.insert("user", &owner);
|
||||
|
||||
context.insert("channel", &channel);
|
||||
context.insert("community", &community);
|
||||
|
||||
// return
|
||||
Ok(Html(data.1.render("chats/message.html", &context).unwrap()))
|
||||
}
|
||||
|
|
|
@ -130,6 +130,8 @@ pub struct ChatsAppQuery {
|
|||
pub page: usize,
|
||||
#[serde(default)]
|
||||
pub nav: bool,
|
||||
#[serde(default)]
|
||||
pub message: usize,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue