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

crates/app/src/routes/api/v1/channels/channels.rs

@@ -80,10 +80,12 @@ pub async fn create_group_request(
             Err(e) => return Json(e.into()),
         };
 
-        if other_user.settings.private_chats && data
+        if other_user.settings.private_chats
+            && data
                 .get_userfollow_by_initiator_receiver(other_user.id, user.id)
                 .await
-                .is_err() {
+                .is_err()
+        {
             return Json(Error::NotAllowed.into());
         }
     }
@@ -168,6 +170,28 @@ pub async fn update_position_request(
     }
 }
 
+pub async fn add_member_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+    Path(id): Path<usize>,
+    Json(req): Json<KickMember>,
+) -> impl IntoResponse {
+    let data = &(data.read().await).0;
+    let user = match get_user_from_token!(jar, data) {
+        Some(ua) => ua,
+        None => return Json(Error::NotAllowed.into()),
+    };
+
+    match data.add_channel_member(id, user, req.member).await {
+        Ok(_) => Json(ApiReturn {
+            ok: true,
+            message: "Member added".to_string(),
+            payload: (),
+        }),
+        Err(e) => Json(e.into()),
+    }
+}
+
 pub async fn kick_member_request(
     jar: CookieJar,
     Extension(data): Extension<State>,

crates/app/src/routes/api/v1/mod.rs

@@ -300,6 +300,10 @@ pub fn routes() -> Router {
             post(channels::channels::update_position_request),
         )
         .route("/channels/{id}", delete(channels::channels::delete_request))
+        .route(
+            "/channels/{id}/add",
+            post(channels::channels::add_member_request),
+        )
         .route(
             "/channels/{id}/kick",
             post(channels::channels::kick_member_request),

crates/app/src/routes/pages/chats.rs

@@ -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(