Merge 0378739384 into 1285d702d7

.github/workflows/build_and_test.yml

@@ -2,133 +2,153 @@ name: Build and Test
 
 on:
   push:
-    branches: ["main"]
+    branches: [ "main" ]
   pull_request:
-    branches: ["main", "dev"]
+    branches: [ "main", "dev" ]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   linux:
+
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    
     steps:
-      - uses: actions/checkout@v4
-      - name: Clone spacebar server
-        run: |
-          git clone https://github.com/bitfl0wer/server.git
-      - uses: actions/setup-node@v4
-        with:
+    - uses: actions/checkout@v4
+    - name: Clone spacebar server
+      run: |
+        git clone https://github.com/bitfl0wer/server.git
+    - uses: actions/setup-node@v4
+      with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
           cache-dependency-path: server/package-lock.json
-      - name: Prepare and start Spacebar server
-        run: |
-          npm install
-          npm run setup
-          npm run start &
-        working-directory: ./server
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-all-crates: "true"
-          prefix-key: "linux"
-      - uses: taiki-e/install-action@nextest
-      - name: Build, Test with nextest, Publish Coverage
-        run: |
-          if [ -n "${{ secrets.COVERALLS_REPO_TOKEN }}" ]; then
-            if [ "${{github.event.pull_request.head.ref}}" = "main" ]; then
-              curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-              cargo binstall --no-confirm cargo-tarpaulin --force
-              cargo tarpaulin --all-features --avoid-cfg-tarpaulin --tests --verbose --skip-clean --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }} --timeout 120
-            else
-              echo "Code Coverage step is skipped on non-main PRs and PRs from forks."
-              cargo nextest run --verbose --all-features
-            fi
-          else
-            echo "Code Coverage step is skipped on non-main PRs and PRs from forks."
-            cargo nextest run --verbose --all-features
-          fi
-  linux-non-default-features:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - name: Check common non-default feature configurations
-        run: |
-          echo "No features:"
-          cargo check --features="" --no-default-features
-          echo "Only client:"
-          cargo check --features="client" --no-default-features
-          echo "Only backend:"
-          cargo check --features="backend" --no-default-features
-          echo "Only voice:"
-          cargo check --features="voice" --no-default-features
-          echo "Only voice gateway:"
-          cargo check --features="voice_gateway" --no-default-features
-          echo "Backend + client:"
-          cargo check --features="backend, client" --no-default-features
-          echo "Backend + voice:"
-          cargo check --features="backend, voice" --no-default-features
-          echo "Backend + voice gateway:"
-          cargo check --features="backend, voice_gateway" --no-default-features
-          echo "Client + voice gateway:"
-          cargo check --features="client, voice_gateway" --no-default-features
+    - name: Prepare and start Spacebar server
+      run: |
+        npm install
+        npm run setup
+        npm run start &
+      working-directory: ./server
+    - uses: Swatinem/rust-cache@v2
+      with:
+        cache-all-crates: "true"
+        prefix-key: "linux"
+    - name: Build, Test and Publish Coverage
+      run: |
+        if [ -n "${{ secrets.COVERALLS_REPO_TOKEN }}" ]; then
+          curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+          cargo binstall --no-confirm cargo-tarpaulin --force
+          cargo tarpaulin --all-features --avoid-cfg-tarpaulin --tests --verbose --skip-clean --coveralls ${{ secrets.COVERALLS_REPO_TOKEN }} --timeout 120
+        else
+          echo "Code Coverage step is skipped on forks!"
+          cargo build --verbose --all-features
+          cargo test --verbose --all-features
+        fi
+    - name: Check common non-default feature configurations
+      run: |
+        echo "No features:"
+        cargo check --features="" --no-default-features
+        echo "Only client:"
+        cargo check --features="client" --no-default-features
+        echo "Only backend:"
+        cargo check --features="backend" --no-default-features
+        echo "Only voice:"
+        cargo check --features="voice" --no-default-features
+        echo "Only voice gateway:"
+        cargo check --features="voice_gateway" --no-default-features
+        echo "Backend + client:"
+        cargo check --features="backend, client" --no-default-features
+        echo "Backend + voice:"
+        cargo check --features="backend, voice" --no-default-features
+        echo "Backend + voice gateway:"
+        cargo check --features="backend, voice_gateway" --no-default-features
+        echo "Client + voice gateway:"
+        cargo check --features="client, voice_gateway" --no-default-features 
+  # wasm-safari:
+  #   runs-on: macos-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Clone spacebar server
+  #     run: |
+  #       git clone https://github.com/bitfl0wer/server.git
+  #   - uses: actions/setup-node@v4
+  #     with:
+  #         node-version: 18
+  #         cache: 'npm'
+  #         cache-dependency-path: server/package-lock.json
+  #   - name: Prepare and start Spacebar server
+  #     run: |
+  #       npm install
+  #       npm run setup
+  #       npm run start &
+  #     working-directory: ./server
+  #   - uses: Swatinem/rust-cache@v2 
+  #     with:
+  #       cache-all-crates: "true"
+  #       prefix-key: "macos-safari"
+  #   - name: Run WASM tests with Safari, Firefox, Chrome
+  #     run: |
+  #       rustup target add wasm32-unknown-unknown
+  #       curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+  #       cargo binstall --no-confirm wasm-bindgen-cli --version "0.2.88" --force
+  #       SAFARIDRIVER=$(which safaridriver) cargo test --target wasm32-unknown-unknown --no-default-features --features="client, rt" --no-fail-fast
   wasm-gecko:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v4
