From 86178bb3a5ad131766a57cdcac9f22fed3c55f8a Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 22 Aug 2020 19:09:13 +0200
Subject: Swap rank on plain and json response for room list.

Note to self: More explicit should have lower rank (higher precedence.)
---
 src/controllers/room.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/controllers/room.rs b/src/controllers/room.rs
index 43d3e60..8b85344 100644
--- a/src/controllers/room.rs
+++ b/src/controllers/room.rs
@@ -21,25 +21,27 @@ use crate::{
     models,
 };
 
+use std::result::Result;
 use rocket::get;
 use rocket_contrib::{
     json::Json,
     templates::Template,
 };
 use serde::Serialize;
+use std::error::Error;
 
 #[derive(Serialize)]
 struct Context {
     rooms : Vec<models::Room>,
 }
 
-#[get("/", rank = 1)]
-pub fn list_rooms(db: db::Connection) -> Template {
-    let ctx = Context { rooms: db.get_rooms().unwrap() };
-    Template::render("room/list", &ctx)
-}
-
-#[get("/", format = "application/json", rank = 2)]
+#[get("/", format = "application/json", rank = 1)]
 pub fn get_rooms_json(db: db::Connection) -> Json<Vec<models::Room>> {
     Json(db.get_rooms().unwrap())
 }
+
+#[get("/", rank = 2)]
+pub fn list_rooms(db: db::Connection) -> Result<Template, Box<dyn Error>> {
+    let ctx = Context { rooms: db.get_rooms()? };
+    Ok(Template::render("room/list", &ctx))
+}
-- 
cgit v1.2.3