From 6621a09ec9f99a67fd9bfee4fc908c8896831b64 Mon Sep 17 00:00:00 2001 From: notplants Date: Wed, 29 Jun 2022 16:22:58 -0400 Subject: [PATCH] Insert domain into invite --- Cargo.lock | 4 ++-- peach-web/Cargo.toml | 2 +- peach-web/src/utils/sbot.rs | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 321f665..7699594 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1079,7 +1079,7 @@ dependencies = [ [[package]] name = "golgi" version = "0.1.4" -source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git#ca4c1114ddf328b818144c5a1af0187b1357e9be" +source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#ca4c1114ddf328b818144c5a1af0187b1357e9be" dependencies = [ "async-std", "async-stream 0.3.3", @@ -2331,7 +2331,7 @@ dependencies = [ [[package]] name = "peach-web" -version = "0.6.18" +version = "0.6.19" dependencies = [ "async-std", "base64 0.13.0", diff --git a/peach-web/Cargo.toml b/peach-web/Cargo.toml index 6c295cc..9379556 100644 --- a/peach-web/Cargo.toml +++ b/peach-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "peach-web" -version = "0.6.18" +version = "0.6.19" authors = ["Andrew Reid ", "Max Fowler "] edition = "2018" description = "peach-web is a web application which provides a web interface for monitoring and interacting with the PeachCloud device. This allows administration of the single-board computer (ie. Raspberry Pi) running PeachCloud, as well as the ssb-server and related plugins." diff --git a/peach-web/src/utils/sbot.rs b/peach-web/src/utils/sbot.rs index 98ab413..28ce5d1 100644 --- a/peach-web/src/utils/sbot.rs +++ b/peach-web/src/utils/sbot.rs @@ -157,7 +157,13 @@ pub fn create_invite(uses: u16) -> Result> { let mut sbot_client = init_sbot_with_config(&sbot_config).await?; debug!("Generating Scuttlebutt invite code"); - let invite_code = sbot_client.invite_create(uses).await?; + 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..]; + } Ok(invite_code) }) -- 2.40.1