Simplify getting user from session

scpwiki · Nov 6, 2023 · c216569 · c216569
1 parent 706e794
commit c216569
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/deepwell/src/services/view/service.rs b/deepwell/src/services/view/service.rs
@@ -337,10 +337,7 @@ impl ViewService {
         let user = match user_ref {
             Some(user_ref) => UserService::get_optional(ctx, user_ref).await?,
             // For users visiting their own user info page
-            None => match &viewer.user_session {
-                Some(user_session) => Some(user_session.user.clone()),
-                None => None,
-            },
+            None => viewer.user_session.clone().and_then(|session| Some(session.user)),
         };
 
         let output = match user {