Reformat, relicense, and more

strawmelonjuice · Apr 8, 2024 · 5645326 · 5645326
1 parent d9041fd
commit 5645326
Show file tree

Hide file tree

Showing 11 changed files with 847 additions and 23 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ documentation = "https://cynthia-docs.strawmelonjuice.com/"
 authors = ["MLC Bloeiman <[email protected]>"]
 version = "2.1.4-alpha.0.1"
 edition = "2021"
-license = "GPL-3.0 OR MIT"
+license = "AGPL-3"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/LICENSE b/LICENSE
diff --git a/src/config.rs b/src/config.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use crate::logger;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
@@ -190,13 +196,13 @@ fn c_l_filep() -> String {
     String::from("./cynthia.log")
 }
 
-fn d_logging () -> Logging {
+fn d_logging() -> Logging {
     Logging {
         file: d_file_logging(),
         console: d_console_logging(),
     }
 }
-fn d_file_logging () -> FileLogging {
+fn d_file_logging() -> FileLogging {
     FileLogging {
         filepath: "./cynthia.log".to_string(),
         enabled: true,
@@ -210,7 +216,7 @@ fn d_file_logging () -> FileLogging {
         jsr_errors: true,
     }
 }
-fn d_console_logging () -> ConsoleLogging {
+fn d_console_logging() -> ConsoleLogging {
     ConsoleLogging {
         enabled: true,
         cache: false,
@@ -222,4 +228,4 @@ fn d_console_logging () -> ConsoleLogging {
         plugin_asset_requests: false,
         jsr_errors: true,
     }
-}
+}
diff --git a/src/contentservers.rs b/src/contentservers.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use std::fs;
 
 use actix_web::HttpResponse;

diff --git a/src/dashfunctions.rs b/src/dashfunctions.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use crate::{logger, LoadedData};
 use actix_web::web::Data;
 use actix_web::{post, web, HttpResponse};
@@ -19,10 +25,8 @@ struct DashAPIData {
 }
 
 #[derive(Deserialize)]
-struct PluginDashInstallParams {
-    plugin_name: String,
-    plugin_version: String,
-}
+struct PluginDashInstallParams(String, Option<String>);
+
 #[derive(Deserialize)]
 struct PluginDashRemoveParams {
     plugin_name: String,
@@ -63,12 +67,13 @@ pub(crate) async fn dashserver(
                 Ok(s) => {
                     let plugindata: PluginDashInstallParams = s;
                     crate::subcommand::plugin_install(
-                        plugindata.plugin_name,
-                        plugindata.plugin_version,
+                        plugindata.0,
+                        plugindata.1.unwrap_or("latest".parse().unwrap()),
                     );
                 }
 
                 Err(_e) => {
+                    println!("{}", data.params);
                     return HttpResponse::BadRequest().body(String::from("Invalid plugin."));
                 }
             },

diff --git a/src/files.rs b/src/files.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use crate::jsr::{jsruntime, BUNJSR, BUN_NPM_EX, NODEJSR, NODEJSR_EX};
 use crate::structs::CynthiaCacheIndexObject;
 use crate::{config, logger};

diff --git a/src/jsr.rs b/src/jsr.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use crate::logger;
 
 // Bun on windows is enabled by default. This is because choosing to have Bun on windows, means choosing for an experimental feature.

diff --git a/src/logger.rs b/src/logger.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 #![allow(dead_code)]
 
 use crate::config;
@@ -84,11 +90,25 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
     if !clog.enabled {
         return;
     };
-    let mut file = OpenOptions::new().append(true).create(true).open(log.clone().file.filepath).unwrap();
+    let mut file = OpenOptions::new()
+        .append(true)
+        .create(true)
+        .open(log.clone().file.filepath)
+        .unwrap();
     file.seek(SeekFrom::End(0)).unwrap();
     match act {
         200 | 2 => {
-            if log.file.clone().enabled && log.file.clone().requests { file.write_all(format!("[{}]\t200/SUCCESS\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().requests {
+                file.write_all(
+                    format!(
+                        "[{}]\t200/SUCCESS\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             if !clog.requests {
                 return;
             };
@@ -103,7 +123,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             println!("{0}👍{DIVVER}{1}", preq, msg);
         }
         3 | 404 => {
-            if log.file.clone().enabled && log.file.clone().requests { file.write_all(format!("[{}]\t404/NOTFOUND\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().requests {
+                file.write_all(
+                    format!(
+                        "[{}]\t404/NOTFOUND\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             if !clog.requests {
                 return;
             };
@@ -118,7 +148,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             println!("{0}👎{DIVVER}{1}", preq, msg);
         }
         5 => {
-            if log.file.clone().enabled && log.file.clone().error { file.write_all(format!("[{}]\tERROR\t\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().error {
+                file.write_all(
+                    format!(
+                        "[{}]\tERROR\t\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             // Check if these log items are enabled
             if !clog.error {
                 return;
@@ -134,7 +174,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             eprintln!("{0}{1}", preq, msg.bright_red());
         }
         15 => {
-            if log.file.clone().enabled && log.file.clone().warn { file.write_all(format!("[{}]\tWARNING\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().warn {
+                file.write_all(
+                    format!(
+                        "[{}]\tWARNING\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             // Check if these log items are enabled
             if !clog.warn {
                 return;
@@ -150,7 +200,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             eprintln!("{0}⚠{DIVVER}{1}", preq, msg.on_bright_magenta().black());
         }
         12 => {
-            if log.file.clone().enabled && log.file.clone().jsr_errors { file.write_all(format!("[{}]\tERROR-JS\t\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().jsr_errors {
+                file.write_all(
+                    format!(
+                        "[{}]\tERROR-JS\t\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             // Check if these log items are enabled
             if !clog.jsr_errors {
                 return;
@@ -166,7 +226,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             eprintln!("{0}{1}", preq, msg.bright_red().on_bright_yellow());
         }
         49038 => {
-            if log.file.clone().enabled && log.file.clone().proxy_requests { file.write_all(format!("[{}]\tPROXY\t\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().proxy_requests {
+                file.write_all(
+                    format!(
+                        "[{}]\tPROXY\t\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             // Check if these log items are enabled
             if !clog.proxy_requests {
                 return;
@@ -182,7 +252,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             println!("{0}❕{DIVVER}{1}", preq, msg.bright_green());
         }
         293838 => {
-            if log.file.clone().enabled && log.file.clone().plugin_asset_requests { file.write_all(format!("[{}]\t200/PLUGIN\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().plugin_asset_requests {
+                file.write_all(
+                    format!(
+                        "[{}]\t200/PLUGIN\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
 
             // Check if these log items are enabled
             if !clog.plugin_asset_requests {
@@ -199,7 +279,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             println!("{0}❕{DIVVER}{1}", preq, msg.bright_green());
         }
         10 => {
-            if log.file.clone().enabled && log.file.clone().info { file.write_all(format!("[{}]\tNOTE\t\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().info {
+                file.write_all(
+                    format!(
+                        "[{}]\tNOTE\t\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             // Check if these log items are enabled
             if !clog.info {
                 return;
@@ -215,7 +305,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             println!("{0}❕{DIVVER}{1}", preq, msg.bright_green());
         }
         31 => {
-            if log.file.clone().enabled && log.file.clone().cache { file.write_all(format!("[{}]\tCACHING\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled && log.file.clone().cache {
+                file.write_all(
+                    format!(
+                        "[{}]\tCACHING\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             if !clog.cache {
                 return;
             };
@@ -230,7 +330,17 @@ pub(crate) fn log_by_act_num(act: i32, msg: String) {
             println!("{0}♻️{DIVVER}{1}", preq, msg.bright_white().italic());
         }
         _ => {
-            if log.file.clone().enabled { file.write_all(format!("[{}]\tLOG\t\t\t\t{}\n", times, strip_ansi_escapes::strip_str(msg.clone().as_str())).as_bytes()).unwrap(); };
+            if log.file.clone().enabled {
+                file.write_all(
+                    format!(
+                        "[{}]\tLOG\t\t\t\t{}\n",
+                        times,
+                        strip_ansi_escapes::strip_str(msg.clone().as_str())
+                    )
+                    .as_bytes(),
+                )
+                .unwrap();
+            };
             let name = format!("[{} - [LOG]", times).blue();
             let spaceleft = if name.chars().count() < SPACES {
                 SPACES - name.chars().count()

diff --git a/src/main.rs b/src/main.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use actix_files::NamedFile;
 use std::io::{Error, ErrorKind};
 use std::{fs, path::Path, process, sync::Mutex};
@@ -591,7 +597,13 @@ As of now, Cynthia has only 4 commands:
         .italic()
     ));
     if cynthiadashactive {
-        logger::general_warn( String::from("Cynthia dashboard plugin found! The Cynthia Dashboard has additional permissions, so uninstall it if left unused, also check the source  of this plugin."));
+        logger::general_warn(String::from("Cynthia dashboard plugin found!"));
+        logger::general_warn(String::from(
+            "The Cynthia Dashboard has additional permissions,",
+        ));
+        logger::general_warn(String::from(
+            " so uninstall it if left unused. Also check the source of this plugin, is it genuine?",
+        ));
 
         HttpServer::new(move || {
             App::new()

diff --git a/src/structs.rs b/src/structs.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use crate::config::CynthiaConf;
 use serde::{Deserialize, Serialize};
 

diff --git a/src/subcommand.rs b/src/subcommand.rs
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024, MLC 'Strawmelonjuice' Bloeiman
+ *
+ * Licensed under the GNU AFFERO GENERAL PUBLIC LICENSE Version 3, see the LICENSE file for more information.
+ */
+
 use crate::structs::CynthiaPluginManifestItem;
 use crate::{
     jsr::{BUN_NPM, BUN_NPM_EX, NODE_NPM},