refactor: seperate out disconnect logic

.github/workflows/docker.yaml

@@ -49,13 +49,6 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       # Authenticate with Docker Hub and GHCR
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Login to Github Container Registry
         uses: docker/login-action@v2
         with:
@@ -72,14 +65,13 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ghcr.io/${{ github.repository_owner }}/base:latest
 
-      # revoltchat/server
+      # stoatchat/api
       - name: Docker meta
         id: meta-delta
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/server
-            ghcr.io/revoltchat/server
+            ghcr.io/stoatchat/api
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -92,14 +84,13 @@ jobs:
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-delta.outputs.labels }}
 
-      # revoltchat/bonfire
+      # stoatchat/events
       - name: Docker meta
         id: meta-bonfire
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/bonfire
-            ghcr.io/revoltchat/bonfire
+            ghcr.io/stoatchat/events
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -112,14 +103,13 @@ jobs:
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-bonfire.outputs.labels }}
 
-      # revoltchat/autumn
+      # stoatchat/file-server
       - name: Docker meta
         id: meta-autumn
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/autumn
-            ghcr.io/revoltchat/autumn
+            ghcr.io/stoatchat/file-server
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -132,14 +122,13 @@ jobs:
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-autumn.outputs.labels }}
 
-      # revoltchat/january
+      # stoatchat/proxy
       - name: Docker meta
         id: meta-january
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/january
-            ghcr.io/revoltchat/january
+            ghcr.io/stoatchat/proxy
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -152,14 +141,13 @@ jobs:
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-january.outputs.labels }}
 
-      # revoltchat/gifbox
+      # stoatchat/gifbox
       - name: Docker meta
         id: meta-gifbox
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/gifbox
-            ghcr.io/revoltchat/gifbox
+            ghcr.io/stoatchat/gifbox
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -172,14 +160,13 @@ jobs:
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-gifbox.outputs.labels }}
 
-      # revoltchat/crond
+      # stoatchat/crond
       - name: Docker meta
         id: meta-crond
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/crond
-            ghcr.io/revoltchat/crond
+            ghcr.io/stoatchat/crond
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -192,14 +179,13 @@ jobs:
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-crond.outputs.labels }}
 
-      # revoltchat/pushd
+      # stoatchat/pushd
       - name: Docker meta
         id: meta-pushd
         uses: docker/metadata-action@v4
         with:
           images: |
-            docker.io/revoltchat/pushd
-            ghcr.io/revoltchat/pushd
+            ghcr.io/stoatchat/pushd
       - name: Publish
         uses: docker/build-push-action@v4
         with:
@@ -211,3 +197,22 @@ jobs:
           build-args: |
             BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
           labels: ${{ steps.meta-pushd.outputs.labels }}
+
+      # stoatchat/voice-ingress
+      - name: Docker meta
+        id: meta-voice-ingress
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ghcr.io/stoatchat/voice-ingress
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/daemons/voice-ingress/Dockerfile
+          tags: ${{ steps.meta-voice-ingress.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-voice-ingress.outputs.labels }}

.github/workflows/rust.yaml

@@ -73,7 +73,7 @@ jobs:
         if: github.event_name != 'pull_request' && github.ref_name == 'main'
         uses: actions/checkout@v3
         with:
-          repository: revoltchat/api
+          repository: stoatchat/api
           path: api
           token: ${{ secrets.PAT }}
 

.github/workflows/triage_issue.yml

