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

add: group channels, group channel members list, group channel renaming

Browse source
This commit is contained in:
trisua 2025-05-06 21:30:02 -04:00
parent a62905a8c4
commit b91e9a62fb
16 changed files with 341 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/app/src/routes/pages/chats.rs
View file

@ -15,6 +15,7 @@ use serde::Deserialize;
#[derive(Deserialize)]
pub struct RenderMessage {
pub data: String,
pub grouped: bool,
}
pub async fn redirect_request() -> impl IntoResponse {
@ -276,6 +277,7 @@ pub async fn message_request(
context.insert("channel", &channel);
context.insert("community", &community);
context.insert("grouped", &req.grouped);
// return
Ok(Html(data.1.render("chats/message.html", &context).unwrap()))
@ -285,7 +287,7 @@ pub async fn message_request(
pub async fn channels_request(
jar: CookieJar,
Extension(data): Extension<State>,
Path((community, channel)): Path<(usize, usize)>,
Path((community, channel_id)): Path<(usize, usize)>,
Query(props): Query<PaginatedQuery>,
) -> impl IntoResponse {
let data = data.read().await;
@ -310,14 +312,42 @@ pub async fn channels_request(
}
};
let channel = if channel_id != 0 {
Some(match data.0.get_channel_by_id(channel_id).await {
Ok(p) => p,
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
})
} else {
None
};
let members = if community == 0 && channel.is_some() {
let ignore_users = data.0.get_userblocks_receivers(user.id).await;
let mut channel = channel.as_ref().unwrap().clone();
channel.members.insert(0, channel.owner); // include the owner in the members list (at the start)
Some(
match data.0.fill_members(&channel.members, ignore_users).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("channels", &channels);
context.insert("page", &props.page);
context.insert("members", &members);
context.insert("channel", &channel);
context.insert("selected_community", &community);
context.insert("selected_channel", &channel);
context.insert("selected_channel", &channel_id);
// return
Ok(Html(