routes.api: fix get_captcha endpoint (#1135)

[lemmy.git] / server / src / routes / index.rs

diff --git a/server/src/routes/index.rs b/server/src/routes/index.rs
index b044833efb1b88687363e97e7e3cb480a3175fa1..88a36c3983b9aa6ae4b46e9c60e669b9abff44ba 100644 (file)
--- a/server/src/routes/index.rs
+++ b/server/src/routes/index.rs
@@ -1,12 +1,12 @@
-use crate::settings::Settings;
 use actix_files::NamedFile;
-use actix_web::web;
+use actix_web::*;
+use lemmy_utils::settings::Settings;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
   cfg
     .route("/", web::get().to(index))
     .route(
-      "/home/type/{type}/sort/{sort}/page/{page}",
+      "/home/data_type/{data_type}/listing_type/{listing_type}/sort/{sort}/page/{page}",
       web::get().to(index),
     )
     .route("/login", web::get().to(index))
@@ -17,7 +17,10 @@ pub fn config(cfg: &mut web::ServiceConfig) {
     .route("/communities", web::get().to(index))
     .route("/post/{id}/comment/{id2}", web::get().to(index))
     .route("/post/{id}", web::get().to(index))
-    .route("/c/{name}/sort/{sort}/page/{page}", web::get().to(index))
+    .route(
+      "/c/{name}/data_type/{data_type}/sort/{sort}/page/{page}",
+      web::get().to(index),
+    )
     .route("/c/{name}", web::get().to(index))
     .route("/community/{id}", web::get().to(index))
     .route(
@@ -30,17 +33,19 @@ pub fn config(cfg: &mut web::ServiceConfig) {
     .route("/modlog/community/{community_id}", web::get().to(index))
     .route("/modlog", web::get().to(index))
     .route("/setup", web::get().to(index))
+    .route("/admin", web::get().to(index))
     .route(
       "/search/q/{q}/type/{type}/sort/{sort}/page/{page}",
       web::get().to(index),
     )
     .route("/search", web::get().to(index))
     .route("/sponsors", web::get().to(index))
-    .route("/password_change/{token}", web::get().to(index));
+    .route("/password_change/{token}", web::get().to(index))
+    .route("/instances", web::get().to(index));
 }
 
-async fn index() -> Result<NamedFile, actix_web::error::Error> {
+async fn index() -> Result<NamedFile, Error> {
   Ok(NamedFile::open(
-    Settings::get().front_end_dir.to_owned() + "/index.html",
+    Settings::get().front_end_dir + "/index.html",
   )?)
 }