feat: add all teams commands

Author: coffeeispower

src/commands.rs

@@ -10,7 +10,6 @@ pub mod remove;
 pub mod restart;
 pub mod start;
 pub mod stop;
-pub mod teams;
 pub mod upload;
 use colored::Colorize;
 use dialoguer::{theme::ColorfulTheme, Select};
@@ -100,16 +99,19 @@ mod tests {
         assert_eq!(super::format_warn("Some warnings"), out)
     }
 }
-pub fn ask_for_app(token: String, action: &str) -> Result<u128, FetchError> {
-    let user = crate::entities::user::fetch_user(token.clone())?;
-    match user.apps.len() {
+pub fn ask_for_app(token: String, action: &str, teams: bool) -> Result<u128, FetchError> {
+    let apps = if teams {
+        crate::entities::app::App::fetch_foreign_apps(token)
+    } else {
+        crate::entities::app::App::fetch_all(token)
+    }?;
+    match apps.len() {
         0 => {
-            err("You don't have any apps. Use `discloud up` to upload one.");
-            std::process::exit(1)
-        }
-        1 => Ok(user.apps[0].parse().unwrap()),
+            format_err("You don't have any apps!");
+            std::process::exit(1);
+        },
+        1 => Ok(apps[0].id.parse().unwrap()),
         _ => {
-            let apps = crate::entities::app::App::fetch_all(token)?;
             let options = apps
                 .iter()
                 .map(|app| format!("{}: ({}) {}", app.name, app.lang, app.id))

src/commands/apps.rs

@@ -2,11 +2,11 @@ use colored::Colorize;
 
 use crate::entities::FetchError;
 #[tracing::instrument]
-pub fn apps() {
+pub fn apps(teams: bool) {
     let token = super::expect_token();
-    match crate::entities::app::App::fetch_all(token) {
+    match if !teams {crate::entities::app::App::fetch_all(token)} else {crate::entities::app::App::fetch_foreign_apps(token)} {
         Ok(apps) => {
-            println!("Your apps:");
+            println!("{}Your apps:", if teams{"(Not) "} else {""});
             for app in apps {
                 println!(
                     "- {}: ({}) {}",

src/commands/commit.rs

@@ -16,9 +16,9 @@ fn get_zip_file_path() -> PathBuf {
     dst_file
 }
 #[tracing::instrument]
-pub fn commit() {
+pub fn commit(teams: bool) {
     let token = super::expect_token();
-    let app_id = match super::ask_for_app(token.clone(), "commit") {
+    let app_id = match super::ask_for_app(token.clone(), "commit", teams) {
         Ok(app_id) => app_id,
         Err(error) => {
             super::err(&format!("Couldn't fetch apps: {}", error));
@@ -33,8 +33,8 @@ pub fn commit() {
         Err(e) => super::err(&format!("Failed to zip: {:?}", e)),
     }
     let mut spinner = Spinner::new(spinners::Spinners::Earth, "Committing app...".to_string());
-    let msg = match upload_zip(token, app_id) {
-        Ok(()) => super::format_log("Your app was successfully commited!"),
+    let msg = match upload_zip(token, app_id, teams) {
+        Ok(()) => if !teams {super::format_log("Your app was updated successfully!")} else {super::format_log("Your buddy's app was updated!")},
         Err(err) => super::format_err(&err),
     };
     spinner.stop_with_message(msg);
@@ -115,7 +115,7 @@ fn zip_dir_to_file(
     Ok(())
 }
 #[tracing::instrument]
-fn upload_zip(token: String, app_id: u128) -> Result<(), String> {
+fn upload_zip(token: String, app_id: u128, teams: bool) -> Result<(), String> {
     let file_path = get_zip_file_path();
     let file_path = file_path.to_str().unwrap();
     let client = reqwest::blocking::Client::builder()
@@ -127,7 +127,7 @@ fn upload_zip(token: String, app_id: u128) -> Result<(), String> {
         Err(err) => Err(format!("Couldn't open zip file: {}", err)),
         Ok(form) => {
             let req = client
-                .put(crate::api_url!(format!("/app/{}/commit", app_id)))
+                .put(crate::api_url!(format!("/{}/{}/commit", if teams {"team"} else {"app"}, app_id)))
                 .multipart(form)
                 .header("api-token", token);
             let res = req.send();

src/commands/logs.rs

@@ -1,12 +1,12 @@
 use spinners::{Spinner, Spinners};
 
 #[tracing::instrument]
-pub fn logs() {
+pub fn logs(teams: bool) {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "show the logs") {
+    match super::ask_for_app(token.clone(), "show the logs", teams) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Bounce, "Downloading the logs".into());
-            match crate::entities::app::App::get_logs(token, app_id) {
+            match crate::entities::app::App::get_logs(token, app_id, teams) {
                 Ok(logs) => {
                     spinner.stop_with_message(logs);
                 }

src/commands/mods/add.rs

@@ -8,7 +8,7 @@ use crate::{
 #[tracing::instrument]
 pub fn add(id: u128) {
     let token = expect_token();
-    let app_id = crate::handle_result!(ask_for_app(token.clone(), "add a moderator"));
+    let app_id = crate::handle_result!(ask_for_app(token.clone(), "add a moderator", false));
     let mut spinner = Spinner::new(
         spinners::Spinners::Bounce,
         format!("Adding {} as a moderator", id),

src/commands/mods/allow.rs

@@ -4,7 +4,8 @@ pub fn allow(id: u128, features: Vec<Feature>) {
     let token = super::expect_token();
     let app_id = crate::handle_result!(super::ask_for_app(
         token.clone(),
-        "modify the mod's permissions"
+        "modify the mod's permissions",
+        false
     ));
     let mut spinner = Spinner::new(Spinners::Pong, "Adding the permissions...".into());
     let moderator = crate::handle_result!(crate::entities::moderator::Mod::fetch_mod(

src/commands/mods/deny.rs

@@ -10,7 +10,8 @@ pub fn deny(id: u128, features: Vec<Feature>) {
     let token = super::expect_token();
     let app_id = crate::handle_result!(super::ask_for_app(
         token.clone(),
-        "modify the mod's permissions"
+        "modify the mod's permissions",
+        false
     ));
     let mut spinner = Spinner::new(Spinners::Toggle2, "Removing the permissions...".into());
     let moderator = crate::handle_result!(crate::entities::moderator::Mod::fetch_mod(

src/commands/mods/remove.rs

@@ -8,7 +8,7 @@ use crate::{
 #[tracing::instrument]
 pub fn remove(id: u128) {
     let token = expect_token();
-    let app_id = handle_result!(ask_for_app(token.clone(), "remove the moderator"));
+    let app_id = handle_result!(ask_for_app(token.clone(), "remove the moderator", false));
     let mut spinner = Spinner::new(
         spinners::Spinners::Moon,
         format!("Sending {} to the moon", id),

src/commands/remove.rs

@@ -2,7 +2,7 @@ use spinners::*;
 #[tracing::instrument]
 pub fn remove() {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "delete") {
+    match super::ask_for_app(token.clone(), "delete", false) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Flip, "Deleting your app".into());
             match crate::entities::app::App::delete(token, app_id) {

src/commands/restart.rs

@@ -1,11 +1,11 @@
 use spinners::*;
 #[tracing::instrument]
-pub fn restart() {
+pub fn restart(teams: bool) {
     let token = super::expect_token();
-    match super::ask_for_app(token.clone(), "restart") {
+    match super::ask_for_app(token.clone(), "restart", teams) {
         Ok(app_id) => {
             let mut spinner = Spinner::new(Spinners::Earth, "Restarting your app".into());
-            match crate::entities::app::App::restart(token, app_id) {
+            match crate::entities::app::App::restart(token, app_id, teams) {
                 Ok(()) => {
                     spinner.stop_with_message(super::format_log("Your app is up!"));
                 }