From 626f16afb8eea9fdbf7048c0b908368fcb21978a Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Thu, 6 Aug 2020 19:32:31 -0700
Subject: [PATCH] guarding so that _a_ flag is required for us to do anything

---
 server/src/main.rs | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/server/src/main.rs b/server/src/main.rs
index 6905999..cf16c08 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -174,6 +174,25 @@ async fn main() -> Result<(), u16>{
              .help("Starts the API server"))
         .get_matches();
 
+
+    if args.args.len() == 0 {
+		println!("Freechat Server 0.1
+shockrah
+Decentralized chat system
+
+USAGE:
+    freechat-server [FLAGS] [OPTIONS]
+
+FLAGS:
+    -h, --help       Prints help information
+    -s, --server     Starts the API server
+    -V, --version    Prints version information
+
+OPTIONS:
+    -c, --create-owner <Owner>     Creates an account with full permissions in the SQL database.
+    -d, --db-url <DATABASE URL>    Sets the DATABASE URL via an environment variable");
+    }
+
     if let Some(db_url) = args.value_of("db-url") {
         set_var("DATABASE_URL", db_url);
     }
@@ -181,12 +200,16 @@ async fn main() -> Result<(), u16>{
     if let Some(owner_name) = args.value_of("create-owner") {
         let p = Pool::new(&env::var("DATABASE_URL").unwrap());
         println!("Creating owner {{ {} }}...", owner_name);
-        members::insert_new_member(&p, owner_name.to_string(), std::u64::MAX);
+        if let Ok(owner) = members::insert_new_member(&p, owner_name.to_string(), std::u64::MAX).await {
+            println!("{}", owner.to_json());
+        }
         p.disconnect();
     }
 
-    if main_ret == NO_ERR {
-        main_ret = start_server(main_ret).await;
+    if let Some(_) = args.value_of("server") {
+        if main_ret == NO_ERR {
+            main_ret = start_server(main_ret).await;
+        }
     }
 
     if main_ret != 0 {