From 373243a81f8c44fcfc6a3612ba46da2c6a3286c6 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 31 May 2025 13:11:36 +0200
Subject: use RenderInfo guard everywhere and start to use FlashMessage

---
 server/src/ui/admin/log.rs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'server/src/ui/admin/log.rs')

diff --git a/server/src/ui/admin/log.rs b/server/src/ui/admin/log.rs
index c26b697..61d2ba7 100644
--- a/server/src/ui/admin/log.rs
+++ b/server/src/ui/admin/log.rs
@@ -4,10 +4,9 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use crate::{
-    helper::{language::AcceptLanguage, A},
+    helper::{RequestInfo, A},
     ui::error::MyResult,
 };
-use jellyimport::is_importing;
 use jellylogic::{
     admin::log::{get_log_buffer, get_log_stream},
     session::Session,
@@ -15,20 +14,14 @@ use jellylogic::{
 use jellyui::{
     admin::log::{render_log_line, ServerLogPage},
     render_page,
-    scaffold::{RenderInfo, SessionInfo},
 };
 use rocket::{get, response::content::RawHtml};
 use rocket_ws::{Message, Stream, WebSocket};
 use serde_json::json;
 
 #[get("/admin/log?<warnonly>", rank = 2)]
-pub fn r_admin_log<'a>(
-    session: A<Session>,
-    warnonly: bool,
-    lang: AcceptLanguage,
-) -> MyResult<RawHtml<String>> {
-    session.0.assert_admin()?;
-    let AcceptLanguage(lang) = lang;
+pub fn r_admin_log<'a>(ri: RequestInfo, warnonly: bool) -> MyResult<RawHtml<String>> {
+    ri.session.assert_admin()?;
     let messages = get_log_buffer(warnonly)
         .into_iter()
         .map(|l| render_log_line(&l))
@@ -38,13 +31,7 @@ pub fn r_admin_log<'a>(
             messages: &messages,
             warnonly,
         },
-        RenderInfo {
-            importing: is_importing(),
-            session: Some(SessionInfo {
-                user: session.0.user,
-            }),
-        },
-        lang,
+        ri.render_info(),
     )))
 }
 
-- 
cgit v1.2.3-70-g09d2