bundle change-password cli with peach-web

Cargo.toml

@@ -9,6 +9,7 @@ members = [
     "peach-monitor",
     "peach-stats",
     "peach-jsonrpc-server",
-    "peach-dyndns-updater"
+    "peach-dyndns-updater",
+    "tilde-client"
 ]
 

ORIGINAL-PEACHCLOUD-README.md

@@ -0,0 +1,74 @@
+# [PeachCloud](http://peachcloud.org) :peach: :cloud:
+
+_Better [Scuttlebutt](https://scuttlebutt.nz) cloud infrastructure as a hardware product._
+
+[**_Support us on OpenCollective!_**](https://opencollective.com/peachcloud)
+
+[![Build Status](https://build.coopcloud.tech/api/badges/PeachCloud/peach-workspace/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/PeachCloud/peach-workspace)
+
+## Background
+
+- April 2018 project proposal: [`%HqwAsltORROCh4uyOq6iV+SsqU3OuNUevnq+5dwCqVI=.sha256`](https://viewer.scuttlebot.io/%25HqwAsltORROCh4uyOq6iV%2BSsqU3OuNUevnq%2B5dwCqVI%3D.sha256)
+- November 2018 project pivot: [`%9NCyTf+oBxG0APlXRCKtrGZj3t+i+Kp3pKPN1gtFX2c=.sha256`](https://viewer.scuttlebot.io/%259NCyTf%2BoBxG0APlXRCKtrGZj3t%2Bi%2BKp3pKPN1gtFX2c%3D.sha256)
+
+## Active Repositories
+
+**Documentation**
+
+ - [peach-devdocs](https://github.com/peachcloud/peach-devdocs) - Developer documentation for PeachCloud in the form of a Markdown book
+
+**Devops**
+
+ - [peach-vps](https://github.com/peachcloud/peach-vps) - Setup scripts and configuration files for deploying a PeachCloud development server
+ 
+**Image building & device configuration**
+
+ - [peach-config](https://github.com/peachcloud/peach-config) - Configuration instructions, files and scripts
+ - [peach-img-builder](https://github.com/peachcloud/peach-img-builder) - Vmdb2 script for building a Debian disc image for Raspberry Pi with PeachCloud pre-installed
+
+**Microservices**
+
+ - [peach-buttons](https://github.com/peachcloud/peach-buttons) - Emit GPIO events using JSON-RPC pubsub over WS
+ - [peach-oled](https://github.com/peachcloud/peach-oled) - Write and draw to OLED display using JSON-RPC over HTTP
+ - [peach-menu](https://github.com/peachcloud/peach-menu) - A menu for monitoring and interacting with the PeachCloud device
+ - [peach-network](https://github.com/peachcloud/peach-network) - Query and configure network interfaces using JSON-RPC over HTTP
+ - [peach-stats](https://github.com/peachcloud/peach-stats) - Query system statistics using JSON-RPC over HTTP
+ - [peach-lib](https://github.com/peachcloud/peach-lib) - JSON-RPC client library for the PeachCloud ecosystem
+ - [peach-monitor](https://github.com/peachcloud/peach-monitor) - Monitor network data usage and set alert flags based on user-defined thresholds
+
+**Diagnostics**
+
+ - [peach-probe](https://github.com/peachcloud/peach-probe) - Probe PeachCloud microservices to evaluate their state and ensure correct API responses
+
+**Web interface**
+
+ - [peach-patterns](https://github.com/peachcloud/peach-patterns) - Pattern library for the PeachCloud UI design system
+ - [peach-web](https://github.com/peachcloud/peach-web) - A web interface for monitoring and interacting with the PeachCloud device
+
+## Continuous Integration
+
+[Drone CI](https://docs.drone.io/) is used to provide continuous integration for this workspace. The configuration file can be found in `.drone.yml` in the root of this repository. It is currently configured to run `cargo fmt`, `cargo clippy`, `cargo test` and `cargo build` on every `pull request` event. The pipeline runs on the AMD64 Debian Buster image from the official Rust Docker image repository.
+
+The status of the current and previous CI builds can be viewed via the [Drone CI Build UI](https://build.coopcloud.tech/PeachCloud/peach-workspace) (kindly hosted by Co-op Cloud).
+
+Adding `[CI SKIP]` to the end of a commit message results in the CI checks being skipped for the next event. For example:
+
+```
+git commit -m "update readme [CI SKIP]"
+git push origin main
+```
+
+## Developer Diaries
+
+- [@ahdinosaur](https://github.com/ahdinosaur): `@6ilZq3kN0F+dXFHAPjAwMm87JEb/VdB+LC9eIMW3sa0=.ed25519`
+  - 1: [`%bSkZCJBmNYUmECNKYOiWkgEeRxrlo2UghNBzE6Cph94=.sha256`](https://viewer.scuttlebot.io/%25bSkZCJBmNYUmECNKYOiWkgEeRxrlo2UghNBzE6Cph94%3D.sha256)
+  - 2: [`%2L7gYAh2ih+7eFCrtObPWIUYHuGnJjwj4KCXrCIsWhM=.sha256`](https://viewer.scuttlebot.io/%252L7gYAh2ih%2B7eFCrtObPWIUYHuGnJjwj4KCXrCIsWhM%3D.sha256)
+ - [@mycognosist](https://github.com/mycognosist): `@HEqy940T6uB+T+d9Jaa58aNfRzLx9eRWqkZljBmnkmk=.ed25519`
+   - [`%mKUByRp4Gib6fqP1q2/dHg+ueSoR+Sj2Y0D7T0Np0D4=.sha256`](https://viewer.scuttlebot.io/%25mKUByRp4Gib6fqP1q2%2FdHg%2BueSoR%2BSj2Y0D7T0Np0D4%3D.sha256)
+
+## Accounts
+
+- [GitHub](https://github.com/peachcloud)
+- [Twitter](https://twitter.com/peachcloudorg)
+- [Email](mailto:peachcloudorg@gmail.com)
+- [OpenCollective](https://opencollective.com/peachcloud)

README.md

@@ -2,73 +2,35 @@
 
 _Better [Scuttlebutt](https://scuttlebutt.nz) cloud infrastructure as a hardware product._
 
-[**_Support us on OpenCollective!_**](https://opencollective.com/peachcloud)
+![image of peachcloud device](https://peach.commoninternet.net/assets/peachcloud.jpg)
+
+## About
+
+This project is a hack that combines PeachCloud with TildFriends. 
+
+The original PeachCloud project was paused when most development in the Scuttlebutt ecosystem stopped (reference), 
+but even after most funding and development and left the ecosystem, a version of the Sbot in C called TildeFriends was finished,
+and continues to be maintained.
+
+This fork of the PeachCloud project makes use of the TildeFriends sbot to make a minimal and  functional PeachCloud Scuttlebutt pub,
+that can be easily deployed and operated by a non-technical user. 
+
+Due to the timing and conditions of the Scuttlebutt ecosystem, and the rise of new protocols,
+for this particular hack, the focus was on getting the project working in a minimal form (aka more hacky),
+with less of a focus on long-term sustainability of the project as an ecosystem. 
+
+This project serves to provide a working simple-to-use pub for a P2P protocol which is in some ways frozen in amber,
+as well as to share the PeachCloud interface and project, as a design-inspiration for other projects.
+
+## Setup
+
+TODO: how to install with yunohost
+TODO: how to install without yunohost 
 
-[![Build Status](https://build.coopcloud.tech/api/badges/PeachCloud/peach-workspace/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/PeachCloud/peach-workspace)
 
 ## Background
 
 - April 2018 project proposal: [`%HqwAsltORROCh4uyOq6iV+SsqU3OuNUevnq+5dwCqVI=.sha256`](https://viewer.scuttlebot.io/%25HqwAsltORROCh4uyOq6iV%2BSsqU3OuNUevnq%2B5dwCqVI%3D.sha256)
 - November 2018 project pivot: [`%9NCyTf+oBxG0APlXRCKtrGZj3t+i+Kp3pKPN1gtFX2c=.sha256`](https://viewer.scuttlebot.io/%259NCyTf%2BoBxG0APlXRCKtrGZj3t%2Bi%2BKp3pKPN1gtFX2c%3D.sha256)
-
-## Active Repositories
-
-**Documentation**
-
- - [peach-devdocs](https://github.com/peachcloud/peach-devdocs) - Developer documentation for PeachCloud in the form of a Markdown book
-
-**Devops**
-
- - [peach-vps](https://github.com/peachcloud/peach-vps) - Setup scripts and configuration files for deploying a PeachCloud development server
- 
-**Image building & device configuration**
-
- - [peach-config](https://github.com/peachcloud/peach-config) - Configuration instructions, files and scripts
- - [peach-img-builder](https://github.com/peachcloud/peach-img-builder) - Vmdb2 script for building a Debian disc image for Raspberry Pi with PeachCloud pre-installed
-
-**Microservices**
-
- - [peach-buttons](https://github.com/peachcloud/peach-buttons) - Emit GPIO events using JSON-RPC pubsub over WS
- - [peach-oled](https://github.com/peachcloud/peach-oled) - Write and draw to OLED display using JSON-RPC over HTTP
- - [peach-menu](https://github.com/peachcloud/peach-menu) - A menu for monitoring and interacting with the PeachCloud device
- - [peach-network](https://github.com/peachcloud/peach-network) - Query and configure network interfaces using JSON-RPC over HTTP
- - [peach-stats](https://github.com/peachcloud/peach-stats) - Query system statistics using JSON-RPC over HTTP
- - [peach-lib](https://github.com/peachcloud/peach-lib) - JSON-RPC client library for the PeachCloud ecosystem
- - [peach-monitor](https://github.com/peachcloud/peach-monitor) - Monitor network data usage and set alert flags based on user-defined thresholds
-
-**Diagnostics**
-
- - [peach-probe](https://github.com/peachcloud/peach-probe) - Probe PeachCloud microservices to evaluate their state and ensure correct API responses
-
-**Web interface**
-
- - [peach-patterns](https://github.com/peachcloud/peach-patterns) - Pattern library for the PeachCloud UI design system
- - [peach-web](https://github.com/peachcloud/peach-web) - A web interface for monitoring and interacting with the PeachCloud device
-
-## Continuous Integration
-
-[Drone CI](https://docs.drone.io/) is used to provide continuous integration for this workspace. The configuration file can be found in `.drone.yml` in the root of this repository. It is currently configured to run `cargo fmt`, `cargo clippy`, `cargo test` and `cargo build` on every `pull request` event. The pipeline runs on the AMD64 Debian Buster image from the official Rust Docker image repository.
-
-The status of the current and previous CI builds can be viewed via the [Drone CI Build UI](https://build.coopcloud.tech/PeachCloud/peach-workspace) (kindly hosted by Co-op Cloud).
-
-Adding `[CI SKIP]` to the end of a commit message results in the CI checks being skipped for the next event. For example:
-
-```
-git commit -m "update readme [CI SKIP]"
-git push origin main
-```
-
-## Developer Diaries
-
-- [@ahdinosaur](https://github.com/ahdinosaur): `@6ilZq3kN0F+dXFHAPjAwMm87JEb/VdB+LC9eIMW3sa0=.ed25519`
-  - 1: [`%bSkZCJBmNYUmECNKYOiWkgEeRxrlo2UghNBzE6Cph94=.sha256`](https://viewer.scuttlebot.io/%25bSkZCJBmNYUmECNKYOiWkgEeRxrlo2UghNBzE6Cph94%3D.sha256)
-  - 2: [`%2L7gYAh2ih+7eFCrtObPWIUYHuGnJjwj4KCXrCIsWhM=.sha256`](https://viewer.scuttlebot.io/%252L7gYAh2ih%2B7eFCrtObPWIUYHuGnJjwj4KCXrCIsWhM%3D.sha256)
- - [@mycognosist](https://github.com/mycognosist): `@HEqy940T6uB+T+d9Jaa58aNfRzLx9eRWqkZljBmnkmk=.ed25519`
-   - [`%mKUByRp4Gib6fqP1q2/dHg+ueSoR+Sj2Y0D7T0Np0D4=.sha256`](https://viewer.scuttlebot.io/%25mKUByRp4Gib6fqP1q2%2FdHg%2BueSoR%2BSj2Y0D7T0Np0D4%3D.sha256)
-
-## Accounts
-
-- [GitHub](https://github.com/peachcloud)
-- [Twitter](https://twitter.com/peachcloudorg)
-- [Email](mailto:peachcloudorg@gmail.com)
-- [OpenCollective](https://opencollective.com/peachcloud)
+- [Original PeachCloud ReadMe](/ORIGINAL-PEACHCLOUD-README.md)
+- [Original PeachCloud Documentation](https://peach.commoninternet.net)

pdeploy.sh

@@ -0,0 +1,4 @@
+#! /bin/bash
+cargo build --package peach-web --release
+rsync -azvh /home/notplants/computer/projects/peachpub/peach-workspace/target/release/peach-web root@159.89.42.156:/var/www/peachpub_ynh/peach-web
+ssh root@159.89.42.156 'systemctl restart peachpub_ynh-peach-web'

peach-lib/Cargo.toml

@@ -9,10 +9,12 @@ async-std = "1.10"
 chrono = "0.4"
 dirs = "4.0"
 fslock="0.1"
-golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git" }
+kuska-ssb = { git = "https://github.com/Kuska-ssb/ssb" }
+tilde-client = { path = "../tilde-client" }
 jsonrpc-client-core = "0.5"
 jsonrpc-client-http = "0.5"
 jsonrpc-core = "8.0"
+jsonrpc_client = "0.7"
 log = "0.4"
 nanorand = { version = "0.6", features = ["getrandom"] }
 regex = "1"
@@ -22,3 +24,4 @@ serde_yaml = "0.8"
 toml = "0.5"
 sha3 = "0.10"
 lazy_static = "1.4"
+anyhow = "1.0.86"

peach-lib/src/config_manager.rs

@@ -59,8 +59,11 @@ pub fn get_peach_config_defaults() -> HashMap<String, String> {
         ("SSB_ADMIN_IDS", ""),
         ("ADMIN_PASSWORD_HASH", "47"),
         ("TEMPORARY_PASSWORD_HASH", ""),
-        ("GO_SBOT_DATADIR", "/home/peach/.ssb-go"),
-        ("GO_SBOT_SERVICE", "go-sbot.service"),
+        ("TILDE_SBOT_DATADIR", "/home/peach/.local/share/tildefriends/"),
+        ("TILDE_SBOT_SERVICE", "tilde-sbot.service"),
+        ("TILDE_BINARY_PATH", "/home/peach/tildefriends.standalone"),
+        ("TILDE_WRAPPER_PATH", "/home/peach/run-tilde-sbot.sh"),
+        ("TILDE_CONFIG_PATH", "/home/peach/.local/share/tildefriends/tilde-sbot.toml"),
         ("PEACH_CONFIGDIR", "/var/lib/peachcloud"),
         ("PEACH_HOMEDIR", "/home/peach"),
         ("PEACH_WEBDIR", "/usr/share/peach-web"),
@@ -285,8 +288,12 @@ pub fn delete_ssb_admin_id(ssb_id: &str) -> Result<Vec<String>, PeachError> {
 // looks up the String value for SSB_ADMIN_IDS and converts it into a Vec<String>
 pub fn get_ssb_admin_ids() -> Result<Vec<String>, PeachError> {
     let ssb_admin_ids_str = get_config_value("SSB_ADMIN_IDS")?;
-    let ssb_admin_ids: Vec<String> = serde_json::from_str(&ssb_admin_ids_str)?;
-    Ok(ssb_admin_ids)
+    if ssb_admin_ids_str.trim().is_empty() {
+        Ok(vec![])
+    } else {
+        let ssb_admin_ids: Vec<String> = serde_json::from_str(&ssb_admin_ids_str)?;
+        Ok(ssb_admin_ids)
+    }
 }
 
 // takes in a Vec<String> and saves SSB_ADMIN_IDS as a json string representation of this vec

peach-lib/src/error.rs

@@ -1,9 +1,9 @@
 #![warn(missing_docs)]
 
 //! Error handling for various aspects of the PeachCloud system, including the network, OLED, stats and dyndns JSON-RPC clients, as well as the configuration manager, sbot client and password utilities.
-
-use golgi::GolgiError;
 use std::{io, str, string};
+use jsonrpc_client::JsonRpcError;
+use anyhow::Error; // Add the anyhow crate for errors
 
 /// This type represents all possible errors that can occur when interacting with the PeachCloud library.
 #[derive(Debug)]
@@ -104,8 +104,18 @@ pub enum PeachError {
         path: String,
     },
 
-    /// Represents a Golgi error
-    Golgi(GolgiError),
+    /// Represents a JsonRpcError with Solar
+    JsonRpcError(JsonRpcError),
+
+    /// Represents an Anyhow error with Solar
+    SolarClientError(String),
+
+    /// Represents an Anyhow error with Solar
+    TildeClientError(String),
+
+    /// Represents an error with encoding or decoding an SsbMessage
+    SsbMessageError(String),
+
 }
 
 impl std::error::Error for PeachError {
@@ -134,7 +144,10 @@ impl std::error::Error for PeachError {
             PeachError::Utf8ToStr(_) => None,
             PeachError::Utf8ToString(_) => None,
             PeachError::Write { ref source, .. } => Some(source),
-            PeachError::Golgi(_) => None,
+            PeachError::JsonRpcError(_) => None,
+            PeachError::SolarClientError(_) => None,
+            PeachError::TildeClientError(_) => None,
+            PeachError::SsbMessageError(_) => None,
         }
     }
 }
@@ -192,7 +205,10 @@ impl std::fmt::Display for PeachError {
             PeachError::Write { ref path, .. } => {
                 write!(f, "Write error: {}", path)
             }
-            PeachError::Golgi(ref err) => err.fmt(f),
+            PeachError::JsonRpcError(ref err) => err.fmt(f),
+            PeachError::SolarClientError(ref err) => err.fmt(f),
+            PeachError::TildeClientError(ref err) => err.fmt(f),
+            PeachError::SsbMessageError(ref err) => err.fmt(f),
         }
     }
 }
@@ -263,8 +279,15 @@ impl From<string::FromUtf8Error> for PeachError {
     }
 }
 
-impl From<GolgiError> for PeachError {
-    fn from(err: GolgiError) -> PeachError {
-        PeachError::Golgi(err)
+impl From<JsonRpcError> for PeachError {
+    fn from(err: JsonRpcError) -> PeachError {
+        PeachError::JsonRpcError(err)
     }
 }
+
+impl From<anyhow::Error> for PeachError {
+    fn from(error: anyhow::Error) -> Self {
+        // TODO: include whole error somehow?
+        PeachError::SolarClientError(error.to_string())
+    }
+}

peach-lib/src/lib.rs

@@ -6,9 +6,11 @@ pub mod oled_client;
 pub mod password_utils;
 pub mod sbot;
 pub mod stats_client;
+pub mod ssb_messages;
 
 // re-export error types
 pub use jsonrpc_client_core;
 pub use jsonrpc_core;
 pub use serde_json;
 pub use serde_yaml;
+pub use tilde_client;

peach-lib/src/password_utils.rs

@@ -1,9 +1,9 @@
 use async_std::task;
-use golgi::{sbot::Keystore, Sbot};
 use log::debug;
 use nanorand::{Rng, WyRand};
 use sha3::{Digest, Sha3_256};
 
+use crate::sbot::init_sbot;
 use crate::{config_manager, error::PeachError, sbot::SbotConfig};
 
 /// Returns Ok(()) if the supplied password is correct,
@@ -108,36 +108,20 @@ using this link: http://peach.local/auth/reset",
         // use golgi to send a private message on scuttlebutt
         match task::block_on(publish_private_msg(&msg, &ssb_admin_id)) {
             Ok(_) => (),
-            Err(e) => return Err(PeachError::Sbot(e)),
+            Err(e) => return Err(e),
         }
     }
     Ok(())
 }
 
-async fn publish_private_msg(msg: &str, recipient: &str) -> Result<(), String> {
-    // retrieve latest go-sbot configuration parameters
-    let sbot_config = SbotConfig::read().ok();
-
-    let msg = msg.to_string();
-    let recipient = vec![recipient.to_string()];
+async fn publish_private_msg(msg: &str, recipient: &str) -> Result<(), PeachError> {
 
     // initialise sbot connection with ip:port and shscap from config file
-    let mut sbot_client = match sbot_config {
-        // TODO: panics if we pass `Some(conf.shscap)` as second arg
-        Some(conf) => {
-            let ip_port = conf.lis.clone();
-            Sbot::init(Keystore::GoSbot, Some(ip_port), None)
-                .await
-                .map_err(|e| e.to_string())?
-        }
-        None => Sbot::init(Keystore::GoSbot, None, None)
-            .await
-            .map_err(|e| e.to_string())?,
-    };
+    let mut sbot_client = init_sbot().await?;
 
     debug!("Publishing a Scuttlebutt private message with temporary password");
-    match sbot_client.publish_private(msg, recipient).await {
+    match sbot_client.private_message(recipient, msg).await {
         Ok(_) => Ok(()),
-        Err(e) => Err(format!("Failed to publish private message: {}", e)),
+        Err(e) => Err(PeachError::TildeClientError(format!("Failed to publish private message: {}", e))),
     }
 }

peach-lib/src/sbot.rs

@@ -1,8 +1,8 @@
-//! Data types and associated methods for monitoring and configuring go-sbot.
+//! Data types and associated methods for monitoring and configuring solar-sbot.
 
 use std::{fs, fs::File, io, io::Write, path::PathBuf, process::Command, str};
-
-use golgi::{sbot::Keystore, Sbot};
+use std::os::linux::raw::ino_t;
+use tilde_client::{TildeClient};
 use log::debug;
 
 use crate::config_manager;
@@ -30,7 +30,7 @@ fn dir_size(path: impl Into<PathBuf>) -> io::Result<u64> {
 
 /* SBOT-RELATED TYPES AND METHODS */
 
-/// go-sbot process status.
+/// solar-sbot process status.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct SbotStatus {
     /// Current process state.
@@ -62,15 +62,16 @@ impl Default for SbotStatus {
 }
 
 impl SbotStatus {
-    /// Retrieve statistics for the go-sbot systemd process by querying `systemctl`.
+    /// Retrieve statistics for the solar-sbot systemd process by querying `systemctl`.
     pub fn read() -> Result<Self, PeachError> {
         let mut status = SbotStatus::default();
 
         // note this command does not need to be run as sudo
         // because non-privileged users are able to run systemctl show
+        let service_name = config_manager::get_config_value("TILDE_SBOT_SERVICE")?;
         let info_output = Command::new("systemctl")
             .arg("show")
-            .arg(config_manager::get_config_value("GO_SBOT_SERVICE")?)
+            .arg(service_name)
             .arg("--no-page")
             .output()?;
 
@@ -92,7 +93,7 @@ impl SbotStatus {
         // because non-privileged users are able to run systemctl status
         let status_output = Command::new("systemctl")
             .arg("status")
-            .arg(config_manager::get_config_value("GO_SBOT_SERVICE")?)
+            .arg(config_manager::get_config_value("TILDE_SBOT_SERVICE")?)
             .output()?;
 
         let service_status = str::from_utf8(&status_output.stdout)?;
@@ -100,7 +101,7 @@ impl SbotStatus {
 
         for line in service_status.lines() {
             // example of the output line we're looking for:
-            // `Loaded: loaded (/home/glyph/.config/systemd/user/go-sbot.service; enabled; vendor
+            // `Loaded: loaded (/home/glyph/.config/systemd/user/solar-sbot.service; enabled; vendor
             // preset: enabled)`
             if line.contains("Loaded:") {
                 let before_boot_state = line.find(';');
@@ -130,10 +131,15 @@ impl SbotStatus {
             }
         }
 
+        // TOOD restore this
         // get path to blobstore
+        // let blobstore_path = format!(
+        //     "{}/blobs/sha256",
+        //     config_manager::get_config_value("TILDE_SBOT_DATADIR")?
+        // );
         let blobstore_path = format!(
-            "{}/blobs/sha256",
-            config_manager::get_config_value("GO_SBOT_DATADIR")?
+            "{}",
+            config_manager::get_config_value("TILDE_SBOT_DATADIR")?
         );
 
         // determine the size of the blobstore directory in bytes
@@ -143,27 +149,23 @@ impl SbotStatus {
     }
 }
 
-/// go-sbot configuration parameters.
-#[derive(Debug, Serialize, Deserialize)]
+/// solar-sbot configuration parameters.
+#[derive(Debug, Serialize, Deserialize, Default)]
 #[serde(default)]
-pub struct SbotConfig {
+pub struct Config {
     // TODO: maybe define as a Path type?
     /// Directory path for the log and indexes.
-    pub repo: String,
-    /// Directory path for writing debug output.
-    pub debugdir: String,
+    pub database_directory: String,
     /// Secret-handshake app-key (aka. network key).
     pub shscap: String,
     /// HMAC hash used to sign messages.
     pub hmac: String,
     /// Replication hops (1: friends, 2: friends of friends).
-    pub hops: u8,
+    pub replication_hops: u8,
+    /// Ip address of pub
+    pub ip: String,
     /// Address to listen on.
-    pub lis: String,
-    /// Address to listen on for WebSocket connections.
-    pub wslis: String,
-    /// Address to for metrics and pprof HTTP server.
-    pub debuglis: String,
+    pub ssb_port: String,
     /// Enable sending local UDP broadcasts.
     pub localadv: bool,
     /// Enable listening for UDP broadcasts and connecting.
@@ -176,40 +178,54 @@ pub struct SbotConfig {
     pub promisc: bool,
     /// Disable the UNIX socket RPC interface.
     pub nounixsock: bool,
-    /// Attempt to repair the filesystem before starting.
-    pub repair: bool,
 }
 
-/// Default configuration values for go-sbot.
+// TODO: make this real
+#[derive(Debug, Deserialize, Serialize)]
+#[serde(default)]
+pub struct SbotConfig {
+    pub database_directory: String,
+    pub shscap: String,
+    pub hmac: String,
+    pub replication_hops: i8,
+    pub ip: String,
+    pub ssb_port: String,
+    // TODO: below settings have not been configured with tilde
+    pub localadv: bool,
+    pub localdiscov: bool,
+    pub enable_ebt: bool,
+    pub promisc: bool,
+    pub nounixsock: bool,
+}
+
+/// Default configuration values for solar-sbot.
 impl Default for SbotConfig {
     fn default() -> Self {
         Self {
-            repo: ".ssb-go".to_string(),
-            debugdir: "".to_string(),
+            database_directory: "~/.local/share/tildefriends".to_string(),
             shscap: "1KHLiKZvAvjbY1ziZEHMXawbCEIM6qwjCDm3VYRan/s=".to_string(),
             hmac: "".to_string(),
-            hops: 1,
-            lis: ":8008".to_string(),
-            wslis: ":8989".to_string(),
-            debuglis: "localhost:6078".to_string(),
+            replication_hops: 1,
+            ip: "".to_string(),
+            ssb_port: "8008".to_string(),
             localadv: false,
             localdiscov: false,
             enable_ebt: false,
             promisc: false,
             nounixsock: false,
-            repair: false,
         }
     }
 }
 
 impl SbotConfig {
-    /// Read the go-sbot `config.toml` file from file and deserialize into `SbotConfig`.
+    /// Read the solar-sbot `config.toml` file from file and deserialize into `SbotConfig`.
     pub fn read() -> Result<Self, PeachError> {
-        // determine path of user's go-sbot config.toml
+        // determine path of user's solar-sbot config.toml
         let config_path = format!(
-            "{}/config.toml",
-            config_manager::get_config_value("GO_SBOT_DATADIR")?
+            "{}/tilde-sbot.toml",
+            config_manager::get_config_value("TILDE_SBOT_DATADIR")?
         );
+        println!("TILDE_SBOT_CONFIG_PATH: {}", config_path);
 
         let config_contents = fs::read_to_string(config_path)?;
 
@@ -218,17 +234,17 @@ impl SbotConfig {
         Ok(config)
     }
 
-    /// Write the given `SbotConfig` to the go-sbot `config.toml` file.
+    /// Write the given `SbotConfig` to the tilde-sbot `tilde-sbot.toml` file.
     pub fn write(config: SbotConfig) -> Result<(), PeachError> {
-        let repo_comment = "# For details about go-sbot configuration, please visit the repo: https://github.com/cryptoscope/ssb\n".to_string();
+        let repo_comment = "# For details about tilde-sbot configuration, please visit tilde friends documentation\n".to_string();
 
         // convert the provided `SbotConfig` instance to a string
         let config_string = toml::to_string(&config)?;
 
-        // determine path of user's go-sbot config.toml
+        // determine path of user's solar-sbot config.toml
         let config_path = format!(
-            "{}/config.toml",
-            config_manager::get_config_value("GO_SBOT_DATADIR")?
+            "{}/tilde-sbot.toml",
+            config_manager::get_config_value("TILDE_SBOT_DATADIR")?
         );
 
         // open config file for writing
@@ -245,23 +261,21 @@ impl SbotConfig {
 }
 
 /// Initialise an sbot client
-pub async fn init_sbot() -> Result<Sbot, PeachError> {
-    // read sbot config from config.toml
-    let sbot_config = SbotConfig::read().ok();
+pub async fn init_sbot() -> Result<TildeClient, PeachError> {
+
+    // read sbot config
+    let sbot_config = match SbotConfig::read() {
+        Ok(config) => config,
+        // build default config if an error is returned from the read attempt
+        Err(_) => SbotConfig::default(),
+    };
 
     debug!("Initialising an sbot client with configuration parameters");
-    // initialise sbot connection with ip:port and shscap from config file
-    let key_path = format!(
-        "{}/secret",
-        config_manager::get_config_value("GO_SBOT_DATADIR")?
-    );
-    let sbot_client = match sbot_config {
-        // TODO: panics if we pass `Some(conf.shscap)` as second arg
-        Some(conf) => {
-            let ip_port = conf.lis.clone();
-            Sbot::init(Keystore::CustomGoSbot(key_path), Some(ip_port), None).await?
-        }
-        None => Sbot::init(Keystore::CustomGoSbot(key_path), None, None).await?,
-    };
+    let database_path = format!("{}/db.sqlite", config_manager::get_config_value("TILDE_SBOT_DATADIR")?);
+    let sbot_client = TildeClient {
+            ssb_port: sbot_config.ssb_port,
+            tilde_binary_path: config_manager::get_config_value("TILDE_BINARY_PATH")?,
+            tilde_database_path: database_path,
+        };
     Ok(sbot_client)
 }

peach-lib/src/ssb_messages.rs

@@ -0,0 +1,104 @@
+//! Message types and conversion methods.
+
+use kuska_ssb::api::dto::content::TypedMessage;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use std::fmt::Debug;
+use crate::error::PeachError;
+use crate::error::PeachError::SsbMessageError;
+
+/// `SsbMessageContent` is a type alias for `TypedMessage` from the `kuska_ssb` library.
+/// It is aliased in golgi to fit the naming convention of the other message
+/// types: `SsbMessageKVT` and `SsbMessageValue`.
+///
+/// See the [kuska source code](https://github.com/Kuska-ssb/ssb/blob/master/src/api/dto/content.rs#L103) for the type definition of `TypedMessage`.
+pub type SsbMessageContent = TypedMessage;
+
+/// The `value` of an SSB message (the `V` in `KVT`).
+///
+/// More information concerning the data model can be found in the
+/// [`Metadata` documentation](https://spec.scuttlebutt.nz/feed/messages.html#metadata).
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
+#[allow(missing_docs)]
+pub struct SsbMessageValue {
+    pub previous: Option<String>,
+    pub author: String,
+    pub sequence: u64,
+    pub timestamp: f64,
+    pub hash: String,
+    pub content: Value,
+    pub signature: String,
+}
+
+/// Message content types.
+#[derive(Debug, Eq, PartialEq)]
+#[allow(missing_docs)]
+pub enum SsbMessageContentType {
+    About,
+    Vote,
+    Post,
+    Contact,
+    Unrecognized,
+}
+
+impl SsbMessageValue {
+    /// Get the type field of the message content as an enum, if found.
+    ///
+    /// If no `type` field is found or the `type` field is not a string,
+    /// it returns an `Err(GolgiError::ContentType)`.
+    ///
+    /// If a `type` field is found but with an unknown string,
+    /// it returns an `Ok(SsbMessageContentType::Unrecognized)`.
+    pub fn get_message_type(&self) -> Result<SsbMessageContentType, PeachError> {
+        let msg_type = self
+            .content
+            .get("type")
+            .ok_or_else(|| SsbMessageError("type field not found".to_string()))?;
+        let mtype_str: &str = msg_type.as_str().ok_or_else(|| {
+            SsbMessageError("type field value is not a string as expected".to_string())
+        })?;
+        let enum_type = match mtype_str {
+            "about" => SsbMessageContentType::About,
+            "post" => SsbMessageContentType::Post,
+            "vote" => SsbMessageContentType::Vote,
+            "contact" => SsbMessageContentType::Contact,
+            _ => SsbMessageContentType::Unrecognized,
+        };
+        Ok(enum_type)
+    }
+
+    /// Helper function which returns `true` if this message is of the given type,
+    /// and `false` if the type does not match or is not found.
+    pub fn is_message_type(&self, message_type: SsbMessageContentType) -> bool {
+        let self_message_type = self.get_message_type();
+        match self_message_type {
+            Ok(mtype) => mtype == message_type,
+            Err(_err) => false,
+        }
+    }
+
+    /// Convert the content JSON value into an `SsbMessageContent` `enum`,
+    /// using the `type` field as a tag to select which variant of the `enum`
+    /// to deserialize into.
+    ///
+    /// See the [Serde docs on internally-tagged enum representations](https://serde.rs/enum-representations.html#internally-tagged) for further details.
+    pub fn into_ssb_message_content(self) -> Result<SsbMessageContent, PeachError> {
+        let m: SsbMessageContent = serde_json::from_value(self.content)?;
+        Ok(m)
+    }
+}
+
+/// An SSB message represented as a key-value-timestamp (`KVT`).
+///
+/// More information concerning the data model can be found in the
+/// [`Metadata` documentation](https://spec.scuttlebutt.nz/feed/messages.html#metadata).
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
+#[allow(missing_docs)]
+pub struct SsbMessageKVT {
+    pub key: String,
+    pub value: SsbMessageValue,
+    pub timestamp: Option<f64>,
+    pub rts: Option<f64>,
+}

peach-web/Cargo.toml

@@ -33,13 +33,12 @@ travis-ci = { repository = "peachcloud/peach-web", branch = "master" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-async-std = "1.10"
+async-std = { version = "1", features=["attributes", "tokio1"] }
 base64 = "0.13"
 chrono = "0.4"
 dirs = "4.0"
 env_logger = "0.8"
 futures = "0.3"
-golgi = { git = "https://git.coopcloud.tech/golgi-ssb/golgi.git" }
 lazy_static = "1.4"
 log = "0.4"
 maud = "0.23"
@@ -50,3 +49,7 @@ rouille = { version = "3.5", default-features = false }
 temporary = "0.6"
 vnstat_parse = "0.1.0"
 xdg = "2.2"
+jsonrpc_client = { version = "0.7", features = ["macros", "reqwest"] }
+reqwest = "0.11.24"
+urlencoding = "2.1.3"
+rpassword = "5.0"

peach-web/src/cli/change_password.rs

@@ -0,0 +1,34 @@
+use peach_lib::password_utils::set_new_password;
+use crate::error::PeachWebError;
+
+///  Utility function to set the admin password for peach-web from the command-line.
+pub fn set_peach_web_password(password: Option<String>) -> Result<(), PeachWebError> {
+    match password {
+        // read password from CLI arg
+        Some(password) => {
+            set_new_password(&password)
+                .map_err(|err| PeachWebError::PeachLib { source: err, msg: "Error setting password via cli".to_string() })?;
+            println!(
+                "Your new password has been set for peach-web. You can login through the \
+           web interface with username admin."
+            );
+            Ok(())
+        }
+        // read password from tty
+        None => {
+            let pass1 = rpassword::read_password_from_tty(Some("New password: "))?;
+            let pass2 = rpassword::read_password_from_tty(Some("Confirm password: "))?;
+            if pass1 != pass2 {
+                Err(PeachWebError::InvalidPassword)
+            } else {
+                set_new_password(&pass1)
+                    .map_err(|err| PeachWebError::PeachLib { source: err, msg: "Passwords did not match".to_string() })?;
+                println!(
+                    "Your new password has been set for peach-web. You can login through the \
+                web interface with username admin."
+                );
+                Ok(())
+            }
+        }
+    }
+}

peach-web/src/cli/mod.rs

@@ -0,0 +1 @@
+pub mod change_password;

peach-web/src/error.rs

@@ -2,36 +2,40 @@
 
 use std::io::Error as IoError;
 
-use golgi::GolgiError;
 use peach_lib::error::PeachError;
 use peach_lib::{serde_json, serde_yaml};
 use serde_json::error::Error as JsonError;
 use serde_yaml::Error as YamlError;
+use peach_lib::tilde_client::TildeError;
 
 /// Custom error type encapsulating all possible errors for the web application.
 #[derive(Debug)]
 pub enum PeachWebError {
     FailedToRegisterDynDomain(String),
-    Golgi(GolgiError),
     HomeDir,
     Io(IoError),
     Json(JsonError),
     OsString,
     PeachLib { source: PeachError, msg: String },
     Yaml(YamlError),
+    Tilde(TildeError),
+    InvalidPassword,
+    NotYetImplemented,
 }
 
 impl std::error::Error for PeachWebError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match *self {
             PeachWebError::FailedToRegisterDynDomain(_) => None,
-            PeachWebError::Golgi(ref source) => Some(source),
             PeachWebError::HomeDir => None,
+            PeachWebError::InvalidPassword => None,
             PeachWebError::Io(ref source) => Some(source),
             PeachWebError::Json(ref source) => Some(source),
             PeachWebError::OsString => None,
             PeachWebError::PeachLib { ref source, .. } => Some(source),
             PeachWebError::Yaml(ref source) => Some(source),
+            PeachWebError::Tilde(ref source) => Some(source),
+            PeachWebError::NotYetImplemented => None
         }
     }
 }
@@ -42,11 +46,14 @@ impl std::fmt::Display for PeachWebError {
             PeachWebError::FailedToRegisterDynDomain(ref msg) => {
                 write!(f, "DYN DNS error: {}", msg)
             }
-            PeachWebError::Golgi(ref source) => write!(f, "Golgi error: {}", source),
             PeachWebError::HomeDir => write!(
                 f,
                 "Filesystem error: failed to determine home directory path"
             ),
+            PeachWebError::InvalidPassword => write!(
+                f,
+                "Failed to change password via CLI"
+            ),
             PeachWebError::Io(ref source) => write!(f, "IO error: {}", source),
             PeachWebError::Json(ref source) => write!(f, "Serde JSON error: {}", source),
             PeachWebError::OsString => write!(
@@ -55,16 +62,12 @@ impl std::fmt::Display for PeachWebError {
             ),
             PeachWebError::PeachLib { ref source, .. } => write!(f, "{}", source),
             PeachWebError::Yaml(ref source) => write!(f, "Serde YAML error: {}", source),
+            PeachWebError::Tilde(ref source) => write!(f, "Tilde error: {}", source),
+            PeachWebError::NotYetImplemented => write!(f, "Not yet implemented"),
         }
     }
 }
 
-impl From<GolgiError> for PeachWebError {
-    fn from(err: GolgiError) -> PeachWebError {
-        PeachWebError::Golgi(err)
-    }
-}
-
 impl From<IoError> for PeachWebError {
     fn from(err: IoError) -> PeachWebError {
         PeachWebError::Io(err)
@@ -91,3 +94,9 @@ impl From<YamlError> for PeachWebError {
         PeachWebError::Yaml(err)
     }
 }
+
+impl From<TildeError> for PeachWebError {
+    fn from(err: TildeError) -> PeachWebError {
+        PeachWebError::Tilde(err)
+    }
+}

peach-web/src/main.rs

@@ -19,11 +19,9 @@ mod public_router;
 mod routes;
 mod templates;
 pub mod utils;
+mod cli;
 
-use std::{
-    collections::HashMap,
-    sync::{Mutex, RwLock},
-};
+use std::{collections::HashMap, env, sync::{Mutex, RwLock}};
 
 use lazy_static::lazy_static;
 use log::info;
@@ -52,9 +50,7 @@ pub struct SessionData {
 }
 
 /// Launch the peach-web server.
-fn main() {
-    // initialize logger
-    env_logger::init();
+fn run_webserver() {
 
     // set ip address / hostname and port for the webserver
     // defaults to "127.0.0.1:8000"
@@ -121,3 +117,22 @@ fn main() {
         })
     });
 }
+
+/// cli entry point
+fn main() {
+    env_logger::init();
+
+    let mut args = env::args();
+    let _program = args.next(); // skip program name
+
+    match args.next().as_deref() {
+        Some("run") => run_webserver(),
+        Some("change-password") => {
+            cli::change_password::set_peach_web_password(args.next());
+        }
+        _ => {
+            eprintln!("Usage: peach-web <run|change-password>");
+            std::process::exit(1);
+        }
+    }
+}

peach-web/src/public_router.rs

@@ -26,7 +26,7 @@ pub fn handle_route(request: &Request, session_data: &mut Option<SessionData>) -
     }
 
     // set the `.ssb-go` path in order to mount the blob fileserver
-    let ssb_path = sbot::get_go_ssb_path().expect("define ssb-go dir path");
+    let ssb_path = sbot::get_tilde_ssb_path().expect("define ssb-go dir path");
     let blobstore = format!("{}/blobs/sha256", ssb_path);
 
     // blobstore file server

peach-web/src/routes/authentication/change.rs

@@ -41,7 +41,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };
@@ -102,12 +102,12 @@ pub fn handle_form(request: &Request) -> Response {
     ) {
         Ok(_) => (
             // <cookie-name>=<cookie-value>
-            "flash_name=success".to_string(),
-            "flash_msg=New password has been saved".to_string(),
+            "success".to_string(),
+            "New password has been saved".to_string(),
         ),
         Err(err) => (
-            "flash_name=error".to_string(),
-            format!("flash_msg=Failed to save new password: {}", err),
+            "error".to_string(),
+            format!("Failed to save new password: {}", err),
         ),
     };
 

peach-web/src/routes/authentication/forgot.rs

@@ -38,7 +38,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };

peach-web/src/routes/authentication/login.rs

@@ -37,7 +37,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };
@@ -76,8 +76,8 @@ pub fn handle_form(request: &Request, session_data: &mut Option<SessionData>) ->
             debug!("Unsuccessful login attempt");
             let err_msg = format!("Invalid password: {}", err);
             let (flash_name, flash_msg) = (
-                "flash_name=error".to_string(),
-                format!("flash_msg={}", err_msg),
+                "error".to_string(),
+                format!("{}", err_msg),
             );
 
             // if unsuccessful login, render /login page again

peach-web/src/routes/authentication/logout.rs

@@ -14,8 +14,8 @@ pub fn deauthenticate(session_data: &mut Option<SessionData>) -> Response {
     *session_data = None;
 
     let (flash_name, flash_msg) = (
-        "flash_name=success".to_string(),
-        "flash_msg=Logged out".to_string(),
+        "success".to_string(),
+        "Logged out".to_string(),
     );
 
     // set the flash cookie headers and redirect to the login page

peach-web/src/routes/authentication/reset.rs

@@ -41,7 +41,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };
@@ -100,12 +100,12 @@ pub fn handle_form(request: &Request) -> Response {
         &data.new_password2,
     ) {
         Ok(_) => (
-            "flash_name=success".to_string(),
-            "flash_msg=New password has been saved. Return home to login".to_string(),
+            "success".to_string(),
+            "New password has been saved. Return home to login".to_string(),
         ),
         Err(err) => (
-            "flash_name=error".to_string(),
-            format!("flash_msg=Failed to reset password: {}", err),
+            "error".to_string(),
+            format!("Failed to reset password: {}", err),
         ),
     };
 

peach-web/src/routes/authentication/temporary.rs

@@ -21,8 +21,8 @@ pub fn handle_form() -> Response {
         Ok(_) => {
             debug!("Sent temporary password to device admin(s)");
             (
-                "flash_name=success".to_string(),
-                "flash_msg=A temporary password has been sent to the admin(s) of this device"
+                "success".to_string(),
+                "A temporary password has been sent to the admin(s) of this device"
                     .to_string(),
             )
         }

peach-web/src/routes/guide.rs

@@ -29,67 +29,67 @@ pub fn build_template() -> PreEscaped<String> {
                             }
                         }
                         " to start the sbot. If the server starts successfully, you will see a green smiley face on the home page. If the face is orange and sleeping, that means the sbot is still inactive (ie. the process is not running). If the face is red and dead, that means the sbot failed to start - indicated an error. For now, the best way to gain insight into the problem is to check the systemd log. Open a terminal and enter: "
-                        code { "systemctl status go-sbot.service" }
+                        code { "systemctl status tilde-sbot.service" }
                         ". The log output may give some clues about the source of the error."
                     }
                 }
-                (PreEscaped("<!-- BUG REPORTS -->"))
-                details {
-                    summary class="card-text link" { "Submit a bug report" }
-                    p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
-                        "Bug reports can be submitted by "
-                        strong {
-                            a href="https://git.coopcloud.tech/PeachCloud/peach-workspace/issues/new?template=BUG_TEMPLATE.md" class="link font-gray" {
-                                "filing an issue"
-                            }
-                        }
-                        " on the peach-workspace git repo. Before filing a report, first check to see if an issue already exists for the bug you've encountered. If not, you're invited to submit a new report; the template will guide you through several questions."
-                    }
-                }
-                (PreEscaped("<!-- REQUEST SUPPORT -->"))
-                details {
-                    summary class="card-text link" { "Share feedback & request support" }
-                    p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
-                        "You're invited to share your thoughts and experiences of PeachCloud in the #peachcloud channel on Scuttlebutt. The channel is also a good place to ask for help."
-                    }
-                    p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
-                        "Alternatively, we have a "
-                        strong {
-                            a href="https://matrix.to/#/#peachcloud:matrix.org" class="link font-gray" {
-                                "Matrix channel"
-                            }
-                        }
-                        " for discussion about PeachCloud and you can also reach out to @glyph "
-                        strong {
-                            a href="mailto:glyph@mycelial.technology" class="link font-gray" {
-                                "via email"
-                            }
-                        }
-                        "."
-                    }
-                }
-                (PreEscaped("<!-- CONTRIBUTE -->"))
-                details {
-                    summary class="card-text link" { "Contribute to PeachCloud" }
-                    p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
-                        "PeachCloud is free, open-source software and relies on donations and grants to fund develop. Donations can be made on our "
-                        strong {
-                            a href="https://opencollective.com/peachcloud" class="link font-gray" {
-                                "Open Collective"
-                            }
-                        }
-                        " page."
-                    }
-                    p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
-                        "Programmers, designers, artists and writers are also welcome to contribute to the project. Please visit the "
-                        strong {
-                            a href="https://git.coopcloud.tech/PeachCloud/peach-workspace" class="link font-gray" {
-                                "main PeachCloud git repository"
-                            }
-                        }
-                        " to find out more details or contact the team via Scuttlebutt, Matrix or email."
-                    }
-                }
+                // (PreEscaped("<!-- BUG REPORTS -->"))
+                // details {
+                //     summary class="card-text link" { "Submit a bug report" }
+                //     p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
+                //         "Bug reports can be submitted by "
+                //         strong {
+                //             a href="https://git.coopcloud.tech/PeachCloud/peach-workspace/issues/new?template=BUG_TEMPLATE.md" class="link font-gray" {
+                //                 "filing an issue"
+                //             }
+                //         }
+                //         " on the peach-workspace git repo. Before filing a report, first check to see if an issue already exists for the bug you've encountered. If not, you're invited to submit a new report; the template will guide you through several questions."
+                //     }
+                // }
+                // (PreEscaped("<!-- REQUEST SUPPORT -->"))
+                // details {
+                //     summary class="card-text link" { "Share feedback & request support" }
+                //     p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
+                //         "You're invited to share your thoughts and experiences of PeachCloud in the #peachcloud channel on Scuttlebutt. The channel is also a good place to ask for help."
+                //     }
+                //     p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
+                //         "Alternatively, we have a "
+                //         strong {
+                //             a href="https://matrix.to/#/#peachcloud:matrix.org" class="link font-gray" {
+                //                 "Matrix channel"
+                //             }
+                //         }
+                //         " for discussion about PeachCloud and you can also reach out to @glyph "
+                //         strong {
+                //             a href="mailto:glyph@mycelial.technology" class="link font-gray" {
+                //                 "via email"
+                //             }
+                //         }
+                //         "."
+                //     }
+                // }
+                // (PreEscaped("<!-- CONTRIBUTE -->"))
+                // details {
+                //     summary class="card-text link" { "Contribute to PeachCloud" }
+                //     p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
+                //         "PeachCloud is free, open-source software and relies on donations and grants to fund develop. Donations can be made on our "
+                //         strong {
+                //             a href="https://opencollective.com/peachcloud" class="link font-gray" {
+                //                 "Open Collective"
+                //             }
+                //         }
+                //         " page."
+                //     }
+                //     p class="card-text" style="margin-top: 1rem; margin-bottom: 1rem;" {
+                //         "Programmers, designers, artists and writers are also welcome to contribute to the project. Please visit the "
+                //         strong {
+                //             a href="https://git.coopcloud.tech/PeachCloud/peach-workspace" class="link font-gray" {
+                //                 "main PeachCloud git repository"
+                //             }
+                //         }
+                //         " to find out more details or contact the team via Scuttlebutt, Matrix or email."
+                //     }
+                // }
             }
         }
     };

peach-web/src/routes/scuttlebutt/block.rs

@@ -21,17 +21,17 @@ pub fn handle_form(request: &Request) -> Response {
         Ok(status) if status.state == Some("active".to_string()) => {
             match sbot::block_peer(&data.public_key) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Social interactions are unavailable.".to_string(),
         ),
     };

peach-web/src/routes/scuttlebutt/follow.rs

@@ -21,17 +21,17 @@ pub fn handle_form(request: &Request) -> Response {
         Ok(status) if status.state == Some("active".to_string()) => {
             match sbot::follow_peer(&data.public_key) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Social interactions are unavailable.".to_string(),
         ),
     };

peach-web/src/routes/scuttlebutt/invites.rs

@@ -1,5 +1,6 @@
 use maud::{html, Markup, PreEscaped};
 use peach_lib::sbot::SbotStatus;
+use peach_lib::config_manager;
 use rouille::{post_input, try_or_400, Request, Response};
 
 use crate::{
@@ -14,9 +15,9 @@ use crate::{
 
 /// Render the invite form template.
 fn invite_form_template(
-    flash_name: Option<&str>,
-    flash_msg: Option<&str>,
-    invite_code: Option<&str>,
+    flash_name: Option<String>,
+    flash_msg: Option<String>,
+    invite_code: Option<String>,
 ) -> Markup {
     html! {
         (PreEscaped("<!-- SCUTTLEBUTT INVITE FORM -->"))
@@ -40,7 +41,7 @@ fn invite_form_template(
                 // avoid displaying the invite code-containing flash msg
                 @if name != "code" {
                     (PreEscaped("<!-- FLASH MESSAGE -->"))
-                    (templates::flash::build_template(name, msg))
+                    (templates::flash::build_template(&name, &msg))
                 }
             }
         }
@@ -51,10 +52,11 @@ fn invite_form_template(
 pub fn build_template(request: &Request) -> PreEscaped<String> {
     // check for flash cookies; will be (None, None) if no flash cookies are found
     let (flash_name, flash_msg) = request.retrieve_flash();
+    println!("build template invites!");
 
     // if flash_name is "code" then flash_msg will be an invite code
-    let invite_code = if flash_name == Some("code") {
-        flash_msg
+    let invite_code = if flash_name == Some("code".to_string()) {
+        flash_msg.clone()
     } else {
         None
     };
@@ -89,9 +91,11 @@ pub fn handle_form(request: &Request) -> Response {
     }));
 
     let (flash_name, flash_msg) = match sbot::create_invite(data.uses) {
-        Ok(code) => ("flash_name=code".to_string(), format!("flash_msg={}", code)),
-        Err(e) => ("flash_name=error".to_string(), format!("flash_msg={}", e)),
+        Ok(code) => ("code".to_string(), format!("{}", code)),
+        Err(e) => ("error".to_string(), format!("{}", e)),
     };
 
+    println!("invite flash name: {}, {}", flash_name, flash_msg);
+
     Response::redirect_303("/scuttlebutt/invites").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/scuttlebutt/peers.rs

@@ -17,10 +17,10 @@ pub fn build_template() -> PreEscaped<String> {
                     div class="card-container" {
                         (PreEscaped("<!-- BUTTONS -->"))
                         div id="buttons" {
-                            a id="search" class="button button-primary center" href="/scuttlebutt/search" title="Search for a peer" { "Search" }
-                            a id="friends" class="button button-primary center" href="/scuttlebutt/friends" title="List friends" { "Friends" }
-                            a id="follows" class="button button-primary center" href="/scuttlebutt/follows" title="List follows" { "Follows" }
-                            a id="blocks" class="button button-primary center" href="/scuttlebutt/blocks" title="List blocks" { "Blocks" }
+                            // a id="search" class="button button-primary center" href="/scuttlebutt/search" title="Search for a peer" { "Search" }
+                            // a id="friends" class="button button-primary center" href="/scuttlebutt/friends" title="List friends" { "Friends" }
+                            // a id="follows" class="button button-primary center" href="/scuttlebutt/follows" title="List follows" { "Follows" }
+                            // a id="blocks" class="button button-primary center" href="/scuttlebutt/blocks" title="List blocks" { "Blocks" }
                             a id="invites" class="button button-primary center" href="/scuttlebutt/invites" title="Create invites" { "Invites" }
                         }
                     }

peach-web/src/routes/scuttlebutt/private.rs

@@ -74,7 +74,7 @@ pub fn build_template(request: &Request, ssb_id: Option<String>) -> PreEscaped<S
                     // render flash message if cookies were found in the request
                     @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                         (PreEscaped("<!-- FLASH MESSAGE -->"))
-                        (templates::flash::build_template(name, msg))
+                        (templates::flash::build_template(&name, &msg))
                     }
                 }
             }
@@ -112,17 +112,17 @@ pub fn handle_form(request: &Request) -> Response {
         Ok(status) if status.state == Some("active".to_string()) => {
             match sbot::publish_private_msg(data.text, recipients) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Private messaging is unavailable.".to_string(),
         ),
     };

peach-web/src/routes/scuttlebutt/profile.rs

@@ -160,7 +160,7 @@ pub fn build_template(request: &Request, ssb_id: Option<String>) -> PreEscaped<S
                             // render flash message if cookies were found in the request
                             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                                (templates::flash::build_template(name, msg))
+                                (templates::flash::build_template(&name, &msg))
                             }
                         }
                     }

peach-web/src/routes/scuttlebutt/profile_update.rs

@@ -81,7 +81,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                             // render flash message if cookies were found in the request
                             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                                (templates::flash::build_template(name, msg))
+                                (templates::flash::build_template(&name, &msg))
                             }
                         }
                     }
@@ -139,17 +139,17 @@ pub fn handle_form(request: &Request) -> Response {
                 data.image,
             ) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Profile is unavailable.".to_string(),
         ),
     };
@@ -165,7 +165,7 @@ pub fn handle_form(request: &Request) -> Response {
         }
         Err(err) => {
             let (flash_name, flash_msg) =
-                ("flash_name=error".to_string(), format!("flash_msg={}", err));
+                ("error".to_string(), format!("{}", err));
             Response::redirect_303("/scuttlebutt/search").add_flash(flash_name, flash_msg)
         }
     }

peach-web/src/routes/scuttlebutt/publish.rs

@@ -22,17 +22,17 @@ pub fn handle_form(request: &Request) -> Response {
         Ok(status) if status.state == Some("active".to_string()) => {
             match sbot::publish_public_post(data.text) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Public posting is unavailable.".to_string(),
         ),
     };

peach-web/src/routes/scuttlebutt/search.rs

@@ -29,7 +29,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                 // render flash message if cookies were found in the request
                 @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                     (PreEscaped("<!-- FLASH MESSAGE -->"))
-                    (templates::flash::build_template(name, msg))
+                    (templates::flash::build_template(&name, &msg))
                 }
             }
         }
@@ -62,7 +62,7 @@ pub fn handle_form(request: &Request) -> Response {
         }
         Err(err) => {
             let (flash_name, flash_msg) =
-                ("flash_name=error".to_string(), format!("flash_msg={}", err));
+                ("error".to_string(), format!("{}", err));
             Response::redirect_303("/scuttlebutt/search").add_flash(flash_name, flash_msg)
         }
     }

peach-web/src/routes/scuttlebutt/unblock.rs

@@ -21,17 +21,17 @@ pub fn handle_form(request: &Request) -> Response {
         Ok(status) if status.state == Some("active".to_string()) => {
             match sbot::unblock_peer(&data.public_key) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Social interactions are unavailable.".to_string(),
         ),
     };

peach-web/src/routes/scuttlebutt/unfollow.rs

@@ -21,17 +21,17 @@ pub fn handle_form(request: &Request) -> Response {
         Ok(status) if status.state == Some("active".to_string()) => {
             match sbot::unfollow_peer(&data.public_key) {
                 Ok(success_msg) => (
-                    "flash_name=success".to_string(),
-                    format!("flash_msg={}", success_msg),
+                    "success".to_string(),
+                    format!("{}", success_msg),
                 ),
                 Err(error_msg) => (
-                    "flash_name=error".to_string(),
-                    format!("flash_msg={}", error_msg),
+                    "error".to_string(),
+                    format!("{}", error_msg),
                 ),
             }
         }
         _ => (
-            "flash_name=warning".to_string(),
+            "warning".to_string(),
             "Social interactions are unavailable.".to_string(),
         ),
     };

peach-web/src/routes/settings/admin/add.rs

@@ -21,12 +21,12 @@ pub fn handle_form(request: &Request) -> Response {
     // save submitted admin id to file
     let (flash_name, flash_msg) = match config_manager::add_ssb_admin_id(&data.ssb_id) {
         Ok(_) => (
-            "flash_name=success".to_string(),
-            "flash_msg=Added SSB administrator".to_string(),
+            "success".to_string(),
+            "Added SSB administrator".to_string(),
         ),
         Err(err) => (
-            "flash_name=error".to_string(),
-            format!("flash_msg=Failed to add new administrator: {}", err),
+            "error".to_string(),
+            format!("Failed to add new administrator: {}", err),
         ),
     };
 

peach-web/src/routes/settings/admin/configure.rs

@@ -20,8 +20,8 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
         // currently produces an error because we end up with Some(String)
         // instead of Some(str)
         Err(_err) => {
-            flash_name = Some("flash_name=error");
-            flash_msg = Some("flash_msg=Failed to read PeachCloud configuration file");
+            flash_name = Some("error".to_string());
+            flash_msg = Some("Failed to read PeachCloud configuration file".to_string());
             None
         }
     };
@@ -58,7 +58,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };

peach-web/src/routes/settings/admin/delete.rs

@@ -21,12 +21,12 @@ pub fn handle_form(request: &Request) -> Response {
     let (flash_name, flash_msg) = match config_manager::delete_ssb_admin_id(&data.ssb_id) {
         Ok(_) => (
             // <cookie-name>=<cookie-value>
-            "flash_name=success".to_string(),
-            "flash_msg=Removed SSB administrator".to_string(),
+            "success".to_string(),
+            "Removed SSB administrator".to_string(),
         ),
         Err(err) => (
-            "flash_name=error".to_string(),
-            format!("flash_msg=Failed to remove administrator: {}", err),
+            "error".to_string(),
+            format!("Failed to remove administrator: {}", err),
         ),
     };
 

peach-web/src/routes/settings/network/add_ap.rs

@@ -51,7 +51,7 @@ pub fn build_template(request: &Request, selected_ap: Option<String>) -> PreEsca
             }
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };
@@ -91,7 +91,7 @@ pub fn handle_form(request: &Request) -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/settings/network/wifi/add").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/network/ap_details.rs

@@ -180,7 +180,7 @@ pub fn build_template(request: &Request, selected_ap: String) -> PreEscaped<Stri
             }
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };

peach-web/src/routes/settings/network/configure_dns.rs

@@ -111,7 +111,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                 (render_save_button())
                 @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                     (PreEscaped("<!-- FLASH MESSAGE -->"))
-                    (templates::flash::build_template(name, msg))
+                    (templates::flash::build_template(&name, &msg))
                 }
             }
         }
@@ -195,7 +195,7 @@ pub fn handle_form(request: &Request) -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/settings/network/dns").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/network/data_usage_limits.rs

@@ -158,7 +158,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
         }
         @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
             (PreEscaped("<!-- FLASH MESSAGE -->"))
-            (templates::flash::build_template(name, msg))
+            (templates::flash::build_template(&name, &msg))
         }
     };
 }

peach-web/src/routes/settings/network/menu.rs

@@ -52,7 +52,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };

peach-web/src/routes/settings/network/modify_ap.rs

@@ -52,7 +52,7 @@ pub fn build_template(request: &Request, selected_ap: Option<String>) -> PreEsca
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };
@@ -99,7 +99,7 @@ pub fn handle_form(request: &Request) -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/settings/network/wifi/modify").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/power/menu.rs

@@ -23,7 +23,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                 }
                 @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                     (PreEscaped("<!-- FLASH MESSAGE -->"))
-                    (templates::flash::build_template(name, msg))
+                    (templates::flash::build_template(&name, &msg))
                 }
             }
         }

peach-web/src/routes/settings/power/reboot.rs

@@ -30,7 +30,7 @@ pub fn handle_reboot() -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/power").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/power/shutdown.rs

@@ -29,7 +29,7 @@ pub fn handle_shutdown() -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/power").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/scuttlebutt/configure.rs

@@ -33,16 +33,8 @@ fn read_status_and_config() -> (String, SbotConfig, String, String) {
         Err(_) => SbotConfig::default(),
     };
 
-    // split the listen address into ip and port
-    let (ip, port) = match sbot_config.lis.find(':') {
-        Some(index) => {
-            let (ip, port) = sbot_config.lis.split_at(index);
-            // remove the : from the port
-            (ip.to_string(), port.replace(':', ""))
-        }
-        // if no ':' separator is found, assume an ip has been configured (without port)
-        None => (sbot_config.lis.to_string(), String::new()),
-    };
+    let ip = sbot_config.ip.clone();
+    let port = sbot_config.ssb_port.clone();
 
     (run_on_startup, sbot_config, ip, port)
 }
@@ -52,7 +44,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
     // check for flash cookies; will be (None, None) if no flash cookies are found
     let (flash_name, flash_msg) = request.retrieve_flash();
 
-    let (run_on_startup, sbot_config, ip, port) = read_status_and_config();
+    let (run_on_startup, sbot_config, ip, ssb_port) = read_status_and_config();
 
     let menu_template = html! {
         (PreEscaped("<!-- SBOT CONFIGURATION FORM -->"))
@@ -62,42 +54,42 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                     label for="hops" class="label-small font-gray" { "HOPS" }
                     div id="hops" style="display: flex; justify-content: space-evenly;" {
                         div {
-                            @if sbot_config.hops == 0 {
-                                input type="radio" id="hops_0" name="hops" value="0" checked;
+                            @if sbot_config.replication_hops == 0 {
+                                input type="radio" id="hops_0" name="replication_hops" value="0" checked;
                             } @else {
-                                input type="radio" id="hops_0" name="hops" value="0";
+                                input type="radio" id="hops_0" name="replication_hops" value="0";
                             }
                             label class="font-normal" for="hops_0" { "0" }
                         }
                         div {
-                            @if sbot_config.hops == 1 {
-                                input type="radio" id="hops_1" name="hops" value="1" checked;
+                            @if sbot_config.replication_hops == 1 {
+                                input type="radio" id="hops_1" name="replication_hops" value="1" checked;
                             } @else {
-                                input type="radio" id="hops_1" name="hops" value="1";
+                                input type="radio" id="hops_1" name="replication_hops" value="1";
                             }
                             label class="font-normal" for="hops_1" { "1" }
                         }
                         div {
-                            @if sbot_config.hops == 2 {
-                                input type="radio" id="hops_2" name="hops" value="2" checked;
+                            @if sbot_config.replication_hops == 2 {
+                                input type="radio" id="hops_2" name="replication_hops" value="2" checked;
                             } @else {
-                                input type="radio" id="hops_2" name="hops" value="2";
+                                input type="radio" id="hops_2" name="replication_hops" value="2";
                             }
                             label class="font-normal" for="hops_2" { "2" }
                         }
                         div {
-                            @if sbot_config.hops == 3 {
-                                input type="radio" id="hops_3" name="hops" value="3" checked;
+                            @if sbot_config.replication_hops == 3 {
+                                input type="radio" id="hops_3" name="replication_hops" value="3" checked;
                             } @else {
-                                input type="radio" id="hops_3" name="hops" value="3";
+                                input type="radio" id="hops_3" name="replication_hops" value="3";
                             }
                             label class="font-normal" for="hops_3" { "3" }
                         }
                         div {
-                            @if sbot_config.hops == 4 {
-                                input type="radio" id="hops_4" name="hops" value="4" checked;
+                            @if sbot_config.replication_hops == 4 {
+                                input type="radio" id="hops_4" name="replication_hops" value="4" checked;
                             } @else {
-                                input type="radio" id="hops_4" name="hops" value="4";
+                                input type="radio" id="hops_4" name="replication_hops" value="4";
                             }
                             label class="font-normal" for="hops_4" { "4" }
                         }
@@ -106,11 +98,11 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                 div class="center" style="display: flex; justify-content: space-between;" {
                     div style="display: flex; flex-direction: column; width: 60%; margin-bottom: 2rem;" title="IP address on which the sbot runs" {
                         label for="ip" class="label-small font-gray" { "IP ADDRESS" }
-                        input type="text" id="ip" name="lis_ip" value=(ip);
+                        input type="text" id="ip" name="ip" value=(ip);
                     }
                     div style="display: flex; flex-direction: column; width: 20%; margin-bottom: 2rem;" title="Port on which the sbot runs" {
                         label for="port" class="label-small font-gray" { "PORT" }
-                        input type="text" id="port" name="lis_port" value=(port);
+                        input type="text" id="port" name="ssb_port" value=(ssb_port);
                     }
                 }
                 div class="center" style="display: flex; flex-direction: column; margin-bottom: 2rem;" title="Network key (aka 'caps key') to define the Scuttleverse in which the sbot operates in" {
@@ -119,34 +111,35 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                 }
                 div class="center" style="display: flex; flex-direction: column; margin-bottom: 2rem;" title="Directory in which the sbot database is saved" {
                     label for="database_dir" class="label-small font-gray" { "DATABASE DIRECTORY" }
-                    input type="text" id="database_dir" name="repo" value=(sbot_config.repo);
+                    input type="text" id="database_dir" name="database_directory" value=(sbot_config.database_directory);
                 }
+                // TODO: re-add these checkboxes, if tilde adds them
                 div class="center" {
-                    @if sbot_config.enable_ebt {
-                        input type="checkbox" id="ebtReplication" style="margin-bottom: 1rem;" name="enable_ebt" checked;
-                    } @else {
-                        input type="checkbox" id="ebtReplication" style="margin-bottom: 1rem;" name="enable_ebt";
-                    }
-                    label class="font-normal" for="ebtReplication" title="Enable Epidemic Broadcast Tree (EBT) replication instead of legacy replication" {
-                        "Enable EBT Replication"
-                    }
-                    br;
-                    @if sbot_config.localadv {
-                        input type="checkbox" id="lanBroadcast" style="margin-bottom: 1rem;" name="localadv" checked;
-                    } @else {
-                        input type="checkbox" id="lanBroadcast" style="margin-bottom: 1rem;" name="localadv";
-                    }
-                    label class="font-normal" for="lanBroadcast" title="Broadcast the IP and port of this sbot instance so that local peers can discovery it and attempt to connect" {
-                        "Enable LAN Broadcasting"
-                    }
-                    br;
-                    @if sbot_config.localdiscov {
-                        input type="checkbox" id="lanDiscovery" style="margin-bottom: 1rem;" name="localdiscov" checked;
-                    } @else {
-                        input type="checkbox" id="lanDiscovery" style="margin-bottom: 1rem;" name="localdiscov";
-                    }
-                    label class="font-normal" for="lanDiscovery" title="Listen for the presence of local peers and attempt to connect if found" { "Enable LAN Discovery" }
-                    br;
+                    // @if sbot_config.enable_ebt {
+                    //     input type="checkbox" id="ebtReplication" style="margin-bottom: 1rem;" name="enable_ebt" checked;
+                    // } @else {
+                    //     input type="checkbox" id="ebtReplication" style="margin-bottom: 1rem;" name="enable_ebt";
+                    // }
+                    // label class="font-normal" for="ebtReplication" title="Enable Epidemic Broadcast Tree (EBT) replication instead of legacy replication" {
+                    //     "Enable EBT Replication"
+                    // }
+                    // br;
+                    // @if sbot_config.localadv {
+                    //     input type="checkbox" id="lanBroadcast" style="margin-bottom: 1rem;" name="localadv" checked;
+                    // } @else {
+                    //     input type="checkbox" id="lanBroadcast" style="margin-bottom: 1rem;" name="localadv";
+                    // }
+                    // label class="font-normal" for="lanBroadcast" title="Broadcast the IP and port of this sbot instance so that local peers can discovery it and attempt to connect" {
+                    //     "Enable LAN Broadcasting"
+                    // }
+                    // br;
+                    // @if sbot_config.localdiscov {
+                    //     input type="checkbox" id="lanDiscovery" style="margin-bottom: 1rem;" name="localdiscov" checked;
+                    // } @else {
+                    //     input type="checkbox" id="lanDiscovery" style="margin-bottom: 1rem;" name="localdiscov";
+                    // }
+                    // label class="font-normal" for="lanDiscovery" title="Listen for the presence of local peers and attempt to connect if found" { "Enable LAN Discovery" }
+                    // br;
                     @if run_on_startup == "enabled" {
                         input type="checkbox" id="startup" style="margin-bottom: 1rem;" name="startup" checked;
                     } @else {
@@ -154,18 +147,9 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
                     }
                     label class="font-normal" for="startup" title="Run the pub automatically on system startup" { "Run pub when computer starts" }
                     br;
-                    @if sbot_config.repair {
-                        input type="checkbox" id="repair" name="repair" checked;
-                    } @else {
-                        input type="checkbox" id="repair" name="repair";
-                    }
-                    label class="font-normal" for="repair" title="Attempt to repair the filesystem when starting the pub" { "Attempt filesystem repair when pub starts" }
                 }
                 (PreEscaped("<!-- hidden input elements for all other config variables -->"))
-                input type="hidden" id="debugdir" name="debugdir" value=(sbot_config.debugdir);
                 input type="hidden" id="hmac" name="hmac" value=(sbot_config.hmac);
-                input type="hidden" id="wslis" name="wslis" value=(sbot_config.wslis);
-                input type="hidden" id="debuglis" name="debuglis" value=(sbot_config.debuglis);
                 input type="hidden" id="promisc" name="promisc" value=(sbot_config.promisc);
                 input type="hidden" id="nounixsock" name="nounixsock" value=(sbot_config.nounixsock);
                 (PreEscaped("<!-- BUTTONS -->"))
@@ -176,7 +160,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };
@@ -196,61 +180,56 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
     templates::base::build_template(body, theme)
 }
 
+// use std::io::Read;
 /// Parse the sbot configuration values and write to file.
 pub fn handle_form(request: &Request, restart: bool) -> Response {
+
     // query the request body for form data
     // return a 400 error if the admin_id field is missing
     let data = try_or_400!(post_input!(request, {
-        repo: String,
-        debugdir: String,
+        database_directory: String,
         shscap: String,
         hmac: String,
-        hops: u8,
-        lis_ip: String,
-        lis_port: String,
-        wslis: String,
-        debuglis: String,
+        replication_hops: i8,
+        ip: String,
+        ssb_port: String,
         localadv: bool,
         localdiscov: bool,
         enable_ebt: bool,
         promisc: bool,
         nounixsock: bool,
         startup: bool,
-        repair: bool,
     }));
 
     // concat the ip and port for listen address
-    let lis = format!("{}:{}", data.lis_ip, data.lis_port);
+    let lis = format!("{}:{}", data.ip, data.ssb_port);
 
     // instantiate `SbotConfig` from form data
     let config = SbotConfig {
-        lis,
-        hops: data.hops,
-        repo: data.repo,
-        debugdir: data.debugdir,
+        ip: data.ip,
+        ssb_port: data.ssb_port,
+        replication_hops: data.replication_hops,
+        database_directory: data.database_directory,
         shscap: data.shscap,
         localadv: data.localadv,
         localdiscov: data.localdiscov,
         hmac: data.hmac,
-        wslis: data.wslis,
-        debuglis: data.debuglis,
         enable_ebt: data.enable_ebt,
         promisc: data.promisc,
         nounixsock: data.nounixsock,
-        repair: data.repair,
     };
 
     match data.startup {
         true => {
-            debug!("Enabling go-sbot.service");
+            debug!("Enabling tilde-sbot.service");
             if let Err(e) = sbot::systemctl_sbot_cmd("enable") {
-                warn!("Failed to enable go-sbot.service: {}", e)
+                warn!("Failed to enable tilde-sbot.service: {}", e)
             }
         }
         false => {
-            debug!("Disabling go-sbot.service");
+            debug!("Disabling tilde-sbot.service");
             if let Err(e) = sbot::systemctl_sbot_cmd("disable") {
-                warn!("Failed to disable go-sbot.service: {}", e)
+                warn!("Failed to disable tilde-sbot.service: {}", e)
             }
         }
     };
@@ -272,7 +251,7 @@ pub fn handle_form(request: &Request, restart: bool) -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/settings/scuttlebutt/configure").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/scuttlebutt/default.rs

@@ -15,7 +15,7 @@ pub fn write_config() -> Response {
         ),
     };
 
-    let (flash_name, flash_msg) = (format!("flash_name={}", name), format!("flash_msg={}", msg));
+    let (flash_name, flash_msg) = (format!("{}", name), format!("{}", msg));
 
     Response::redirect_303("/settings/scuttlebutt/configure").add_flash(flash_name, flash_msg)
 }

peach-web/src/routes/settings/scuttlebutt/menu.rs

@@ -48,7 +48,7 @@ pub fn build_template(request: &Request) -> PreEscaped<String> {
             // render flash message if cookies were found in the request
             @if let (Some(name), Some(msg)) = (flash_name, flash_msg) {
                 (PreEscaped("<!-- FLASH MESSAGE -->"))
-                (templates::flash::build_template(name, msg))
+                (templates::flash::build_template(&name, &msg))
             }
         }
     };

peach-web/src/routes/settings/scuttlebutt/restart.rs

@@ -14,17 +14,17 @@ pub fn restart_sbot() -> Response {
         // if stop was successful, try to start the process
         Ok(_) => match systemctl_sbot_cmd("start") {
             Ok(_) => (
-                "flash_name=success".to_string(),
-                "flash_msg=Sbot process has been restarted".to_string(),
+                "success".to_string(),
+                "Sbot process has been restarted".to_string(),
             ),
             Err(e) => (
-                "flash_name=error".to_string(),
-                format!("flash_msg=Failed to start the sbot process: {}", e),
+                "error".to_string(),
+                format!("Failed to start the sbot process: {}", e),
             ),
         },
         Err(e) => (
-            "flash_name=error".to_string(),
-            format!("flash_msg=Failed to stop the sbot process: {}", e),
+            "error".to_string(),
+            format!("Failed to stop the sbot process: {}", e),
         ),
     };
 

peach-web/src/routes/settings/scuttlebutt/start.rs

@@ -12,12 +12,12 @@ pub fn start_sbot() -> Response {
     info!("Starting go-sbot.service");
     let (flash_name, flash_msg) = match systemctl_sbot_cmd("start") {
         Ok(_) => (
-            "flash_name=success".to_string(),
-            "flash_msg=Sbot process has been started".to_string(),
+            "success".to_string(),
+            "Sbot process has been started".to_string(),
         ),
         Err(_) => (
-            "flash_name=error".to_string(),
-            "flash_msg=Failed to start the sbot process".to_string(),
+            "error".to_string(),
+            "Failed to start the sbot process".to_string(),
         ),
     };
 

peach-web/src/routes/settings/scuttlebutt/stop.rs

@@ -9,15 +9,15 @@ use crate::utils::{flash::FlashResponse, sbot::systemctl_sbot_cmd};
 /// Redirect to the Scuttlebutt settings menu and communicate the outcome of
 /// the attempt via a flash message.
 pub fn stop_sbot() -> Response {
-    info!("Stopping go-sbot.service");
+    info!("Stopping tilde-sbot.service");
     let (flash_name, flash_msg) = match systemctl_sbot_cmd("stop") {
         Ok(_) => (
-            "flash_name=success".to_string(),
-            "flash_msg=Sbot process has been stopped".to_string(),
+            "success".to_string(),
+            "Sbot process has been stopped".to_string(),
         ),
         Err(_) => (
-            "flash_name=error".to_string(),
-            "flash_msg=Failed to stop the sbot process".to_string(),
+            "error".to_string(),
+            "Failed to stop the sbot process".to_string(),
         ),
     };
 

peach-web/src/routes/status/scuttlebutt.rs

@@ -102,7 +102,7 @@ fn memory_element(memory: Option<u32>) -> Markup {
 fn hops_element() -> Markup {
     // retrieve go-sbot systemd process status
     let hops = match SbotConfig::read() {
-        Ok(conf) => conf.hops,
+        Ok(conf) => conf.replication_hops,
         _ => 0,
     };
 

peach-web/src/utils/flash.rs

@@ -1,21 +1,21 @@
 use rouille::{input, Request, Response};
+use urlencoding;
 
 /// Flash message trait for `Request`.
 pub trait FlashRequest {
     /// Retrieve the flash message cookie values from a `Request`.
-    fn retrieve_flash(&self) -> (Option<&str>, Option<&str>);
+    fn retrieve_flash(&self) -> (Option<String>, Option<String>);
 }
 
 impl FlashRequest for Request {
-    fn retrieve_flash(&self) -> (Option<&str>, Option<&str>) {
-        // check for flash cookies
+    fn retrieve_flash(&self) -> (Option<String>, Option<String>) {
         let flash_name = input::cookies(self)
             .find(|&(n, _)| n == "flash_name")
             // return the value of the cookie (key is already known)
-            .map(|key_val| key_val.1);
+            .and_then(|(_, val)| urlencoding::decode(&val).ok().map(|s| s.into_owned()));
         let flash_msg = input::cookies(self)
             .find(|&(n, _)| n == "flash_msg")
-            .map(|key_val| key_val.1);
+            .and_then(|(_, val)| urlencoding::decode(&val).ok().map(|s| s.into_owned()));
 
         (flash_name, flash_msg)
     }
@@ -31,9 +31,12 @@ pub trait FlashResponse {
 
 impl FlashResponse for Response {
     fn add_flash(self, flash_name: String, flash_msg: String) -> Response {
+
+        let flash_name = urlencoding::encode(&flash_name).into_owned();
+        let flash_msg = urlencoding::encode(&flash_msg).into_owned();
         // set the flash cookie headers
-        self.with_additional_header("Set-Cookie", format!("{}; Max-Age=1", flash_name))
-            .with_additional_header("Set-Cookie", format!("{}; Max-Age=1", flash_msg))
+        self.with_additional_header("Set-Cookie", format!("flash_name={}; Max-Age=1;", flash_name))
+            .with_additional_header("Set-Cookie", format!("flash_msg={}; Max-Age=1;", flash_msg))
     }
 
     fn reset_flash(self) -> Response {

peach-web/src/utils/sbot.rs

@@ -11,37 +11,36 @@ use std::{
 use async_std::task;
 use dirs;
 use futures::stream::TryStreamExt;
-use golgi::{
-    api::{friends::RelationshipQuery, history_stream::CreateHistoryStream},
-    blobs,
-    messages::SsbMessageKVT,
-    sbot::Keystore,
-    Sbot,
-};
 use log::debug;
 use peach_lib::config_manager;
 use peach_lib::sbot::SbotConfig;
+use peach_lib::sbot::init_sbot;
+use peach_lib::ssb_messages::SsbMessageKVT;
 use rouille::input::post::BufferedFile;
 use temporary::Directory;
-
+use peach_lib::serde_json::json;
+use peach_lib::tilde_client::{TildeClient, TildeError};
 use crate::{error::PeachWebError, utils::sbot};
 
 // SBOT HELPER FUNCTIONS
 
-/// Executes a systemctl command for the go-sbot.service process.
+/// Executes a systemctl command for the solar-sbot.service process.
 pub fn systemctl_sbot_cmd(cmd: &str) -> Result<Output, PeachWebError> {
-    let output = Command::new("sudo")
+    let mut command = Command::new("sudo");
+    command
         .arg("systemctl")
         .arg(cmd)
-        .arg(config_manager::get_config_value("GO_SBOT_SERVICE")?)
-        .output()?;
+        .arg(config_manager::get_config_value("TILDE_SBOT_SERVICE")?);
+    println!("systemctl command: {:?}", command);
+    let output = command.output()?;
+    println!("systemctl output: {:?}", output);
     Ok(output)
 }
 
 /// Executes a systemctl stop command followed by start command.
 /// Returns a redirect with a flash message stating the output of the restart attempt.
 pub fn restart_sbot_process() -> (String, String) {
-    debug!("Restarting go-sbot.service");
+    debug!("Restarting solar-sbot.service");
     match systemctl_sbot_cmd("stop") {
         // if stop was successful, try to start the process
         Ok(_) => match systemctl_sbot_cmd("start") {
@@ -68,23 +67,9 @@ pub fn restart_sbot_process() -> (String, String) {
 }
 
 /// Initialise an sbot client with the given configuration parameters.
-pub async fn init_sbot_with_config(
-    sbot_config: &Option<SbotConfig>,
-) -> Result<Sbot, PeachWebError> {
+pub async fn init_sbot_client() -> Result<TildeClient, PeachWebError> {
     debug!("Initialising an sbot client with configuration parameters");
-    // initialise sbot connection with ip:port and shscap from config file
-    let key_path = format!(
-        "{}/secret",
-        config_manager::get_config_value("GO_SBOT_DATADIR")?
-    );
-    let sbot_client = match sbot_config {
-        // TODO: panics if we pass `Some(conf.shscap)` as second arg
-        Some(conf) => {
-            let ip_port = conf.lis.clone();
-            Sbot::init(Keystore::CustomGoSbot(key_path), Some(ip_port), None).await?
-        }
-        None => Sbot::init(Keystore::CustomGoSbot(key_path), None, None).await?,
-    };
+    let sbot_client = init_sbot().await?;
     Ok(sbot_client)
 }
 
@@ -127,48 +112,45 @@ pub fn validate_public_key(public_key: &str) -> Result<(), String> {
 /// reverses the list and reads the sequence number of the most recently
 /// authored message. This gives us the size of the database in terms of
 /// the total number of locally-authored messages.
-pub fn latest_sequence_number() -> Result<u64, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
+pub fn latest_sequence_number() -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let mut sbot_client = init_sbot_client().await?;
+
+        let sequence_num = sbot_client.latest_sequence_number().await?;
+        Ok(sequence_num)
 
         // retrieve the local id
-        let id = sbot_client.whoami().await?;
+        // let id = sbot_client.whoami().await?;
 
-        let args = CreateHistoryStream::new(id).keys_values(true, true);
-        let history_stream = sbot_client.create_history_stream(args).await?;
-        let mut msgs: Vec<SsbMessageKVT> = history_stream.try_collect().await?;
+        // let history_stream = sbot_client.feed(&id).await?;
 
-        // there will be zero messages when the sbot is run for the first time
-        if msgs.is_empty() {
-            Ok(0)
-        } else {
-            // reverse the list of messages so we can easily reference the latest one
-            msgs.reverse();
-
-            // return the sequence number of the latest msg
-            Ok(msgs[0].value.sequence)
-        }
+        // let mut msgs: Vec<SsbMessageKVT> = history_stream.try_collect().await?;
+        //
+        // // there will be zero messages when the sbot is run for the first time
+        // if msgs.is_empty() {
+        //     Ok(0)
+        // } else {
+        //     // reverse the list of messages so we can easily reference the latest one
+        //     msgs.reverse();
+        //
+        //     // return the sequence number of the latest msg
+        //     Ok(msgs[0].value.sequence)
+        // }
     })
 }
 
-pub fn create_invite(uses: u16) -> Result<String, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
+pub fn create_invite(uses: u16) -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let mut sbot_client = init_sbot_client().await?;
 
-        debug!("Generating Scuttlebutt invite code");
-        let mut invite_code = sbot_client.invite_create(uses).await?;
-
-        // insert domain into invite if one is configured
-        let domain = config_manager::get_config_value("EXTERNAL_DOMAIN")?;
-        if !domain.is_empty() {
-            invite_code = domain + &invite_code[4..];
-        }
+        let external_domain = config_manager::get_config_value("EXTERNAL_DOMAIN").ok();
+        let mut invite_code = sbot_client.create_invite(uses as i32, external_domain.as_deref()).await?;
 
         Ok(invite_code)
     })
@@ -210,11 +192,9 @@ impl Profile {
 
 /// Retrieve the profile info for the given public key.
 pub fn get_profile_info(ssb_id: Option<String>) -> Result<Profile, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
-    let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let sbot_client = init_sbot_client().await?;
 
         let local_id = sbot_client.whoami().await?;
 
@@ -226,32 +206,11 @@ pub fn get_profile_info(ssb_id: Option<String>) -> Result<Profile, Box<dyn Error
             // we are not dealing with the local profile
             profile.is_local_profile = false;
 
-            // determine relationship between peer and local id
-            let follow_query = RelationshipQuery {
-                source: local_id.clone(),
-                dest: peer_id.clone(),
-            };
-
             // query follow state
-            profile.following = match sbot_client.friends_is_following(follow_query).await {
-                Ok(following) if following == "true" => Some(true),
-                Ok(following) if following == "false" => Some(false),
-                _ => None,
-            };
+            profile.following = Some(sbot_client.is_following(&local_id, &peer_id).await?);
 
-            // TODO: i don't like that we have to instantiate the same query object
-            // twice. see if we can streamline this in golgi
-            let block_query = RelationshipQuery {
-                source: local_id.clone(),
-                dest: peer_id.clone(),
-            };
-
-            // query block state
-            profile.blocking = match sbot_client.friends_is_blocking(block_query).await {
-                Ok(blocking) if blocking == "true" => Some(true),
-                Ok(blocking) if blocking == "false" => Some(false),
-                _ => None,
-            };
+            // TODO: implement this check in solar_client so that this can be a real value
+            profile.blocking = Some(false);
 
             peer_id
         } else {
@@ -262,7 +221,7 @@ pub fn get_profile_info(ssb_id: Option<String>) -> Result<Profile, Box<dyn Error
         };
 
         // retrieve the profile info for the given id
-        let info = sbot_client.get_profile_info(&id).await?;
+        let info = get_peer_info(&id).await?;
         // set each profile field accordingly
         for (key, val) in info {
             match key.as_str() {
@@ -272,26 +231,27 @@ pub fn get_profile_info(ssb_id: Option<String>) -> Result<Profile, Box<dyn Error
                 _ => (),
             }
         }
-
+        //
         // assign the ssb public key
         // (could be for the local profile or a peer)
         profile.id = Some(id);
 
-        // determine the path to the blob defined by the value of `profile.image`
-        if let Some(ref blob_id) = profile.image {
-            profile.blob_path = match blobs::get_blob_path(blob_id) {
-                Ok(path) => {
-                    // if we get the path, check if the blob is in the blobstore.
-                    // this allows us to default to a placeholder image in the template
-                    if let Ok(exists) = blob_is_stored_locally(&path).await {
-                        profile.blob_exists = exists
-                    };
-
-                    Some(path)
-                }
-                Err(_) => None,
-            }
-        }
+        // TODO: blobs support
+        // // determine the path to the blob defined by the value of `profile.image`
+        // if let Some(ref blob_id) = profile.image {
+        //     profile.blob_path = match blobs::get_blob_path(blob_id) {
+        //         Ok(path) => {
+        //             // if we get the path, check if the blob is in the blobstore.
+        //             // this allows us to default to a placeholder image in the template
+        //             if let Ok(exists) = blob_is_stored_locally(&path).await {
+        //                 profile.blob_exists = exists
+        //             };
+        //
+        //             Some(path)
+        //         }
+        //         Err(_) => None,
+        //     }
+        // }
 
         Ok(profile)
     })
@@ -306,16 +266,14 @@ pub fn update_profile_info(
     new_name: Option<String>,
     new_description: Option<String>,
     image: Option<BufferedFile>,
-) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+) -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
-            .await
-            .map_err(|e| e.to_string())?;
+        let mut sbot_client = init_sbot_client().await?;
 
-        // track whether the name, description or image have been updated
+        // // track whether the name, description or image have been updated
         let mut name_updated: bool = false;
         let mut description_updated: bool = false;
         let mut image_updated: bool = false;
@@ -326,9 +284,9 @@ pub fn update_profile_info(
             if name != current_name {
                 debug!("Publishing a new Scuttlebutt profile name");
                 if let Err(e) = sbot_client.publish_name(&name).await {
-                    return Err(format!("Failed to update name: {}", e));
+                    return Err(PeachWebError::Tilde(TildeError {message: (format!("Failed to update name: {}", e))}));
                 } else {
-                    name_updated = true
+                    name_updated = true;
                 }
             }
         }
@@ -338,7 +296,7 @@ pub fn update_profile_info(
             if description != current_description {
                 debug!("Publishing a new Scuttlebutt profile description");
                 if let Err(e) = sbot_client.publish_description(&description).await {
-                    return Err(format!("Failed to update description: {}", e));
+                    return Err(PeachWebError::Tilde(TildeError {message: (format!("Failed to update description: {}", e))}));
                 } else {
                     description_updated = true
                 }
@@ -354,12 +312,14 @@ pub fn update_profile_info(
                         // if the file was successfully added to the blobstore,
                         // publish an about image message with the blob id
                         if let Err(e) = sbot_client.publish_image(&blob_id).await {
-                            return Err(format!("Failed to update image: {}", e));
+                            return Err(PeachWebError::Tilde(TildeError {message: (format!("Failed to update image: {}", e))}));
                         } else {
                             image_updated = true
                         }
                     }
-                    Err(e) => return Err(format!("Failed to add image to blobstore: {}", e)),
+                    Err(e) => {
+                        return Err(PeachWebError::Tilde(TildeError {message: (format!("Failed to add image to blob store: {}", e))}));
+                    }
                 }
             } else {
                 image_updated = false
@@ -376,53 +336,49 @@ pub fn update_profile_info(
 }
 
 /// Follow a peer.
-pub fn follow_peer(public_key: &str) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+pub fn follow_peer(public_key: &str) -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
-            .await
-            .map_err(|e| e.to_string())?;
+        let mut sbot_client = init_sbot_client()
+            .await?;
 
         debug!("Following a Scuttlebutt peer");
-        match sbot_client.follow(public_key).await {
-            Ok(_) => Ok("Followed peer".to_string()),
-            Err(e) => Err(format!("Failed to follow peer: {}", e)),
-        }
+        Err(PeachWebError::NotYetImplemented)
     })
 }
 
 /// Unfollow a peer.
-pub fn unfollow_peer(public_key: &str) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+pub fn unfollow_peer(public_key: &str) -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
-            .await
-            .map_err(|e| e.to_string())?;
+        let mut sbot_client = init_sbot_client()
+            .await?;
 
-        debug!("Unfollowing a Scuttlebutt peer");
-        match sbot_client.unfollow(public_key).await {
-            Ok(_) => Ok("Unfollowed peer".to_string()),
-            Err(e) => Err(format!("Failed to unfollow peer: {}", e)),
-        }
+        Err(PeachWebError::NotYetImplemented)
+        // debug!("Unfollowing a Scuttlebutt peer");
+        // match sbot_client.unfollow(public_key).await {
+        //     Ok(_) => Ok("Unfollowed peer".to_string()),
+        //     Err(e) => Err(format!("Failed to unfollow peer: {}", e)),
+        // }
     })
 }
 
 /// Block a peer.
 pub fn block_peer(public_key: &str) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
+        let mut sbot_client = init_sbot_client()
             .await
             .map_err(|e| e.to_string())?;
 
         debug!("Blocking a Scuttlebutt peer");
-        match sbot_client.block(public_key).await {
+        match sbot_client.create_block(public_key).await {
             Ok(_) => Ok("Blocked peer".to_string()),
             Err(e) => Err(format!("Failed to block peer: {}", e)),
         }
@@ -430,176 +386,161 @@ pub fn block_peer(public_key: &str) -> Result<String, String> {
 }
 
 /// Unblock a peer.
-pub fn unblock_peer(public_key: &str) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+pub fn unblock_peer(public_key: &str) -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
-            .await
-            .map_err(|e| e.to_string())?;
+        let mut sbot_client = init_sbot_client()
+            .await?;
 
         debug!("Unblocking a Scuttlebutt peer");
-        match sbot_client.unblock(public_key).await {
-            Ok(_) => Ok("Unblocked peer".to_string()),
-            Err(e) => Err(format!("Failed to unblock peer: {}", e)),
-        }
+        Err(PeachWebError::NotYetImplemented)
+        // match sbot_client.unblock(public_key).await {
+        //     Ok(_) => Ok("Unblocked peer".to_string()),
+        //     Err(e) => Err(format!("Failed to unblock peer: {}", e)),
+        // }
     })
 }
 
 /// Retrieve a list of peers blocked by the local public key.
 pub fn get_blocks_list() -> Result<Vec<HashMap<String, String>>, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
-    let sbot_config = SbotConfig::read().ok();
+    // populate this vec to return
+    let mut to_return: Vec<HashMap<String, String>> = Vec::new();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let mut sbot_client = init_sbot_client().await?;
 
-        let blocks = sbot_client.get_blocks().await?;
+        let self_id = sbot_client.whoami().await?;
 
-        // we'll use this to store the profile info for each peer whom we block
-        let mut peer_list = Vec::new();
+        let blocks = sbot_client.get_blocks(&self_id).await?;
 
         if !blocks.is_empty() {
             for peer in blocks.iter() {
                 // trim whitespace (including newline characters) and
                 // remove the inverted-commas around the id
+                // TODO: is this necessary?
                 let key = peer.trim().replace('"', "");
-                // retrieve the profile info for the given peer
-                let mut peer_info = sbot_client.get_profile_info(&key).await?;
-                // insert the public key of the peer into the info hashmap
-                peer_info.insert("id".to_string(), key.to_string());
-                // we do not even attempt to find the blob for a blocked peer,
-                // since it may be vulgar to cause distress to the local peer.
-                peer_info.insert("blob_exists".to_string(), "false".to_string());
+                let peer_info = get_peer_info(&key).await?;
+
                 // push profile info to peer_list vec
-                peer_list.push(peer_info)
+                to_return.push(peer_info)
             }
         }
 
-        // return the list of blocked peers
-        Ok(peer_list)
+        // return the list of peers
+        Ok(to_return)
     })
 }
 
+
+pub async fn get_peer_info(key: &str) -> Result<HashMap<String, String>, Box<dyn Error>> {
+    let mut sbot_client = init_sbot_client().await?;
+    // key,value dict of info about this peer
+    let tilde_profile_info = sbot_client.get_profile_info(key).await.map_err(|err| {
+        println!("error getting profile info: {}", err);
+        err
+    }
+    )?;
+    let mut peer_info = HashMap::new();
+    tilde_profile_info.get("name").and_then(|val| val.as_str()).map(|val| {
+        peer_info.insert("name".to_string(), val.to_string());
+    });
+    tilde_profile_info.get("description").and_then(|val| val.as_str()).map(|val| {
+        peer_info.insert("description".to_string(), val.to_string());
+    });
+
+    // insert the public key of the peer into the info hashmap
+    peer_info.insert("id".to_string(), key.to_string());
+    // TODO: display profile photo blob
+    // // retrieve the profile image blob id for the given peer
+    // if let Some(blob_id) = peer_info.get("image") {
+    //     // look-up the path for the image blob
+    //     if let Ok(blob_path) = blobs::get_blob_path(blob_id) {
+    //         // insert the image blob path of the peer into the info hashmap
+    //         peer_info.insert("blob_path".to_string(), blob_path.to_string());
+    //         // check if the blob is in the blobstore
+    //         // set a flag in the info hashmap
+    //         match blob_is_stored_locally(&blob_path).await {
+    //             Ok(exists) if exists => {
+    //                 peer_info.insert("blob_exists".to_string(), "true".to_string())
+    //             }
+    //             _ => peer_info.insert("blob_exists".to_string(), "false".to_string()),
+    //         };
+    //     }
+    // }
+    Ok(peer_info)
+}
+
 /// Retrieve a list of peers followed by the local public key.
 pub fn get_follows_list() -> Result<Vec<HashMap<String, String>>, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
-    let sbot_config = SbotConfig::read().ok();
+
+    // populate this vec to return
+    let mut to_return: Vec<HashMap<String, String>> = Vec::new();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let mut sbot_client = init_sbot_client().await?;
 
-        let follows = sbot_client.get_follows().await?;
+        let self_id = sbot_client.whoami().await?;
 
-        // we'll use this to store the profile info for each peer who follows us
-        let mut peer_list = Vec::new();
+        let follows = sbot_client.get_follows(&self_id).await?;
 
         if !follows.is_empty() {
             for peer in follows.iter() {
                 // trim whitespace (including newline characters) and
                 // remove the inverted-commas around the id
+                // TODO: is this necessary?
                 let key = peer.trim().replace('"', "");
-                // retrieve the profile info for the given peer
-                let mut peer_info = sbot_client.get_profile_info(&key).await?;
-                // insert the public key of the peer into the info hashmap
-                peer_info.insert("id".to_string(), key.to_string());
-                // retrieve the profile image blob id for the given peer
-                if let Some(blob_id) = peer_info.get("image") {
-                    // look-up the path for the image blob
-                    if let Ok(blob_path) = blobs::get_blob_path(blob_id) {
-                        // insert the image blob path of the peer into the info hashmap
-                        peer_info.insert("blob_path".to_string(), blob_path.to_string());
-                        // check if the blob is in the blobstore
-                        // set a flag in the info hashmap
-                        match blob_is_stored_locally(&blob_path).await {
-                            Ok(exists) if exists => {
-                                peer_info.insert("blob_exists".to_string(), "true".to_string())
-                            }
-                            _ => peer_info.insert("blob_exists".to_string(), "false".to_string()),
-                        };
-                    }
-                }
+                let peer_info = get_peer_info(&key).await?;
+
                 // push profile info to peer_list vec
-                peer_list.push(peer_info)
+                to_return.push(peer_info)
             }
         }
 
         // return the list of peers
-        Ok(peer_list)
+        Ok(to_return)
     })
 }
 
 /// Retrieve a list of peers friended by the local public key.
 pub fn get_friends_list() -> Result<Vec<HashMap<String, String>>, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
-    let sbot_config = SbotConfig::read().ok();
+
+    // populate this vec to return
+    let mut to_return: Vec<HashMap<String, String>> = Vec::new();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let mut sbot_client = init_sbot_client().await?;
 
-        let local_id = sbot_client.whoami().await?;
+        let self_id = sbot_client.whoami().await?;
 
-        let follows = sbot_client.get_follows().await?;
+        let friends = sbot_client.get_friends(&self_id).await?;
 
-        // we'll use this to store the profile info for each friend
-        let mut peer_list = Vec::new();
-
-        if !follows.is_empty() {
-            for peer in follows.iter() {
+        if !friends.is_empty() {
+            for peer in friends.iter() {
                 // trim whitespace (including newline characters) and
                 // remove the inverted-commas around the id
-                let peer_id = peer.trim().replace('"', "");
-                // retrieve the profile info for the given peer
-                let mut peer_info = sbot_client.get_profile_info(&peer_id).await?;
-                // insert the public key of the peer into the info hashmap
-                peer_info.insert("id".to_string(), peer_id.to_string());
-                // retrieve the profile image blob id for the given peer
-                if let Some(blob_id) = peer_info.get("image") {
-                    // look-up the path for the image blob
-                    if let Ok(blob_path) = blobs::get_blob_path(blob_id) {
-                        // insert the image blob path of the peer into the info hashmap
-                        peer_info.insert("blob_path".to_string(), blob_path.to_string());
-                        // check if the blob is in the blobstore
-                        // set a flag in the info hashmap
-                        match sbot::blob_is_stored_locally(&blob_path).await {
-                            Ok(exists) if exists => {
-                                peer_info.insert("blob_exists".to_string(), "true".to_string())
-                            }
-                            _ => peer_info.insert("blob_exists".to_string(), "false".to_string()),
-                        };
-                    }
-                }
+                // TODO: is this necessary?
+                let key = peer.trim().replace('"', "");
+                let peer_info = get_peer_info(&key).await?;
 
-                // check if the peer follows us (making us friends)
-                let follow_query = RelationshipQuery {
-                    source: peer_id.to_string(),
-                    dest: local_id.clone(),
-                };
-
-                // query follow state
-                match sbot_client.friends_is_following(follow_query).await {
-                    Ok(following) if following == "true" => {
-                        // only push profile info to peer_list vec if they follow us
-                        peer_list.push(peer_info)
-                    }
-                    _ => (),
-                };
+                // push profile info to peer_list vec
+                to_return.push(peer_info)
             }
         }
 
         // return the list of peers
-        Ok(peer_list)
+        Ok(to_return)
     })
 }
 
 /// Retrieve the local public key (id).
 pub fn get_local_id() -> Result<String, Box<dyn Error>> {
-    // retrieve latest go-sbot configuration parameters
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config).await?;
+        let mut sbot_client = init_sbot_client().await?;
 
         let local_id = sbot_client.whoami().await?;
 
@@ -609,16 +550,20 @@ pub fn get_local_id() -> Result<String, Box<dyn Error>> {
 
 /// Publish a public post.
 pub fn publish_public_post(text: String) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
+        let mut sbot_client = init_sbot_client()
             .await
             .map_err(|e| e.to_string())?;
 
         debug!("Publishing a new Scuttlebutt public post");
-        match sbot_client.publish_post(&text).await {
+        let post = json!({
+            "type": "post",
+            "text": &text,
+        });
+        match sbot_client.publish(post).await {
             Ok(_) => Ok("Published post".to_string()),
             Err(e) => Err(format!("Failed to publish post: {}", e)),
         }
@@ -626,38 +571,33 @@ pub fn publish_public_post(text: String) -> Result<String, String> {
 }
 
 /// Publish a private message.
-pub fn publish_private_msg(text: String, recipients: Vec<String>) -> Result<String, String> {
-    // retrieve latest go-sbot configuration parameters
+pub fn publish_private_msg(text: String, recipients: Vec<String>) -> Result<String, PeachWebError> {
+    // retrieve latest solar-sbot configuration parameters
     let sbot_config = SbotConfig::read().ok();
 
     task::block_on(async {
-        let mut sbot_client = init_sbot_with_config(&sbot_config)
-            .await
-            .map_err(|e| e.to_string())?;
+        let mut sbot_client = init_sbot_client()
+            .await?;
 
-        debug!("Publishing a new Scuttlebutt private message");
-        match sbot_client
-            .publish_private(text.to_string(), recipients)
-            .await
-        {
-            Ok(_) => Ok("Published private message".to_string()),
-            Err(e) => Err(format!("Failed to publish private message: {}", e)),
+        for recipient in &recipients {
+            sbot_client.private_message(recipient, &text).await?;
         }
+        Ok("Published private message".to_string())
     })
 }
 
 // FILEPATH FUNCTIONS
 
-/// Return the path of the ssb-go directory.
-pub fn get_go_ssb_path() -> Result<String, PeachWebError> {
-    let go_ssb_path = match SbotConfig::read() {
-        Ok(conf) => conf.repo,
+/// Return the path of the tilde-sbot directory.
+pub fn get_tilde_ssb_path() -> Result<String, PeachWebError> {
+    let tilde_ssb_path = match SbotConfig::read() {
+        Ok(conf) => conf.database_directory,
         // return the default path if unable to read `config.toml`
         Err(_) => {
             // determine the home directory
             let mut home_path = dirs::home_dir().ok_or(PeachWebError::HomeDir)?;
-            // add the go-ssb subdirectory
-            home_path.push(".ssb-go");
+            // add the .ssb-tilde subdirectory
+            home_path.push(".ssb-tilde");
             // convert the PathBuf to a String
             home_path
                 .into_os_string()
@@ -665,12 +605,12 @@ pub fn get_go_ssb_path() -> Result<String, PeachWebError> {
                 .map_err(|_| PeachWebError::OsString)?
         }
     };
-    Ok(go_ssb_path)
+    Ok(tilde_ssb_path)
 }
 
 /// Check whether a blob is in the blobstore.
 pub async fn blob_is_stored_locally(blob_path: &str) -> Result<bool, PeachWebError> {
-    let go_ssb_path = get_go_ssb_path()?;
+    let go_ssb_path = get_tilde_ssb_path()?;
     let complete_path = format!("{}/blobs/sha256/{}", go_ssb_path, blob_path);
     let blob_exists_locally = Path::new(&complete_path).exists();
     Ok(blob_exists_locally)
@@ -691,25 +631,13 @@ pub async fn write_blob_to_store(image: BufferedFile) -> Result<String, PeachWeb
     // write file to temporary path
     fs::write(&temp_path, &image.data)?;
 
-    // open the file and read it into a buffer
-    let mut file = File::open(&temp_path)?;
-    let mut buffer = Vec::new();
-    file.read_to_end(&mut buffer)?;
+    // create blob from file
+    let mut sbot_client = init_sbot_client().await?;
 
-    // hash the bytes representing the file
-    let (hex_hash, blob_id) = blobs::hash_blob(&buffer)?;
-
-    // define the blobstore path and blob filename
-    let (blob_dir, blob_filename) = hex_hash.split_at(2);
-    let go_ssb_path = get_go_ssb_path()?;
-    let blobstore_sub_dir = format!("{}/blobs/sha256/{}", go_ssb_path, blob_dir);
-
-    // create the blobstore sub-directory
-    fs::create_dir_all(&blobstore_sub_dir)?;
-
-    // copy the file to the blobstore
-    let blob_path = format!("{}/{}", blobstore_sub_dir, blob_filename);
-    fs::copy(temp_path, blob_path)?;
+    let blob_path = temp_path.to_str().ok_or("Error storing blob to disk").map_err(|e| PeachWebError::Tilde(TildeError {
+        message: format!("Error storing blob to disk: {}", e),
+    }))?;
+    let blob_id = sbot_client.store_blob(blob_path).await?;
 
     Ok(blob_id)
 }

run-tilde-sbot.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Exit on error
+set -e
+
+# Usage check
+if [ "$#" -lt 2 ]; then
+  echo "Usage: $0 <CONFIG_FILE> <TILDEFRIENDS_PATH>"
+  exit 1
+fi
+
+CONFIG_FILE="$1"
+TILDEFRIENDS_PATH="$2"
+
+
+# Extract network_key (if it exists)
+NETWORK_KEY=$(grep -v '^\s*#' "$CONFIG_FILE" | grep -E '^\s*network_key\s*=' | sed -E 's/.*=\s*"?(.*?)"?\s*/\1/')
+DATABASE_DIRECTORY=$(grep -v '^\s*#' "$CONFIG_FILE" \
+    | grep -E '^\s*database_directory\s*=' \
+    | sed -E 's/.*=\s*"([^"]*)"\s*/\1/')
+
+# Extract all other key-value pairs except network_key
+ARGS=$(grep -v '^\s*#' "$CONFIG_FILE" \
+    | grep -E '^\s*[a-zA-Z0-9_.-]+\s*=' \
+    | grep -v '^\s*network_key\s*=' \
+    | sed -E 's/\s*=\s*/=/' \
+    | tr -d '"' \
+    | paste -sd, -)
+
+echo "ARGS: $ARGS"
+[ -n "$NETWORK_KEY" ] && echo "NETWORK_KEY: $NETWORK_KEY"
+[ -n "$DATABASE_DIRECTORY" ] && echo "DATABASE_DIRECTORY: $DATABASE_DIRECTORY"
+
+CMD="\"$TILDEFRIENDS_PATH\" run"
+[ -n "$ARGS" ] && CMD="$CMD -a \"$ARGS\""
+[ -n "$NETWORK_KEY" ] && CMD="$CMD -k \"$NETWORK_KEY\""
+[ -n "$DATABASE_DIRECTORY" ] && CMD="$CMD -d \"$DATABASE_DIRECTORY/db.sqlite\""
+
+echo "Running command:"
+echo "$CMD"
+
+# Execute the command
+eval $CMD

tdeploy.sh

@@ -0,0 +1,3 @@
+#! /bin/bash
+cargo build --package peach-web --release
+rsync -azvh /home/notplants/computer/projects/peachpub/peach-workspace/target/release/peach-web root@10.243.137.235:/var/www/peachpub_ynh/peach-web

tilde-client/.gitignore

@@ -0,0 +1,2 @@
+/target
+Cargo.lock

tilde-client/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "tilde-client"
+version = "0.0.1"
+authors = ["Max Fowler <max@mfowler.info>"]
+edition = "2018"
+
+[dependencies]
+async-std = "1.10"
+anyhow = "1.0.86"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_yaml = "0.8"

tilde-client/README.md

@@ -0,0 +1,37 @@
+# peach-lib
+
+![Generic badge](https://img.shields.io/badge/version-1.2.9-<COLOR>.svg)
+
+JSON-RPC client library for the PeachCloud ecosystem.
+
+`peach-lib` offers the ability to programmatically interact with the `peach-network`, `peach-oled` and `peach-stats` microservices.
+
+## Overview
+
+The `peach-lib` crate bundles JSON-RPC client code for making requests to the three PeachCloud microservices which expose JSON-RPC servers (`peach-network`, `peach-oled` and `peach-menu`). The full list of available RPC APIs can be found in the READMEs of the respective microservices ([peach-network](https://github.com/peachcloud/peach-network), [peach-oled](https://github.com/peachcloud/peach-oled), [peach-menu](https://github.com/peachcloud/peach-menu)), or in the [developer documentation for PeachCloud](http://docs.peachcloud.org/software/microservices/index.html). 
+
+The library also includes a custom error type, `PeachError`, which bundles the underlying error types into three variants: `JsonRpcHttp`, `JsonRpcCore` and `Serde`. When used as the returned error type in a `Result` function response, this allows convenient use of the `?` operator (as illustrated in the example usage code below).
+
+## Usage
+
+Define the dependency in your `Cargo.toml` file:
+
+`peach-lib = { git = "https://github.com/peachcloud/peach-lib", branch = "main"  }`
+
+Import the required client from the library:
+
+```rust
+use peach_lib::network_client;
+```
+
+Call one of the exposed methods:
+
+```rust
+network_client::ip("wlan0")?;
+```
+
+Further example usage can be found in the [`peach-menu`](https://github.com/peachcloud/peach-menu) code (see `src/states.rs`).
+
+## Licensing
+
+AGPL-3.0

tilde-client/src/error.rs

@@ -0,0 +1,18 @@
+#![warn(missing_docs)]
+
+use std::error::Error;
+use std::fmt;
+
+/// all tilde client errors
+#[derive(Debug)]
+pub struct TildeError {
+    pub message: String,
+}
+
+impl fmt::Display for TildeError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.message)
+    }
+}
+
+impl Error for TildeError {}

tilde-client/src/lib.rs

@@ -0,0 +1,142 @@
+// methods for interacting with tilde sbot
+
+use std::collections::HashMap;
+pub use crate::error::TildeError;
+
+use serde_json::{json, Value};
+use std::process::{Command, exit};
+
+mod error;
+
+pub struct TildeClient {
+    pub ssb_port: String,
+    pub tilde_binary_path: String,
+    pub tilde_database_path: String,
+}
+pub fn init_sbot() {
+    println!("++ init sbot!");
+}
+
+impl TildeClient {
+
+    pub fn run_tilde_command(&self, args: Vec<&str>) -> Result<String, TildeError> {
+        let mut command = Command::new(&self.tilde_binary_path);
+        let mut full_args = args.clone();
+        full_args.push("-d");
+        full_args.push(self.tilde_database_path.as_str());
+        command.args(full_args);
+        let output = command
+            .output().map_err(|e| TildeError {
+                message: format!("Command execution failed: {}", e),
+        })?;
+
+        if !output.status.success() {
+            println!("command: {:?}", command);
+            println!("stderr: {:?}", String::from_utf8_lossy(&output.stderr).to_string());
+            println!("stdout: {:?}", String::from_utf8_lossy(&output.stdout).to_string());
+            return Err(TildeError { message: format!("Command failed with status: {}", output.status) })
+        }
+
+        let result = String::from_utf8_lossy(&output.stdout).to_string();
+        println!("Command: {:?}", command);
+        println!("Command output: {}", result);
+
+        Ok(result)
+    }
+
+    pub async fn tilde_command_to_value(&self, args: Vec<&str>) -> Result<Value, TildeError> {
+        let result = self.run_tilde_command(args)?;
+        let value = serde_json::from_str(&result).map_err(|e| TildeError {
+            message: format!("Failed to parse JSON: {}", e),
+        })?;
+        Ok(value)
+    }
+
+    pub async fn whoami(&self) -> Result<String, TildeError> {
+        self.run_tilde_command(vec!["get_identity"]).map(|val| val.trim_end().to_string())
+    }
+
+    pub async fn get_profile_info(&self, key: &str) -> Result<Value, TildeError> {
+        self.tilde_command_to_value(vec!["get_profile", "-i", key]).await
+    }
+
+    pub async fn latest_sequence_number(&self) -> Result<String, TildeError> {
+        let key = self.whoami().await?;
+        // let num = self.run_tilde_command(vec!["get_sequence", "-i", &key])?.parse::<u64>().map_err(|e| TildeError {
+        //     message: format!("Failed to parse u64 from sequence number: {}", e),
+        // })?;
+        let num = self.run_tilde_command(vec!["get_sequence", "-i", &key])?;
+        println!("NUM: {}", num);
+        Ok(num)
+    }
+
+    pub async fn is_following(&self, from_id: &str, to_id: &str) -> Result<bool, TildeError> {
+        todo!();
+    }
+
+    pub async fn create_block(&self, key: &str) -> Result<bool, TildeError> {
+        todo!();
+    }
+    pub async fn get_blocks(&self, key: &str) -> Result<Vec<String>, TildeError> {
+        todo!();
+    }
+
+    pub async fn get_follows(&self, key: &str) -> Result<Vec<String>, TildeError> {
+        todo!();
+    }
+
+    pub async fn get_friends(&self, key: &str) -> Result<Vec<String>, TildeError> {
+        todo!();
+    }
+
+    pub async fn publish(&self, post: Value) -> Result<String, TildeError> {
+        let json_string = post.to_string();
+        let key = self.whoami().await?;
+        self.run_tilde_command(vec!["publish", "-u", ":admin", "-i", &key, "-c", &json_string])
+    }
+
+    pub async fn publish_name(&self, name: &str) -> Result<String, TildeError> {
+        let key = self.whoami().await?;
+        let about_post = json!({
+            "type": "about",
+            "about": key,
+            "name": name
+        });
+        self.publish(about_post).await
+    }
+
+    pub async fn publish_description(&self, description: &str) -> Result<String, TildeError> {
+        let key = self.whoami().await?;
+        let about_post = json!({
+            "type": "about",
+            "about": key,
+            "description": description
+        });
+        self.publish(about_post).await
+    }
+
+    pub async fn publish_image(&self, image_blob_id: &str) -> Result<String, TildeError> {
+        let key = self.whoami().await?;
+        let about_post = json!({
+            "type": "about",
+            "about": key,
+            "image": image_blob_id
+        });
+        self.publish(about_post).await
+    }
+
+    pub async fn store_blob(&self, blob_file_path: &str) -> Result<String, TildeError> {
+        self.run_tilde_command(vec!["store_blob", "-f", blob_file_path])
+    }
+
+    pub async fn private_message(&self, recipient_key: &str, message: &str) -> Result<String, TildeError> {
+        let self_key = self.whoami().await?;
+        self.run_tilde_command(vec!["private", "-u", ":admin", "-i", &self_key, "-r", recipient_key, "-t", message])
+    }
+
+    pub async fn create_invite(&self, num_uses: i32, external_domain: Option<&str>) -> Result<String, TildeError> {
+        let key = self.whoami().await?;
+        let address = external_domain.unwrap_or_else(|| "127.0.0.1");
+        self.run_tilde_command(vec!["create_invite", "-u", &num_uses.to_string(), "-i", &key, "-p", &self.ssb_port, "-a", address, "-e", "-1"])
+    }
+}