-      - name: Clone spacebar server
-        run: |
-          git clone https://github.com/bitfl0wer/server.git
-      - uses: actions/setup-node@v4
-        with:
+    - uses: actions/checkout@v4
+    - name: Clone spacebar server
+      run: |
+        git clone https://github.com/bitfl0wer/server.git
+    - uses: actions/setup-node@v4
+      with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
           cache-dependency-path: server/package-lock.json
-      - name: Prepare and start Spacebar server
-        run: |
-          npm install
-          npm run setup
-          npm run start &
-        working-directory: ./server
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-all-crates: "true"
-          prefix-key: "macos"
-      - name: Run WASM tests with Safari, Firefox, Chrome
-        run: |
-          rustup target add wasm32-unknown-unknown
-          curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-          cargo binstall --no-confirm wasm-bindgen-cli --version "0.2.92" --force
-          GECKODRIVER=$(which geckodriver) cargo test --target wasm32-unknown-unknown --no-default-features --features="client, rt, voice_gateway"
+    - name: Prepare and start Spacebar server
+      run: |
+        npm install
+        npm run setup
+        npm run start &
+      working-directory: ./server
+    - uses: Swatinem/rust-cache@v2 
+      with:
+        cache-all-crates: "true"
+        prefix-key: "macos"
+    - name: Run WASM tests with Safari, Firefox, Chrome
+      run: |
+        rustup target add wasm32-unknown-unknown
+        curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+        cargo binstall --no-confirm wasm-bindgen-cli --version "0.2.92" --force
+        GECKODRIVER=$(which geckodriver) cargo test --target wasm32-unknown-unknown --no-default-features --features="client, rt, voice_gateway"
   wasm-chrome:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v4
-      - name: Clone spacebar server
-        run: |
-          git clone https://github.com/bitfl0wer/server.git
-      - uses: actions/setup-node@v4
-        with:
+    - uses: actions/checkout@v4
+    - name: Clone spacebar server
+      run: |
+        git clone https://github.com/bitfl0wer/server.git
+    - uses: actions/setup-node@v4
+      with:
           node-version: 18
-          cache: "npm"
+          cache: 'npm'
           cache-dependency-path: server/package-lock.json
-      - name: Prepare and start Spacebar server
-        run: |
-          npm install
-          npm run setup
-          npm run start &
-        working-directory: ./server
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-all-crates: "true"
-          prefix-key: "macos"
-      - name: Run WASM tests with Safari, Firefox, Chrome
-        run: |
-          rustup target add wasm32-unknown-unknown
-          curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-          cargo binstall --no-confirm wasm-bindgen-cli --version "0.2.92" --force
-          CHROMEDRIVER=$(which chromedriver) cargo test --target wasm32-unknown-unknown --no-default-features --features="client, rt, voice_gateway"
+    - name: Prepare and start Spacebar server
+      run: |
+        npm install
+        npm run setup
+        npm run start &
+      working-directory: ./server
+    - uses: Swatinem/rust-cache@v2 
+      with:
+        cache-all-crates: "true"
+        prefix-key: "macos"
+    - name: Run WASM tests with Safari, Firefox, Chrome
+      run: |
+        rustup target add wasm32-unknown-unknown
+        curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+        cargo binstall --no-confirm wasm-bindgen-cli --version "0.2.92" --force
+        CHROMEDRIVER=$(which chromedriver) cargo test --target wasm32-unknown-unknown --no-default-features --features="client, rt, voice_gateway"

CONTRIBUTING.md

@@ -3,10 +3,8 @@
 
 **Please refer to the [contribution guidelines](https://github.com/polyphony-chat/.github/blob/main/CONTRIBUTION_GUIDELINES.md) and [our Code of Conduct](https://github.com/polyphony-chat/.github/blob/main/CODE_OF_CONDUCT.md) before making a contribution.**
 
-Contributions should always fork from and merge back into the `dev` branch.
-
 Chorus is currently missing voice support and a lot of API endpoints, many of which should be trivial to implement,
 ever since [we streamlined the process of doing so](https://github.com/polyphony-chat/chorus/discussions/401).
 
 If you'd like to contribute new functionality, check out [The 'Meta'-issues.](https://github.com/polyphony-chat/chorus/issues?q=is%3Aissue+label%3A%22Type%3A+Meta%22+) They contain a comprehensive list of all features which are yet missing for full Discord.com compatibility.
-Please feel free to open an Issue with the idea you have, or a Pull Request.
+Please feel free to open an Issue with the idea you have, or a Pull Request. 

src/types/config/types/subconfigs/limits/global.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Copy, PartialOrd, Ord, Hash)]
 pub struct GlobalRateLimit {
-    pub limit: u64,
+    pub limit: u16,
     pub window: u64,
     pub enabled: bool,
 }

src/types/entities/guild.rs

@@ -240,18 +240,13 @@ impl PartialEq for GuildInvite {
     }
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Default, Clone, PartialEq, Hash, Eq, PartialOrd, Ord, Copy,
-)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Hash, Eq, PartialOrd, Ord, Copy)]
 pub struct UnavailableGuild {
     pub id: Snowflake,
-    pub unavailable: Option<bool>,
-    pub geo_restricted: Option<bool>,
+    pub unavailable: bool,
 }
 
-#[derive(
-    Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy,
-)]
+#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy)]
 pub struct GuildCreateResponse {
     pub id: Snowflake,
 }

tests/guilds.rs

@@ -70,6 +70,15 @@ async fn guild_create_ban() {
     )
     .await
     .unwrap();
+    assert!(Guild::create_ban(
+        guild.id,
+        other_user_id,
+        None,
+        GuildBanCreateSchema::default(),
+        &mut bundle.user,
+    )
+    .await
+    .is_err());
     common::teardown(bundle).await
 }