Bumping to version 0.1.5. Added the violence command, along with a us…

…er registration system and plugins to go with it.
sonicrules1234 · Aug 11, 2021 · adcacfb · adcacfb
1 parent eedd836
commit adcacfb
Show file tree

Hide file tree

Showing 19 changed files with 474 additions and 70 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,4 +14,4 @@
 /sonicobject/test.db
 /sonicmacros/target
 /sonicmacros/Cargo.lock
-
+/sftp.json
diff --git a/Cargo.nix b/Cargo.nix
@@ -87,7 +87,7 @@ rec {
     #   inject test dependencies into the build
 
     crates = {
-      "acid-store" = rec {
+      "acid-store 0.8.0" = rec {
         crateName = "acid-store";
         version = "0.8.0";
         edition = "2018";
@@ -183,6 +183,89 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "store-directory" ];
       };
+      "acid-store 0.9.1" = rec {
+        crateName = "acid-store";
+        version = "0.9.1";
+        edition = "2018";
+        sha256 = "0jqzswjd7xld0ycvwj2iyj5v3mlh66fm289gc83pklpjziv5inpk";
+        authors = [
+          "Wren Powell <[email protected]>"
+        ];
+        dependencies = [
+          {
+            name = "anyhow";
+            packageId = "anyhow";
+          }
+          {
+            name = "bitflags";
+            packageId = "bitflags";
+          }
+          {
+            name = "blake3";
+            packageId = "blake3";
+          }
+          {
+            name = "cdchunking";
+            packageId = "cdchunking";
+          }
+          {
+            name = "digest";
+            packageId = "digest";
+          }
+          {
+            name = "hex-literal";
+            packageId = "hex-literal";
+          }
+          {
+            name = "once_cell";
+            packageId = "once_cell";
+          }
+          {
+            name = "rmp";
+            packageId = "rmp";
+          }
+          {
+            name = "rmp-serde";
+            packageId = "rmp-serde";
+          }
+          {
+            name = "secrecy";
+            packageId = "secrecy";
+          }
+          {
+            name = "serde";
+            packageId = "serde";
+            features = [ "derive" "rc" ];
+          }
+          {
+            name = "thiserror";
+            packageId = "thiserror";
+          }
+          {
+            name = "uuid";
+            packageId = "uuid";
+            features = [ "serde" "v4" ];
+          }
+          {
+            name = "weak-table";
+            packageId = "weak-table";
+          }
+        ];
+        features = {
+          "compression" = [ "lz4" ];
+          "encryption" = [ "sodiumoxide" "rand" ];
+          "file-metadata" = [ "repo-file" "nix" "filetime" "xattr" "users" "exacl" ];
+          "fuse-mount" = [ "fuse" "bimap" "time" "tempfile" "file-metadata" ];
+          "hash-algorithms" = [ "blake2" "sha2" "sha3" ];
+          "repo-file" = [ "relative-path" "walkdir" "hole-punch" ];
+          "store-rclone" = [ "store-sftp" "rand" ];
+          "store-redis" = [ "redis" ];
+          "store-s3" = [ "rust-s3" "tokio" ];
+          "store-sftp" = [ "ssh2" ];
+          "store-sqlite" = [ "rusqlite" ];
+        };
+        resolvedDefaultFeatures = [ "default" "store-directory" ];
+      };
       "adler32" = rec {
         crateName = "adler32";
         version = "1.2.0";
@@ -597,6 +680,22 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
+      "block-buffer" = rec {
+        crateName = "block-buffer";
+        version = "0.9.0";
+        edition = "2018";
+        sha256 = "1r4pf90s7d7lj1wdjhlnqa26vvbm6pnc33z138lxpnp9srpi2lj1";
+        authors = [
+          "RustCrypto Developers"
+        ];
+        dependencies = [
+          {
+            name = "generic-array";
+            packageId = "generic-array";
+          }
+        ];
+
+      };
       "bumpalo" = rec {
         crateName = "bumpalo";
         version = "3.7.0";
@@ -1057,6 +1156,28 @@ rec {
           "asio" = [ "asio-sys" "num-traits" ];
         };
       };
+      "cpufeatures" = rec {
+        crateName = "cpufeatures";
+        version = "0.1.5";
+        edition = "2018";
+        sha256 = "1vvid867wpnz5wzma3f4x2ijl83fgr6x1fc6shspzpf9ysb9djb6";
+        authors = [
+          "RustCrypto Developers"
+        ];
+        dependencies = [
+          {
+            name = "libc";
+            packageId = "libc";
+            target = { target, features }: (stdenv.hostPlatform.config == "aarch64-apple-darwin");
+          }
+          {
+            name = "libc";
+            packageId = "libc";
+            target = { target, features }: ((target."arch" == "aarch64") && (target."os" == "linux"));
+          }
+        ];
+
+      };
       "crc32fast" = rec {
         crateName = "crc32fast";
         version = "1.2.1";
@@ -1815,6 +1936,20 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
+      "hex" = rec {
+        crateName = "hex";
+        version = "0.4.3";
+        edition = "2018";
+        sha256 = "0w1a4davm1lgzpamwnba907aysmlrnygbqmfis2mqjx5m552a93z";
+        authors = [
+          "KokaKiwi <[email protected]>"
+        ];
+        features = {
+          "default" = [ "std" ];
+          "std" = [ "alloc" ];
+        };
+        resolvedDefaultFeatures = [ "alloc" "default" "std" ];
+      };
       "hex-literal" = rec {
         crateName = "hex-literal";
         version = "0.2.1";
@@ -3510,6 +3645,16 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "default" "race" "std" ];
       };
+      "opaque-debug" = rec {
+        crateName = "opaque-debug";
+        version = "0.3.0";
+        edition = "2018";
+        sha256 = "1m8kzi4nd6shdqimn0mgb24f0hxslhnqd1whakyq06wcqd086jk2";
+        authors = [
+          "RustCrypto Developers"
+        ];
+
+      };
       "parking_lot" = rec {
         crateName = "parking_lot";
         version = "0.11.1";
@@ -4805,6 +4950,62 @@ rec {
         ];
 
       };
+      "sha2" = rec {
+        crateName = "sha2";
+        version = "0.9.5";
+        edition = "2018";
+        sha256 = "04lzf4swq6cijvxnc6facr3g72h5v7a5z8lz3xrkf8gxa9bswqmk";
+        authors = [
+          "RustCrypto Developers"
+        ];
+        dependencies = [
+          {
+            name = "block-buffer";
+            packageId = "block-buffer";
+          }
+          {
+            name = "cfg-if";
+            packageId = "cfg-if 1.0.0";
+          }
+          {
+            name = "cpufeatures";
+            packageId = "cpufeatures";
+            target = { target, features }: (stdenv.hostPlatform.config == "aarch64-apple-darwin");
+          }
+          {
+            name = "cpufeatures";
+            packageId = "cpufeatures";
+            target = { target, features }: ((target."arch" == "aarch64") && (target."os" == "linux"));
+          }
+          {
+            name = "cpufeatures";
+            packageId = "cpufeatures";
+            target = { target, features }: ((target."arch" == "x86") || (target."arch" == "x86_64"));
+          }
+          {
+            name = "digest";
+            packageId = "digest";
+          }
+          {
+            name = "opaque-debug";
+            packageId = "opaque-debug";
+          }
+        ];
+        devDependencies = [
+          {
+            name = "digest";
+            packageId = "digest";
+            features = [ "dev" ];
+          }
+        ];
+        features = {
+          "asm" = [ "sha2-asm" ];
+          "asm-aarch64" = [ "asm" ];
+          "default" = [ "std" ];
+          "std" = [ "digest/std" ];
+        };
+        resolvedDefaultFeatures = [ "default" "std" ];
+      };
       "shlex" = rec {
         crateName = "shlex";
         version = "0.1.1";
@@ -4901,7 +5102,7 @@ rec {
       };
       "sonicbot" = rec {
         crateName = "sonicbot";
-        version = "0.1.4";
+        version = "0.1.5";
         edition = "2018";
         crateBin = [
           { name = "sonicbot"; path = "src/main.rs"; }
@@ -4913,9 +5114,13 @@ rec {
         dependencies = [
           {
             name = "acid-store";
-            packageId = "acid-store";
+            packageId = "acid-store 0.9.1";
             features = [ "store-directory" ];
           }
+          {
+            name = "hex";
+            packageId = "hex";
+          }
           {
             name = "humantime";
             packageId = "humantime";
@@ -4957,6 +5162,10 @@ rec {
             name = "serde_json";
             packageId = "serde_json";
           }
+          {
+            name = "sha2";
+            packageId = "sha2";
+          }
           {
             name = "sonicmacros";
             packageId = "sonicmacros";
@@ -5002,7 +5211,7 @@ rec {
         dependencies = [
           {
             name = "acid-store";
-            packageId = "acid-store";
+            packageId = "acid-store 0.8.0";
             features = [ "store-directory" ];
           }
           {

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sonicbot"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Westly Ward <[email protected]>"]
 edition = "2018"
 
@@ -20,14 +20,15 @@ rand = "0.8.4"
 reqwest = { version = "0.10", default-features = false, features = ["blocking", "rustls-tls"] }
 #sled = "0.34.6"
 sonicobject = { path = "./sonicobject" }
-acid-store = { version = "0.8.0", features = ["store-directory"] }
+acid-store = { version = "0.9.1", features = ["store-directory"] }
 sonicmacros = { path = "./sonicmacros" }
 humantime = "2.1.0"
 textwrap = "0.14.2"
 regex = "1.5.4"
+hex = "0.4.3"
+sha2 = "0.9.5"
 #empty-option = "0.1.1"
 
-
 [target.'cfg(target_os = "android")'.dependencies]
 macroquad = "0.3.7"
 linewrapper = { path = "./linewrapper" }
@@ -44,6 +45,7 @@ linewrapper = { path = "./linewrapper" }
 #ndk = "0.3.0"
 #ndk-glue = "0.3.0"
 
+
 [[package.metadata.android.permission]]
 name = "android.permission.INTERNET"
 

diff --git a/sonicmacros/src/lib.rs b/sonicmacros/src/lib.rs
@@ -48,7 +48,7 @@ pub fn backinsert(item: TokenStream) -> TokenStream {
     }
     //println!("1");
     let lastitemindex = items.len() - 1;
-    let lastvalue = items.last().unwrap();
+    //let lastvalue = items.last().unwrap();
     let firstvalue = &items.clone()[0];
     //println!("2");
     for (num, token) in items.clone().into_iter().enumerate() {
@@ -107,15 +107,15 @@ use crate::msgfmts;
     }
     code.push_str(r#"pub struct ModList {
         pub modnames: Vec<String>,
-        pub mainfunctions: HashMap<String, Box<dyn Fn(IRCMessage, &mut SonicObject, SonicObject) -> Vec<msgfmts::Message>>>,
+        pub mainfunctions: HashMap<String, Box<dyn Fn(IRCMessage, &mut SonicObject, SonicObject, &mut SonicObject) -> Vec<msgfmts::Message>>>,
         pub permissions: HashMap<String, u8>,
         pub syntaxes: HashMap<String, String>,
         pub helps: HashMap<String, String>,
         pub minargs: HashMap<String, u8>,
     }
     impl ModList {
         pub fn new() -> Self {
-            let mut mainfunctions: HashMap<String, Box<dyn Fn(IRCMessage, &mut SonicObject, SonicObject) -> Vec<msgfmts::Message>>> = HashMap::new();
+            let mut mainfunctions: HashMap<String, Box<dyn Fn(IRCMessage, &mut SonicObject, SonicObject, &mut SonicObject) -> Vec<msgfmts::Message>>> = HashMap::new();
             let mut permissions: HashMap<String, u8> = HashMap::new();
             let mut syntaxes: HashMap<String, String> = HashMap::new();
             let mut helps: HashMap<String, String> = HashMap::new();