Merge branch 'main' into feat/admin-api

# Conflicts:
#	crates/core/database/src/util/bridge/v0.rs
#	crates/core/result/src/axum.rs
#	crates/core/result/src/lib.rs
#	crates/core/result/src/rocket.rs

scripts/build-image-layer.sh

@@ -38,7 +38,8 @@ deps() {
     crates/services/january/src \
     crates/services/gifbox/src \
     crates/daemons/crond/src \
-    crates/daemons/pushd/src
+    crates/daemons/pushd/src \
+    crates/daemons/voice-ingress/src
   echo 'fn main() { panic!("stub"); }' |
     tee crates/bonfire/src/main.rs |
     tee crates/delta/src/main.rs |
@@ -46,7 +47,8 @@ deps() {
     tee crates/services/january/src/main.rs |
     tee crates/services/gifbox/src/main.rs |
     tee crates/daemons/crond/src/main.rs |
-    tee crates/daemons/pushd/src/main.rs
+    tee crates/daemons/pushd/src/main.rs |
+    tee crates/daemons/voice-ingress/src/main.rs
   echo '' |
     tee crates/core/config/src/lib.rs |
     tee crates/core/database/src/lib.rs |
@@ -72,6 +74,7 @@ apps() {
     crates/delta/src/main.rs \
     crates/daemons/crond/src/main.rs \
     crates/daemons/pushd/src/main.rs \
+    crates/daemons/voice-ingress/src/main.rs \
     crates/core/config/src/lib.rs \
     crates/core/database/src/lib.rs \
     crates/core/models/src/lib.rs \

scripts/publish-debug-image.sh

@@ -28,6 +28,7 @@ docker build -t ghcr.io/stoatchat/january:$TAG - < crates/services/january/Docke
 docker build -t ghcr.io/stoatchat/gifbox:$TAG - < crates/services/gifbox/Dockerfile
 docker build -t ghcr.io/stoatchat/crond:$TAG - < crates/daemons/crond/Dockerfile
 docker build -t ghcr.io/stoatchat/pushd:$TAG - < crates/daemons/pushd/Dockerfile
+docker build -t ghcr.io/stoatchat/voice-ingress:$TAG - < crates/daemons/voice-ingress/Dockerfile
 
 if [ "$DEBUG" = "true" ]; then
   git restore Cargo.toml
@@ -40,3 +41,4 @@ docker push ghcr.io/stoatchat/january:$TAG
 docker push ghcr.io/stoatchat/gifbox:$TAG
 docker push ghcr.io/stoatchat/crond:$TAG
 docker push ghcr.io/stoatchat/pushd:$TAG
+docker push ghcr.io/stoatchat/voice-ingress:$TAG

scripts/start.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cargo build \
-    --bin revolt-delta \
-    --bin revolt-bonfire \
-    --bin revolt-autumn \
-    --bin revolt-january \
-    --bin revolt-gifbox
-
-trap 'pkill -f revolt-' SIGINT
-cargo run --bin revolt-delta &
-cargo run --bin revolt-bonfire &
-cargo run --bin revolt-autumn &
-cargo run --bin revolt-january &
-cargo run --bin revolt-gifbox

scripts/try-tag-and-release.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-date=$(date +'%Y%m%d')
-incr=1
-
-while [ $(git tag -l "$date-$incr") ]; do
-    incr=$((incr+1))
-done
-
-tag=$date-$incr
-echo About to tag and push $tag in 3 seconds...
-sleep 3s
-
-git tag $tag
-git push --atomic origin $(git rev-parse --abbrev-ref HEAD) $tag