filed/.env.example

@@ -8,5 +8,4 @@ REDIS_PREFIX=bfile-
 
 USERCONTENT_DIR=/opt/user_uploads
 
-INSTANCE_URL=http://localhost
-UPLOADS_PATH=file # can be only one alphanumeric word
+INSTANCE_URL=http://localhost

filed/src/env.rs

@@ -19,8 +19,7 @@ pub struct Env {
     pub listen: SocketAddr,
     pub redis: Redis,
     pub filedir: String,
-    pub instanceurl: String,
-    pub uploadspath: String
+    pub instanceurl: String
 }
 
 fn get_var<T: Into<String>, O: From<String>>(name: T) -> Result<O, String> {
@@ -54,8 +53,7 @@ pub fn loadenv() -> Result<Env, Box<dyn std::error::Error>> {
                 }
                 spath
             },
-            instanceurl: get_var("INSTANCE_URL")?,
-            uploadspath: get_var("UPLOADS_PATH")?
+            instanceurl: get_var("INSTANCE_URL")?
         }
     )
 }

filed/src/web/api.rs

@@ -1,18 +0,0 @@
-use warp::{reply::Reply, reject::Rejection, Filter};
-
-use super::state::SharedState;
-
-mod get_all;
-
-pub fn api_root() -> Box<dyn Reply> {
-    Box::new(warp::reply::json(&String::from("{ error: \"You have called the API root of a blek! File instance. Refer to https://git.blek.codes/blek/bfile.git for documentation.\" }")))
-}
-
-pub fn get_routes(state: SharedState) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
-    let api = warp::path!("api");
-    let api = api
-        .and(warp::path::end())
-        .map(api_root)
-        .or(get_all::get_all_f(state));
-    api
-}

filed/src/web/api/get_all.rs

@@ -1,13 +0,0 @@
-use warp::{reply::Reply, reject::Rejection, Filter};
-
-use crate::web::state::SharedState;
-
-pub async fn get_all(_state: SharedState) -> Result<Box<dyn Reply>, Rejection> {
-    Ok(Box::new(warp::reply::json(&String::from("aaaaa"))))
-}
-
-pub fn get_all_f(state: SharedState) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
-    warp::path!("get_all")
-        .map(move || state.clone())
-        .and_then(get_all)
-}

filed/src/web/mod.rs

@@ -12,7 +12,6 @@ mod pages;
 mod forms;
 mod state;
 mod rejection;
-mod api;
 
 use state::SharedState;
 
@@ -21,8 +20,7 @@ pub fn routes(state: SharedState) -> impl Filter<Extract = impl Reply, Error = R
     let staticpath = staticpath.to_str().unwrap().to_string() + "/static";
 
     pages::get_routes(state.clone())
-        .or(forms::get_routes(state.clone()))
-        .or(api::get_routes(state))
+        .or(forms::get_routes(state))
         .or(warp::fs::dir(staticpath.to_string()))
 }
 

filed/src/web/pages.rs

@@ -2,9 +2,9 @@
  pages.rs - All the HTML pages
 */
 
-use std::collections::HashMap;
+use std::{collections::HashMap, convert::Infallible};
 
-use warp::{reply::{Reply, Html}, Filter, reject::Rejection};
+use warp::{reply::{Reply, Html}, Filter, reject::{Rejection, Reject}};
 use askama::Template;
 
 use crate::env::Env;