add: ability to add user to stack through block list ui
This commit is contained in:
parent
8c969cd56f
commit
2a77c61bf2
10 changed files with 130 additions and 20 deletions
|
@ -211,6 +211,10 @@ pub async fn add_user_request(
|
|||
Err(e) => return Json(e.into()),
|
||||
};
|
||||
|
||||
if stack.users.contains(&other_user.id) {
|
||||
return Json(Error::MiscError("This user is already in this stack".to_string()).into());
|
||||
}
|
||||
|
||||
stack.users.push(other_user.id);
|
||||
|
||||
// check number of stacks
|
||||
|
|
|
@ -131,6 +131,7 @@ pub fn routes() -> Router {
|
|||
.route("/stacks", get(stacks::list_request))
|
||||
.route("/stacks/{id}", get(stacks::feed_request))
|
||||
.route("/stacks/{id}/manage", get(stacks::manage_request))
|
||||
.route("/stacks/add_user/{id}", get(stacks::add_user_request))
|
||||
// journals
|
||||
.route("/journals", get(journals::redirect_request))
|
||||
.route("/journals/{journal}/{note}", get(journals::app_request))
|
||||
|
|
|
@ -157,3 +157,41 @@ pub async fn manage_request(
|
|||
// return
|
||||
Ok(Html(data.1.render("stacks/manage.html", &context).unwrap()))
|
||||
}
|
||||
|
||||
/// `/stacks/add_user`
|
||||
pub async fn add_user_request(
|
||||
jar: CookieJar,
|
||||
Path(id): Path<usize>,
|
||||
Extension(data): Extension<State>,
|
||||
) -> impl IntoResponse {
|
||||
let data = data.read().await;
|
||||
let user = match get_user_from_token!(jar, data.0) {
|
||||
Some(ua) => ua,
|
||||
None => {
|
||||
return Err(Html(
|
||||
render_error(Error::NotAllowed, &jar, &data, &None).await,
|
||||
));
|
||||
}
|
||||
};
|
||||
|
||||
let add_user = match data.0.get_user_by_id(id).await {
|
||||
Ok(ua) => ua,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &None).await)),
|
||||
};
|
||||
|
||||
let stacks = match data.0.get_stacks_by_user(user.id).await {
|
||||
Ok(p) => p,
|
||||
Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
|
||||
};
|
||||
|
||||
let lang = get_lang!(jar, data.0);
|
||||
let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
|
||||
|
||||
context.insert("stacks", &stacks);
|
||||
context.insert("add_user", &add_user);
|
||||
|
||||
// return
|
||||
Ok(Html(
|
||||
data.1.render("stacks/add_user.html", &context).unwrap(),
|
||||
))
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue