user creation; flash message in request info

1 files changed, 3 insertions, 16 deletions

diff --git a/server/src/ui/account/settings.rs b/server/src/ui/account/settings.rs
index 2052c5e..bb4b323 100644
--- a/server/src/ui/account/settings.rs
+++ b/server/src/ui/account/settings.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use jellycommon::{
-    jellyobject::{Object, ObjectBuffer, ObjectBufferBuilder, Path, Tag},
+    jellyobject::{OBB, Object, ObjectBuffer, Path, Tag},
     routes::u_account_settings,
     *,
 };
@@ -19,7 +19,6 @@ use rocket::{
     FromForm,
     form::{self, Contextual, Form, validate::len},
     get, post,
-    request::FlashMessage,
     response::{Flash, Redirect},
 };
 use std::ops::Range;
@@ -39,21 +38,9 @@ fn option_len<'v>(value: &Option<String>, range: Range<usize>) -> form::Result<'
 }
 
 #[get("/account/settings")]
-pub fn r_account_settings(ri: RequestInfo, flash: Option<FlashMessage>) -> MyResult<UiResponse> {
+pub fn r_account_settings(ri: RequestInfo) -> MyResult<UiResponse> {
     let user = ri.require_user()?;
-    let mut view = ObjectBufferBuilder::default();
-    view.push(VIEW_USER_SETTINGS, user);
-    if let Some(flash) = flash {
-        view.push(
-            VIEW_MESSAGE,
-            ObjectBuffer::new(&mut [
-                (MESSAGE_KIND.0, &flash.kind()),
-                (MESSAGE_TEXT.0, &flash.message()),
-            ])
-            .as_object(),
-        );
-    }
-    Ok(ri.respond_ui(view.finish()))
+    Ok(ri.respond_ui(OBB::new().with(VIEW_USER_SETTINGS, user)))
 }
 
 #[post("/account/settings", data = "<form>")]