@@ -14,7 +14,7 @@ jobs:
         run: |
           gh api graphql -f query='
             query {
-              organization(login: "revoltchat"){
+              organization(login: "stoatchat"){
                 projectV2(number: 3) {
                   id
                   fields(first:20) {

.github/workflows/triage_pr.yml

@@ -14,7 +14,7 @@ jobs:
         run: |
           gh api graphql -f query='
             query {
-              organization(login: "revoltchat"){
+              organization(login: "stoatchat"){
                 projectV2(number: 5) {
                   id
                   fields(first:20) {

Dockerfile

@@ -34,6 +34,7 @@ COPY crates/services/january/Cargo.toml ./crates/services/january/
 COPY crates/services/gifbox/Cargo.toml ./crates/services/gifbox/
 COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/
 COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/
+COPY crates/daemons/voice-ingress/Cargo.toml ./crates/daemons/voice-ingress/
 RUN sh /tmp/build-image-layer.sh deps
 
 # Build all apps

Dockerfile.useCurrentArch

@@ -30,6 +30,7 @@ COPY crates/services/january/Cargo.toml ./crates/services/january/
 COPY crates/services/gifbox/Cargo.toml ./crates/services/gifbox/
 COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/
 COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/
+COPY crates/daemons/voice-ingress/Cargo.toml ./crates/daemons/voice-ingress/
 RUN sh /tmp/build-image-layer.sh deps
 
 # Build all apps

crates/bonfire/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

crates/core/database/src/voice/mod.rs

@@ -412,7 +412,9 @@ pub async fn sync_voice_permissions(
     server: Option<&Server>,
     role_id: Option<&str>,
 ) -> Result<()> {
-    let node = get_channel_node(channel.id()).await?.unwrap();
+    let Some(node) = get_channel_node(channel.id()).await? else {
+        return Ok(());
+    };
 
     for user_id in get_voice_channel_members(channel.id())
         .await?
@@ -454,9 +456,9 @@ pub async fn sync_user_voice_permissions(
             .as_ref()
             .is_none_or(|member| member.roles.iter().any(|r| r == role_id))
     }) {
-        let voice_state = get_voice_state(channel_id, server_id, &user.id)
-            .await?
-            .unwrap();
+        let Some(voice_state) = get_voice_state(channel_id, server_id, &user.id).await? else {
+            return Ok(());
+        };
 
         let mut query = DatabasePermissionQuery::new(db, user)
             .channel(channel)

crates/core/result/src/lib.rs

@@ -232,7 +232,9 @@ impl<T, E: std::fmt::Debug> ToRevoltError<T> for Result<T, E> {
         let loc = Location::caller();
 
         self
-            .map_err(|_| {
+            .map_err(|e| {
+                log::error!("{e:?}");
+
                 Error {
                     error_type: ErrorType::InternalError,
                     location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())

crates/daemons/crond/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

crates/daemons/pushd/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

crates/daemons/voice-ingress/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

crates/daemons/voice-ingress/src/api.rs

@@ -214,40 +214,59 @@ pub async fn ingress(
             // forbid any size which goes over the limit and also limit the aspect ratio to stop people from making too tall or too wide and bypassing the limit.
             // TODO: figure out how to track audio stream quality
 
-            if event.event == "track_published"
-                && (track.r#type == TrackType::Data as i32
-                    || (track.r#type == TrackType::Video as i32
-                        && (user_limits.video_resolution[0] != 0
-                            && user_limits.video_resolution[1] != 0
-                            && track.width * track.height
-                                > user_limits.video_resolution[0]
-                                    * user_limits.video_resolution[1])
-                        || (user_limits.video_aspect_ratio[0]
-                            != user_limits.video_aspect_ratio[1]
-                            && !(user_limits.video_aspect_ratio[0]
-                                ..=user_limits.video_aspect_ratio[1])
-                                .contains(&(track.width as f32 / track.height as f32)))))
-            {
-                voice_client.remove_user(node, user_id, channel_id).await?;
-                delete_voice_state(channel_id, channel.server(), user_id).await?;
-            } else {
-                let partial = update_voice_state_tracks(
-                    channel_id,
-                    channel.server(),
-                    user_id,
-                    event.event == "track_published", // to avoid duplicating this entire case twice
-                    track.source,
-                )
-                .await?;
+            if event.event == "track_published" {
+                let mut disconnect = false;
 
-                EventV1::UserVoiceStateUpdate {
-                    id: user_id.clone(),
-                    channel_id: channel_id.clone(),
-                    data: partial,
-                }
-                .p(channel_id.clone())
-                .await;
+                if track.r#type == TrackType::Data as i32 {
+                    log::debug!("User published data");
+                    disconnect = true;
+                };
+
+                if track.r#type == TrackType::Video as i32 {
+                    if user_limits.video_resolution[0] != 0
+                        && user_limits.video_resolution[1] != 0
+                        && track.width * track.height
+                            > user_limits.video_resolution[0] * user_limits.video_resolution[1]
+                    {
+                        log::debug!("User published video with out of bounds resolution");
+                        disconnect = true;
+                    };
+
+                    if user_limits.video_aspect_ratio[0] != user_limits.video_aspect_ratio[1]
+                        && !(user_limits.video_aspect_ratio[0]..=user_limits.video_aspect_ratio[1])
+                            .contains(&(track.width as f32 / track.height as f32))
+                    {
+                        log::debug!("User published video with out of bounds aspect ratio");
+                        disconnect = true;
+                    };
+                };
+
+                if disconnect {
+                    log::debug!("Removing user {user_id} from channel {channel_id} {event:?} due to forbidden track.");
+
+                    voice_client.remove_user(node, user_id, channel_id).await?;
+                    delete_voice_state(channel_id, channel.server(), user_id).await?;
+
+                    return Ok(EmptyResponse);
+                };
+            };
+
+            let partial = update_voice_state_tracks(
+                channel_id,
+                channel.server(),
+                user_id,
+                event.event == "track_published", // to avoid duplicating this entire case twice
+                track.source,
+            )
+            .await?;
+
+            EventV1::UserVoiceStateUpdate {
+                id: user_id.clone(),
+                channel_id: channel_id.clone(),
+                data: partial,
             }
+            .p(channel_id.clone())
+            .await;
         }
         _ => {}
     };

crates/delta/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

crates/services/autumn/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

crates/services/gifbox/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 
 # Bundle Stage
 FROM gcr.io/distroless/cc-debian12:nonroot

crates/services/january/Dockerfile

@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian
 
 # Bundle Stage

scripts/publish-debug-image.sh

@@ -20,25 +20,25 @@ fi
 
 TAG=$1-debug
 echo "Building images, will tag for ghcr.io with $TAG!"
-docker build -t ghcr.io/revoltchat/base:latest -f Dockerfile.useCurrentArch .
-docker build -t ghcr.io/revoltchat/server:$TAG - < crates/delta/Dockerfile
-docker build -t ghcr.io/revoltchat/bonfire:$TAG - < crates/bonfire/Dockerfile
-docker build -t ghcr.io/revoltchat/autumn:$TAG - < crates/services/autumn/Dockerfile
-docker build -t ghcr.io/revoltchat/january:$TAG - < crates/services/january/Dockerfile
-docker build -t ghcr.io/revoltchat/gifbox:$TAG - < crates/services/gifbox/Dockerfile
-docker build -t ghcr.io/revoltchat/crond:$TAG - < crates/daemons/crond/Dockerfile
-docker build -t ghcr.io/revoltchat/pushd:$TAG - < crates/daemons/pushd/Dockerfile
-docker build -t ghcr.io/revoltchat/voice-ingress:$TAG - < crates/daemons/voice-ingress/Dockerfile
+docker build -t ghcr.io/stoatchat/base:latest -f Dockerfile.useCurrentArch .
+docker build -t ghcr.io/stoatchat/server:$TAG - < crates/delta/Dockerfile
+docker build -t ghcr.io/stoatchat/bonfire:$TAG - < crates/bonfire/Dockerfile
+docker build -t ghcr.io/stoatchat/autumn:$TAG - < crates/services/autumn/Dockerfile
+docker build -t ghcr.io/stoatchat/january:$TAG - < crates/services/january/Dockerfile
+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
 fi
 
-docker push ghcr.io/revoltchat/server:$TAG
-docker push ghcr.io/revoltchat/bonfire:$TAG
-docker push ghcr.io/revoltchat/autumn:$TAG
-docker push ghcr.io/revoltchat/january:$TAG
-docker push ghcr.io/revoltchat/gifbox:$TAG
-docker push ghcr.io/revoltchat/crond:$TAG
-docker push ghcr.io/revoltchat/pushd:$TAG
-docker push ghcr.io/revoltchat/voice-ingress:$TAG
+docker push ghcr.io/stoatchat/server:$TAG
+docker push ghcr.io/stoatchat/bonfire:$TAG
+docker push ghcr.io/stoatchat/autumn:$TAG
+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