Merge branch 'main'

This commit is contained in:
oSumAtrIX 2022-08-30 02:31:50 +02:00
commit aee3c0f60a
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
3 changed files with 13 additions and 10 deletions

View File

@ -19,6 +19,9 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt install libleptonica-dev libtesseract-dev libssl-dev
- name: Setup Rust toolchain - name: Setup Rust toolchain
id: rust-toolchain id: rust-toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@ -28,12 +31,6 @@ jobs:
override: true override: true
components: clippy components: clippy
- name: Setup Node.js
if: github.event_name != 'pull_request'
uses: actions/setup-node@v2
with:
node-version: "lts/*"
- name: Cache - name: Cache
uses: actions/cache@v3 uses: actions/cache@v3
id: cache id: cache
@ -47,8 +44,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --target=x86_64-unknown-linux-musl args: --release
use-cross: true
- name: cargo clippy - name: cargo clippy
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
@ -60,7 +56,7 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: revanced-discord-bot name: revanced-discord-bot
path: target/x86_64-unknown-linux-musl/release/revanced-discord-bot path: target/release/revanced-discord-bot
- name: Setup semantic-release - name: Setup semantic-release
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'

View File

@ -1,3 +1,10 @@
# [1.10.0](https://github.com/revanced/revanced-discord-bot/compare/v1.9.0...v1.10.0) (2022-08-27)
### Features
* ocr & mute on rejoin ([#20](https://github.com/revanced/revanced-discord-bot/issues/20)) ([afb7e79](https://github.com/revanced/revanced-discord-bot/commit/afb7e79b6756f79c99e6db60e47ea054104fa415))
# [1.9.0](https://github.com/revanced/revanced-discord-bot/compare/v1.8.1...v1.9.0) (2022-08-22) # [1.9.0](https://github.com/revanced/revanced-discord-bot/compare/v1.8.1...v1.9.0) (2022-08-22)

View File

@ -7,7 +7,7 @@ use super::*;
use crate::utils::bot::get_data_lock; use crate::utils::bot::get_data_lock;
use crate::utils::ocr; use crate::utils::ocr;
fn contains_match(regex: &[Regex], text: &str) -> bool { pub fn contains_match(regex: &[Regex], text: &str) -> bool {
regex.iter().any(|r| r.is_match(text)) regex.iter().any(|r| r.is_match(text))
} }