mirror of
https://github.com/stoatchat/stoatchat.git
synced 2026-07-06 19:25:59 +00:00
Compare commits
3 Commits
v0.13.3
...
fix/hosepi
| Author | SHA1 | Date | |
|---|---|---|---|
|
805f2c4528 | ||
|
|
5a6155fdb6 | ||
|
|
c5844b6281 |
24
.github/pull_request_template.md
vendored
24
.github/pull_request_template.md
vendored
@@ -1,24 +0,0 @@
|
||||
<!-- Describe your changes -->
|
||||
|
||||
Fixes # (issue)
|
||||
|
||||
## How was this PR tested?
|
||||
|
||||
<!-- What did you do to test your changes? -->
|
||||
|
||||
- [ ] Test A
|
||||
- [ ] Test B
|
||||
|
||||
## Checklist:
|
||||
|
||||
- [ ] I have carefully read [the contributing guidelines](https://developers.stoat.chat/developing/contrib/)
|
||||
- [ ] I have performed a self-review of my own code
|
||||
- [ ] I have made corresponding changes to the documentation if applicable
|
||||
- [ ] I have no unrelated changes in the PR
|
||||
- [ ] I have confirmed that any new dependencies are strictly necessary
|
||||
- [ ] I have written tests for new code (if applicable)
|
||||
- [ ] I have followed naming conventions/patterns in the surrounding code
|
||||
|
||||
## Please declare, if any, LLM usage involved in creating this PR
|
||||
|
||||
...
|
||||
6
.github/workflows/git-town.yml
vendored
6
.github/workflows/git-town.yml
vendored
@@ -1,6 +1,3 @@
|
||||
# DO NOT EDIT DIRECTLY IN REPOSITORY
|
||||
# Managed in Terraform templates
|
||||
|
||||
name: Git Town
|
||||
|
||||
on:
|
||||
@@ -11,7 +8,7 @@ jobs:
|
||||
name: Display the branch stack
|
||||
runs-on: ubuntu-slim
|
||||
|
||||
if: ${{ github.event.pull_request.head.repo.full_name == github.repository && !startsWith(github.head_ref, 'release-please--') }}
|
||||
if: ${{ !startsWith(github.head_ref, 'release-please--') }}
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
@@ -20,4 +17,3 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
|
||||
- uses: stoatchat/action-git-town@4bc5c942e4603bffa0806b51d5fe5f0bc5deb0ac
|
||||
continue-on-error: true
|
||||
3
.github/workflows/release-webhook.yml
vendored
3
.github/workflows/release-webhook.yml
vendored
@@ -1,6 +1,3 @@
|
||||
# DO NOT EDIT DIRECTLY IN REPOSITORY
|
||||
# Managed in Terraform templates
|
||||
|
||||
name: Release Webhook
|
||||
|
||||
on:
|
||||
|
||||
5
.github/workflows/validate-pr-title.yml
vendored
5
.github/workflows/validate-pr-title.yml
vendored
@@ -1,6 +1,3 @@
|
||||
# DO NOT EDIT DIRECTLY IN REPOSITORY
|
||||
# Managed in Terraform templates
|
||||
|
||||
name: "Lint PR"
|
||||
|
||||
on:
|
||||
@@ -18,6 +15,6 @@ jobs:
|
||||
permissions:
|
||||
pull-requests: read
|
||||
steps:
|
||||
- uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
|
||||
- uses: amannn/action-semantic-pull-request@v6
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -16,13 +16,4 @@ idiomatic_version_file_enable_tools = ["rust"]
|
||||
[tasks.start]
|
||||
description = "Run all services"
|
||||
depends = ["docker:start", "build"]
|
||||
wait_for = ["docker:start", "build"]
|
||||
run = [{ task = "service:*" }]
|
||||
|
||||
[env]
|
||||
BUILDER = "cargo"
|
||||
DOCKER_NETWORK_NAME = "stoatchat_default"
|
||||
DATABASE_PORT = "27017"
|
||||
RABBIT_PORT = "5672"
|
||||
REDIS_PORT = "6379"
|
||||
_.file = { path = ".env", tools = true }
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
#MISE description="Build project"
|
||||
set -e
|
||||
|
||||
${BUILDER} build "$@"
|
||||
cargo build "$@"
|
||||
|
||||
@@ -3,11 +3,3 @@
|
||||
set -e
|
||||
|
||||
docker compose up -d
|
||||
|
||||
docker run \
|
||||
--network=${DOCKER_NETWORK_NAME} \
|
||||
--name wait \
|
||||
--rm dokku/wait -c \
|
||||
rabbit:${RABBIT_PORT},\
|
||||
database:${DATABASE_PORT},\
|
||||
redis:${REDIS_PORT}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
".": "0.13.3"
|
||||
".": "0.11.5"
|
||||
}
|
||||
96
CHANGELOG.md
96
CHANGELOG.md
@@ -1,101 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## [0.13.3](https://github.com/stoatchat/stoatchat/compare/v0.13.2...v0.13.3) (2026-05-15)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* don't automatically set up rabbitmq in delta ([#749](https://github.com/stoatchat/stoatchat/issues/749)) ([7647cfc](https://github.com/stoatchat/stoatchat/commit/7647cfc8d93aba99f5faef13eb3d970097540d76))
|
||||
* don't declare queues which seem to cause the backend to crash in prod ([7647cfc](https://github.com/stoatchat/stoatchat/commit/7647cfc8d93aba99f5faef13eb3d970097540d76))
|
||||
|
||||
## [0.13.2](https://github.com/stoatchat/stoatchat/compare/v0.13.1...v0.13.2) (2026-05-11)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* update default exchange to `revolt.default` ([#746](https://github.com/stoatchat/stoatchat/issues/746)) ([fcb8091](https://github.com/stoatchat/stoatchat/commit/fcb8091cd7a00d7f26c798daa33aae4b923b2a8b))
|
||||
|
||||
## [0.13.1](https://github.com/stoatchat/stoatchat/compare/v0.13.0...v0.13.1) (2026-05-10)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* amqprs startup bug ([#744](https://github.com/stoatchat/stoatchat/issues/744)) ([1100eaf](https://github.com/stoatchat/stoatchat/commit/1100eaf46f849f2509ae01ac497556ca33bde778))
|
||||
|
||||
## [0.13.0](https://github.com/stoatchat/stoatchat/compare/v0.12.1...v0.13.0) (2026-05-08)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add embed support for YouTube Shorts ([#734](https://github.com/stoatchat/stoatchat/issues/734)) ([d46c7f7](https://github.com/stoatchat/stoatchat/commit/d46c7f7f3c04524c0639c3e0a122626f8e0b3bf7))
|
||||
* add emoji rename endpoint ([#714](https://github.com/stoatchat/stoatchat/issues/714)) ([23ad135](https://github.com/stoatchat/stoatchat/commit/23ad1359834bb7d07a460b8678d6a6ebffc73eb0))
|
||||
* add legal links to root payload ([#733](https://github.com/stoatchat/stoatchat/issues/733)) ([21d8201](https://github.com/stoatchat/stoatchat/commit/21d82018cf84ab0fdd10613d254b9562aea8eea3))
|
||||
* add role icon support ([#724](https://github.com/stoatchat/stoatchat/issues/724)) ([841985d](https://github.com/stoatchat/stoatchat/commit/841985d3b994df1c6eefab2fc7ecbd77ab22c493))
|
||||
* Add webhook endpoints for editing and deleting messages ([#682](https://github.com/stoatchat/stoatchat/issues/682)) ([6f3441c](https://github.com/stoatchat/stoatchat/commit/6f3441cf4acac2a8e6e1bf07a279a153b80f7956))
|
||||
* automatically sanitise usernames on create/update ([#689](https://github.com/stoatchat/stoatchat/issues/689)) ([e937697](https://github.com/stoatchat/stoatchat/commit/e93769786c7669485a659ee471630740d3cea702))
|
||||
* blacklist private ip ranges and add january domain blocklist ([#731](https://github.com/stoatchat/stoatchat/issues/731)) ([6b41db9](https://github.com/stoatchat/stoatchat/commit/6b41db984bb491b2e58324309cc70d8c14e0b814))
|
||||
* Rewrite acks ([#741](https://github.com/stoatchat/stoatchat/issues/741)) ([ab5bd47](https://github.com/stoatchat/stoatchat/commit/ab5bd47a39ee889de0b5ae6e7b560620853daead))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add new_user_hours to configuration limits ([#729](https://github.com/stoatchat/stoatchat/issues/729)) ([279f5d5](https://github.com/stoatchat/stoatchat/commit/279f5d5fd7af2df55902c706859ec07f569cdb1e))
|
||||
* add reconnection policy to Redis subscriber to prevent ghost state ([#708](https://github.com/stoatchat/stoatchat/issues/708)) ([057f2bb](https://github.com/stoatchat/stoatchat/commit/057f2bb8b359f8b942741a30ff54eeb8fbe3e0b1))
|
||||
* docker compose file had personal url in it ([#742](https://github.com/stoatchat/stoatchat/issues/742)) ([0719985](https://github.com/stoatchat/stoatchat/commit/0719985ac5636590f91e6f9ec4b68f3eded70c13))
|
||||
* don't strip ICC from exif ([#735](https://github.com/stoatchat/stoatchat/issues/735)) ([d76a711](https://github.com/stoatchat/stoatchat/commit/d76a71141f3e508f6308ba52fa28eaeb56fb3438))
|
||||
* dont send notification in fcm ([#721](https://github.com/stoatchat/stoatchat/issues/721)) ([89171e9](https://github.com/stoatchat/stoatchat/commit/89171e9bd0f15711157e78c6eec0fe7b480de93a))
|
||||
* encode filenames in redirects ([#737](https://github.com/stoatchat/stoatchat/issues/737)) ([9fd7128](https://github.com/stoatchat/stoatchat/commit/9fd7128f800badbd184baf943d4f799e601201e4))
|
||||
* january ip redirects & domain resolver ([#738](https://github.com/stoatchat/stoatchat/issues/738)) ([356491e](https://github.com/stoatchat/stoatchat/commit/356491e934b274f9e895df883dd63ef0b3123510))
|
||||
* update message length validation to remove upper limit ([#723](https://github.com/stoatchat/stoatchat/issues/723)) ([ed4fd5e](https://github.com/stoatchat/stoatchat/commit/ed4fd5ebfe6d0ea534a0898da4afdc1f4e2cd6c5))
|
||||
* use correct response for NoEffect errors ([#732](https://github.com/stoatchat/stoatchat/issues/732)) ([5378cd2](https://github.com/stoatchat/stoatchat/commit/5378cd22b4c7d85f44c31a6af0dda00941b80d5c))
|
||||
|
||||
## [0.12.1](https://github.com/stoatchat/stoatchat/compare/v0.12.0...v0.12.1) (2026-04-10)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add migration to update existing files to be animated ([#705](https://github.com/stoatchat/stoatchat/issues/705)) ([f2c056a](https://github.com/stoatchat/stoatchat/commit/f2c056a1515be493b195f3f5db5886c2ddf36700))
|
||||
* don't send self dm notifications ([#706](https://github.com/stoatchat/stoatchat/issues/706)) ([f30b729](https://github.com/stoatchat/stoatchat/commit/f30b729ca90d0be6853c57ab4935694e5e59ae56))
|
||||
* mise start + missing docker image ([#564](https://github.com/stoatchat/stoatchat/issues/564)) ([fb8fe16](https://github.com/stoatchat/stoatchat/commit/fb8fe1655776791421284a6a093e86f0320c258a))
|
||||
* test failure due to wrong assertion ([#707](https://github.com/stoatchat/stoatchat/issues/707)) ([f81e329](https://github.com/stoatchat/stoatchat/commit/f81e3291bdd57af9ceedb2987b111acc7051d69c))
|
||||
|
||||
## [0.12.0](https://github.com/stoatchat/stoatchat/compare/v0.11.5...v0.12.0) (2026-03-28)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add bug report template for issue tracking ([#627](https://github.com/stoatchat/stoatchat/issues/627)) ([f777e28](https://github.com/stoatchat/stoatchat/commit/f777e2863c6ca50057c8b5d0a5be14915d287724))
|
||||
* Add slowmode functionality to text channels ([#680](https://github.com/stoatchat/stoatchat/issues/680)) ([6107f24](https://github.com/stoatchat/stoatchat/commit/6107f242fd3ebaff71a15f9a16330ffbcb4f2d7b))
|
||||
* Allow restricting server creation to specific users ([#685](https://github.com/stoatchat/stoatchat/issues/685)) ([edfa97d](https://github.com/stoatchat/stoatchat/commit/edfa97db108c9c81828547f98a1db5315cb5ba4a))
|
||||
* compute thumbhash for images ([#596](https://github.com/stoatchat/stoatchat/issues/596)) ([c2d4369](https://github.com/stoatchat/stoatchat/commit/c2d4369e160f32d79bce0a0b0f14677f89de3669))
|
||||
* Detect animation in image files for fetch_preview ([#574](https://github.com/stoatchat/stoatchat/issues/574)) ([3fa0abf](https://github.com/stoatchat/stoatchat/commit/3fa0abf47f5f42ddd8ee041fe4c44fbc5ba800c1))
|
||||
* expose global and user limits in root API response ([#644](https://github.com/stoatchat/stoatchat/issues/644)) ([0b522eb](https://github.com/stoatchat/stoatchat/commit/0b522ebddc17f2e3f792ff5e2347793e9849fa23))
|
||||
* implement time based message sweep on user ban ([#670](https://github.com/stoatchat/stoatchat/issues/670)) ([98c7b1b](https://github.com/stoatchat/stoatchat/commit/98c7b1b5a5b9fdac5c0ab83be10f0e23114dbfc9))
|
||||
* load config from env vars ([#576](https://github.com/stoatchat/stoatchat/issues/576)) ([5191bd1](https://github.com/stoatchat/stoatchat/commit/5191bd16b2a905b8409838e34eb0baca96f08580))
|
||||
* parse message push notification content and replace internal formatting ([#693](https://github.com/stoatchat/stoatchat/issues/693)) ([d1e72ce](https://github.com/stoatchat/stoatchat/commit/d1e72cee42c54e16f4e49af569897528b10a28ca))
|
||||
* Transfer ownership ([#396](https://github.com/stoatchat/stoatchat/issues/396)) ([735d644](https://github.com/stoatchat/stoatchat/commit/735d644e043793cb86e74aab5b88bb4b8bc17ba2))
|
||||
* update livekit ([#698](https://github.com/stoatchat/stoatchat/issues/698)) ([f181edc](https://github.com/stoatchat/stoatchat/commit/f181edc8f2ff3ce4b6d48938dfc73931ecfa2279))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add flag for disabling events instead of commenting them out ([#695](https://github.com/stoatchat/stoatchat/issues/695)) ([a5cd08a](https://github.com/stoatchat/stoatchat/commit/a5cd08a655dece4269f3ac84fa2387ae356709a5))
|
||||
* add masquerade permission to default direct message settings ([#665](https://github.com/stoatchat/stoatchat/issues/665)) ([ab52569](https://github.com/stoatchat/stoatchat/commit/ab525699bd6663333f0e9fed6d2455e482e6a09f))
|
||||
* Check for appropriate permission for removing other users avatar ([#657](https://github.com/stoatchat/stoatchat/issues/657)) ([d56135e](https://github.com/stoatchat/stoatchat/commit/d56135e0cbc713884c9378832952f7ad490fa315))
|
||||
* default video resolution is a non-existent size ([#601](https://github.com/stoatchat/stoatchat/issues/601)) ([0698e11](https://github.com/stoatchat/stoatchat/commit/0698e115e8d003d615e468c4fb9654e6bbc9107f)), closes [#588](https://github.com/stoatchat/stoatchat/issues/588)
|
||||
* **docs:** Update GitHub links ([#647](https://github.com/stoatchat/stoatchat/issues/647)) ([b830631](https://github.com/stoatchat/stoatchat/commit/b830631bd25a546844b7bdd30386084bb365e4de))
|
||||
* don't use a bitop for OR ([#676](https://github.com/stoatchat/stoatchat/issues/676)) ([5701b5c](https://github.com/stoatchat/stoatchat/commit/5701b5c18c513f796af365169ceaea372a22638c))
|
||||
* Fix typo for p256dh in vapid notification flow ([#622](https://github.com/stoatchat/stoatchat/issues/622)) ([a80ad1c](https://github.com/stoatchat/stoatchat/commit/a80ad1cbe58b8af5e45751e51d94d93c1cea1c9f))
|
||||
* improve generated openapi.json ([#584](https://github.com/stoatchat/stoatchat/issues/584)) ([52ed510](https://github.com/stoatchat/stoatchat/commit/52ed5100c2446e0b261085639e123e7e124cab2c))
|
||||
* no node state set on channel creation ([#653](https://github.com/stoatchat/stoatchat/issues/653)) ([24d0d2b](https://github.com/stoatchat/stoatchat/commit/24d0d2b7266f6f8a692d0a52704acfecf517674c))
|
||||
* only show first line on commit messages ([#696](https://github.com/stoatchat/stoatchat/issues/696)) ([91783b9](https://github.com/stoatchat/stoatchat/commit/91783b906697fc85305dee683f7c15dda55f0c50))
|
||||
* pass &str to Reference ([#697](https://github.com/stoatchat/stoatchat/issues/697)) ([ccda6f5](https://github.com/stoatchat/stoatchat/commit/ccda6f5c53ee043705f7ff6b5f6c393f020781de))
|
||||
* redis_url vs redis_uri in config ([#666](https://github.com/stoatchat/stoatchat/issues/666)) ([b0b728f](https://github.com/stoatchat/stoatchat/commit/b0b728fb0dbc9ee28360301de1c3ea501bbbff1d))
|
||||
* replace some links and Revolt mentions to current Stoat ([#515](https://github.com/stoatchat/stoatchat/issues/515)) ([d629e89](https://github.com/stoatchat/stoatchat/commit/d629e89304be2f0011e189293b278f07d346aa7d))
|
||||
* send push notifications for DM and group messages ([#660](https://github.com/stoatchat/stoatchat/issues/660)) ([52c0d2f](https://github.com/stoatchat/stoatchat/commit/52c0d2f266b76d8975bba2d5e75c62bb30149c45))
|
||||
* store server id in redis and in room metadata to be able to delete voice state in all scenarios ([#656](https://github.com/stoatchat/stoatchat/issues/656)) ([49c6289](https://github.com/stoatchat/stoatchat/commit/49c628958070e4f0a5edc764d3b48158589219d9))
|
||||
* uname is missing from crond ([#675](https://github.com/stoatchat/stoatchat/issues/675)) ([dc4438b](https://github.com/stoatchat/stoatchat/commit/dc4438bc3c7b2cad8d442b3cd438afb9ed566a5e))
|
||||
|
||||
## [0.11.5](https://github.com/stoatchat/stoatchat/compare/v0.11.4...v0.11.5) (2026-02-17)
|
||||
|
||||
|
||||
|
||||
4710
Cargo.lock
generated
4710
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
172
Cargo.toml
172
Cargo.toml
@@ -1,5 +1,5 @@
|
||||
[workspace]
|
||||
resolver = "3"
|
||||
resolver = "2"
|
||||
|
||||
members = [
|
||||
"crates/delta",
|
||||
@@ -20,130 +20,24 @@ lto = true
|
||||
[workspace.dependencies]
|
||||
# Async
|
||||
async-trait = "0.1.89"
|
||||
tokio = "1.49.0"
|
||||
async-channel = "2.3.1"
|
||||
futures = "0.3.32"
|
||||
async-std = "1.8.0"
|
||||
async-tungstenite = "0.17.0"
|
||||
futures-locks = "0.7.1"
|
||||
async-lock = "2.8.0"
|
||||
async-recursion = "1.0.4"
|
||||
tokio = { version = "1.49.0", features = ["macros", "rt"] }
|
||||
|
||||
# Error Handling
|
||||
anyhow = "1.0.100"
|
||||
thiserror = "2.0.18"
|
||||
sentry = "0.31.5"
|
||||
sentry-anyhow = "0.38.1"
|
||||
|
||||
# Data Validation
|
||||
regex = "1.12.3"
|
||||
validator = "0.16"
|
||||
|
||||
# Data Types
|
||||
uuid = "1.19.0"
|
||||
ulid = "1.2.1"
|
||||
nanoid = "0.4.0"
|
||||
typenum = "1.17.0"
|
||||
num_enum = "0.6.1"
|
||||
bitfield = "0.13.2"
|
||||
|
||||
# Time
|
||||
chrono = "0.4.15"
|
||||
iso8601-timestamp = "0.2.10"
|
||||
|
||||
# Data Collections
|
||||
lru = "0.16.3"
|
||||
indexmap = "2.13.1"
|
||||
dashmap = "5.2.0"
|
||||
moka = "0.12.8"
|
||||
lru_time_cache = "0.11.11"
|
||||
deadqueue = "0.2.4"
|
||||
|
||||
# Web scraping
|
||||
scraper = "0.20.0"
|
||||
encoding_rs = "0.8.34"
|
||||
|
||||
# Mail
|
||||
lettre = "0.10.0-alpha.4"
|
||||
|
||||
# HTTP Requests
|
||||
reqwest = "0.13.2"
|
||||
isahc = "1.7"
|
||||
|
||||
# Notifications
|
||||
fcm_v1 = "0.3.0"
|
||||
web-push = "0.10.0"
|
||||
revolt_a2 = "0.10"
|
||||
|
||||
# Parsing
|
||||
logos = "0.15"
|
||||
|
||||
# SVG rendering
|
||||
usvg = "0.44.0"
|
||||
resvg = "0.44.0"
|
||||
tiny-skia = "0.11.4"
|
||||
|
||||
# Logging
|
||||
log = "0.4.29"
|
||||
pretty_env_logger = "0.4.0"
|
||||
|
||||
# Redis
|
||||
redis-kiss = "0.1.4"
|
||||
fred = "8.0.1"
|
||||
|
||||
# Serialisation
|
||||
bincode = "1.3.3"
|
||||
serde_json = "1.0.79"
|
||||
rmp-serde = "1.0.0"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
strum_macros = "0.26.4"
|
||||
|
||||
# MongoDB
|
||||
bson = { version = "2.1.0" }
|
||||
mongodb = { version = "3.1.0" }
|
||||
|
||||
# S3
|
||||
aws-config = "1.5.5"
|
||||
aws-sdk-s3 = "1.46.0"
|
||||
# Other Utilities
|
||||
uuid = { version = "1.19.0", features = ["v4"] }
|
||||
|
||||
# Axum (HTTP server)
|
||||
axum-macros = "0.4.1"
|
||||
axum_typed_multipart = "0.12.1"
|
||||
axum = "0.7.5"
|
||||
axum-extra = "0.9"
|
||||
tower-http = "0.5.2"
|
||||
|
||||
# Rocket (HTTP server)
|
||||
rocket = "0.5.1"
|
||||
rocket_empty = "0.1.1"
|
||||
revolt_rocket_okapi = "0.10.0"
|
||||
rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
|
||||
rocket_authifier = "1.0.16"
|
||||
rocket_prometheus = "0.10.0-rc.3"
|
||||
|
||||
# Spec Generation
|
||||
utoipa = "4.2.3"
|
||||
revolt_okapi = "0.9.1"
|
||||
schemars = "0.8.8"
|
||||
utoipa-scalar = "0.1.0"
|
||||
axum = { version = "0.7.5", features = ["multipart"] }
|
||||
tower-http = { version = "0.5.2", features = ["cors", "trace"] }
|
||||
|
||||
# Image Processing
|
||||
jxl-oxide = "0.12.5"
|
||||
sha2 = "0.10.8"
|
||||
kamadak-exif = "0.5.4"
|
||||
webp = "0.3.0"
|
||||
image = "0.25.2" # avif encode requires dav1d system library: features = ["avif-native"]
|
||||
thumbhash = "0.1.0"
|
||||
lcms2 = "6.1.1" # for color profile processing
|
||||
|
||||
# File processing
|
||||
revolt_clamav-client = "0.1.5"
|
||||
simdutf8 = "0.1.4"
|
||||
|
||||
# Content type processing
|
||||
infer = "0.16.0"
|
||||
ffprobe = "0.4.0"
|
||||
imagesize = "0.13.0"
|
||||
jxl-oxide = { version = "0.12.5", features = ["image"] }
|
||||
image = "0.25.9"
|
||||
|
||||
# OpenTelemetry
|
||||
tracing = "0.1.44"
|
||||
@@ -153,52 +47,4 @@ tracing-subscriber = { version = "0.3.22", features = [
|
||||
opentelemetry = { version = "0.31.0", features = ["logs"] }
|
||||
opentelemetry_sdk = { version = "0.31.0", features = ["logs"] }
|
||||
opentelemetry-otlp = { version = "0.31.0", features = ["logs"] }
|
||||
opentelemetry-appender-tracing = "0.31.1"
|
||||
|
||||
# Authifier
|
||||
authifier = "1.0.16"
|
||||
|
||||
# RabbitMQ
|
||||
amqprs = "1.7.0"
|
||||
lapin = "4.7.1"
|
||||
|
||||
# Voice
|
||||
livekit-api = "0.4.4"
|
||||
livekit-protocol = "0.7.4"
|
||||
livekit-runtime = "0.4.0"
|
||||
|
||||
# Other Utilities
|
||||
once_cell = "1.9.0"
|
||||
config = "0.13.3"
|
||||
cached = "0.44.0"
|
||||
rand = "0.8.5"
|
||||
base64 = "0.21.3"
|
||||
decancer = "3.3.3"
|
||||
linkify = "0.8.1"
|
||||
url-escape = "0.1.1"
|
||||
revolt_optional_struct = "0.2.0"
|
||||
unicode-segmentation = "1.10.1"
|
||||
querystring = "1.1.0"
|
||||
tempfile = "3.12.0"
|
||||
aes-gcm = "0.10.3"
|
||||
auto_ops = "0.3.0"
|
||||
url = "2.2.2"
|
||||
impl_ops = "0.1.1"
|
||||
lazy_static = "1.5.0"
|
||||
mime = "0.3.17"
|
||||
futures-lite = "2.6.1"
|
||||
|
||||
# Build Dependencies
|
||||
vergen = "7.5.0"
|
||||
|
||||
# Local packages
|
||||
revolt-coalesced = { version = "0.13.3", path = "crates/core/coalesced" }
|
||||
revolt-config = { version = "0.13.3", path = "crates/core/config" }
|
||||
revolt-database = { version = "0.13.3", path = "crates/core/database" }
|
||||
revolt-files = { version = "0.13.3", path = "crates/core/files" }
|
||||
revolt-models = { version = "0.13.3", path = "crates/core/models" }
|
||||
revolt-parser = { version = "0.13.3", path = "crates/core/parser" }
|
||||
revolt-permissions = { version = "0.13.3", path = "crates/core/permissions" }
|
||||
revolt-presence = { version = "0.13.3", path = "crates/core/presence" }
|
||||
revolt-ratelimits = { version = "0.13.3", path = "crates/core/ratelimits" }
|
||||
revolt-result = { version = "0.13.3", path = "crates/core/result" }
|
||||
opentelemetry-appender-tracing = { version = "0.31.1" }
|
||||
|
||||
85
README.md
85
README.md
@@ -2,14 +2,14 @@
|
||||
<h1>
|
||||
Stoat Backend
|
||||
|
||||
[](https://github.com/stoatchat/stoatchat/stargazers)
|
||||
[](https://github.com/stoatchat/stoatchat/network/members)
|
||||
[](https://github.com/stoatchat/stoatchat/pulls)
|
||||
[](https://github.com/stoatchat/stoatchat/issues)
|
||||
[](https://github.com/stoatchat/stoatchat/graphs/contributors)
|
||||
[](https://github.com/stoatchat/stoatchat/blob/main/LICENSE)
|
||||
[](https://github.com/revoltchat/backend/stargazers)
|
||||
[](https://github.com/revoltchat/backend/network/members)
|
||||
[](https://github.com/revoltchat/backend/pulls)
|
||||
[](https://github.com/revoltchat/backend/issues)
|
||||
[](https://github.com/revoltchat/backend/graphs/contributors)
|
||||
[](https://github.com/revoltchat/backend/blob/main/LICENSE)
|
||||
</h1>
|
||||
The services and libraries that power the Stoat service.<br/>
|
||||
The services and libraries that power the Revolt service.<br/>
|
||||
<br/>
|
||||
|
||||
| Crate | Path | Description | |
|
||||
@@ -39,7 +39,7 @@ Rust 1.86.0 or higher.
|
||||
|
||||
## Development Guide
|
||||
|
||||
Before contributing, make yourself familiar with [our contribution guidelines](https://developers.stoat.chat/developing/contrib/) and the [technical documentation for this project](https://developers.stoat.chat/).
|
||||
Before contributing, make yourself familiar with [our contribution guidelines](https://developers.revolt.chat/contrib.html) and the [technical documentation for this project](https://revoltchat.github.io/backend/).
|
||||
|
||||
Before getting started, you'll want to install:
|
||||
|
||||
@@ -70,20 +70,11 @@ As a heads-up, the development environment uses the following ports:
|
||||
Now you can clone and build the project:
|
||||
|
||||
```bash
|
||||
git clone https://github.com/stoatchat/stoatchat stoat-backend
|
||||
cd stoat-backend
|
||||
mise install
|
||||
git clone https://github.com/revoltchat/backend revolt-backend
|
||||
cd revolt-backend
|
||||
mise build
|
||||
```
|
||||
|
||||
> [!TIP]
|
||||
> You can override `BUILDER` in your `.env` file to run cargo with mold if you installed it:
|
||||
>
|
||||
> ```bash
|
||||
> # .env
|
||||
> BUILDER = "mold --run cargo"
|
||||
> ```
|
||||
|
||||
A default configuration `Revolt.toml` is present in this project that is suited for development.
|
||||
|
||||
If you'd like to change anything, create a `Revolt.overrides.toml` file and specify relevant variables.
|
||||
@@ -120,7 +111,7 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec
|
||||
> - "14672:15672"
|
||||
> ```
|
||||
>
|
||||
> With the corresponding Revolt configuration:
|
||||
> And corresponding Revolt configuration:
|
||||
>
|
||||
> ```toml
|
||||
> # Revolt.overrides.toml
|
||||
@@ -132,41 +123,53 @@ If you'd like to change anything, create a `Revolt.overrides.toml` file and spec
|
||||
> [rabbit]
|
||||
> port = 14072
|
||||
> ```
|
||||
>
|
||||
> And mise configuration
|
||||
>
|
||||
> ```bash
|
||||
> #.env
|
||||
> DATABASE_PORT = "14017"
|
||||
> RABBIT_PORT = "14072"
|
||||
> REDIS_PORT = "14079"
|
||||
> ```
|
||||
|
||||
Then continue:
|
||||
|
||||
```bash
|
||||
cp livekit.example.yml livekit.yml
|
||||
# start other necessary services
|
||||
docker compose up -d
|
||||
|
||||
mise start
|
||||
# run everything together
|
||||
./scripts/start.sh
|
||||
# .. or individually
|
||||
# run the API server
|
||||
cargo run --bin revolt-delta
|
||||
# run the events server
|
||||
cargo run --bin revolt-bonfire
|
||||
# run the file server
|
||||
cargo run --bin revolt-autumn
|
||||
# run the proxy server
|
||||
cargo run --bin revolt-january
|
||||
# run the tenor proxy
|
||||
cargo run --bin revolt-gifbox
|
||||
# run the push daemon (not usually needed in regular development)
|
||||
cargo run --bin revolt-pushd
|
||||
|
||||
# hint:
|
||||
# mold -run <cargo build, cargo run, etc...>
|
||||
# mold -run ./scripts/start.sh
|
||||
```
|
||||
|
||||
You can start a web client by doing the following in another terminal:
|
||||
You can start a web client by doing the following:
|
||||
|
||||
```bash
|
||||
# if you do not have yarn yet and have a modern Node.js:
|
||||
corepack enable
|
||||
|
||||
# clone the web client and run it:
|
||||
git clone --recursive https://github.com/stoatchat/for-web stoat-web
|
||||
cd stoat-web
|
||||
# refer to stoat-web/README.md for startup, creating an account and loging in
|
||||
git clone --recursive https://github.com/revoltchat/revite
|
||||
cd revite
|
||||
yarn
|
||||
yarn build:deps
|
||||
echo "VITE_API_URL=http://local.revolt.chat:14702" > .env.local
|
||||
yarn dev --port 14701
|
||||
```
|
||||
|
||||
Then go to http://local.revolt.chat:14701 to create an account/login.
|
||||
|
||||
When signing up, go to http://localhost:14080 to find confirmation/password reset emails.
|
||||
|
||||
To stop all services, hit (CTRL + c) in the terminal you ran `mise start` and run `mise docker:stop`
|
||||
|
||||
|
||||
## Deployment Guide
|
||||
|
||||
### Cutting new crate releases
|
||||
@@ -195,14 +198,14 @@ Tag and push a new release by running:
|
||||
just release
|
||||
```
|
||||
|
||||
If you have bumped the crate versions, proceed to [GitHub releases](https://github.com/stoatchat/stoatchat/releases/new) to create a changelog.
|
||||
If you have bumped the crate versions, proceed to [GitHub releases](https://github.com/revoltchat/backend/releases/new) to create a changelog.
|
||||
|
||||
## Testing
|
||||
|
||||
First, start the required services:
|
||||
|
||||
```sh
|
||||
docker compose up -d
|
||||
docker compose -f docker-compose.db.yml up -d
|
||||
```
|
||||
|
||||
Now run tests for whichever database:
|
||||
@@ -214,6 +217,6 @@ TEST_DB=MONGODB cargo nextest run
|
||||
|
||||
## License
|
||||
|
||||
The Stoat backend is generally licensed under the [GNU Affero General Public License v3.0](https://github.com/stoatchat/stoatchat/blob/main/LICENSE).
|
||||
The Revolt backend is generally licensed under the [GNU Affero General Public License v3.0](https://github.com/revoltchat/backend/blob/master/LICENSE).
|
||||
|
||||
**Individual crates may supply their own licenses!**
|
||||
|
||||
@@ -15,7 +15,7 @@ host = "127.0.0.1"
|
||||
[hosts]
|
||||
# Web locations of various services
|
||||
# Defaults assume all services are reverse-proxied
|
||||
# See https://github.com/stoatchat/self-hosted/blob/main/Caddyfile
|
||||
# See https://github.com/revoltchat/self-hosted/blob/master/Caddyfile
|
||||
#
|
||||
# Remember to change these to https/wss where appropriate in production!
|
||||
app = "http://local.revolt.chat:14701"
|
||||
|
||||
18
compose.yml
18
compose.yml
@@ -8,20 +8,10 @@ services:
|
||||
# MongoDB
|
||||
database:
|
||||
image: mongo
|
||||
command: mongod --replSet rs0
|
||||
ports:
|
||||
- "27017:27017"
|
||||
volumes:
|
||||
- ./.data/db:/data/db
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
healthcheck:
|
||||
test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'127.0.0.1:27017'}]}) }" | mongosh --port 27017 --quiet
|
||||
interval: 5s
|
||||
timeout: 30s
|
||||
start_period: 0s
|
||||
start_interval: 1s
|
||||
retries: 30
|
||||
ulimits:
|
||||
nofile:
|
||||
soft: 65536
|
||||
@@ -29,8 +19,8 @@ services:
|
||||
|
||||
# MinIO
|
||||
minio:
|
||||
image: firstfinger/minio:latest
|
||||
#command: server /data
|
||||
image: minio/minio
|
||||
command: server /data
|
||||
environment:
|
||||
MINIO_ROOT_USER: minioautumn
|
||||
MINIO_ROOT_PASSWORD: minioautumn
|
||||
@@ -80,8 +70,8 @@ services:
|
||||
MAILDEV_INCOMING_PASS: smtp
|
||||
|
||||
livekit:
|
||||
image: ghcr.io/stoatchat/livekit-server:v1.9.13
|
||||
image: ghcr.io/stoatchat/livekit-server:v1.9.9
|
||||
command: --config /etc/livekit.yml
|
||||
network_mode: "host"
|
||||
volumes:
|
||||
- ./livekit.yml:/etc/livekit.yml
|
||||
- ./livekit.yml:/etc/livekit.yml
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-bonfire"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
license = "AGPL-3.0-or-later"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
@@ -9,38 +9,46 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
# util
|
||||
log = { workspace = true }
|
||||
sentry = { workspace = true }
|
||||
lru = { workspace = true }
|
||||
ulid = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
redis-kiss = { workspace = true }
|
||||
lru_time_cache = { workspace = true }
|
||||
async-channel = { workspace = true }
|
||||
log = "*"
|
||||
sentry = "0.31.5"
|
||||
lru = "0.7.6"
|
||||
ulid = "0.5.0"
|
||||
once_cell = "1.9.0"
|
||||
redis-kiss = "0.1.4"
|
||||
lru_time_cache = "0.11.11"
|
||||
async-channel = "2.3.1"
|
||||
|
||||
# parsing
|
||||
querystring = { workspace = true }
|
||||
regex = { workspace = true }
|
||||
querystring = "1.1.0"
|
||||
regex = "1.11.1"
|
||||
|
||||
# serde
|
||||
bincode = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
rmp-serde = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
bincode = "1.3.3"
|
||||
serde_json = "1.0.79"
|
||||
rmp-serde = "1.0.0"
|
||||
serde = "1.0.136"
|
||||
|
||||
# async
|
||||
futures = { workspace = true }
|
||||
async-tungstenite = { workspace = true, features = ["async-std-runtime"] }
|
||||
async-std = { workspace = true }
|
||||
futures = "0.3.21"
|
||||
async-tungstenite = { version = "0.17.0", features = ["async-std-runtime"] }
|
||||
async-std = { version = "1.8.0", features = [
|
||||
"tokio1",
|
||||
"tokio02",
|
||||
"attributes",
|
||||
] }
|
||||
async-trait = "0.1.89"
|
||||
|
||||
# core
|
||||
authifier = { workspace = true }
|
||||
revolt-result = { workspace = true }
|
||||
revolt-models = { workspace = true }
|
||||
revolt-config = { workspace = true }
|
||||
revolt-database = { workspace = true, features = ["voice"] }
|
||||
revolt-permissions = { workspace = true }
|
||||
revolt-presence = { workspace = true, features = ["redis-is-patched"] }
|
||||
authifier = { version = "1.0.16" }
|
||||
revolt-result = { path = "../core/result" }
|
||||
revolt-models = { path = "../core/models" }
|
||||
revolt-config = { path = "../core/config" }
|
||||
revolt-database = { path = "../core/database", features = ["voice"] }
|
||||
revolt-permissions = { path = "../core/permissions" }
|
||||
revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
|
||||
|
||||
# redis
|
||||
fred = { workspace = true, features = ["subscriber-client"] }
|
||||
fred = { version = "8.0.1", features = ["subscriber-client"] }
|
||||
|
||||
# Redis
|
||||
amqprs = { version = "1.7.0" }
|
||||
@@ -4,7 +4,7 @@ use futures::future::join_all;
|
||||
use revolt_database::{
|
||||
events::client::{EventV1, ReadyPayloadFields},
|
||||
util::permissions::DatabasePermissionQuery,
|
||||
voice::{get_channel_voice_state, UserVoiceChannel},
|
||||
voice::get_channel_voice_state,
|
||||
Channel, Database, Member, MemberCompositeKey, Presence, RelationshipStatus,
|
||||
};
|
||||
use revolt_models::v0;
|
||||
@@ -167,9 +167,7 @@ impl State {
|
||||
| Channel::TextChannel { voice: Some(_), .. }
|
||||
)
|
||||
}) {
|
||||
if let Ok(Some(voice_state)) =
|
||||
get_channel_voice_state(&UserVoiceChannel::from_channel(channel)).await
|
||||
{
|
||||
if let Ok(Some(voice_state)) = get_channel_voice_state(channel).await {
|
||||
if let Some(server) = channel.server() {
|
||||
let set = voice_state_server_members
|
||||
.entry(server.to_string())
|
||||
@@ -400,33 +398,29 @@ impl State {
|
||||
}
|
||||
|
||||
/// Push presence change to the user and all associated server topics
|
||||
pub async fn broadcast_presence_change(&self, target: bool) {
|
||||
let config = revolt_config::config().await;
|
||||
if config.disable_events_dont_use {
|
||||
return;
|
||||
}
|
||||
pub async fn broadcast_presence_change(&self, _target: bool) {
|
||||
// disabled events
|
||||
// if if let Some(status) = &self.cache.users.get(&self.cache.user_id).unwrap().status {
|
||||
// status.presence != Some(Presence::Invisible)
|
||||
// } else {
|
||||
// true
|
||||
// } {
|
||||
// let event = EventV1::UserUpdate {
|
||||
// id: self.cache.user_id.clone(),
|
||||
// data: v0::PartialUser {
|
||||
// online: Some(target),
|
||||
// ..Default::default()
|
||||
// },
|
||||
// clear: vec![],
|
||||
// event_id: Some(ulid::Ulid::new().to_string()),
|
||||
// };
|
||||
|
||||
if if let Some(status) = &self.cache.users.get(&self.cache.user_id).unwrap().status {
|
||||
status.presence != Some(Presence::Invisible)
|
||||
} else {
|
||||
true
|
||||
} {
|
||||
let event = EventV1::UserUpdate {
|
||||
id: self.cache.user_id.clone(),
|
||||
data: v0::PartialUser {
|
||||
online: Some(target),
|
||||
..Default::default()
|
||||
},
|
||||
clear: vec![],
|
||||
event_id: Some(ulid::Ulid::new().to_string()),
|
||||
};
|
||||
// for server in self.cache.servers.keys() {
|
||||
// event.clone().p(server.clone()).await;
|
||||
// }
|
||||
|
||||
for server in self.cache.servers.keys() {
|
||||
event.clone().p(server.clone()).await;
|
||||
}
|
||||
|
||||
event.p(self.cache.user_id.clone()).await;
|
||||
}
|
||||
// event.p(self.cache.user_id.clone()).await;
|
||||
// }
|
||||
}
|
||||
|
||||
/// Handle an incoming event for protocol version 1
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
use std::{
|
||||
collections::{HashMap, HashSet}, num::NonZeroUsize, sync::Arc, time::Duration
|
||||
collections::{HashMap, HashSet},
|
||||
sync::Arc,
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use async_std::sync::{Mutex, RwLock};
|
||||
@@ -55,7 +57,7 @@ impl Default for Cache {
|
||||
members: Default::default(),
|
||||
servers: Default::default(),
|
||||
|
||||
seen_events: LruCache::new(NonZeroUsize::new(20).unwrap()),
|
||||
seen_events: LruCache::new(20),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,18 @@
|
||||
use std::env;
|
||||
|
||||
use amqprs::{
|
||||
channel::{
|
||||
BasicConsumeArguments, Channel, ExchangeDeclareArguments, QueueBindArguments,
|
||||
QueueDeclareArguments,
|
||||
},
|
||||
connection::{Connection, OpenConnectionArguments},
|
||||
consumer::AsyncConsumer,
|
||||
BasicProperties, Deliver,
|
||||
};
|
||||
use async_std::net::TcpListener;
|
||||
use async_trait::async_trait;
|
||||
use redis_kiss::AsyncCommands;
|
||||
use revolt_database::util::rabbit::set_rabbitmq_connection;
|
||||
use revolt_presence::clear_region;
|
||||
|
||||
#[macro_use]
|
||||
@@ -31,6 +43,55 @@ async fn main() {
|
||||
let try_socket = TcpListener::bind(bind).await;
|
||||
let listener = try_socket.expect("Failed to bind");
|
||||
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
let rmq_conn = Connection::open(&OpenConnectionArguments::new(
|
||||
&config.rabbit.host,
|
||||
config.rabbit.port,
|
||||
&config.rabbit.username,
|
||||
&config.rabbit.password,
|
||||
))
|
||||
.await
|
||||
.expect("Failed to connect to RabbitMQ");
|
||||
|
||||
set_rabbitmq_connection(rmq_conn.clone());
|
||||
|
||||
if std::env::var("ENABLE_RABBITMQ_INGRESS").as_deref().is_ok_and(|v| v == "1") {
|
||||
let channel = rmq_conn
|
||||
.open_channel(None)
|
||||
.await
|
||||
.expect("Failed to open RabbitMQ channel.");
|
||||
|
||||
channel
|
||||
.exchange_declare(
|
||||
ExchangeDeclareArguments::new("events", "fanout")
|
||||
.durable(true)
|
||||
.finish(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to declare exchange");
|
||||
|
||||
channel
|
||||
.queue_declare(QueueDeclareArguments::new("events").durable(true).finish())
|
||||
.await
|
||||
.expect("Failed to declare queue");
|
||||
|
||||
channel
|
||||
.queue_bind(QueueBindArguments::new("events", "events", "events"))
|
||||
.await
|
||||
.expect("Failed to bind queue");
|
||||
|
||||
channel
|
||||
.basic_consume(
|
||||
RabbitToRedisConsumer,
|
||||
BasicConsumeArguments::new("events", "")
|
||||
.manual_ack(false)
|
||||
.finish(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to consume channel");
|
||||
}
|
||||
|
||||
// Start accepting new connections and spawn a client for each connection.
|
||||
while let Ok((stream, addr)) = listener.accept().await {
|
||||
async_std::task::spawn(async move {
|
||||
@@ -40,3 +101,32 @@ async fn main() {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
struct RabbitToRedisConsumer;
|
||||
|
||||
#[async_trait]
|
||||
impl AsyncConsumer for RabbitToRedisConsumer {
|
||||
async fn consume(
|
||||
&mut self,
|
||||
_channel: &Channel,
|
||||
_deliver: Deliver,
|
||||
basic_properties: BasicProperties,
|
||||
content: Vec<u8>,
|
||||
) {
|
||||
let mut redis_conn = redis_kiss::get_connection()
|
||||
.await
|
||||
.expect("Failed to connect to Redis.");
|
||||
|
||||
let pubsub_channel = basic_properties
|
||||
.headers()
|
||||
.expect("No headers")
|
||||
.get(&"c".try_into().unwrap())
|
||||
.expect("No channel header")
|
||||
.to_string();
|
||||
|
||||
redis_conn
|
||||
.publish(pubsub_channel, content)
|
||||
.await
|
||||
.expect("failed to publish")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ use authifier::AuthifierEvent;
|
||||
use fred::{
|
||||
error::RedisErrorKind,
|
||||
interfaces::{ClientLike, EventInterface, PubsubInterface},
|
||||
types::{ReconnectPolicy, RedisConfig},
|
||||
types::RedisConfig,
|
||||
};
|
||||
use futures::{
|
||||
channel::oneshot,
|
||||
@@ -225,9 +225,9 @@ async fn listener(
|
||||
.unwrap_or(REDIS_URI.to_string());
|
||||
|
||||
let redis_config = RedisConfig::from_url(&url).unwrap();
|
||||
let mut builder = fred::types::Builder::from_config(redis_config);
|
||||
builder.set_policy(ReconnectPolicy::new_exponential(8, 100, 30_000, 2));
|
||||
let subscriber = match report_internal_error!(builder.build_subscriber_client()) {
|
||||
let subscriber = match report_internal_error!(
|
||||
fred::types::Builder::from_config(redis_config).build_subscriber_client()
|
||||
) {
|
||||
Ok(subscriber) => subscriber,
|
||||
Err(_) => return,
|
||||
};
|
||||
@@ -236,21 +236,16 @@ async fn listener(
|
||||
return;
|
||||
}
|
||||
|
||||
// Let Fred automatically re-subscribe to tracked channels on reconnect.
|
||||
subscriber.manage_subscriptions();
|
||||
|
||||
// Handle Redis connection dropping
|
||||
let (clean_up_s, clean_up_r) = async_channel::bounded(1);
|
||||
let clean_up_s = Arc::new(Mutex::new(clean_up_s));
|
||||
subscriber.on_error(move |err| {
|
||||
warn!("Redis subscriber error: {:?}", err);
|
||||
if let RedisErrorKind::Canceled = err.kind() {
|
||||
let clean_up_s = clean_up_s.clone();
|
||||
spawn(async move {
|
||||
clean_up_s.lock().await.send(()).await.ok();
|
||||
});
|
||||
}
|
||||
// Transient errors (IO, timeout) are handled by the reconnect policy.
|
||||
|
||||
Ok(())
|
||||
});
|
||||
@@ -433,8 +428,6 @@ async fn worker(
|
||||
mut read: WsReader,
|
||||
write: &Mutex<WsWriter>,
|
||||
) {
|
||||
let revolt_config = revolt_config::config().await;
|
||||
|
||||
loop {
|
||||
let t1 = read.try_next().fuse();
|
||||
let t2 = kill_signal_r.recv().fuse();
|
||||
@@ -470,11 +463,8 @@ async fn worker(
|
||||
};
|
||||
|
||||
match payload {
|
||||
// disabled events
|
||||
ClientMessage::BeginTyping { channel } => {
|
||||
if revolt_config.disable_events_dont_use {
|
||||
continue;
|
||||
}
|
||||
|
||||
if !subscribed.read().await.contains(&channel) {
|
||||
continue;
|
||||
}
|
||||
@@ -487,10 +477,6 @@ async fn worker(
|
||||
.await;
|
||||
}
|
||||
ClientMessage::EndTyping { channel } => {
|
||||
if revolt_config.disable_events_dont_use {
|
||||
continue;
|
||||
}
|
||||
|
||||
if !subscribed.read().await.contains(&channel) {
|
||||
continue;
|
||||
}
|
||||
@@ -527,4 +513,4 @@ async fn worker(
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-coalesced"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Paul Makles <me@insrt.uk>", "Zomatree <me@zomatree.live>"]
|
||||
@@ -15,12 +15,12 @@ cache = ["dep:lru"]
|
||||
default = ["tokio"]
|
||||
|
||||
[dependencies]
|
||||
tokio = { workspace = true, features = ["sync"], optional = true }
|
||||
indexmap = { workspace = true, optional = true }
|
||||
lru = { workspace = true, optional = true }
|
||||
tokio = { version = "1.47.0", features = ["sync"], optional = true }
|
||||
indexmap = { version = "2.13.0", optional = true }
|
||||
lru = { version = "0.16.3", optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
tokio = { workspace = true, features = [
|
||||
tokio = { version = "1.47.0", features = [
|
||||
"rt",
|
||||
"rt-multi-thread",
|
||||
"macros",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-config"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -18,24 +18,24 @@ default = ["test", "sentry"]
|
||||
|
||||
[dependencies]
|
||||
# Utility
|
||||
config = { workspace = true }
|
||||
cached = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
config = "0.13.3"
|
||||
cached = "0.44.0"
|
||||
once_cell = "1.18.0"
|
||||
|
||||
# Serde
|
||||
serde = { workspace = true }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
# Async
|
||||
futures-locks = { workspace = true }
|
||||
async-std = { workspace = true, features = ["attributes"], optional = true }
|
||||
futures-locks = "0.7.1"
|
||||
async-std = { version = "1.8.0", features = ["attributes"], optional = true }
|
||||
|
||||
# Logging
|
||||
log = { workspace = true }
|
||||
pretty_env_logger = { workspace = true }
|
||||
log = "0.4.14"
|
||||
pretty_env_logger = "0.4.0"
|
||||
|
||||
# Sentry
|
||||
sentry = { workspace = true, optional = true }
|
||||
sentry-anyhow = { workspace = true, optional = true }
|
||||
sentry = { version = "0.31.5", optional = true }
|
||||
sentry-anyhow = { version = "0.38.1", optional = true }
|
||||
|
||||
# Core
|
||||
revolt-result = { workspace = true, optional = true }
|
||||
revolt-result = { version = "0.11.5", path = "../result", optional = true }
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
production = false
|
||||
disable_events_dont_use = false
|
||||
|
||||
[database]
|
||||
# MongoDB connection URL
|
||||
@@ -12,7 +11,7 @@ redis = "redis://redis/"
|
||||
[hosts]
|
||||
# Web locations of various services
|
||||
# Defaults assume all services are reverse-proxied
|
||||
# See https://github.com/stoatchat/self-hosted/blob/main/Caddyfile
|
||||
# See https://github.com/revoltchat/self-hosted/blob/master/Caddyfile
|
||||
#
|
||||
# Remember to change these to https/wss where appropriate in production!
|
||||
app = "http://local.revolt.chat"
|
||||
@@ -30,16 +29,12 @@ host = "rabbit"
|
||||
port = 5672
|
||||
username = "rabbituser"
|
||||
password = "rabbitpass"
|
||||
default_exchange = "revolt.default"
|
||||
|
||||
[rabbit.queues]
|
||||
acks = "internal.ack"
|
||||
|
||||
[api]
|
||||
|
||||
[api.registration]
|
||||
# Whether an invite should be required for registration
|
||||
# See https://github.com/stoatchat/self-hosted#making-your-instance-invite-only
|
||||
# See https://github.com/revoltchat/self-hosted#making-your-instance-invite-only
|
||||
invite_only = false
|
||||
|
||||
[api.smtp]
|
||||
@@ -82,8 +77,6 @@ call_ring_duration = 30
|
||||
[api.livekit.nodes]
|
||||
|
||||
[api.users]
|
||||
# Minimum allowed length of usernames
|
||||
min_username_length = 2
|
||||
|
||||
[pushd]
|
||||
# this changes the names of the queues to not overlap
|
||||
@@ -95,11 +88,6 @@ production = true
|
||||
# Increasing this will resolve mentions faster, but will consume more memory while resolving.
|
||||
mass_mention_chunk_size = 200
|
||||
|
||||
# How long pushd will cache resolved names for rendered message notifications.
|
||||
# Increasing this will result in lower database usage, but may result in a situation where a user/channel/role name changes
|
||||
# and the notifications still resolve to the old name.
|
||||
render_cache_time = 60
|
||||
|
||||
# none of these should need changing
|
||||
exchange = "revolt.notifications"
|
||||
message_queue = "notifications.origin.message"
|
||||
@@ -136,8 +124,6 @@ pkcs8 = ""
|
||||
key_id = ""
|
||||
team_id = ""
|
||||
|
||||
[january]
|
||||
blocked_domains = []
|
||||
|
||||
[files]
|
||||
# Encryption key for stored files
|
||||
@@ -234,10 +220,6 @@ new_user_hours = 72
|
||||
# (should be greater than any one file upload limit)
|
||||
body_limit_size = 20_000_000
|
||||
|
||||
# If any userids are entered here, only those users will be able to create servers.
|
||||
# Leave empty to allow all users to create servers
|
||||
restrict_server_creation = []
|
||||
|
||||
[features.limits.new_user]
|
||||
# Limits imposed on new users
|
||||
|
||||
@@ -321,12 +303,6 @@ emojis = 500_000
|
||||
# default: 5
|
||||
process_message_delay_limit = 5
|
||||
|
||||
[features.legal_links]
|
||||
# URLs for legal documents
|
||||
terms_of_service = ""
|
||||
privacy_policy = ""
|
||||
guidelines = ""
|
||||
|
||||
[sentry]
|
||||
# Configuration for Sentry error reporting
|
||||
api = ""
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::{collections::HashMap, path::Path};
|
||||
|
||||
use cached::proc_macro::cached;
|
||||
use config::{Config, Environment, File, FileFormat};
|
||||
use config::{Config, File, FileFormat};
|
||||
use futures_locks::RwLock;
|
||||
use once_cell::sync::Lazy;
|
||||
use serde::Deserialize;
|
||||
@@ -109,8 +109,6 @@ static CONFIG_BUILDER: Lazy<RwLock<Config>> = Lazy::new(|| {
|
||||
cwd = path.parent();
|
||||
}
|
||||
|
||||
builder = builder.add_source(Environment::with_prefix("REVOLT").separator("__"));
|
||||
|
||||
builder.build().unwrap()
|
||||
})
|
||||
});
|
||||
@@ -122,19 +120,12 @@ pub struct Database {
|
||||
pub redis_pubsub: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct RabbitQueues {
|
||||
pub acks: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct Rabbit {
|
||||
pub host: String,
|
||||
pub port: u16,
|
||||
pub username: String,
|
||||
pub password: String,
|
||||
pub default_exchange: String,
|
||||
pub queues: RabbitQueues,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
@@ -238,7 +229,6 @@ pub struct LiveKitNode {
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct ApiUsers {
|
||||
pub early_adopter_cutoff: Option<u64>,
|
||||
pub min_username_length: usize,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
@@ -256,7 +246,6 @@ pub struct Pushd {
|
||||
pub production: bool,
|
||||
pub exchange: String,
|
||||
pub mass_mention_chunk_size: usize,
|
||||
pub render_cache_time: usize,
|
||||
|
||||
// Queues
|
||||
pub message_queue: String,
|
||||
@@ -309,11 +298,6 @@ impl Pushd {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct January {
|
||||
pub blocked_domains: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct FilesLimit {
|
||||
pub min_file_size: usize,
|
||||
@@ -358,8 +342,6 @@ pub struct GlobalLimits {
|
||||
pub new_user_hours: usize,
|
||||
|
||||
pub body_limit_size: usize,
|
||||
|
||||
pub restrict_server_creation: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
@@ -389,16 +371,6 @@ pub struct FeaturesLimitsCollection {
|
||||
pub roles: HashMap<String, FeaturesLimits>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct LegalLinks {
|
||||
/// Terms of Service URL
|
||||
pub terms_of_service: String,
|
||||
/// Privacy Policy URL
|
||||
pub privacy_policy: String,
|
||||
/// Guidelines URL
|
||||
pub guidelines: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct FeaturesAdvanced {
|
||||
#[serde(default)]
|
||||
@@ -416,7 +388,6 @@ impl Default for FeaturesAdvanced {
|
||||
#[derive(Deserialize, Debug, Clone)]
|
||||
pub struct Features {
|
||||
pub limits: FeaturesLimitsCollection,
|
||||
pub legal_links: LegalLinks,
|
||||
pub webhooks_enabled: bool,
|
||||
pub mass_mentions_send_notifications: bool,
|
||||
pub mass_mentions_enabled: bool,
|
||||
@@ -444,12 +415,10 @@ pub struct Settings {
|
||||
pub hosts: Hosts,
|
||||
pub api: Api,
|
||||
pub pushd: Pushd,
|
||||
pub january: January,
|
||||
pub files: Files,
|
||||
pub features: Features,
|
||||
pub sentry: Sentry,
|
||||
pub production: bool,
|
||||
pub disable_events_dont_use: bool,
|
||||
}
|
||||
|
||||
impl Settings {
|
||||
@@ -485,9 +454,7 @@ pub async fn config() -> Settings {
|
||||
}
|
||||
|
||||
// auto-detect production nodes
|
||||
if config.hosts.api.contains("https")
|
||||
&& (config.hosts.api.contains("revolt.chat") || config.hosts.api.contains("stoat.chat"))
|
||||
{
|
||||
if config.hosts.api.contains("https") && config.hosts.api.contains("revolt.chat") {
|
||||
config.production = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-database"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "AGPL-3.0-or-later"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -32,72 +32,80 @@ default = ["mongodb", "async-std-runtime", "tasks"]
|
||||
|
||||
[dependencies]
|
||||
# Core
|
||||
revolt-config = { workspace = true, features = ["report-macros"] }
|
||||
revolt-result = { workspace = true }
|
||||
revolt-models = { workspace = true, features = ["validator"] }
|
||||
revolt-presence = { workspace = true }
|
||||
revolt-permissions = { workspace = true, features = ["serde", "bson"] }
|
||||
revolt-parser = { workspace = true }
|
||||
revolt-coalesced = { workspace = true }
|
||||
revolt-config = { version = "0.11.5", path = "../config", features = [
|
||||
"report-macros",
|
||||
] }
|
||||
revolt-result = { version = "0.11.5", path = "../result" }
|
||||
revolt-models = { version = "0.11.5", path = "../models", features = [
|
||||
"validator",
|
||||
] }
|
||||
revolt-presence = { version = "0.11.5", path = "../presence" }
|
||||
revolt-permissions = { version = "0.11.5", path = "../permissions", features = [
|
||||
"serde",
|
||||
"bson",
|
||||
] }
|
||||
revolt-parser = { version = "0.11.5", path = "../parser" }
|
||||
|
||||
# Utility
|
||||
log = { workspace = true }
|
||||
lru = { workspace = true }
|
||||
rand = { workspace = true }
|
||||
ulid = { workspace = true }
|
||||
nanoid = { workspace = true }
|
||||
base64 = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
indexmap = { workspace = true }
|
||||
decancer = { workspace = true }
|
||||
deadqueue = { workspace = true }
|
||||
linkify = { workspace = true, optional = true }
|
||||
url-escape = { workspace = true, optional = true }
|
||||
validator = { workspace = true, features = ["derive"] }
|
||||
isahc = { workspace = true, features = ["json"], optional = true }
|
||||
log = "0.4"
|
||||
lru = "0.11.0"
|
||||
rand = "0.8.5"
|
||||
ulid = "1.0.0"
|
||||
nanoid = "0.4.0"
|
||||
base64 = "0.21.3"
|
||||
once_cell = "1.17"
|
||||
indexmap = "1.9.1"
|
||||
decancer = "1.6.2"
|
||||
deadqueue = "0.2.4"
|
||||
linkify = { optional = true, version = "0.8.1" }
|
||||
url-escape = { optional = true, version = "0.1.1" }
|
||||
validator = { version = "0.16", features = ["derive"] }
|
||||
isahc = { optional = true, version = "1.7", features = ["json"] }
|
||||
|
||||
# Serialisation
|
||||
serde_json = { workspace = true }
|
||||
revolt_optional_struct = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
iso8601-timestamp = { workspace = true, features = ["serde", "bson"] }
|
||||
serde_json = "1"
|
||||
revolt_optional_struct = "0.2.0"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
iso8601-timestamp = { version = "0.2.10", features = ["serde", "bson"] }
|
||||
|
||||
# Events
|
||||
redis-kiss = { workspace = true }
|
||||
redis-kiss = { version = "0.1.4" }
|
||||
|
||||
# Database
|
||||
bson = { workspace = true, optional = true }
|
||||
mongodb = { workspace = true, optional = true }
|
||||
bson = { optional = true, version = "2.1.0" }
|
||||
mongodb = { optional = true, version = "3.1.0" }
|
||||
|
||||
# Database Migration
|
||||
unicode-segmentation = { workspace = true }
|
||||
regex = { workspace = true }
|
||||
unicode-segmentation = "1.10.1"
|
||||
regex = "1"
|
||||
|
||||
# Async Language Features
|
||||
futures = { workspace = true }
|
||||
async-lock = { workspace = true }
|
||||
async-trait = { workspace = true }
|
||||
async-recursion = { workspace = true }
|
||||
futures = "0.3.19"
|
||||
async-lock = "2.8.0"
|
||||
async-trait = "0.1.51"
|
||||
async-recursion = "1.0.4"
|
||||
|
||||
# Async
|
||||
async-std = { workspace = true, features = ["attributes"], optional = true }
|
||||
async-std = { version = "1.8.0", features = ["attributes"], optional = true }
|
||||
|
||||
# Axum Impl
|
||||
axum = { workspace = true, optional = true }
|
||||
axum = { version = "0.7.5", optional = true }
|
||||
|
||||
# Rocket Impl
|
||||
schemars = { workspace = true, optional = true }
|
||||
rocket = { workspace = true, features = ["json"], optional = true }
|
||||
revolt_okapi = { workspace = true, optional = true }
|
||||
revolt_rocket_okapi = { workspace = true, optional = true }
|
||||
schemars = { version = "0.8.8", optional = true }
|
||||
rocket = { version = "0.5.1", default-features = false, features = [
|
||||
"json",
|
||||
], optional = true }
|
||||
revolt_okapi = { version = "0.9.1", optional = true }
|
||||
revolt_rocket_okapi = { version = "0.10.0", optional = true }
|
||||
|
||||
# Authifier
|
||||
authifier = { workspace = true }
|
||||
authifier = { version = "1.0.16" }
|
||||
|
||||
# RabbitMQ
|
||||
amqprs = { workspace = true }
|
||||
amqprs = { version = "1.7.0" }
|
||||
|
||||
# Voice
|
||||
livekit-api = { workspace = true, optional = true }
|
||||
livekit-protocol = { workspace = true, optional = true }
|
||||
livekit-runtime = { workspace = true, features = ["tokio"], optional = true }
|
||||
livekit-api = { version = "0.4.4", optional = true }
|
||||
livekit-protocol = { version = "0.4.0", optional = true }
|
||||
livekit-runtime = { version = "0.3.1", features = ["tokio"], optional = true }
|
||||
|
||||
@@ -2,10 +2,7 @@ use std::collections::HashSet;
|
||||
|
||||
use crate::events::rabbit::*;
|
||||
use crate::User;
|
||||
use amqprs::channel::{
|
||||
BasicPublishArguments, ExchangeDeclareArguments, ExchangeType, QueueBindArguments,
|
||||
QueueDeclareArguments,
|
||||
};
|
||||
use amqprs::channel::{BasicPublishArguments, ExchangeDeclareArguments};
|
||||
use amqprs::connection::OpenConnectionArguments;
|
||||
use amqprs::{channel::Channel, connection::Connection, error::Error as AMQPError};
|
||||
use amqprs::{BasicProperties, FieldTable};
|
||||
@@ -14,6 +11,8 @@ use revolt_presence::filter_online;
|
||||
|
||||
use serde_json::to_string;
|
||||
|
||||
// TODO: move away from storing Connection and Channel to using thread local singletons - #659
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct AMQP {
|
||||
#[allow(unused)]
|
||||
@@ -29,7 +28,7 @@ impl AMQP {
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn new_auto() -> revolt_result::Result<AMQP> {
|
||||
pub async fn new_auto() -> AMQP {
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
let connection = Connection::open(&OpenConnectionArguments::new(
|
||||
@@ -46,58 +45,16 @@ impl AMQP {
|
||||
.await
|
||||
.expect("Failed to open RabbitMQ channel");
|
||||
|
||||
let mut resp = AMQP::new(connection, channel);
|
||||
//resp.configure_channels().await?;
|
||||
Ok(resp)
|
||||
}
|
||||
|
||||
pub async fn repoen_channel(&mut self) {
|
||||
self.channel = self
|
||||
.connection
|
||||
.open_channel(None)
|
||||
.await
|
||||
.expect("Failed to open RabbitMQ channel");
|
||||
}
|
||||
|
||||
pub async fn configure_channels(&mut self) -> revolt_result::Result<()> {
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
if !self.channel.is_open() {
|
||||
self.repoen_channel().await;
|
||||
}
|
||||
|
||||
self.channel
|
||||
channel
|
||||
.exchange_declare(
|
||||
ExchangeDeclareArguments::new(
|
||||
&config.rabbit.default_exchange,
|
||||
&ExchangeType::Topic.to_string(),
|
||||
)
|
||||
.durable(true)
|
||||
.finish(),
|
||||
ExchangeDeclareArguments::new(&config.pushd.exchange, "direct")
|
||||
.durable(true)
|
||||
.finish(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to declare exchange");
|
||||
|
||||
// Configure acks channel & routing
|
||||
self.channel
|
||||
.queue_declare(
|
||||
QueueDeclareArguments::new(&config.rabbit.queues.acks)
|
||||
.durable(true)
|
||||
.no_wait(true)
|
||||
.finish(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to bind queue");
|
||||
|
||||
self.channel
|
||||
.queue_bind(QueueBindArguments::new(
|
||||
&config.rabbit.queues.acks,
|
||||
&config.rabbit.default_exchange,
|
||||
&config.rabbit.queues.acks,
|
||||
))
|
||||
.await
|
||||
.expect("Failed to bind channel");
|
||||
Ok(())
|
||||
AMQP::new(connection, channel)
|
||||
}
|
||||
|
||||
pub async fn friend_request_accepted(
|
||||
@@ -277,9 +234,7 @@ impl AMQP {
|
||||
.await
|
||||
}
|
||||
|
||||
/// # Sends an ack to pushd to update badges on iPhones.
|
||||
/// Not to be confused with the process_ack function, which handles sending all acks to crond for processing.
|
||||
pub async fn ack_notification_message(
|
||||
pub async fn ack_message(
|
||||
&self,
|
||||
user_id: String,
|
||||
channel_id: String,
|
||||
@@ -363,41 +318,4 @@ impl AMQP {
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// # Send an ack to crond for processing
|
||||
pub async fn process_ack(
|
||||
&self,
|
||||
user_id: &str,
|
||||
channel_id: Option<&str>,
|
||||
server_id: Option<&str>,
|
||||
) -> Result<(), AMQPError> {
|
||||
let config = revolt_config::config().await;
|
||||
|
||||
let payload = AckEventPayload {
|
||||
user_id: user_id.to_string(),
|
||||
channel_id: channel_id.map(|value| value.to_string()),
|
||||
server_id: server_id.map(|value| value.to_string()),
|
||||
};
|
||||
let payload = to_string(&payload).unwrap();
|
||||
|
||||
info!(
|
||||
"Sending ack processor event on exchange {}, channel {}: {}",
|
||||
config.rabbit.default_exchange, config.rabbit.queues.acks, payload
|
||||
);
|
||||
|
||||
self.channel
|
||||
.basic_publish(
|
||||
BasicProperties::default()
|
||||
.with_content_type("application/json")
|
||||
.with_persistence(true)
|
||||
//.with_headers(headers)
|
||||
.finish(),
|
||||
payload.into(),
|
||||
BasicPublishArguments::new(
|
||||
&config.rabbit.default_exchange,
|
||||
&config.rabbit.queues.acks,
|
||||
),
|
||||
)
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,20 @@
|
||||
use amqprs::{
|
||||
channel::{BasicPublishArguments},
|
||||
BasicProperties, FieldTable,
|
||||
};
|
||||
use authifier::AuthifierEvent;
|
||||
use revolt_result::Error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use revolt_models::v0::{
|
||||
AppendMessage, Channel, ChannelUnread, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember, FieldsMessage, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialEmoji, PartialMember, PartialMessage, PartialRole, PartialServer, PartialUser, PartialUserVoiceState, PartialWebhook, PolicyChange, RemovalIntention, Report, Server, User, UserSettings, UserVoiceState, Webhook
|
||||
AppendMessage, Channel, ChannelUnread, ChannelVoiceState, Emoji, FieldsChannel, FieldsMember,
|
||||
FieldsMessage, FieldsRole, FieldsServer, FieldsUser, FieldsWebhook, Member, MemberCompositeKey,
|
||||
Message, PartialChannel, PartialMember, PartialMessage, PartialRole, PartialServer,
|
||||
PartialUser, PartialUserVoiceState, PartialWebhook, PolicyChange, RemovalIntention, Report,
|
||||
Server, User, UserSettings, UserVoiceState, Webhook,
|
||||
};
|
||||
|
||||
use crate::Database;
|
||||
use crate::{util::rabbit::get_channel, Database};
|
||||
|
||||
/// Ping Packet
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
@@ -219,12 +227,6 @@ pub enum EventV1 {
|
||||
/// New emoji
|
||||
EmojiCreate(Emoji),
|
||||
|
||||
/// Update existing emoji
|
||||
EmojiUpdate {
|
||||
id: String,
|
||||
data: PartialEmoji,
|
||||
},
|
||||
|
||||
/// Delete emoji
|
||||
EmojiDelete { id: String },
|
||||
|
||||
@@ -310,14 +312,23 @@ pub enum EventV1 {
|
||||
impl EventV1 {
|
||||
/// Publish helper wrapper
|
||||
pub async fn p(self, channel: String) {
|
||||
#[cfg(not(debug_assertions))]
|
||||
redis_kiss::p(channel, self).await;
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
info!("Publishing event to {channel}: {self:?}");
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
redis_kiss::publish(channel, self).await.unwrap();
|
||||
let rmq = get_channel().await;
|
||||
|
||||
let mut headers = FieldTable::new();
|
||||
headers.insert("c".try_into().unwrap(), channel.clone().into());
|
||||
let mut properties = BasicProperties::default();
|
||||
properties.with_headers(headers);
|
||||
|
||||
rmq.basic_publish(
|
||||
properties,
|
||||
serde_json::to_string(&self).unwrap().into_bytes(),
|
||||
BasicPublishArguments::new("events", "events"),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
/// Publish user event
|
||||
|
||||
@@ -78,11 +78,3 @@ pub struct AckPayload {
|
||||
pub channel_id: String,
|
||||
pub message_id: String,
|
||||
}
|
||||
|
||||
/// This is not the same as the AckPayload above, as the state for this event is stored in redis to allow for state updates while the event is queued.
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct AckEventPayload {
|
||||
pub user_id: String,
|
||||
pub channel_id: Option<String>,
|
||||
pub server_id: Option<String>,
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#![allow(deprecated)]
|
||||
use std::{borrow::Cow, collections::HashMap};
|
||||
|
||||
use redis_kiss::get_connection;
|
||||
use revolt_config::config;
|
||||
use revolt_models::v0::{self, MessageAuthor};
|
||||
use revolt_permissions::OverrideField;
|
||||
@@ -111,10 +110,6 @@ auto_derived!(
|
||||
/// Voice Information for when this channel is also a voice channel
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
voice: Option<VoiceInformation>,
|
||||
|
||||
/// The channel's slowmode delay in seconds
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
slowmode: Option<u64>,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -151,8 +146,6 @@ auto_derived!(
|
||||
pub last_message_id: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub voice: Option<VoiceInformation>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub slowmode: Option<u64>,
|
||||
}
|
||||
|
||||
/// Optional fields on channel object
|
||||
@@ -213,7 +206,6 @@ impl Channel {
|
||||
role_permissions: HashMap::new(),
|
||||
nsfw: data.nsfw.unwrap_or(false),
|
||||
voice: data.voice.map(|voice| voice.into()),
|
||||
slowmode: None,
|
||||
},
|
||||
v0::LegacyServerChannelType::Voice => Channel::TextChannel {
|
||||
id: id.clone(),
|
||||
@@ -226,7 +218,6 @@ impl Channel {
|
||||
role_permissions: HashMap::new(),
|
||||
nsfw: data.nsfw.unwrap_or(false),
|
||||
voice: Some(data.voice.unwrap_or_default().into()),
|
||||
slowmode: None,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -644,7 +635,7 @@ impl Channel {
|
||||
}
|
||||
|
||||
/// Acknowledge a message
|
||||
pub async fn ack(&self, user: &str, message: &str, amqp: &AMQP) -> Result<()> {
|
||||
pub async fn ack(&self, user: &str, message: &str) -> Result<()> {
|
||||
EventV1::ChannelAck {
|
||||
id: self.id().to_string(),
|
||||
user: user.to_string(),
|
||||
@@ -653,7 +644,17 @@ impl Channel {
|
||||
.private(user.to_string())
|
||||
.await;
|
||||
|
||||
crate::util::acker::ack_channel(user, self.id(), message, amqp).await
|
||||
#[cfg(feature = "tasks")]
|
||||
crate::tasks::ack::queue_ack(
|
||||
self.id().to_string(),
|
||||
user.to_string(),
|
||||
crate::tasks::ack::AckEvent::AckMessage {
|
||||
id: message.to_string(),
|
||||
},
|
||||
)
|
||||
.await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Remove user from a group
|
||||
|
||||
@@ -2,7 +2,6 @@ use std::collections::HashSet;
|
||||
use std::str::FromStr;
|
||||
|
||||
use once_cell::sync::Lazy;
|
||||
use revolt_models::v0;
|
||||
use revolt_result::Result;
|
||||
use ulid::Ulid;
|
||||
|
||||
@@ -42,12 +41,6 @@ auto_derived!(
|
||||
Server { id: String },
|
||||
Detached,
|
||||
}
|
||||
|
||||
/// Partial representation of an emoji
|
||||
pub struct PartialEmoji {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub name: Option<String>,
|
||||
}
|
||||
);
|
||||
|
||||
#[allow(clippy::disallowed_methods)]
|
||||
@@ -82,26 +75,6 @@ impl Emoji {
|
||||
db.detach_emoji(&self).await
|
||||
}
|
||||
|
||||
/// Update an emoji
|
||||
pub async fn update(&mut self, db: &Database, partial: PartialEmoji) -> Result<()> {
|
||||
if let Some(name) = partial.name.clone() {
|
||||
self.name = name;
|
||||
}
|
||||
|
||||
db.update_emoji(&self.id, &partial).await?;
|
||||
|
||||
EventV1::EmojiUpdate {
|
||||
id: self.id.clone(),
|
||||
data: v0::PartialEmoji {
|
||||
name: partial.name.clone(),
|
||||
},
|
||||
}
|
||||
.p(self.parent().to_string())
|
||||
.await;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Check whether we can use a given emoji
|
||||
pub async fn can_use(db: &Database, emoji: &str) -> Result<bool> {
|
||||
if Ulid::from_str(emoji).is_ok() {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use revolt_result::Result;
|
||||
|
||||
use crate::{Emoji, PartialEmoji};
|
||||
use crate::Emoji;
|
||||
|
||||
#[cfg(feature = "mongodb")]
|
||||
mod mongodb;
|
||||
@@ -20,9 +20,6 @@ pub trait AbstractEmojis: Sync + Send {
|
||||
/// Fetch emoji by their parent ids
|
||||
async fn fetch_emoji_by_parent_ids(&self, parent_ids: &[String]) -> Result<Vec<Emoji>>;
|
||||
|
||||
/// Update emoji with new information
|
||||
async fn update_emoji(&self, emoji_id: &str, partial: &PartialEmoji) -> Result<()>;
|
||||
|
||||
/// Detach an emoji by its id
|
||||
async fn detach_emoji(&self, emoji: &Emoji) -> Result<()>;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use bson::Document;
|
||||
use revolt_result::Result;
|
||||
|
||||
use crate::{Emoji, PartialEmoji};
|
||||
use crate::Emoji;
|
||||
use crate::MongoDb;
|
||||
|
||||
use super::AbstractEmojis;
|
||||
@@ -46,11 +46,6 @@ impl AbstractEmojis for MongoDb {
|
||||
)
|
||||
}
|
||||
|
||||
/// Update emoji with new information
|
||||
async fn update_emoji(&self, emoji_id: &str, partial: &PartialEmoji) -> Result<()> {
|
||||
query!(self, update_one_by_id, COL, emoji_id, partial, vec![], None).map(|_| ())
|
||||
}
|
||||
|
||||
/// Detach an emoji by its id
|
||||
async fn detach_emoji(&self, emoji: &Emoji) -> Result<()> {
|
||||
self.col::<Document>(COL)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use revolt_result::Result;
|
||||
|
||||
use crate::{Emoji, PartialEmoji};
|
||||
use crate::Emoji;
|
||||
use crate::EmojiParent;
|
||||
use crate::ReferenceDb;
|
||||
|
||||
@@ -54,19 +54,6 @@ impl AbstractEmojis for ReferenceDb {
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// Update emoji with new information
|
||||
async fn update_emoji(&self, emoji_id: &str, partial: &PartialEmoji) -> Result<()> {
|
||||
let mut emojis = self.emojis.lock().await;
|
||||
if let Some(emoji) = emojis.get_mut(emoji_id) {
|
||||
if let Some(name) = partial.name.clone() {
|
||||
emoji.name = name;
|
||||
}
|
||||
Ok(())
|
||||
} else {
|
||||
Err(create_error!(NotFound))
|
||||
}
|
||||
}
|
||||
|
||||
/// Detach an emoji by its id
|
||||
async fn detach_emoji(&self, emoji: &Emoji) -> Result<()> {
|
||||
let mut emojis = self.emojis.lock().await;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -45,8 +45,7 @@ auto_derived!(
|
||||
Image {
|
||||
width: isize,
|
||||
height: isize,
|
||||
thumbhash: Option<Vec<u8>>,
|
||||
animated: Option<bool>,
|
||||
// animated: bool // TODO: https://docs.rs/image/latest/image/trait.AnimationDecoder.html for APNG support
|
||||
},
|
||||
/// File is a video with specific dimensions
|
||||
Video { width: isize, height: isize },
|
||||
|
||||
@@ -17,12 +17,6 @@ pub trait AbstractAttachmentHashes: Sync + Send {
|
||||
/// Update an attachment hash nonce value.
|
||||
async fn set_attachment_hash_nonce(&self, hash: &str, nonce: &str) -> Result<()>;
|
||||
|
||||
/// Updates the attachments animated metadata value.
|
||||
///
|
||||
/// The primary use for this is to update the metadata for existing uploaded files, this
|
||||
/// can only be used for images.
|
||||
async fn set_attachment_hash_animated(&self, hash: &str, animated: bool) -> Result<()>;
|
||||
|
||||
/// Delete attachment hash by id.
|
||||
async fn delete_attachment_hash(&self, id: &str) -> Result<()>;
|
||||
}
|
||||
|
||||
@@ -48,29 +48,6 @@ impl AbstractAttachmentHashes for MongoDb {
|
||||
.map_err(|_| create_database_error!("update_one", COL))
|
||||
}
|
||||
|
||||
/// Updates the attachments animated metadata value.
|
||||
///
|
||||
/// The primary use for this is to update the metadata for existing uploaded files, this
|
||||
/// can only be used for images.
|
||||
async fn set_attachment_hash_animated(&self, hash: &str, animated: bool) -> Result<()> {
|
||||
self.col::<FileHash>(COL)
|
||||
.update_one(
|
||||
doc! {
|
||||
"_id": hash,
|
||||
"metadata.type": "Image",
|
||||
"metadata.animated": { "$exists": false },
|
||||
},
|
||||
doc! {
|
||||
"$set": {
|
||||
"metadata.animated": animated
|
||||
}
|
||||
},
|
||||
)
|
||||
.await
|
||||
.map(|_| ())
|
||||
.map_err(|_| create_database_error!("update_one", COL))
|
||||
}
|
||||
|
||||
/// Delete attachment hash by id.
|
||||
async fn delete_attachment_hash(&self, id: &str) -> Result<()> {
|
||||
query!(self, delete_one_by_id, COL, id).map(|_| ())
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use revolt_result::Result;
|
||||
|
||||
use crate::{FileHash, Metadata, ReferenceDb};
|
||||
use crate::FileHash;
|
||||
use crate::ReferenceDb;
|
||||
|
||||
use super::AbstractAttachmentHashes;
|
||||
|
||||
@@ -38,29 +39,6 @@ impl AbstractAttachmentHashes for ReferenceDb {
|
||||
}
|
||||
}
|
||||
|
||||
/// Updates the attachments animated metadata value.
|
||||
///
|
||||
/// The primary use for this is to update the metadata for existing uploaded files, this
|
||||
/// can only be used for images.
|
||||
async fn set_attachment_hash_animated(&self, hash: &str, animated: bool) -> Result<()> {
|
||||
let mut hashes = self.file_hashes.lock().await;
|
||||
if let Some(FileHash {
|
||||
metadata:
|
||||
Metadata::Image {
|
||||
animated: Some(animated_metadata),
|
||||
..
|
||||
},
|
||||
..
|
||||
}) = hashes.get_mut(hash)
|
||||
{
|
||||
*animated_metadata = animated;
|
||||
|
||||
Ok(())
|
||||
} else {
|
||||
Err(create_error!(NotFound))
|
||||
}
|
||||
}
|
||||
|
||||
/// Delete attachment hash by id.
|
||||
async fn delete_attachment_hash(&self, id: &str) -> Result<()> {
|
||||
let mut file_hashes = self.file_hashes.lock().await;
|
||||
|
||||
@@ -70,7 +70,6 @@ auto_derived!(
|
||||
LegacyGroupIcon,
|
||||
ChannelIcon,
|
||||
ServerIcon,
|
||||
RoleIcon,
|
||||
}
|
||||
|
||||
/// Information about what the file was used for
|
||||
@@ -240,23 +239,4 @@ impl File {
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
/// Use a file for a role icon
|
||||
pub async fn use_role_icon(
|
||||
db: &Database,
|
||||
id: &str,
|
||||
parent: &str,
|
||||
uploader_id: &str,
|
||||
) -> Result<File> {
|
||||
db.find_and_use_attachment(
|
||||
id,
|
||||
"icons",
|
||||
FileUsedFor {
|
||||
id: parent.to_owned(),
|
||||
object_type: FileUsedForType::RoleIcon,
|
||||
},
|
||||
uploader_id.to_owned(),
|
||||
)
|
||||
.await
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
use std::{collections::HashSet, hash::RandomState};
|
||||
|
||||
use indexmap::{IndexMap, IndexSet};
|
||||
use iso8601_timestamp::Timestamp;
|
||||
use revolt_config::{config, FeaturesLimits};
|
||||
@@ -7,8 +9,6 @@ use revolt_models::v0::{
|
||||
};
|
||||
use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
|
||||
use revolt_result::{ErrorType, Result};
|
||||
use std::time::SystemTime;
|
||||
use std::{collections::HashSet, hash::RandomState};
|
||||
use ulid::Ulid;
|
||||
use validator::Validate;
|
||||
|
||||
@@ -388,7 +388,6 @@ impl Message {
|
||||
mut role_mentions,
|
||||
mut mentions_everyone,
|
||||
mut mentions_online,
|
||||
..
|
||||
} = message_mentions;
|
||||
|
||||
if allow_mass_mentions && server_id.is_some() && !role_mentions.is_empty() {
|
||||
@@ -498,7 +497,7 @@ impl Message {
|
||||
user_mentions.retain(|m| recipients_hash.contains(m));
|
||||
role_mentions.clear();
|
||||
}
|
||||
Channel::TextChannel { ref server, .. } => {
|
||||
Channel::TextChannel { ref server, .. }=> {
|
||||
let mentions_vec = Vec::from_iter(user_mentions.iter().cloned());
|
||||
|
||||
let valid_members = db.fetch_members(server.as_str(), &mentions_vec[..]).await;
|
||||
@@ -688,13 +687,8 @@ impl Message {
|
||||
)
|
||||
.await?;
|
||||
|
||||
let is_dm_or_group = matches!(
|
||||
channel,
|
||||
Channel::DirectMessage { .. } | Channel::Group { .. }
|
||||
);
|
||||
|
||||
if !self.has_suppressed_notifications()
|
||||
&& (is_dm_or_group || self.mentions.is_some() || self.contains_mass_push_mention())
|
||||
&& (self.mentions.is_some() || self.contains_mass_push_mention())
|
||||
{
|
||||
// send Push notifications
|
||||
#[cfg(feature = "tasks")]
|
||||
@@ -705,7 +699,7 @@ impl Message {
|
||||
Some(
|
||||
PushNotification::from(
|
||||
self.clone().into_model(user, member),
|
||||
Some(author.clone()),
|
||||
Some(author),
|
||||
channel.to_owned().into(),
|
||||
)
|
||||
.await,
|
||||
@@ -713,11 +707,7 @@ impl Message {
|
||||
self.clone(),
|
||||
match channel {
|
||||
Channel::DirectMessage { recipients, .. }
|
||||
| Channel::Group { recipients, .. } => recipients
|
||||
.iter()
|
||||
.filter(|uid| *uid != author.id())
|
||||
.cloned()
|
||||
.collect(),
|
||||
| Channel::Group { recipients, .. } => recipients.clone(),
|
||||
Channel::TextChannel { .. } => {
|
||||
self.mentions.clone().unwrap_or_default()
|
||||
}
|
||||
@@ -1039,31 +1029,6 @@ impl Message {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Bulk delete messages by an author since a given time
|
||||
pub async fn bulk_delete_by_author_since(
|
||||
db: &Database,
|
||||
channels: &[String],
|
||||
author: &str,
|
||||
since: SystemTime,
|
||||
) -> Result<()> {
|
||||
let deleted_groups = db
|
||||
.delete_messages_by_author_since(channels, author, since)
|
||||
.await?;
|
||||
|
||||
for (channel_id, message_ids) in deleted_groups {
|
||||
if !message_ids.is_empty() {
|
||||
EventV1::BulkMessageDelete {
|
||||
channel: channel_id.clone(),
|
||||
ids: message_ids,
|
||||
}
|
||||
.p(channel_id)
|
||||
.await;
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Remove a reaction from a message
|
||||
pub async fn remove_reaction(&self, db: &Database, user: &str, emoji: &str) -> Result<()> {
|
||||
// Check if it actually exists
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
use std::collections::HashMap;
|
||||
use std::time::SystemTime;
|
||||
use revolt_result::Result;
|
||||
|
||||
use crate::{AppendMessage, FieldsMessage, Message, MessageQuery, PartialMessage};
|
||||
@@ -42,12 +40,4 @@ pub trait AbstractMessages: Sync + Send {
|
||||
|
||||
/// Delete messages from a channel by their ids and corresponding channel id
|
||||
async fn delete_messages(&self, channel: &str, ids: &[String]) -> Result<()>;
|
||||
|
||||
/// Delete all messages from a specific author in a server from a certain ULID onwards
|
||||
async fn delete_messages_by_author_since(
|
||||
&self,
|
||||
channels: &[String],
|
||||
author: &str,
|
||||
since: SystemTime
|
||||
) -> Result<HashMap<String, Vec<String>>>;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
use bson::{to_bson, Document};
|
||||
use futures::try_join;
|
||||
use futures::StreamExt;
|
||||
use mongodb::options::FindOptions;
|
||||
use revolt_models::v0::MessageSort;
|
||||
use revolt_result::Result;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::time::SystemTime;
|
||||
use ulid::Ulid;
|
||||
|
||||
use crate::{
|
||||
AppendMessage, DocumentId, FieldsMessage, IntoDocumentPath, Message, MessageQuery,
|
||||
@@ -310,112 +306,6 @@ impl AbstractMessages for MongoDb {
|
||||
.map(|_| ())
|
||||
.map_err(|_| create_database_error!("delete_many", COL))
|
||||
}
|
||||
|
||||
/// Delete all messages from a specific author in a server from a certain ULID onwards
|
||||
async fn delete_messages_by_author_since(
|
||||
&self,
|
||||
channels: &[String],
|
||||
author: &str,
|
||||
since: SystemTime,
|
||||
) -> Result<HashMap<String, Vec<String>>> {
|
||||
let threshold_ulid = Ulid::from_datetime(since).to_string();
|
||||
|
||||
let filter = doc! {
|
||||
"author": author,
|
||||
"channel": { "$in": channels },
|
||||
"_id": { "$gte": &threshold_ulid }
|
||||
};
|
||||
|
||||
let pipeline = vec![
|
||||
doc! { "$match": filter.clone() },
|
||||
doc! {
|
||||
"$project": {
|
||||
"channel": 1_i32,
|
||||
"message_id": "$_id",
|
||||
"attachment_ids": {
|
||||
"$map": {
|
||||
"input": { "$ifNull": ["$attachments", Vec::<bson::Bson>::new()] },
|
||||
"as": "a",
|
||||
"in": "$$a._id"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
doc! {
|
||||
"$group": {
|
||||
"_id": "$channel",
|
||||
"message_ids": { "$push": "$message_id" },
|
||||
"attachment_ids_nested": { "$push": "$attachment_ids" }
|
||||
}
|
||||
},
|
||||
doc! {
|
||||
"$project": {
|
||||
"message_ids": 1_i32,
|
||||
"attachment_ids": {
|
||||
"$reduce": {
|
||||
"input": "$attachment_ids_nested",
|
||||
"initialValue": Vec::<bson::Bson>::new(),
|
||||
"in": { "$setUnion": ["$$value", "$$this"] }
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
];
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
struct AggregatedChannel {
|
||||
#[serde(rename = "_id")]
|
||||
channel: String,
|
||||
message_ids: Vec<String>,
|
||||
#[serde(default)]
|
||||
attachment_ids: Vec<String>,
|
||||
}
|
||||
|
||||
let mut cursor = self
|
||||
.col::<Document>(COL)
|
||||
.aggregate(pipeline)
|
||||
.await
|
||||
.map_err(|_| create_database_error!("aggregate", COL))?
|
||||
.with_type::<AggregatedChannel>();
|
||||
|
||||
let mut deleted_messages: HashMap<String, Vec<String>> = HashMap::new();
|
||||
let mut attachment_ids: HashSet<String> = HashSet::new();
|
||||
|
||||
while let Some(result) = cursor.next().await {
|
||||
if let Ok(item) = result {
|
||||
for id in item.attachment_ids {
|
||||
attachment_ids.insert(id);
|
||||
}
|
||||
deleted_messages.insert(item.channel, item.message_ids);
|
||||
}
|
||||
}
|
||||
|
||||
// Mark attachments as deleted before deleting messages
|
||||
if !attachment_ids.is_empty() {
|
||||
self.col::<Document>("attachments")
|
||||
.update_many(
|
||||
doc! {
|
||||
"_id": {
|
||||
"$in": attachment_ids.into_iter().collect::<Vec<String>>()
|
||||
}
|
||||
},
|
||||
doc! {
|
||||
"$set": {
|
||||
"deleted": true
|
||||
}
|
||||
},
|
||||
)
|
||||
.await
|
||||
.map_err(|_| create_database_error!("update_many", "attachments"))?;
|
||||
}
|
||||
|
||||
self.col::<Document>(COL)
|
||||
.delete_many(filter)
|
||||
.await
|
||||
.map_err(|_| create_database_error!("delete_many", COL))?;
|
||||
|
||||
Ok(deleted_messages)
|
||||
}
|
||||
}
|
||||
|
||||
impl IntoDocumentPath for FieldsMessage {
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
use std::collections::HashMap;
|
||||
use futures::future::try_join_all;
|
||||
use indexmap::IndexSet;
|
||||
use revolt_result::Result;
|
||||
use std::time::SystemTime;
|
||||
use ulid::Ulid;
|
||||
|
||||
use crate::{AppendMessage, FieldsMessage, Message, MessageQuery, PartialMessage, ReferenceDb};
|
||||
|
||||
use super::AbstractMessages;
|
||||
@@ -249,7 +247,7 @@ impl AbstractMessages for ReferenceDb {
|
||||
let mut messages = self.messages.lock().await;
|
||||
if let Some(message) = messages.get_mut(id) {
|
||||
if let Some(users) = message.reactions.get_mut(emoji) {
|
||||
users.swap_remove(&user.to_string());
|
||||
users.remove(&user.to_string());
|
||||
}
|
||||
|
||||
Ok(())
|
||||
@@ -262,7 +260,7 @@ impl AbstractMessages for ReferenceDb {
|
||||
async fn clear_reaction(&self, id: &str, emoji: &str) -> Result<()> {
|
||||
let mut messages = self.messages.lock().await;
|
||||
if let Some(message) = messages.get_mut(id) {
|
||||
message.reactions.swap_remove(emoji);
|
||||
message.reactions.remove(emoji);
|
||||
Ok(())
|
||||
} else {
|
||||
Err(create_error!(NotFound))
|
||||
@@ -288,63 +286,4 @@ impl AbstractMessages for ReferenceDb {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Delete all messages from a specific author in a list of channels from a certain ULID onwards
|
||||
async fn delete_messages_by_author_since(
|
||||
&self,
|
||||
channels: &[String],
|
||||
author: &str,
|
||||
since: SystemTime
|
||||
) -> Result<HashMap<String, Vec<String>>> {
|
||||
let threshold_ulid = Ulid::from_datetime(since).to_string();
|
||||
let mut deleted_messages: HashMap<String, Vec<String>> = HashMap::new();
|
||||
let mut attachment_ids: Vec<String> = Vec::new();
|
||||
|
||||
let messages = self.messages.lock().await;
|
||||
|
||||
// First pass: collect attachment IDs and message IDs to delete
|
||||
for (id, message) in messages.iter() {
|
||||
let should_delete = message.author == author
|
||||
&& channels.contains(&message.channel)
|
||||
&& id.as_str() >= threshold_ulid.as_str();
|
||||
|
||||
if should_delete {
|
||||
// Collect attachment IDs
|
||||
if let Some(attachments) = &message.attachments {
|
||||
for attachment in attachments {
|
||||
attachment_ids.push(attachment.id.clone());
|
||||
}
|
||||
}
|
||||
|
||||
deleted_messages
|
||||
.entry(message.channel.clone())
|
||||
.or_default()
|
||||
.push(id.clone());
|
||||
}
|
||||
}
|
||||
drop(messages);
|
||||
|
||||
// Mark attachments as deleted
|
||||
if !attachment_ids.is_empty() {
|
||||
let mut files = self.files.lock().await;
|
||||
for attachment_id in attachment_ids {
|
||||
if let Some(file) = files.get_mut(&attachment_id) {
|
||||
file.deleted = Some(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Delete the messages
|
||||
self.messages
|
||||
.lock()
|
||||
.await
|
||||
.retain(|id, message| {
|
||||
let should_keep = !(message.author == author
|
||||
&& channels.contains(&message.channel)
|
||||
&& id.as_str() >= threshold_ulid.as_str());
|
||||
should_keep
|
||||
});
|
||||
|
||||
Ok(deleted_messages)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
|
||||
use revolt_result::{create_error, Result};
|
||||
|
||||
use crate::{
|
||||
events::client::EventV1, util::permissions::DatabasePermissionQuery, Channel, Database, File,
|
||||
Server, SystemMessage, User,
|
||||
events::client::EventV1, util::permissions::DatabasePermissionQuery, Channel,
|
||||
Database, File, Server, SystemMessage, User,
|
||||
};
|
||||
|
||||
fn default_true() -> bool {
|
||||
@@ -45,6 +45,7 @@ auto_derived_partial!(
|
||||
/// Whether the member is server-wide voice deafened
|
||||
#[serde(skip_serializing_if = "is_true", default = "default_true")]
|
||||
pub can_receive: bool,
|
||||
|
||||
// This value only exists in the database, not the models.
|
||||
// If it is not-None, the database layer should return None to member fetching queries.
|
||||
// pub pending_deletion_at: Option<Timestamp>
|
||||
@@ -152,11 +153,7 @@ impl Member {
|
||||
|
||||
#[cfg(feature = "voice")]
|
||||
for channel in &channels {
|
||||
if let Ok(Some(voice_state)) = crate::voice::get_channel_voice_state(
|
||||
&crate::voice::UserVoiceChannel::from_channel(channel),
|
||||
)
|
||||
.await
|
||||
{
|
||||
if let Ok(Some(voice_state)) = crate::voice::get_channel_voice_state(channel).await {
|
||||
voice_states.push(voice_state)
|
||||
}
|
||||
}
|
||||
@@ -178,7 +175,7 @@ impl Member {
|
||||
.map(|channel| channel.into())
|
||||
.collect(),
|
||||
emojis: emojis.into_iter().map(|emoji| emoji.into()).collect(),
|
||||
voice_states,
|
||||
voice_states
|
||||
}
|
||||
.private(user.id.clone())
|
||||
.await;
|
||||
@@ -228,14 +225,14 @@ impl Member {
|
||||
|
||||
pub fn remove_field(&mut self, field: &FieldsMember) {
|
||||
match field {
|
||||
FieldsMember::JoinedAt => {}
|
||||
FieldsMember::JoinedAt => {},
|
||||
FieldsMember::Avatar => self.avatar = None,
|
||||
FieldsMember::Nickname => self.nickname = None,
|
||||
FieldsMember::Roles => self.roles.clear(),
|
||||
FieldsMember::Timeout => self.timeout = None,
|
||||
FieldsMember::CanReceive => self.can_receive = true,
|
||||
FieldsMember::CanPublish => self.can_publish = true,
|
||||
FieldsMember::VoiceChannel => {}
|
||||
FieldsMember::VoiceChannel => {},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -86,9 +86,6 @@ auto_derived_partial!(
|
||||
/// Ranking of this role
|
||||
#[serde(default)]
|
||||
pub rank: i64,
|
||||
/// Custom icon attachment
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub icon: Option<File>,
|
||||
},
|
||||
"PartialRole"
|
||||
);
|
||||
@@ -132,7 +129,6 @@ auto_derived!(
|
||||
/// Optional fields on server object
|
||||
pub enum FieldsRole {
|
||||
Colour,
|
||||
Icon,
|
||||
}
|
||||
);
|
||||
|
||||
@@ -309,7 +305,6 @@ impl Role {
|
||||
colour: self.colour,
|
||||
hoist: Some(self.hoist),
|
||||
rank: Some(self.rank),
|
||||
icon: self.icon,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -323,7 +318,6 @@ impl Role {
|
||||
colour: None,
|
||||
hoist: false,
|
||||
permissions: Default::default(),
|
||||
icon: None,
|
||||
};
|
||||
|
||||
db.insert_role(&server.id, &role).await?;
|
||||
@@ -373,7 +367,6 @@ impl Role {
|
||||
pub fn remove_field(&mut self, field: &FieldsRole) {
|
||||
match field {
|
||||
FieldsRole::Colour => self.colour = None,
|
||||
FieldsRole::Icon => self.icon = None,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ impl AbstractServers for MongoDb {
|
||||
},
|
||||
doc! {
|
||||
"$set": {
|
||||
"roles.".to_owned() + role.id.as_str(): to_document(role)
|
||||
"roles.".to_owned() + &role.id: to_document(role)
|
||||
.map_err(|_| create_database_error!("to_document", "role"))?
|
||||
}
|
||||
},
|
||||
@@ -172,7 +172,6 @@ impl IntoDocumentPath for FieldsRole {
|
||||
fn as_path(&self) -> Option<&'static str> {
|
||||
Some(match self {
|
||||
FieldsRole::Colour => "colour",
|
||||
FieldsRole::Icon => "icon",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ use futures::future::join_all;
|
||||
use iso8601_timestamp::Timestamp;
|
||||
use once_cell::sync::Lazy;
|
||||
use rand::seq::SliceRandom;
|
||||
use regex::{Regex, RegexBuilder};
|
||||
use revolt_config::{config, FeaturesLimits};
|
||||
use revolt_models::v0::{self, UserBadges, UserFlags};
|
||||
use revolt_presence::filter_online;
|
||||
@@ -164,13 +163,6 @@ pub static DISCRIMINATOR_SEARCH_SPACE: Lazy<HashSet<String>> = Lazy::new(|| {
|
||||
set.into_iter().collect()
|
||||
});
|
||||
|
||||
static BLOCKED_USERNAME_PATTERNS: Lazy<Regex> = Lazy::new(|| {
|
||||
RegexBuilder::new("`{3}|(discord|rvlt|guilded|stt)\\.gg|(revolt|stoat)\\.chat|https?:\\/\\/")
|
||||
.case_insensitive(true)
|
||||
.build()
|
||||
.unwrap()
|
||||
});
|
||||
|
||||
#[allow(clippy::derivable_impls)]
|
||||
impl Default for User {
|
||||
fn default() -> Self {
|
||||
@@ -206,13 +198,11 @@ impl User {
|
||||
I: Into<Option<String>>,
|
||||
D: Into<Option<PartialUser>>,
|
||||
{
|
||||
let new_username = User::sanitise_username(&username).await?;
|
||||
User::validate_username(&new_username)?;
|
||||
|
||||
let username = User::validate_username(username)?;
|
||||
let mut user = User {
|
||||
id: account_id.into().unwrap_or_else(|| Ulid::new().to_string()),
|
||||
discriminator: User::find_discriminator(db, &new_username, None).await?,
|
||||
username: new_username.clone(),
|
||||
discriminator: User::find_discriminator(db, &username, None).await?,
|
||||
username,
|
||||
last_acknowledged_policy_change: Timestamp::now_utc(),
|
||||
..Default::default()
|
||||
};
|
||||
@@ -288,40 +278,39 @@ impl User {
|
||||
}
|
||||
}
|
||||
|
||||
/// Validate a username
|
||||
///
|
||||
/// This will check if the username is a blocked name or contains a blocked pattern.
|
||||
fn validate_username(username: &str) -> Result<()> {
|
||||
/// Sanitise and validate a username can be used
|
||||
pub fn validate_username(username: String) -> Result<String> {
|
||||
// Copy the username for validation
|
||||
let username_lowercase = username.to_lowercase();
|
||||
|
||||
const BLOCKED_USERNAMES: &[&str] = &["admin", "revolt", "stoat"];
|
||||
|
||||
if BLOCKED_USERNAMES.contains(&username_lowercase.as_str())
|
||||
|| BLOCKED_USERNAME_PATTERNS.is_match(username)
|
||||
{
|
||||
// Block homoglyphs
|
||||
if decancer::cure(&username_lowercase).into_str() != username_lowercase {
|
||||
return Err(create_error!(InvalidUsername));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
// Ensure the username itself isn't blocked
|
||||
const BLOCKED_USERNAMES: &[&str] = &["admin", "revolt"];
|
||||
|
||||
/// Sanitise a username
|
||||
///
|
||||
/// This will clean up Unicode homoglyphs and pad to the min username length with underscores.
|
||||
async fn sanitise_username(username: &str) -> Result<String> {
|
||||
let options = decancer::Options::default().retain_capitalization();
|
||||
let mut username = decancer::cure(username, options)
|
||||
.map_err(|_| create_error!(InvalidUsername))?
|
||||
.to_string();
|
||||
for username in BLOCKED_USERNAMES {
|
||||
if username_lowercase == *username {
|
||||
return Err(create_error!(InvalidUsername));
|
||||
}
|
||||
}
|
||||
|
||||
let config = revolt_config::config().await;
|
||||
let username_length_diff = config
|
||||
.api
|
||||
.users
|
||||
.min_username_length
|
||||
.saturating_sub(username.len());
|
||||
if username_length_diff > 0 {
|
||||
username.push_str(&"_".repeat(username_length_diff))
|
||||
// Ensure none of the following substrings show up in the username
|
||||
const BLOCKED_SUBSTRINGS: &[&str] = &[
|
||||
"```",
|
||||
"discord.gg",
|
||||
"rvlt.gg",
|
||||
"guilded.gg",
|
||||
"https://",
|
||||
"http://",
|
||||
];
|
||||
|
||||
for substr in BLOCKED_SUBSTRINGS {
|
||||
if username_lowercase.contains(substr) {
|
||||
return Err(create_error!(InvalidUsername));
|
||||
}
|
||||
}
|
||||
|
||||
Ok(username)
|
||||
@@ -427,14 +416,12 @@ impl User {
|
||||
|
||||
/// Update a user's username
|
||||
pub async fn update_username(&mut self, db: &Database, username: String) -> Result<()> {
|
||||
let new_username = User::sanitise_username(&username).await?;
|
||||
User::validate_username(&new_username)?;
|
||||
|
||||
if self.username.to_lowercase() == new_username.to_lowercase() {
|
||||
let username = User::validate_username(username)?;
|
||||
if self.username.to_lowercase() == username.to_lowercase() {
|
||||
self.update(
|
||||
db,
|
||||
PartialUser {
|
||||
username: Some(new_username),
|
||||
username: Some(username),
|
||||
..Default::default()
|
||||
},
|
||||
vec![],
|
||||
@@ -447,12 +434,12 @@ impl User {
|
||||
discriminator: Some(
|
||||
User::find_discriminator(
|
||||
db,
|
||||
&new_username,
|
||||
&username,
|
||||
Some((self.discriminator.to_string(), self.id.clone())),
|
||||
)
|
||||
.await?,
|
||||
),
|
||||
username: Some(new_username),
|
||||
username: Some(username),
|
||||
..Default::default()
|
||||
},
|
||||
vec![],
|
||||
@@ -838,109 +825,3 @@ impl User {
|
||||
badges
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::User;
|
||||
|
||||
#[test]
|
||||
fn username_validation_blocked_names() {
|
||||
let username_admin = "Admin";
|
||||
let username_revolt = "Revolt";
|
||||
let username_stoat = "Stoat";
|
||||
let username_allowed = "Allowed";
|
||||
|
||||
assert!(User::validate_username(username_admin).is_err());
|
||||
assert!(User::validate_username(username_revolt).is_err());
|
||||
assert!(User::validate_username(username_stoat).is_err());
|
||||
assert!(User::validate_username(username_allowed).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn username_validation_blocked_patterns() {
|
||||
let username_grave = "```_test";
|
||||
let username_discord = "discord.gg_test";
|
||||
let username_rvlt = "rvlt.gg_test";
|
||||
let username_guilded = "guilded.gg_test";
|
||||
let username_stt = "stt.gg_test";
|
||||
let username_revolt = "revolt.chat_test";
|
||||
let username_stoat = "stoat.chat_test";
|
||||
let username_http = "http://_test";
|
||||
let username_https = "https://_test";
|
||||
|
||||
assert!(User::validate_username(username_grave).is_err());
|
||||
assert!(User::validate_username(username_discord).is_err());
|
||||
assert!(User::validate_username(username_rvlt).is_err());
|
||||
assert!(User::validate_username(username_guilded).is_err());
|
||||
assert!(User::validate_username(username_stt).is_err());
|
||||
assert!(User::validate_username(username_revolt).is_err());
|
||||
assert!(User::validate_username(username_stoat).is_err());
|
||||
assert!(User::validate_username(username_http).is_err());
|
||||
assert!(User::validate_username(username_https).is_err());
|
||||
}
|
||||
|
||||
#[async_std::test]
|
||||
async fn username_sanitisation_clean() {
|
||||
let username_clean = "Test";
|
||||
|
||||
let username_clean_sanitised = User::sanitise_username(username_clean).await;
|
||||
|
||||
assert!(username_clean_sanitised.is_ok());
|
||||
assert_eq!(username_clean, username_clean_sanitised.unwrap());
|
||||
}
|
||||
|
||||
#[async_std::test]
|
||||
async fn username_sanitisation_homoglyphs() {
|
||||
let username_homoglyphs = "𝔽𝕌Ňℕｙ";
|
||||
|
||||
let username_homoglyphs_sanitised =
|
||||
User::sanitise_username(username_homoglyphs).await.unwrap();
|
||||
|
||||
assert_ne!(username_homoglyphs, username_homoglyphs_sanitised);
|
||||
assert_eq!("funny", username_homoglyphs_sanitised);
|
||||
}
|
||||
|
||||
#[async_std::test]
|
||||
async fn username_sanitisation_padding() {
|
||||
let username_padding = "a";
|
||||
|
||||
let username = User::sanitise_username(username_padding).await.unwrap();
|
||||
|
||||
assert_eq!("a_", username);
|
||||
}
|
||||
|
||||
#[async_std::test]
|
||||
async fn create_user() {
|
||||
use revolt_result::Result;
|
||||
|
||||
database_test!(|db| async move {
|
||||
let mut created_clean = User::create(&db, "Test".to_string(), None, None)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert_eq!("Test", created_clean.username);
|
||||
|
||||
created_clean
|
||||
.update_username(&db, "Test2".to_string())
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
assert_eq!("Test2", created_clean.username);
|
||||
|
||||
let created_invalid_result: Result<_> =
|
||||
User::create(&db, "stoat.chat".to_string(), None, None).await;
|
||||
|
||||
assert!(created_invalid_result.is_err());
|
||||
|
||||
let mut updated_invalid = User::create(&db, "Test".to_string(), None, None)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let updated_invalid_update_result = updated_invalid
|
||||
.update_username(&db, "http://test".to_string())
|
||||
.await;
|
||||
|
||||
assert!(updated_invalid_update_result.is_err());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,11 +105,7 @@ pub async fn handle_ack_event(
|
||||
|
||||
if mentions_acked > 0 {
|
||||
if let Err(err) = amqp
|
||||
.ack_notification_message(
|
||||
user.to_string(),
|
||||
channel.to_string(),
|
||||
id.to_owned(),
|
||||
)
|
||||
.ack_message(user.to_string(), channel.to_string(), id.to_owned())
|
||||
.await
|
||||
{
|
||||
revolt_config::capture_error(&err);
|
||||
@@ -196,7 +192,9 @@ pub async fn handle_ack_event(
|
||||
.expect("Failed to fetch channel from db");
|
||||
|
||||
if let TextChannel { server, .. } = channel {
|
||||
if let Err(err) = amqp.mass_mention_message_sent(server, mass_mentions).await {
|
||||
if let Err(err) =
|
||||
amqp.mass_mention_message_sent(server, mass_mentions).await
|
||||
{
|
||||
revolt_config::capture_error(&err);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
use redis_kiss::{get_connection, AsyncCommands};
|
||||
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
|
||||
use revolt_result::{Result, ToRevoltError};
|
||||
|
||||
use crate::{events::client::EventV1, Channel, Database, Server, User, AMQP};
|
||||
|
||||
pub async fn ack_channel(user: &str, channel: &str, message: &str, amqp: &AMQP) -> Result<()> {
|
||||
let mut redis = get_connection()
|
||||
.await
|
||||
.map_err(|_| create_error!(InternalError))?;
|
||||
|
||||
let old: Option<String> = redis
|
||||
.getset(format!("acker:{user}+{channel}"), message)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
if old.is_none() || old.unwrap() == message {
|
||||
amqp.process_ack(user, Some(channel), None)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn ack_server(user: &User, server: &Server, db: &Database, amqp: &AMQP) -> Result<()> {
|
||||
let mut redis = get_connection()
|
||||
.await
|
||||
.map_err(|_| create_error!(InternalError))?;
|
||||
|
||||
let channels = db.fetch_channels(&server.channels).await?;
|
||||
let query = crate::util::permissions::DatabasePermissionQuery::new(db, user).server(server);
|
||||
|
||||
for channel in channels {
|
||||
let channel_id = channel.id();
|
||||
let mut q = query.clone().channel(&channel);
|
||||
|
||||
if calculate_channel_permissions(&mut q)
|
||||
.await
|
||||
.has_channel_permission(ChannelPermission::ViewChannel)
|
||||
{
|
||||
let channel_last_msg = match &channel {
|
||||
Channel::TextChannel {
|
||||
last_message_id, ..
|
||||
} => last_message_id,
|
||||
_ => unreachable!(),
|
||||
}
|
||||
.clone();
|
||||
|
||||
if let Some(channel_last_msg) = channel_last_msg {
|
||||
let old: Option<String> = redis
|
||||
.getset(
|
||||
format!("acker:{}+{}", user.id, channel_id),
|
||||
&channel_last_msg,
|
||||
)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
if old.is_none() || old.unwrap() == channel_last_msg {
|
||||
amqp.process_ack(&user.id, Some(channel_id), Some(&server.id))
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
EventV1::ChannelAck {
|
||||
id: channel_id.to_string(),
|
||||
user: user.id.clone(),
|
||||
message_id: channel_last_msg,
|
||||
}
|
||||
.private(user.id.clone())
|
||||
.await;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -190,7 +190,6 @@ impl From<crate::Channel> for Channel {
|
||||
role_permissions,
|
||||
nsfw,
|
||||
voice,
|
||||
slowmode,
|
||||
} => Channel::TextChannel {
|
||||
id,
|
||||
server,
|
||||
@@ -202,7 +201,6 @@ impl From<crate::Channel> for Channel {
|
||||
role_permissions,
|
||||
nsfw,
|
||||
voice: voice.map(|voice| voice.into()),
|
||||
slowmode,
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -256,7 +254,6 @@ impl From<Channel> for crate::Channel {
|
||||
role_permissions,
|
||||
nsfw,
|
||||
voice,
|
||||
slowmode,
|
||||
} => crate::Channel::TextChannel {
|
||||
id,
|
||||
server,
|
||||
@@ -268,7 +265,6 @@ impl From<Channel> for crate::Channel {
|
||||
role_permissions,
|
||||
nsfw,
|
||||
voice: voice.map(|voice| voice.into()),
|
||||
slowmode,
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -287,8 +283,7 @@ impl From<crate::PartialChannel> for PartialChannel {
|
||||
role_permissions: value.role_permissions,
|
||||
default_permissions: value.default_permissions,
|
||||
last_message_id: value.last_message_id,
|
||||
voice: value.voice.map(|voice| voice.into()),
|
||||
slowmode: value.slowmode,
|
||||
voice: value.voice.map(|voice| voice.into())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -306,8 +301,7 @@ impl From<PartialChannel> for crate::PartialChannel {
|
||||
role_permissions: value.role_permissions,
|
||||
default_permissions: value.default_permissions,
|
||||
last_message_id: value.last_message_id,
|
||||
voice: value.voice.map(|voice| voice.into()),
|
||||
slowmode: value.slowmode,
|
||||
voice: value.voice.map(|voice| voice.into())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -412,16 +406,9 @@ impl From<crate::Metadata> for Metadata {
|
||||
match value {
|
||||
crate::Metadata::File => Metadata::File,
|
||||
crate::Metadata::Text => Metadata::Text,
|
||||
crate::Metadata::Image {
|
||||
width,
|
||||
height,
|
||||
thumbhash,
|
||||
animated,
|
||||
} => Metadata::Image {
|
||||
crate::Metadata::Image { width, height } => Metadata::Image {
|
||||
width: width as usize,
|
||||
height: height as usize,
|
||||
thumbhash,
|
||||
animated,
|
||||
},
|
||||
crate::Metadata::Video { width, height } => Metadata::Video {
|
||||
width: width as usize,
|
||||
@@ -437,16 +424,9 @@ impl From<Metadata> for crate::Metadata {
|
||||
match value {
|
||||
Metadata::File => crate::Metadata::File,
|
||||
Metadata::Text => crate::Metadata::Text,
|
||||
Metadata::Image {
|
||||
width,
|
||||
height,
|
||||
thumbhash,
|
||||
animated,
|
||||
} => crate::Metadata::Image {
|
||||
Metadata::Image { width, height } => crate::Metadata::Image {
|
||||
width: width as isize,
|
||||
height: height as isize,
|
||||
thumbhash,
|
||||
animated,
|
||||
},
|
||||
Metadata::Video { width, height } => crate::Metadata::Video {
|
||||
width: width as isize,
|
||||
@@ -535,9 +515,7 @@ impl From<crate::SystemMessage> for SystemMessage {
|
||||
crate::SystemMessage::UserRemove { id, by } => Self::UserRemove { id, by },
|
||||
crate::SystemMessage::MessagePinned { id, by } => Self::MessagePinned { id, by },
|
||||
crate::SystemMessage::MessageUnpinned { id, by } => Self::MessageUnpinned { id, by },
|
||||
crate::SystemMessage::CallStarted { by, finished_at } => {
|
||||
Self::CallStarted { by, finished_at }
|
||||
}
|
||||
crate::SystemMessage::CallStarted { by, finished_at } => Self::CallStarted { by, finished_at }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -926,7 +904,6 @@ impl From<crate::Role> for Role {
|
||||
colour: value.colour,
|
||||
hoist: value.hoist,
|
||||
rank: value.rank,
|
||||
icon: value.icon.map(|f| f.into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -940,7 +917,6 @@ impl From<Role> for crate::Role {
|
||||
colour: value.colour,
|
||||
hoist: value.hoist,
|
||||
rank: value.rank,
|
||||
icon: value.icon.map(|f| f.into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -954,7 +930,6 @@ impl From<crate::PartialRole> for PartialRole {
|
||||
colour: value.colour,
|
||||
hoist: value.hoist,
|
||||
rank: value.rank,
|
||||
icon: value.icon.map(|f| f.into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -968,7 +943,6 @@ impl From<PartialRole> for crate::PartialRole {
|
||||
colour: value.colour,
|
||||
hoist: value.hoist,
|
||||
rank: value.rank,
|
||||
icon: value.icon.map(|f| f.into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -977,7 +951,6 @@ impl From<crate::FieldsRole> for FieldsRole {
|
||||
fn from(value: crate::FieldsRole) -> Self {
|
||||
match value {
|
||||
crate::FieldsRole::Colour => FieldsRole::Colour,
|
||||
crate::FieldsRole::Icon => FieldsRole::Icon,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -986,7 +959,6 @@ impl From<FieldsRole> for crate::FieldsRole {
|
||||
fn from(value: FieldsRole) -> Self {
|
||||
match value {
|
||||
FieldsRole::Colour => crate::FieldsRole::Colour,
|
||||
FieldsRole::Icon => crate::FieldsRole::Icon,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1410,7 +1382,7 @@ impl From<FieldsMessage> for crate::FieldsMessage {
|
||||
impl From<VoiceInformation> for crate::VoiceInformation {
|
||||
fn from(value: VoiceInformation) -> Self {
|
||||
crate::VoiceInformation {
|
||||
max_users: value.max_users,
|
||||
max_users: value.max_users
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1418,7 +1390,7 @@ impl From<VoiceInformation> for crate::VoiceInformation {
|
||||
impl From<crate::VoiceInformation> for VoiceInformation {
|
||||
fn from(value: crate::VoiceInformation) -> Self {
|
||||
VoiceInformation {
|
||||
max_users: value.max_users,
|
||||
max_users: value.max_users
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
pub mod acker;
|
||||
pub mod bridge;
|
||||
pub mod bulk_permissions;
|
||||
mod funcs;
|
||||
@@ -6,5 +5,6 @@ pub mod idempotency;
|
||||
pub mod permissions;
|
||||
pub mod reference;
|
||||
pub mod test_fixtures;
|
||||
pub mod rabbit;
|
||||
|
||||
pub use funcs::*;
|
||||
|
||||
48
crates/core/database/src/util/rabbit.rs
Normal file
48
crates/core/database/src/util/rabbit.rs
Normal file
@@ -0,0 +1,48 @@
|
||||
use amqprs::{channel::Channel, connection::Connection};
|
||||
use once_cell::sync::OnceCell;
|
||||
use std::{
|
||||
collections::HashMap, future::ready, sync::{LazyLock, RwLock}, thread::{ThreadId, current}
|
||||
};
|
||||
|
||||
static RABBIT_CONNECTION: OnceCell<Connection> = OnceCell::new();
|
||||
static RABBIT_CHANNELS: LazyLock<RwLock<HashMap<ThreadId, Channel>>> =
|
||||
LazyLock::new(|| RwLock::new(HashMap::new()));
|
||||
|
||||
pub async fn get_channel_with_init<F: AsyncFnOnce(Channel) -> Channel>(init: F) -> Channel {
|
||||
let conn = RABBIT_CONNECTION
|
||||
.get()
|
||||
.expect("Rabbit connection is not initialised.");
|
||||
|
||||
let thread_id = current().id();
|
||||
|
||||
let channel = RABBIT_CHANNELS
|
||||
.read()
|
||||
.expect("Channels poisioned")
|
||||
.get(&thread_id)
|
||||
.cloned();
|
||||
|
||||
if let Some(channel) = channel {
|
||||
channel
|
||||
} else {
|
||||
let mut channel =
|
||||
conn.open_channel(None)
|
||||
.await
|
||||
.expect("Failed to open rabbitmq channel");
|
||||
|
||||
channel = init(channel).await;
|
||||
|
||||
RABBIT_CHANNELS
|
||||
.write()
|
||||
.expect("Channels poisioned")
|
||||
.insert(thread_id, channel.clone());
|
||||
channel
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_channel() -> Channel {
|
||||
get_channel_with_init(ready).await
|
||||
}
|
||||
|
||||
pub fn set_rabbitmq_connection(connection: Connection) -> bool {
|
||||
RABBIT_CONNECTION.set(connection).is_ok()
|
||||
}
|
||||
@@ -1,5 +1,3 @@
|
||||
use std::fmt::{Display, Write};
|
||||
|
||||
use crate::{
|
||||
events::client::EventV1,
|
||||
models::{Channel, User},
|
||||
@@ -8,11 +6,7 @@ use crate::{
|
||||
};
|
||||
use iso8601_timestamp::{Duration, Timestamp};
|
||||
use livekit_protocol::ParticipantPermission;
|
||||
use redis_kiss::{
|
||||
get_connection as _get_connection,
|
||||
redis::{FromRedisValue, Pipeline, RedisError, RedisWrite, ToRedisArgs, Value},
|
||||
AsyncCommands, Conn,
|
||||
};
|
||||
use redis_kiss::{get_connection as _get_connection, redis::Pipeline, AsyncCommands, Conn};
|
||||
use revolt_config::FeaturesLimits;
|
||||
use revolt_models::v0::{self, PartialUserVoiceState, UserVoiceState};
|
||||
use revolt_permissions::{calculate_channel_permissions, ChannelPermission, PermissionValue};
|
||||
@@ -27,13 +21,13 @@ async fn get_connection() -> Result<Conn> {
|
||||
.map_err(|_| create_error!(InternalError))
|
||||
}
|
||||
|
||||
pub async fn raise_if_in_voice(user: &User, channel: &UserVoiceChannel) -> Result<()> {
|
||||
pub async fn raise_if_in_voice(user: &User, channel_id: &str) -> Result<()> {
|
||||
let mut conn = get_connection().await?;
|
||||
|
||||
if user.bot.is_some() {
|
||||
// bots can be in as many voice channels as it wants so we just check if its already connected to the one its trying to connect to
|
||||
if conn
|
||||
.sismember(format!("vc:{}", &user.id), channel)
|
||||
.sismember(format!("vc:{}", &user.id), channel_id)
|
||||
.await
|
||||
.to_internal_error()?
|
||||
{
|
||||
@@ -51,31 +45,31 @@ pub async fn raise_if_in_voice(user: &User, channel: &UserVoiceChannel) -> Resul
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn set_channel_node(channel_id: &str, node: &str) -> Result<()> {
|
||||
pub async fn set_channel_node(channel: &str, node: &str) -> Result<()> {
|
||||
get_connection()
|
||||
.await?
|
||||
.set(format!("node:{channel_id}"), node)
|
||||
.set(format!("node:{channel}"), node)
|
||||
.await
|
||||
.to_internal_error()
|
||||
}
|
||||
|
||||
pub async fn get_channel_node(channel_id: &str) -> Result<Option<String>> {
|
||||
pub async fn get_channel_node(channel: &str) -> Result<Option<String>> {
|
||||
get_connection()
|
||||
.await?
|
||||
.get(format!("node:{channel_id}"))
|
||||
.get(format!("node:{channel}"))
|
||||
.await
|
||||
.to_internal_error()
|
||||
}
|
||||
|
||||
pub async fn delete_channel_node(channel_id: &str) -> Result<()> {
|
||||
pub async fn delete_channel_node(channel: &str) -> Result<()> {
|
||||
get_connection()
|
||||
.await?
|
||||
.del(format!("node:{channel_id}"))
|
||||
.del(format!("node:{channel}"))
|
||||
.await
|
||||
.to_internal_error()
|
||||
}
|
||||
|
||||
pub async fn get_user_voice_channels(user_id: &str) -> Result<Vec<UserVoiceChannel>> {
|
||||
pub async fn get_user_voice_channels(user_id: &str) -> Result<Vec<String>> {
|
||||
get_connection()
|
||||
.await?
|
||||
.smembers(format!("vc:{user_id}"))
|
||||
@@ -84,14 +78,14 @@ pub async fn get_user_voice_channels(user_id: &str) -> Result<Vec<UserVoiceChann
|
||||
}
|
||||
|
||||
pub async fn set_user_moved_from_voice(
|
||||
old_channel_id: &str,
|
||||
new_channel: &UserVoiceChannel,
|
||||
old_channel: &str,
|
||||
new_channel: &str,
|
||||
user_id: &str,
|
||||
) -> Result<()> {
|
||||
get_connection()
|
||||
.await?
|
||||
.set_ex(
|
||||
format!("moved_from:{user_id}:{old_channel_id}"),
|
||||
format!("moved_from:{user_id}:{old_channel}"),
|
||||
new_channel,
|
||||
10,
|
||||
)
|
||||
@@ -108,25 +102,18 @@ pub async fn get_user_moved_from_voice(channel_id: &str, user_id: &str) -> Resul
|
||||
}
|
||||
|
||||
pub async fn set_user_moved_to_voice(
|
||||
new_channel_id: &str,
|
||||
old_channel: &UserVoiceChannel,
|
||||
new_channel: &str,
|
||||
old_channel: &str,
|
||||
user_id: &str,
|
||||
) -> Result<()> {
|
||||
get_connection()
|
||||
.await?
|
||||
.set_ex(
|
||||
format!("moved_to:{user_id}:{new_channel_id}"),
|
||||
old_channel,
|
||||
10,
|
||||
)
|
||||
.set_ex(format!("moved_to:{user_id}:{new_channel}"), old_channel, 10)
|
||||
.await
|
||||
.to_internal_error()
|
||||
}
|
||||
|
||||
pub async fn get_user_moved_to_voice(
|
||||
channel_id: &str,
|
||||
user_id: &str,
|
||||
) -> Result<Option<UserVoiceChannel>> {
|
||||
pub async fn get_user_moved_to_voice(channel_id: &str, user_id: &str) -> Result<Option<String>> {
|
||||
get_connection()
|
||||
.await?
|
||||
.get_del(format!("moved_to:{user_id}:{channel_id}"))
|
||||
@@ -134,10 +121,10 @@ pub async fn get_user_moved_to_voice(
|
||||
.to_internal_error()
|
||||
}
|
||||
|
||||
pub async fn is_in_voice_channel(user_id: &str, channel: &UserVoiceChannel) -> Result<bool> {
|
||||
pub async fn is_in_voice_channel(user_id: &str, channel_id: &str) -> Result<bool> {
|
||||
get_connection()
|
||||
.await?
|
||||
.sismember(format!("vc:{user_id}"), channel)
|
||||
.sismember(format!("vc:{user_id}"), channel_id)
|
||||
.await
|
||||
.to_internal_error()
|
||||
}
|
||||
@@ -171,15 +158,12 @@ pub fn get_allowed_sources(
|
||||
}
|
||||
|
||||
pub async fn create_voice_state(
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
user_id: &str,
|
||||
joined_at: Timestamp,
|
||||
) -> Result<UserVoiceState> {
|
||||
let unique_key = format!(
|
||||
"{}:{}",
|
||||
&user_id,
|
||||
channel.server_id.as_ref().unwrap_or(&channel.id)
|
||||
);
|
||||
let unique_key = format!("{}:{}", &user_id, server_id.unwrap_or(channel_id));
|
||||
|
||||
let voice_state = UserVoiceState {
|
||||
joined_at,
|
||||
@@ -191,9 +175,9 @@ pub async fn create_voice_state(
|
||||
};
|
||||
|
||||
Pipeline::new()
|
||||
.sadd(format!("vc_members:{}", &channel.id), user_id)
|
||||
.sadd(format!("vc:{user_id}"), channel)
|
||||
.set(&unique_key, &channel.id)
|
||||
.sadd(format!("vc_members:{channel_id}"), user_id)
|
||||
.sadd(format!("vc:{user_id}"), channel_id)
|
||||
.set(&unique_key, channel_id)
|
||||
.set(
|
||||
format!("joined_at:{unique_key}"),
|
||||
joined_at
|
||||
@@ -220,16 +204,16 @@ pub async fn create_voice_state(
|
||||
Ok(voice_state)
|
||||
}
|
||||
|
||||
pub async fn delete_voice_state(channel: &UserVoiceChannel, user_id: &str) -> Result<()> {
|
||||
let unique_key = format!(
|
||||
"{}:{}",
|
||||
&user_id,
|
||||
channel.server_id.as_ref().unwrap_or(&channel.id)
|
||||
);
|
||||
pub async fn delete_voice_state(
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
user_id: &str,
|
||||
) -> Result<()> {
|
||||
let unique_key = format!("{}:{}", &user_id, server_id.unwrap_or(channel_id));
|
||||
|
||||
Pipeline::new()
|
||||
.srem(format!("vc_members:{}", &channel.id), user_id)
|
||||
.srem(format!("vc:{user_id}"), channel)
|
||||
.srem(format!("vc_members:{channel_id}"), user_id)
|
||||
.srem(format!("vc:{user_id}"), channel_id)
|
||||
.del(&[
|
||||
format!("joined_at:{unique_key}"),
|
||||
format!("is_publishing:{unique_key}"),
|
||||
@@ -244,19 +228,20 @@ pub async fn delete_voice_state(channel: &UserVoiceChannel, user_id: &str) -> Re
|
||||
}
|
||||
|
||||
pub async fn delete_channel_voice_state(
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
user_ids: &[String],
|
||||
) -> Result<()> {
|
||||
let parent_id = channel.server_id.as_ref().unwrap_or(&channel.id);
|
||||
let parent_id = server_id.unwrap_or(channel_id);
|
||||
|
||||
let mut pipeline = Pipeline::new();
|
||||
pipeline.del(format!("vc_members:{}", &channel.id));
|
||||
pipeline.del(format!("node:{}", &channel.id));
|
||||
pipeline.del(format!("vc_members:{channel_id}"));
|
||||
pipeline.del(format!("node:{channel_id}"));
|
||||
|
||||
for user_id in user_ids {
|
||||
let unique_key = format!("{user_id}:{parent_id}");
|
||||
|
||||
pipeline.srem(format!("vc:{user_id}"), channel).del(&[
|
||||
pipeline.srem(format!("vc:{user_id}"), channel_id).del(&[
|
||||
format!("joined_at:{unique_key}"),
|
||||
format!("is_publishing:{unique_key}"),
|
||||
format!("is_receiving:{unique_key}"),
|
||||
@@ -273,7 +258,8 @@ pub async fn delete_channel_voice_state(
|
||||
}
|
||||
|
||||
pub async fn update_voice_state_tracks(
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
user_id: &str,
|
||||
added: bool,
|
||||
track: i32,
|
||||
@@ -298,21 +284,18 @@ pub async fn update_voice_state_tracks(
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
update_voice_state(channel, user_id, &partial).await?;
|
||||
update_voice_state(channel_id, server_id, user_id, &partial).await?;
|
||||
|
||||
Ok(partial)
|
||||
}
|
||||
|
||||
pub async fn update_voice_state(
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
user_id: &str,
|
||||
partial: &PartialUserVoiceState,
|
||||
) -> Result<()> {
|
||||
let unique_key = format!(
|
||||
"{}:{}",
|
||||
&user_id,
|
||||
channel.server_id.as_ref().unwrap_or(&channel.id)
|
||||
);
|
||||
let unique_key = format!("{}:{}", &user_id, server_id.unwrap_or(channel_id));
|
||||
|
||||
let mut pipeline = Pipeline::new();
|
||||
|
||||
@@ -338,24 +321,21 @@ pub async fn update_voice_state(
|
||||
.to_internal_error()
|
||||
}
|
||||
|
||||
pub async fn get_voice_channel_members(channel: &UserVoiceChannel) -> Result<Option<Vec<String>>> {
|
||||
pub async fn get_voice_channel_members(channel_id: &str) -> Result<Option<Vec<String>>> {
|
||||
get_connection()
|
||||
.await?
|
||||
.smembers::<_, Option<Vec<String>>>(format!("vc_members:{}", &channel.id))
|
||||
.smembers::<_, Option<Vec<String>>>(format!("vc_members:{channel_id}"))
|
||||
.await
|
||||
.to_internal_error()
|
||||
.map(|opt| opt.and_then(|v| if v.is_empty() { None } else { Some(v) }))
|
||||
}
|
||||
|
||||
pub async fn get_voice_state(
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
user_id: &str,
|
||||
) -> Result<Option<UserVoiceState>> {
|
||||
let unique_key = format!(
|
||||
"{}:{}",
|
||||
&user_id,
|
||||
channel.server_id.as_ref().unwrap_or(&channel.id)
|
||||
);
|
||||
let unique_key = format!("{}:{}", user_id, server_id.unwrap_or(channel_id));
|
||||
|
||||
let (joined_at, is_publishing, is_receiving, screensharing, camera) = get_connection()
|
||||
.await?
|
||||
@@ -396,21 +376,21 @@ pub async fn get_voice_state(
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn get_channel_voice_state(
|
||||
channel: &UserVoiceChannel,
|
||||
) -> Result<Option<v0::ChannelVoiceState>> {
|
||||
let members = get_voice_channel_members(channel).await?;
|
||||
pub async fn get_channel_voice_state(channel: &Channel) -> Result<Option<v0::ChannelVoiceState>> {
|
||||
let members = get_voice_channel_members(channel.id()).await?;
|
||||
|
||||
let server = channel.server();
|
||||
|
||||
if let Some(members) = members {
|
||||
let mut participants = Vec::with_capacity(members.len());
|
||||
|
||||
for user_id in members {
|
||||
if let Some(voice_state) = get_voice_state(channel, &user_id).await? {
|
||||
if let Some(voice_state) = get_voice_state(channel.id(), server, &user_id).await? {
|
||||
participants.push(voice_state);
|
||||
} else {
|
||||
log::info!("Voice state not found but member in voice channel members, removing.");
|
||||
|
||||
delete_voice_state(channel, &user_id).await?;
|
||||
delete_voice_state(channel.id(), server, &user_id).await?;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -418,7 +398,7 @@ pub async fn get_channel_voice_state(
|
||||
participants.shrink_to_fit();
|
||||
|
||||
Ok(Some(v0::ChannelVoiceState {
|
||||
id: channel.id.clone(),
|
||||
id: channel.id().to_string(),
|
||||
participants,
|
||||
}))
|
||||
} else {
|
||||
@@ -426,12 +406,12 @@ pub async fn get_channel_voice_state(
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn move_user(user: &str, from_channel_id: &str, to_channel_id: &str) -> Result<()> {
|
||||
pub async fn move_user(user: &str, from: &str, to: &str) -> Result<()> {
|
||||
get_connection()
|
||||
.await?
|
||||
.smove(
|
||||
format!("vc_members:{from_channel_id}"),
|
||||
format!("vc_members:{to_channel_id}"),
|
||||
format!("vc-members-{from}"),
|
||||
format!("vc-members-{to}"),
|
||||
user,
|
||||
)
|
||||
.await
|
||||
@@ -445,13 +425,11 @@ pub async fn sync_voice_permissions(
|
||||
server: Option<&Server>,
|
||||
role_id: Option<&str>,
|
||||
) -> Result<()> {
|
||||
let user_voice_channel = UserVoiceChannel::from_channel(channel);
|
||||
|
||||
let Some(node) = get_channel_node(channel.id()).await? else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
for user_id in get_voice_channel_members(&user_voice_channel)
|
||||
for user_id in get_voice_channel_members(channel.id())
|
||||
.await?
|
||||
.iter()
|
||||
.flatten()
|
||||
@@ -491,9 +469,7 @@ pub async fn sync_user_voice_permissions(
|
||||
.as_ref()
|
||||
.is_none_or(|member| member.roles.iter().any(|r| r == role_id))
|
||||
}) {
|
||||
let user_voice_channel = UserVoiceChannel::from_channel(channel);
|
||||
|
||||
let Some(voice_state) = get_voice_state(&user_voice_channel, &user.id).await? else {
|
||||
let Some(voice_state) = get_voice_state(channel_id, server_id, &user.id).await? else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
@@ -524,7 +500,7 @@ pub async fn sync_user_voice_permissions(
|
||||
update_event.screensharing = voice_state.screensharing.then_some(can_video);
|
||||
update_event.is_publishing = voice_state.is_publishing.then_some(can_speak);
|
||||
|
||||
update_voice_state(&user_voice_channel, &user.id, &update_event).await?;
|
||||
update_voice_state(channel_id, server_id, &user.id, &update_event).await?;
|
||||
|
||||
voice_client
|
||||
.update_permissions(
|
||||
@@ -603,94 +579,46 @@ pub async fn get_call_notification_recipients(
|
||||
}
|
||||
|
||||
pub async fn remove_user_from_voice_channels(
|
||||
db: &Database,
|
||||
voice_client: &VoiceClient,
|
||||
user_id: &str,
|
||||
) -> Result<()> {
|
||||
for channel in get_user_voice_channels(user_id).await? {
|
||||
remove_user_from_voice_channel(voice_client, &channel, user_id).await?;
|
||||
for channel_id in get_user_voice_channels(user_id).await? {
|
||||
remove_user_from_voice_channel(db, voice_client, &channel_id, user_id).await?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn remove_user_from_voice_channel(
|
||||
db: &Database,
|
||||
voice_client: &VoiceClient,
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
user_id: &str,
|
||||
) -> Result<()> {
|
||||
if let Some(node) = get_channel_node(&channel.id).await? {
|
||||
let _ = voice_client.remove_user(&node, user_id, &channel.id).await;
|
||||
if let Some(node) = get_channel_node(channel_id).await? {
|
||||
let _ = voice_client.remove_user(&node, user_id, channel_id).await;
|
||||
}
|
||||
|
||||
delete_voice_state(channel, user_id).await?;
|
||||
let channel = Reference::from_unchecked(channel_id).as_channel(db).await?;
|
||||
|
||||
delete_voice_state(channel_id, channel.server(), user_id).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn delete_voice_channel(
|
||||
voice_client: &VoiceClient,
|
||||
channel: &UserVoiceChannel,
|
||||
channel_id: &str,
|
||||
server_id: Option<&str>,
|
||||
) -> Result<()> {
|
||||
if let Some(users) = get_voice_channel_members(channel).await? {
|
||||
let node = get_channel_node(&channel.id).await?.unwrap();
|
||||
voice_client.delete_room(&node, &channel.id).await?;
|
||||
if let Some(users) = get_voice_channel_members(channel_id).await? {
|
||||
let node = get_channel_node(channel_id).await?.unwrap();
|
||||
|
||||
delete_channel_voice_state(channel, &users).await?;
|
||||
voice_client.delete_room(&node, channel_id).await?;
|
||||
|
||||
delete_channel_voice_state(channel_id, server_id, &users).await?;
|
||||
};
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub struct RoomMetadata {
|
||||
pub server: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct UserVoiceChannel {
|
||||
pub id: String,
|
||||
pub server_id: Option<String>,
|
||||
}
|
||||
|
||||
impl UserVoiceChannel {
|
||||
pub fn from_string(input: String) -> Self {
|
||||
let mut parts = input.splitn(2, '-');
|
||||
|
||||
Self {
|
||||
id: parts.next().unwrap().to_string(),
|
||||
server_id: parts.next().map(ToString::to_string),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_channel(channel: &Channel) -> Self {
|
||||
Self {
|
||||
id: channel.id().to_string(),
|
||||
server_id: channel.server().map(ToString::to_string),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for UserVoiceChannel {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.write_str(&self.id)?;
|
||||
|
||||
if let Some(server_id) = &self.server_id {
|
||||
f.write_char('-')?;
|
||||
f.write_str(server_id)?
|
||||
};
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl ToRedisArgs for UserVoiceChannel {
|
||||
fn write_redis_args<W: ?Sized + RedisWrite>(&self, out: &mut W) {
|
||||
out.write_arg_fmt(self);
|
||||
}
|
||||
}
|
||||
|
||||
impl FromRedisValue for UserVoiceChannel {
|
||||
fn from_redis_value(v: &Value) -> Result<Self, RedisError> {
|
||||
String::from_redis_value(v).map(UserVoiceChannel::from_string)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use crate::{
|
||||
models::{Channel, User},
|
||||
voice::RoomMetadata,
|
||||
Database,
|
||||
};
|
||||
use livekit_api::{
|
||||
@@ -103,16 +102,11 @@ impl VoiceClient {
|
||||
pub async fn create_room(&self, node: &str, channel: &Channel) -> Result<Room> {
|
||||
let room = self.get_node(node)?;
|
||||
|
||||
let metadata = RoomMetadata {
|
||||
server: channel.server().map(|id| id.to_string()),
|
||||
};
|
||||
|
||||
room.client
|
||||
.create_room(
|
||||
channel.id(),
|
||||
CreateRoomOptions {
|
||||
empty_timeout: 5 * 60, // 5 minutes,
|
||||
metadata: serde_json::to_string(&metadata).to_internal_error()?,
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
|
||||
@@ -6,4 +6,4 @@ This email is intended for {{email}}
|
||||
|
||||
This email has no association with Stoat or Revolt Platforms Ltd.
|
||||
Learn more about third party instances here:
|
||||
https://developers.stoat.chat/faq/
|
||||
https://developers.stoat.chat/faq.html
|
||||
|
||||
@@ -6,4 +6,4 @@ This email is intended for {{email}}
|
||||
|
||||
This email has no association with Stoat or Revolt Platforms Ltd.
|
||||
Learn more about third party instances here:
|
||||
https://developers.stoat.chat/faq/
|
||||
https://developers.revolt.chat/faq.html
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
|
||||
Further violations may result in a permanent ban depending on
|
||||
severity, please abide by the
|
||||
<a href="https://stoat.chat/legal/community-guidelines" style="color: #0d6efd;">Community Guidelines</a>.
|
||||
<a href="https://revolt.chat/aup" style="color: #0d6efd;">Acceptable Usage Policy</a>.
|
||||
</p>
|
||||
<table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||
<tbody>
|
||||
|
||||
@@ -3,7 +3,7 @@ Your account has been suspended, for one or more reasons:
|
||||
|
||||
You will be able to use your account again in {{duration}} days.
|
||||
|
||||
Further violations may result in a permanent ban depending on severity, please abide by the Community Guidelines (https://stoat.chat/legal/community-guidelines).
|
||||
Further violations may result in a permanent ban depending on severity, please abide by the Acceptable Usage Policy (https://revolt.chat/aup).
|
||||
|
||||
Ban evasion is prohibited and will be dealt with accordingly.
|
||||
|
||||
|
||||
@@ -3,6 +3,6 @@ Your account has been suspended, for one or more reasons:
|
||||
|
||||
This email is intended for {{email}}
|
||||
|
||||
This email has no association with Stoat or Revolt Platforms Ltd.
|
||||
This email has no association with Revolt or Revolt Platforms Ltd.
|
||||
Learn more about third party instances here:
|
||||
https://developers.stoat.chat/faq/
|
||||
https://developers.revolt.chat/faq.html
|
||||
|
||||
@@ -7,4 +7,4 @@ This email is intended for {{email}}
|
||||
|
||||
This email has no association with Stoat or Revolt Platforms Ltd.
|
||||
Learn more about third party instances here:
|
||||
https://developers.stoat.chat/faq/
|
||||
https://developers.revolt.chat/faq.html
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-files"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "AGPL-3.0-or-later"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -16,33 +16,33 @@ tracing = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
async-trait = { workspace = true }
|
||||
|
||||
ffprobe = { workspace = true }
|
||||
imagesize = { workspace = true }
|
||||
tempfile = { workspace = true }
|
||||
ffprobe = "0.4.0"
|
||||
imagesize = "0.13.0"
|
||||
tempfile = "3.12.0"
|
||||
|
||||
base64 = { workspace = true }
|
||||
aes-gcm = { workspace = true }
|
||||
typenum = { workspace = true }
|
||||
base64 = "0.22.1"
|
||||
aes-gcm = "0.10.3"
|
||||
typenum = "1.17.0"
|
||||
|
||||
aws-config = { workspace = true }
|
||||
aws-sdk-s3 = { workspace = true, features = ["behavior-version-latest"] }
|
||||
aws-config = "1.5.5"
|
||||
aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
|
||||
|
||||
revolt-config = { workspace = true, features = [
|
||||
revolt-config = { version = "0.11.5", path = "../config", features = [
|
||||
"report-macros",
|
||||
] }
|
||||
revolt-result = { workspace = true }
|
||||
revolt-result = { version = "0.11.5", path = "../result" }
|
||||
|
||||
# image processing
|
||||
jxl-oxide = { workspace = true, features = ["image"] }
|
||||
jxl-oxide = { workspace = true }
|
||||
image = { workspace = true }
|
||||
|
||||
# svg rendering
|
||||
usvg = { workspace = true }
|
||||
resvg = { workspace = true }
|
||||
tiny-skia = { workspace = true }
|
||||
usvg = "0.44.0"
|
||||
resvg = "0.44.0"
|
||||
tiny-skia = "0.11.4"
|
||||
|
||||
# encoding
|
||||
webp = { workspace = true }
|
||||
webp = "0.3.0"
|
||||
|
||||
[dev-dependencies]
|
||||
uuid = { workspace = true, features = ["v4"] }
|
||||
uuid = { workspace = true }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use anyhow::Result;
|
||||
use image::{AnimationDecoder, DynamicImage, ImageBuffer, ImageReader};
|
||||
use image::{DynamicImage, ImageBuffer, ImageReader};
|
||||
use jxl_oxide::integration::JxlDecoder;
|
||||
use revolt_config::report_internal_error;
|
||||
use std::io::{BufRead, Read, Seek};
|
||||
@@ -35,31 +35,6 @@ impl MediaRepository for MediaImpl {
|
||||
}
|
||||
}
|
||||
|
||||
fn is_animated(&self, f: &NamedTempFile, mime: &str) -> Option<bool> {
|
||||
match mime {
|
||||
// Current behaviour is to assume GIFs are animated, this checks for at least 2 frames
|
||||
"image/gif" => {
|
||||
let file = std::fs::File::open(f.path()).ok()?;
|
||||
let reader = std::io::BufReader::new(file);
|
||||
let decoder = image::codecs::gif::GifDecoder::new(reader).ok()?;
|
||||
Some(decoder.into_frames().take(2).count() > 1)
|
||||
}
|
||||
"image/png" => {
|
||||
let file = std::fs::File::open(f.path()).ok()?;
|
||||
let reader = std::io::BufReader::new(file);
|
||||
let decoder = image::codecs::png::PngDecoder::new(reader).ok()?;
|
||||
decoder.is_apng().ok()
|
||||
}
|
||||
"image/webp" => {
|
||||
let file = std::fs::File::open(f.path()).ok()?;
|
||||
let reader = std::io::BufReader::new(file);
|
||||
let decoder = image::codecs::webp::WebPDecoder::new(reader).ok()?;
|
||||
Some(decoder.has_animation())
|
||||
}
|
||||
_ => Some(false),
|
||||
}
|
||||
}
|
||||
|
||||
fn image_size_vec(&self, v: &[u8], mime: &str) -> Option<(usize, usize)> {
|
||||
match mime {
|
||||
"image/svg+xml" => {
|
||||
@@ -196,9 +171,9 @@ impl MediaRepository for MediaImpl {
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::io::Cursor;
|
||||
|
||||
use crate::{MediaImpl, MediaRepository};
|
||||
use std::io::{Cursor, Write};
|
||||
use tempfile::NamedTempFile;
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_jpeg() {
|
||||
@@ -211,15 +186,6 @@ mod tests {
|
||||
media.create_thumbnail(image, "attachments");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_jpeg_is_not_animated() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
f.write_all(include_bytes!("../../tests/assets/test.jpeg"))
|
||||
.unwrap();
|
||||
assert_eq!(media.is_animated(&f, "image/jpeg"), Some(false));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_jpeg_extra_bytes() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
@@ -246,15 +212,6 @@ mod tests {
|
||||
media.create_thumbnail(image, "emojis");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_png_is_not_animated() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
f.write_all(include_bytes!("../../tests/assets/test.png"))
|
||||
.unwrap();
|
||||
assert_eq!(media.is_animated(&f, "image/png"), Some(false));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_png_extra_bytes() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
@@ -302,15 +259,6 @@ mod tests {
|
||||
media.create_thumbnail(image, "attachments");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_animated_png_is_animated() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
f.write_all(include_bytes!("../../tests/assets/anim-icos.apng"))
|
||||
.unwrap();
|
||||
assert_eq!(media.is_animated(&f, "image/png"), Some(true));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_jxl() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
@@ -344,15 +292,6 @@ mod tests {
|
||||
media.create_thumbnail(image, "attachments");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_webp_is_not_animated() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
f.write_all(include_bytes!("../../tests/assets/dice.webp"))
|
||||
.unwrap();
|
||||
assert_eq!(media.is_animated(&f, "image/webp"), Some(false));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_animated_webp() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
@@ -364,15 +303,6 @@ mod tests {
|
||||
media.create_thumbnail(image, "attachments");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_animated_webp_is_animated() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
f.write_all(include_bytes!("../../tests/assets/anim-icos.webp"))
|
||||
.unwrap();
|
||||
assert_eq!(media.is_animated(&f, "image/webp"), Some(true));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_animated_gif() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
@@ -383,13 +313,4 @@ mod tests {
|
||||
let image = media.decode_image(&mut reader, "image/gif").unwrap();
|
||||
media.create_thumbnail(image, "attachments");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn asset_test_animated_gif_is_animated() {
|
||||
let media = MediaImpl::from_config().await;
|
||||
let mut f = NamedTempFile::new().unwrap();
|
||||
f.write_all(include_bytes!("../../tests/assets/anim-icos.gif"))
|
||||
.unwrap();
|
||||
assert_eq!(media.is_animated(&f, "image/gif"), Some(true));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,34 +91,6 @@ pub fn image_size_vec(v: &[u8], mime: &str) -> Option<(usize, usize)> {
|
||||
media.image_size_vec(v, mime)
|
||||
}
|
||||
|
||||
/// Check whether an image file contains animation data
|
||||
pub fn is_animated(f: &NamedTempFile, mime: &str) -> Option<bool> {
|
||||
let media = MediaImpl::new(Files {
|
||||
blocked_mime_types: Default::default(),
|
||||
clamd_host: Default::default(),
|
||||
encryption_key: Default::default(),
|
||||
limit: FilesLimit {
|
||||
max_mega_pixels: 0,
|
||||
max_pixel_side: 0,
|
||||
min_file_size: 0,
|
||||
min_resolution: [0, 0],
|
||||
},
|
||||
preview: Default::default(),
|
||||
s3: FilesS3 {
|
||||
access_key_id: Default::default(),
|
||||
default_bucket: Default::default(),
|
||||
endpoint: Default::default(),
|
||||
path_style_buckets: Default::default(),
|
||||
region: Default::default(),
|
||||
secret_access_key: Default::default(),
|
||||
},
|
||||
scan_mime_types: Default::default(),
|
||||
webp_quality: Default::default(),
|
||||
});
|
||||
|
||||
media.is_animated(f, mime)
|
||||
}
|
||||
|
||||
/// Determine size of video at temp file
|
||||
pub fn video_size(f: &NamedTempFile) -> Option<(i64, i64)> {
|
||||
let media = MediaImpl::new(Files {
|
||||
|
||||
@@ -6,9 +6,6 @@ use thiserror::Error;
|
||||
|
||||
pub trait MediaRepository: Send + Sync + 'static {
|
||||
fn image_size(&self, f: &NamedTempFile) -> Option<(usize, usize)>;
|
||||
|
||||
fn is_animated(&self, f: &NamedTempFile, mime: &str) -> Option<bool>;
|
||||
|
||||
fn image_size_vec(&self, v: &[u8], mime: &str) -> Option<(usize, usize)>;
|
||||
|
||||
fn decode_image<R: Read + BufRead + Seek>(
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-models"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -21,26 +21,26 @@ default = ["serde", "partials", "rocket"]
|
||||
|
||||
[dependencies]
|
||||
# Core
|
||||
revolt-config = { workspace = true }
|
||||
revolt-permissions = { workspace = true }
|
||||
revolt-config = { version = "0.11.5", path = "../config" }
|
||||
revolt-permissions = { version = "0.11.5", path = "../permissions" }
|
||||
|
||||
# Utility
|
||||
regex = { workspace = true }
|
||||
indexmap = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
num_enum = { workspace = true }
|
||||
regex = "1.11"
|
||||
indexmap = "1.9.3"
|
||||
once_cell = "1.17.1"
|
||||
num_enum = "0.6.1"
|
||||
|
||||
# Rocket
|
||||
rocket = { workspace = true, optional = true }
|
||||
rocket = { optional = true, version = "0.5.0-rc.2", default-features = false }
|
||||
|
||||
# Serialisation
|
||||
revolt_optional_struct = { workspace = true, optional = true }
|
||||
serde = { workspace = true, optional = true }
|
||||
iso8601-timestamp = { workspace = true, features = ["schema", "bson"] }
|
||||
revolt_optional_struct = { version = "0.2.0", optional = true }
|
||||
serde = { version = "1", features = ["derive"], optional = true }
|
||||
iso8601-timestamp = { version = "0.2.11", features = ["schema", "bson"] }
|
||||
|
||||
# Spec Generation
|
||||
schemars = { workspace = true, features = ["indexmap2"], optional = true }
|
||||
utoipa = { workspace = true, optional = true }
|
||||
schemars = { version = "0.8.8", optional = true, features = ["indexmap1"] }
|
||||
utoipa = { version = "4.2.3", optional = true }
|
||||
|
||||
# Validation
|
||||
validator = { workspace = true, features = ["derive"], optional = true }
|
||||
validator = { version = "0.16.0", optional = true, features = ["derive"] }
|
||||
|
||||
@@ -112,10 +112,6 @@ auto_derived!(
|
||||
/// Voice Information for when this channel is also a voice channel
|
||||
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
|
||||
voice: Option<VoiceInformation>,
|
||||
|
||||
/// The channel's slowmode delay in seconds
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
slowmode: Option<u64>,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -154,8 +150,6 @@ auto_derived!(
|
||||
pub last_message_id: Option<String>,
|
||||
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
|
||||
pub voice: Option<VoiceInformation>,
|
||||
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
|
||||
pub slowmode: Option<u64>,
|
||||
}
|
||||
|
||||
/// Optional fields on channel object
|
||||
@@ -195,10 +189,6 @@ auto_derived!(
|
||||
/// Voice Information for voice channels
|
||||
pub voice: Option<VoiceInformation>,
|
||||
|
||||
/// The channel's slow mode delay in seconds, up to 6 hours
|
||||
#[cfg_attr(feature = "validator", validate(range(min = 0, max = 21600)))]
|
||||
pub slowmode: Option<u64>,
|
||||
|
||||
/// Fields to remove from channel
|
||||
#[cfg_attr(feature = "serde", serde(default))]
|
||||
pub remove: Vec<FieldsChannel>,
|
||||
|
||||
@@ -54,22 +54,4 @@ auto_derived!(
|
||||
#[serde(default)]
|
||||
pub nsfw: bool,
|
||||
}
|
||||
|
||||
/// Partial emoji representation
|
||||
#[derive(Default)]
|
||||
pub struct PartialEmoji {
|
||||
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
|
||||
pub name: Option<String>,
|
||||
}
|
||||
|
||||
/// Edit emoji information
|
||||
#[cfg_attr(feature = "validator", derive(Validate))]
|
||||
pub struct DataEditEmoji {
|
||||
/// Emoji name
|
||||
#[cfg_attr(
|
||||
feature = "validator",
|
||||
validate(length(min = 1, max = 32), regex = "RE_EMOJI")
|
||||
)]
|
||||
pub name: Option<String>,
|
||||
}
|
||||
);
|
||||
|
||||
@@ -46,13 +46,8 @@ auto_derived!(
|
||||
File,
|
||||
/// File contains textual data and should be displayed as such
|
||||
Text,
|
||||
/// File is an image with specific dimensions, and may be animated
|
||||
Image {
|
||||
width: usize,
|
||||
height: usize,
|
||||
thumbhash: Option<Vec<u8>>,
|
||||
animated: Option<bool>,
|
||||
},
|
||||
/// File is an image with specific dimensions
|
||||
Image { width: usize, height: usize },
|
||||
/// File is a video with specific dimensions
|
||||
Video { width: usize, height: usize },
|
||||
/// File is audio
|
||||
|
||||
@@ -133,10 +133,7 @@ auto_derived!(
|
||||
#[serde(rename = "message_unpinned")]
|
||||
MessageUnpinned { id: String, by: String },
|
||||
#[serde(rename = "call_started")]
|
||||
CallStarted {
|
||||
by: String,
|
||||
finished_at: Option<Timestamp>,
|
||||
},
|
||||
CallStarted { by: String, finished_at: Option<Timestamp> },
|
||||
}
|
||||
|
||||
/// Name and / or avatar override information
|
||||
@@ -204,9 +201,6 @@ auto_derived!(
|
||||
pub image: Option<String>,
|
||||
/// Message content or system message information
|
||||
pub body: String,
|
||||
/// The raw body, if the body has been rendered
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub raw_body: Option<String>,
|
||||
/// Unique tag, usually the channel ID
|
||||
pub tag: String,
|
||||
/// Timestamp at which this notification was created
|
||||
@@ -261,7 +255,7 @@ auto_derived!(
|
||||
pub nonce: Option<String>,
|
||||
|
||||
/// Message content to send
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 0)))]
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 0, max = 2000)))]
|
||||
pub content: Option<String>,
|
||||
/// Attachments to include in message
|
||||
pub attachments: Option<Vec<String>>,
|
||||
@@ -345,7 +339,7 @@ auto_derived!(
|
||||
#[cfg_attr(feature = "validator", derive(Validate))]
|
||||
pub struct DataEditMessage {
|
||||
/// New message content
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 1)))]
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 1, max = 2000)))]
|
||||
pub content: Option<String>,
|
||||
/// Embeds to include in the message
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 0, max = 10)))]
|
||||
@@ -391,7 +385,6 @@ auto_derived!(
|
||||
);
|
||||
|
||||
/// Message Author Abstraction
|
||||
#[derive(Clone)]
|
||||
pub enum MessageAuthor<'a> {
|
||||
User(&'a User),
|
||||
Webhook(&'a Webhook),
|
||||
@@ -515,7 +508,6 @@ impl PushNotification {
|
||||
icon,
|
||||
image,
|
||||
body,
|
||||
raw_body: None,
|
||||
tag: channel.id().to_string(),
|
||||
timestamp,
|
||||
url: format!("{}/channel/{}/{}", config.hosts.app, channel.id(), msg.id),
|
||||
|
||||
@@ -19,9 +19,6 @@ auto_derived!(
|
||||
/// Ban reason
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 0, max = 1024)))]
|
||||
pub reason: Option<String>,
|
||||
/// Messages to delete in seconds
|
||||
#[cfg_attr(feature = "validator", validate(range(min = 0, max = 604800)))]
|
||||
pub delete_message_seconds: Option<i64>,
|
||||
}
|
||||
|
||||
/// Just enough information to list a ban
|
||||
|
||||
@@ -106,9 +106,6 @@ auto_derived_partial!(
|
||||
/// Ranking of this role
|
||||
#[cfg_attr(feature = "serde", serde(default))]
|
||||
pub rank: i64,
|
||||
/// Role icon
|
||||
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
|
||||
pub icon: Option<File>,
|
||||
},
|
||||
"PartialRole"
|
||||
);
|
||||
@@ -126,7 +123,6 @@ auto_derived!(
|
||||
/// Optional fields on server object
|
||||
pub enum FieldsRole {
|
||||
Colour,
|
||||
Icon,
|
||||
}
|
||||
|
||||
/// Channel category
|
||||
@@ -256,9 +252,6 @@ auto_derived!(
|
||||
/// Must be enabled in order to show up on [Revolt Discover](https://rvlt.gg).
|
||||
pub analytics: Option<bool>,
|
||||
|
||||
/// User id of the new owner
|
||||
pub owner: Option<String>,
|
||||
|
||||
/// Fields to remove from server object
|
||||
#[cfg_attr(feature = "serde", serde(default))]
|
||||
pub remove: Vec<FieldsServer>,
|
||||
@@ -282,11 +275,6 @@ auto_derived!(
|
||||
///
|
||||
/// **Removed** - no effect, use the edit server role positions route
|
||||
pub rank: Option<i64>,
|
||||
/// Role icon
|
||||
///
|
||||
/// Provide an Autumn attachment Id.
|
||||
#[cfg_attr(feature = "validator", validate(length(min = 1, max = 128)))]
|
||||
pub icon: Option<String>,
|
||||
/// Fields to remove from role object
|
||||
#[cfg_attr(feature = "serde", serde(default))]
|
||||
pub remove: Vec<FieldsRole>,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-parser"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Zomatree <me@zomatree.live>", "Paul Makles <me@insrt.uk>"]
|
||||
@@ -8,4 +8,4 @@ description = "Revolt Backend: Message Parser"
|
||||
repository = "https://github.com/stoatchat/stoatchat"
|
||||
|
||||
[dependencies]
|
||||
logos = { workspace = true }
|
||||
logos = { version = "0.15" }
|
||||
|
||||
@@ -16,29 +16,23 @@ pub enum MessageToken<'a> {
|
||||
UserMention(&'a str),
|
||||
#[regex("<%(?&id)>", |lex| &lex.slice()[2..lex.slice().len() - 1],)]
|
||||
RoleMention(&'a str),
|
||||
#[regex("<#(?&id)>", |lex| &lex.slice()[2..lex.slice().len() - 1],)]
|
||||
ChannelMention(&'a str),
|
||||
#[regex(":(?&id):", |lex| &lex.slice()[1..lex.slice().len() - 1],)]
|
||||
Emoji(&'a str),
|
||||
#[token("@everyone")]
|
||||
MentionEveryone,
|
||||
#[token("@online")]
|
||||
MentionOnline,
|
||||
MentionOnline
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Default)]
|
||||
pub struct MessageResults {
|
||||
pub user_mentions: HashSet<String>,
|
||||
pub role_mentions: HashSet<String>,
|
||||
pub channel_mentions: HashSet<String>,
|
||||
pub emojis: HashSet<String>,
|
||||
pub mentions_everyone: bool,
|
||||
pub mentions_online: bool,
|
||||
pub mentions_online: bool
|
||||
}
|
||||
|
||||
struct MessageParserIterator<'a, I> {
|
||||
inner: I,
|
||||
temp: VecDeque<MessageToken<'a>>,
|
||||
temp: VecDeque<MessageToken<'a>>
|
||||
}
|
||||
|
||||
impl<'a, I: Iterator<Item = MessageToken<'a>>> Iterator for MessageParserIterator<'a, I> {
|
||||
@@ -61,11 +55,11 @@ impl<'a, I: Iterator<Item = MessageToken<'a>>> Iterator for MessageParserIterato
|
||||
if next_token == Some(MessageToken::CodeblockMarker(ty)) {
|
||||
self.temp.clear();
|
||||
self.temp.push_back(MessageToken::CodeblockMarker(ty));
|
||||
break next_token;
|
||||
break next_token
|
||||
} else if let Some(token) = next_token {
|
||||
self.temp.push_back(token);
|
||||
} else {
|
||||
break Some(MessageToken::CodeblockMarker(ty));
|
||||
break Some(MessageToken::CodeblockMarker(ty))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -75,10 +69,10 @@ impl<'a, I: Iterator<Item = MessageToken<'a>>> Iterator for MessageParserIterato
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_message_iter(text: &str) -> impl Iterator<Item = MessageToken<'_>> + '_ {
|
||||
pub fn parse_message_iter(text: &str) -> impl Iterator<Item = MessageToken> + '_ {
|
||||
MessageParserIterator {
|
||||
inner: MessageToken::lexer(text).flatten(),
|
||||
temp: VecDeque::new(),
|
||||
temp: VecDeque::new()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,23 +82,13 @@ pub fn parse_message(text: &str) -> MessageResults {
|
||||
for token in parse_message_iter(text) {
|
||||
match token {
|
||||
MessageToken::Escape => {}
|
||||
MessageToken::CodeblockMarker(_) => {}
|
||||
MessageToken::UserMention(id) => {
|
||||
results.user_mentions.insert(id.to_string());
|
||||
}
|
||||
MessageToken::RoleMention(id) => {
|
||||
results.role_mentions.insert(id.to_string());
|
||||
}
|
||||
MessageToken::ChannelMention(id) => {
|
||||
results.channel_mentions.insert(id.to_string());
|
||||
}
|
||||
MessageToken::Emoji(id) => {
|
||||
results.emojis.insert(id.to_string());
|
||||
}
|
||||
MessageToken::CodeblockMarker(_) => {},
|
||||
MessageToken::UserMention(id) => { results.user_mentions.insert(id.to_string()); },
|
||||
MessageToken::RoleMention(id) => { results.role_mentions.insert(id.to_string()); },
|
||||
MessageToken::MentionEveryone => results.mentions_everyone = true,
|
||||
MessageToken::MentionOnline => results.mentions_online = true,
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
results
|
||||
}
|
||||
@@ -125,10 +109,7 @@ mod tests {
|
||||
let output = parse_message_iter("Hello <@01FD58YK5W7QRV5H3D64KTQYX3>.").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 1);
|
||||
assert_eq!(
|
||||
output[0],
|
||||
MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(output[0], MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -136,10 +117,7 @@ mod tests {
|
||||
let output = parse_message_iter("Hello <%01FD58YK5W7QRV5H3D64KTQYX3>.").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 1);
|
||||
assert_eq!(
|
||||
output[0],
|
||||
MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(output[0], MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -160,57 +138,29 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_everything() {
|
||||
let output = parse_message_iter("Hello <@01FD58YK5W7QRV5H3D64KTQYX3>, <%01FD58YK5W7QRV5H3D64KTQYX3>, <#01FD58YK5W7QRV5H3D64KTQYX3> @everyone and @online. :01FD58YK5W7QRV5H3D64KTQYX3:").collect::<Vec<_>>();
|
||||
let output = parse_message_iter("Hello <@01FD58YK5W7QRV5H3D64KTQYX3>, <%01FD58YK5W7QRV5H3D64KTQYX3>, @everyone and @online.").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 6);
|
||||
assert_eq!(
|
||||
output[0],
|
||||
MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[1],
|
||||
MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[2],
|
||||
MessageToken::ChannelMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(output[3], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[4], MessageToken::MentionOnline);
|
||||
assert_eq!(output[5], MessageToken::Emoji("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output.len(), 4);
|
||||
assert_eq!(output[0], MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[1], MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[2], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[3], MessageToken::MentionOnline);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_everything_no_spaces() {
|
||||
let output = parse_message_iter(
|
||||
"<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3><#01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online:01FD58YK5W7QRV5H3D64KTQYX3:",
|
||||
)
|
||||
.collect::<Vec<_>>();
|
||||
let output = parse_message_iter("<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 6);
|
||||
assert_eq!(
|
||||
output[0],
|
||||
MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[1],
|
||||
MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[2],
|
||||
MessageToken::ChannelMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(output[3], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[4], MessageToken::MentionOnline);
|
||||
assert_eq!(output[5], MessageToken::Emoji("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output.len(), 4);
|
||||
assert_eq!(output[0], MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[1], MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[2], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[3], MessageToken::MentionOnline);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_codeblock_no_mentions() {
|
||||
let output = parse_message_iter(
|
||||
"```\n<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3><#01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online:01FD58YK5W7QRV5H3D64KTQYX3:\n```",
|
||||
)
|
||||
.collect::<Vec<_>>();
|
||||
let output = parse_message_iter("```\n<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online\n```").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 2);
|
||||
assert_eq!(output[0], MessageToken::CodeblockMarker(3));
|
||||
@@ -219,36 +169,19 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_uncontained_codeblock_should_mention() {
|
||||
let output = parse_message_iter(
|
||||
"```\n<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3><#01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online:01FD58YK5W7QRV5H3D64KTQYX3:",
|
||||
)
|
||||
.collect::<Vec<_>>();
|
||||
let output = parse_message_iter("```\n<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 7);
|
||||
assert_eq!(output.len(), 5);
|
||||
assert_eq!(output[0], MessageToken::CodeblockMarker(3));
|
||||
assert_eq!(
|
||||
output[1],
|
||||
MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[2],
|
||||
MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[3],
|
||||
MessageToken::ChannelMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(output[4], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[5], MessageToken::MentionOnline);
|
||||
assert_eq!(output[6], MessageToken::Emoji("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[1], MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[2], MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[3], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[4], MessageToken::MentionOnline);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_inline_codeblock_no_mentions() {
|
||||
let output = parse_message_iter(
|
||||
"`<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3><#01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online:01FD58YK5W7QRV5H3D64KTQYX3:`",
|
||||
)
|
||||
.collect::<Vec<_>>();
|
||||
let output = parse_message_iter("`<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online`").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 2);
|
||||
assert_eq!(output[0], MessageToken::CodeblockMarker(1));
|
||||
@@ -257,33 +190,19 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_uncontained_inline_codeblock_should_mention() {
|
||||
let output = parse_message_iter(
|
||||
"`<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3><#01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online:01FD58YK5W7QRV5H3D64KTQYX3:",
|
||||
)
|
||||
.collect::<Vec<_>>();
|
||||
let output = parse_message_iter("`<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 7);
|
||||
assert_eq!(output.len(), 5);
|
||||
assert_eq!(output[0], MessageToken::CodeblockMarker(1));
|
||||
assert_eq!(
|
||||
output[1],
|
||||
MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[2],
|
||||
MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(
|
||||
output[3],
|
||||
MessageToken::ChannelMention("01FD58YK5W7QRV5H3D64KTQYX3")
|
||||
);
|
||||
assert_eq!(output[4], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[5], MessageToken::MentionOnline);
|
||||
assert_eq!(output[6], MessageToken::Emoji("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[1], MessageToken::UserMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[2], MessageToken::RoleMention("01FD58YK5W7QRV5H3D64KTQYX3"));
|
||||
assert_eq!(output[3], MessageToken::MentionEveryone);
|
||||
assert_eq!(output[4], MessageToken::MentionOnline);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_codeblock_with_language_no_mentions() {
|
||||
let output = parse_message_iter("```rust\n<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3><#01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online:01FD58YK5W7QRV5H3D64KTQYX3:```").collect::<Vec<_>>();
|
||||
let output = parse_message_iter("```rust\n<@01FD58YK5W7QRV5H3D64KTQYX3><%01FD58YK5W7QRV5H3D64KTQYX3>@everyone@online```").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 2);
|
||||
assert_eq!(output[0], MessageToken::CodeblockMarker(3));
|
||||
@@ -301,8 +220,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_double_inline_codeblock_with_backticks_inside() {
|
||||
let output =
|
||||
parse_message_iter("``this `should` not `ping` @everyone``").collect::<Vec<_>>();
|
||||
let output = parse_message_iter("``this `should` not `ping` @everyone``").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 2);
|
||||
assert_eq!(output[0], MessageToken::CodeblockMarker(2));
|
||||
@@ -320,8 +238,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn test_escaped_codeblock() {
|
||||
let output =
|
||||
parse_message_iter("i am ~~not~~ pinging \\`@everyone` ok.").collect::<Vec<_>>();
|
||||
let output = parse_message_iter("i am ~~not~~ pinging \\`@everyone` ok.").collect::<Vec<_>>();
|
||||
|
||||
assert_eq!(output.len(), 3);
|
||||
assert_eq!(output[0], MessageToken::Escape);
|
||||
@@ -336,4 +253,4 @@ mod tests {
|
||||
assert_eq!(output.len(), 1);
|
||||
assert_eq!(output[0], MessageToken::Escape);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-permissions"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -18,23 +18,23 @@ try-from-primitive = ["dep:num_enum"]
|
||||
|
||||
[dev-dependencies]
|
||||
# Async
|
||||
async-std = { workspace = true, features = ["attributes"] }
|
||||
async-std = { version = "1.8.0", features = ["attributes"] }
|
||||
|
||||
[dependencies]
|
||||
# Core
|
||||
revolt-result = { workspace = true }
|
||||
revolt-result = { version = "0.11.5", path = "../result" }
|
||||
|
||||
# Utility
|
||||
auto_ops = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
num_enum = { workspace = true, optional = true }
|
||||
auto_ops = "0.3.0"
|
||||
once_cell = "1.17"
|
||||
num_enum = { version = "0.6.1", optional = true }
|
||||
|
||||
# Async
|
||||
async-trait = { workspace = true }
|
||||
async-trait = "0.1.51"
|
||||
|
||||
# Serialisation
|
||||
serde = { workspace = true, optional = true }
|
||||
bson = { workspace = true, optional = true }
|
||||
serde = { version = "1", features = ["derive"], optional = true }
|
||||
bson = { version = "2.1.0", optional = true }
|
||||
|
||||
# Spec Generation
|
||||
schemars = { workspace = true, optional = true }
|
||||
schemars = { version = "0.8.8", optional = true }
|
||||
|
||||
@@ -75,8 +75,6 @@ pub enum ChannelPermission {
|
||||
Masquerade = 1 << 28,
|
||||
/// React to messages with emojis
|
||||
React = 1 << 29,
|
||||
/// Bypass slowmode
|
||||
BypassSlowmode = 1 << 39,
|
||||
|
||||
// * Voice permissions
|
||||
/// Connect to a voice channel
|
||||
@@ -101,7 +99,7 @@ pub enum ChannelPermission {
|
||||
MentionRoles = 1 << 38,
|
||||
|
||||
// * Misc. permissions
|
||||
// % Bits 39 to 52: free area
|
||||
// % Bits 38 to 52: free area
|
||||
// % Bits 53 to 64: do not use
|
||||
|
||||
// * Grant all permissions
|
||||
@@ -143,7 +141,7 @@ pub static DEFAULT_PERMISSION: Lazy<u64> = Lazy::new(|| {
|
||||
pub static DEFAULT_PERMISSION_SAVED_MESSAGES: u64 = ChannelPermission::GrantAllSafe as u64;
|
||||
|
||||
pub static DEFAULT_PERMISSION_DIRECT_MESSAGE: Lazy<u64> = Lazy::new(|| {
|
||||
DEFAULT_PERMISSION.add(ChannelPermission::ManageChannel + ChannelPermission::React + ChannelPermission::Masquerade)
|
||||
DEFAULT_PERMISSION.add(ChannelPermission::ManageChannel + ChannelPermission::React)
|
||||
});
|
||||
|
||||
pub static DEFAULT_PERMISSION_SERVER: Lazy<u64> = Lazy::new(|| {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-presence"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "AGPL-3.0-or-later"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -14,16 +14,16 @@ redis-is-patched = []
|
||||
|
||||
[dev-dependencies]
|
||||
# Async
|
||||
async-std = { workspace = true, features = ["attributes"] }
|
||||
async-std = { version = "1.8.0", features = ["attributes"] }
|
||||
|
||||
# Config for loading Redis URI
|
||||
revolt-config = { workspace = true }
|
||||
revolt-config = { version = "0.11.5", path = "../config" }
|
||||
|
||||
[dependencies]
|
||||
# Utility
|
||||
log = { workspace = true }
|
||||
rand = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
log = "0.4.17"
|
||||
rand = "0.8.5"
|
||||
once_cell = "1.17.1"
|
||||
|
||||
# Redis
|
||||
redis-kiss = { workspace = true }
|
||||
redis-kiss = "0.1.4"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-ratelimits"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
authors = ["Zomatree <me@zomatree.live>", "Paul Makles <me@insrt.uk>"]
|
||||
@@ -18,17 +18,17 @@ axum = ["dep:axum", "revolt-database/axum-impl"]
|
||||
default = ["rocket", "axum"]
|
||||
|
||||
[dependencies]
|
||||
revolt-database = { workspace = true }
|
||||
revolt-result = { workspace = true }
|
||||
revolt-config = { workspace = true }
|
||||
revolt-database = { version = "0.11.5", path = "../database" }
|
||||
revolt-result = { version = "0.11.5", path = "../result" }
|
||||
revolt-config = { version = "0.11.5", path = "../config" }
|
||||
|
||||
rocket = { workspace = true, optional = true }
|
||||
revolt_rocket_okapi = { workspace = true, optional = true }
|
||||
rocket = { version = "0.5.1", optional = true }
|
||||
revolt_rocket_okapi = { version = "0.10.0", optional = true }
|
||||
|
||||
axum = { workspace = true, optional = true, features = ["macros"] }
|
||||
axum = { version = "0.7.5", optional = true, features = ["macros"] }
|
||||
|
||||
serde = { workspace = true }
|
||||
authifier = { workspace = true }
|
||||
dashmap = { workspace = true }
|
||||
async-trait = { workspace = true }
|
||||
log = { workspace = true }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
authifier = { version = "1.0.16" }
|
||||
dashmap = "5.2.0"
|
||||
async-trait = "0.1.81"
|
||||
log = "0.4"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-result"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "MIT"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
@@ -22,21 +22,21 @@ default = ["serde", "sentry"]
|
||||
|
||||
[dependencies]
|
||||
# Serialisation
|
||||
serde_json = { workspace = true, optional = true }
|
||||
serde = { workspace = true, optional = true }
|
||||
serde_json = { version = "1", optional = true }
|
||||
serde = { version = "1", features = ["derive"], optional = true }
|
||||
|
||||
# Spec Generation
|
||||
schemars = { workspace = true, optional = true }
|
||||
utoipa = { workspace = true, optional = true }
|
||||
schemars = { version = "0.8.8", optional = true }
|
||||
utoipa = { version = "4.2.3", optional = true }
|
||||
|
||||
# Rocket
|
||||
rocket = { workspace = true, optional = true }
|
||||
revolt_rocket_okapi = { workspace = true, optional = true }
|
||||
revolt_okapi = { workspace = true, optional = true }
|
||||
rocket = { optional = true, version = "0.5.0-rc.2", default-features = false }
|
||||
revolt_rocket_okapi = { version = "0.10.0", optional = true }
|
||||
revolt_okapi = { version = "0.9.1", optional = true }
|
||||
|
||||
# utilities
|
||||
log = { workspace = true }
|
||||
log = "0.4"
|
||||
# Axum
|
||||
axum = { workspace = true, optional = true }
|
||||
axum = { version = "0.7.5", optional = true }
|
||||
|
||||
sentry = { workspace = true, optional = true }
|
||||
sentry = { version = "0.31.5", optional = true }
|
||||
|
||||
@@ -24,7 +24,6 @@ impl IntoResponse for Error {
|
||||
ErrorType::UnknownChannel => StatusCode::NOT_FOUND,
|
||||
ErrorType::UnknownMessage => StatusCode::NOT_FOUND,
|
||||
ErrorType::UnknownAttachment => StatusCode::BAD_REQUEST,
|
||||
ErrorType::CannotDeleteMessage => StatusCode::FORBIDDEN,
|
||||
ErrorType::CannotEditMessage => StatusCode::FORBIDDEN,
|
||||
ErrorType::CannotJoinCall => StatusCode::BAD_REQUEST,
|
||||
ErrorType::TooManyAttachments { .. } => StatusCode::BAD_REQUEST,
|
||||
@@ -37,9 +36,7 @@ impl IntoResponse for Error {
|
||||
ErrorType::NotInGroup => StatusCode::NOT_FOUND,
|
||||
ErrorType::AlreadyPinned => StatusCode::BAD_REQUEST,
|
||||
ErrorType::NotPinned => StatusCode::BAD_REQUEST,
|
||||
ErrorType::InSlowmode { retry_after: _ } => StatusCode::TOO_MANY_REQUESTS,
|
||||
|
||||
ErrorType::CantCreateServers => StatusCode::FORBIDDEN,
|
||||
ErrorType::UnknownServer => StatusCode::NOT_FOUND,
|
||||
ErrorType::InvalidRole => StatusCode::NOT_FOUND,
|
||||
ErrorType::Banned => StatusCode::FORBIDDEN,
|
||||
@@ -77,7 +74,7 @@ impl IntoResponse for Error {
|
||||
ErrorType::DuplicateNonce => StatusCode::CONFLICT,
|
||||
ErrorType::VosoUnavailable => StatusCode::BAD_REQUEST,
|
||||
ErrorType::NotFound => StatusCode::NOT_FOUND,
|
||||
ErrorType::NoEffect => StatusCode::BAD_REQUEST,
|
||||
ErrorType::NoEffect => StatusCode::OK,
|
||||
ErrorType::FailedValidation { .. } => StatusCode::BAD_REQUEST,
|
||||
ErrorType::LiveKitUnavailable => StatusCode::BAD_REQUEST,
|
||||
ErrorType::NotConnected => StatusCode::BAD_REQUEST,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use std::fmt::Display;
|
||||
use std::panic::Location;
|
||||
use std::fmt::Display;
|
||||
|
||||
#[cfg(feature = "serde")]
|
||||
#[macro_use]
|
||||
@@ -78,7 +78,6 @@ pub enum ErrorType {
|
||||
UnknownChannel,
|
||||
UnknownAttachment,
|
||||
UnknownMessage,
|
||||
CannotDeleteMessage,
|
||||
CannotEditMessage,
|
||||
CannotJoinCall,
|
||||
TooManyAttachments {
|
||||
@@ -103,12 +102,8 @@ pub enum ErrorType {
|
||||
NotInGroup,
|
||||
AlreadyPinned,
|
||||
NotPinned,
|
||||
InSlowmode {
|
||||
retry_after: u64,
|
||||
},
|
||||
|
||||
// ? Server related errors
|
||||
CantCreateServers,
|
||||
UnknownServer,
|
||||
InvalidRole,
|
||||
Banned,
|
||||
@@ -237,16 +232,17 @@ impl<T, E: std::fmt::Debug + std::error::Error> ToRevoltError<T> for Result<T, E
|
||||
fn to_internal_error(self) -> Result<T, Error> {
|
||||
let loc = Location::caller();
|
||||
|
||||
self.map_err(|e| {
|
||||
log::error!("{e:?}");
|
||||
#[cfg(feature = "sentry")]
|
||||
sentry::capture_error(&e);
|
||||
self
|
||||
.map_err(|e| {
|
||||
log::error!("{e:?}");
|
||||
#[cfg(feature = "sentry")]
|
||||
sentry::capture_error(&e);
|
||||
|
||||
Error {
|
||||
error_type: ErrorType::InternalError,
|
||||
location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column()),
|
||||
}
|
||||
})
|
||||
Error {
|
||||
error_type: ErrorType::InternalError,
|
||||
location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,9 +251,11 @@ impl<T> ToRevoltError<T> for Option<T> {
|
||||
fn to_internal_error(self) -> Result<T, Error> {
|
||||
let loc = Location::caller();
|
||||
|
||||
self.ok_or_else(|| Error {
|
||||
error_type: ErrorType::InternalError,
|
||||
location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column()),
|
||||
self.ok_or_else(|| {
|
||||
Error {
|
||||
error_type: ErrorType::InternalError,
|
||||
location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,6 @@ impl<'r> Responder<'r, 'static> for Error {
|
||||
ErrorType::UnknownChannel => Status::NotFound,
|
||||
ErrorType::UnknownMessage => Status::NotFound,
|
||||
ErrorType::UnknownAttachment => Status::BadRequest,
|
||||
ErrorType::CannotDeleteMessage => Status::Forbidden,
|
||||
ErrorType::CannotEditMessage => Status::Forbidden,
|
||||
ErrorType::CannotJoinCall => Status::BadRequest,
|
||||
ErrorType::TooManyAttachments { .. } => Status::BadRequest,
|
||||
@@ -43,10 +42,8 @@ impl<'r> Responder<'r, 'static> for Error {
|
||||
ErrorType::NotInGroup => Status::NotFound,
|
||||
ErrorType::AlreadyPinned => Status::BadRequest,
|
||||
ErrorType::NotPinned => Status::BadRequest,
|
||||
ErrorType::InSlowmode { retry_after: _ } => Status::TooManyRequests,
|
||||
ErrorType::InvalidFlagValue => Status::BadRequest,
|
||||
|
||||
ErrorType::CantCreateServers => Status::Forbidden,
|
||||
ErrorType::UnknownServer => Status::NotFound,
|
||||
ErrorType::InvalidRole => Status::NotFound,
|
||||
ErrorType::Banned => Status::Forbidden,
|
||||
@@ -83,7 +80,7 @@ impl<'r> Responder<'r, 'static> for Error {
|
||||
ErrorType::NotAuthenticated => Status::Unauthorized,
|
||||
ErrorType::DuplicateNonce => Status::Conflict,
|
||||
ErrorType::NotFound => Status::NotFound,
|
||||
ErrorType::NoEffect => Status::BadRequest,
|
||||
ErrorType::NoEffect => Status::Ok,
|
||||
ErrorType::FailedValidation { .. } => Status::BadRequest,
|
||||
ErrorType::LiveKitUnavailable => Status::BadRequest,
|
||||
ErrorType::NotAVoiceChannel => Status::BadRequest,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-crond"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
license = "AGPL-3.0-or-later"
|
||||
authors = ["Paul Makles <me@insrt.uk>"]
|
||||
edition = "2021"
|
||||
@@ -11,27 +11,13 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
# Utility
|
||||
log = { workspace = true }
|
||||
log = "0.4"
|
||||
|
||||
# Async
|
||||
tokio = { workspace = true }
|
||||
|
||||
# Redis
|
||||
redis-kiss = { workspace = true }
|
||||
|
||||
# RabbitMQ
|
||||
lapin = { workspace = true }
|
||||
futures-lite = { workspace = true }
|
||||
|
||||
# Processing
|
||||
serde_json = { workspace = true }
|
||||
revolt_optional_struct = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
iso8601-timestamp = { workspace = true, features = ["serde", "bson"] }
|
||||
tokio = { version = "1" }
|
||||
|
||||
# Core
|
||||
revolt-database = { workspace = true }
|
||||
revolt-result = { workspace = true }
|
||||
revolt-config = { workspace = true }
|
||||
revolt-files = { workspace = true }
|
||||
revolt-permissions = { workspace = true }
|
||||
revolt-database = { version = "0.11.5", path = "../../core/database" }
|
||||
revolt-result = { version = "0.11.5", path = "../../core/result" }
|
||||
revolt-config = { version = "0.11.5", path = "../../core/config" }
|
||||
revolt-files = { version = "0.11.5", path = "../../core/files" }
|
||||
|
||||
@@ -5,7 +5,6 @@ FROM debian:12 AS debian
|
||||
# Bundle Stage
|
||||
FROM gcr.io/distroless/cc-debian12:nonroot
|
||||
COPY --from=builder /home/rust/src/target/release/revolt-crond ./
|
||||
COPY --from=debian /usr/bin/uname /usr/bin/uname
|
||||
|
||||
USER nonroot
|
||||
CMD ["./revolt-crond"]
|
||||
@@ -1,7 +1,7 @@
|
||||
use revolt_config::configure;
|
||||
use revolt_database::DatabaseInfo;
|
||||
use revolt_result::Result;
|
||||
use tasks::{acks, file_deletion, prune_dangling_files, prune_members};
|
||||
use tasks::{file_deletion, prune_dangling_files, prune_members};
|
||||
use tokio::try_join;
|
||||
|
||||
pub mod tasks;
|
||||
@@ -14,8 +14,7 @@ async fn main() -> Result<()> {
|
||||
try_join!(
|
||||
file_deletion::task(db.clone()),
|
||||
prune_dangling_files::task(db.clone()),
|
||||
prune_members::task(db.clone()),
|
||||
acks::task(db.clone())
|
||||
prune_members::task(db.clone())
|
||||
)
|
||||
.map(|_| ())
|
||||
}
|
||||
|
||||
@@ -1,129 +0,0 @@
|
||||
use futures_lite::stream::StreamExt;
|
||||
use lapin::{
|
||||
options::*,
|
||||
types::FieldTable,
|
||||
uri::{AMQPAuthority, AMQPQueryString, AMQPUri, AMQPUserInfo},
|
||||
ConnectionBuilder, ConnectionProperties,
|
||||
};
|
||||
use log::info;
|
||||
use redis_kiss::{get_connection, AsyncCommands, Conn as RedisConnection};
|
||||
use revolt_config::config;
|
||||
use revolt_database::{events::rabbit::AckEventPayload, Database};
|
||||
use revolt_result::{Result, ToRevoltError};
|
||||
use serde_json;
|
||||
|
||||
pub async fn task(db: Database) -> Result<()> {
|
||||
let config = config().await;
|
||||
|
||||
let mut redis = get_connection()
|
||||
.await
|
||||
.expect("Failed to get redis connection");
|
||||
|
||||
let uri = AMQPUri {
|
||||
scheme: lapin::uri::AMQPScheme::AMQP,
|
||||
authority: AMQPAuthority {
|
||||
userinfo: AMQPUserInfo {
|
||||
username: config.rabbit.username,
|
||||
password: config.rabbit.password,
|
||||
},
|
||||
host: config.rabbit.host,
|
||||
port: config.rabbit.port,
|
||||
},
|
||||
vhost: "/".to_string(),
|
||||
query: AMQPQueryString::default(),
|
||||
};
|
||||
|
||||
let connection = ConnectionBuilder::new()
|
||||
.expect("Builder")
|
||||
.with_uri(uri)
|
||||
.with_properties(ConnectionProperties::default())
|
||||
.connect()
|
||||
.await
|
||||
.expect("Failed to connect to rabbitmq");
|
||||
|
||||
let reader_channel = connection
|
||||
.create_channel()
|
||||
.await
|
||||
.expect("Failed to create channel");
|
||||
|
||||
let mut consumer = reader_channel
|
||||
.basic_consume(
|
||||
config.rabbit.queues.acks.into(),
|
||||
"crond-ack-consumer".into(),
|
||||
BasicConsumeOptions::default(),
|
||||
FieldTable::default(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to create consumer");
|
||||
|
||||
while let Some(delivery) = consumer.next().await {
|
||||
if let Ok(delivery) = delivery {
|
||||
let payload: std::result::Result<AckEventPayload, _> =
|
||||
serde_json::from_slice(&delivery.data);
|
||||
if let Ok(payload) = payload {
|
||||
info!("{:?}", payload);
|
||||
if let Err(e) = process_channel_ack(
|
||||
&db,
|
||||
payload.user_id,
|
||||
payload.channel_id.unwrap(),
|
||||
&mut redis,
|
||||
)
|
||||
.await
|
||||
{
|
||||
revolt_config::capture_error(&e);
|
||||
_ = delivery.reject(BasicRejectOptions { requeue: false }).await;
|
||||
} else {
|
||||
_ = delivery.ack(BasicAckOptions { multiple: false }).await;
|
||||
}
|
||||
} else {
|
||||
revolt_config::capture_message(
|
||||
format!("Failed to decode ack data: {:?}", delivery.data).as_str(),
|
||||
revolt_config::Level::Error,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(clippy::disallowed_methods)]
|
||||
async fn process_channel_ack(
|
||||
db: &Database,
|
||||
user: String,
|
||||
channel: String,
|
||||
redis: &mut RedisConnection,
|
||||
) -> Result<()> {
|
||||
let message_id: Option<String> = redis
|
||||
.get_del(format!("acker:{user}+{channel}"))
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
if let Some(message_id) = message_id {
|
||||
// This will be uncommented eventually, but we need to sort out the transition to lapin first. For now we'll simply disable the badge update logic.
|
||||
// We also drop a db request as a bonus.
|
||||
|
||||
//let unread = db.fetch_unread(&user, &channel).await?;
|
||||
let _updated = db.acknowledge_message(&channel, &user, &message_id).await?;
|
||||
info!("Set new state for ack: {}:{}:{}", channel, user, message_id);
|
||||
|
||||
// if let (Some(before), Some(after)) = (unread, updated) {
|
||||
// let before_mentions = before.mentions.unwrap_or_default().len();
|
||||
// let after_mentions = after.mentions.unwrap_or_default().len();
|
||||
|
||||
// let mentions_acked = before_mentions - after_mentions;
|
||||
|
||||
// if mentions_acked > 0 {
|
||||
// if let Err(err) = amqp
|
||||
// .ack_message(user.to_string(), channel.to_string(), payload.message_id)
|
||||
// .await
|
||||
// {
|
||||
// revolt_config::capture_error(&err);
|
||||
// }
|
||||
// };
|
||||
// }
|
||||
|
||||
Ok(())
|
||||
} else {
|
||||
Err(message_id.to_internal_error().expect_err("no err"))
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
pub mod acks;
|
||||
pub mod file_deletion;
|
||||
pub mod prune_dangling_files;
|
||||
pub mod prune_members;
|
||||
|
||||
@@ -1,40 +1,43 @@
|
||||
[package]
|
||||
name = "revolt-pushd"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
edition = "2021"
|
||||
license = "AGPL-3.0-or-later"
|
||||
publish = false
|
||||
|
||||
[dependencies]
|
||||
revolt-result = { workspace = true }
|
||||
revolt-config = { workspace = true, features = ["report-macros", "anyhow"] }
|
||||
revolt-database = { workspace = true }
|
||||
revolt-models = { workspace = true, features = ["validator"] }
|
||||
revolt-presence = { workspace = true, features = ["redis-is-patched"] }
|
||||
revolt-parser = { workspace = true }
|
||||
revolt-result = { version = "0.11.5", path = "../../core/result" }
|
||||
revolt-config = { version = "0.11.5", path = "../../core/config", features = [
|
||||
"report-macros",
|
||||
"anyhow",
|
||||
] }
|
||||
revolt-database = { version = "0.11.5", path = "../../core/database" }
|
||||
revolt-models = { version = "0.11.5", path = "../../core/models", features = [
|
||||
"validator",
|
||||
] }
|
||||
revolt-presence = { version = "0.11.5", path = "../../core/presence", features = [
|
||||
"redis-is-patched",
|
||||
] }
|
||||
|
||||
anyhow = { workspace = true }
|
||||
anyhow = { version = "1.0.98" }
|
||||
|
||||
amqprs = { workspace = true }
|
||||
fcm_v1 = { workspace = true }
|
||||
web-push = { workspace = true }
|
||||
isahc = { workspace = true, features = ["json"], optional = true }
|
||||
revolt_a2 = { workspace = true, features = ["ring"] }
|
||||
redis-kiss = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
async-trait = { workspace = true }
|
||||
ulid = { workspace = true }
|
||||
amqprs = { version = "1.7.0" }
|
||||
fcm_v1 = "0.3.0"
|
||||
web-push = "0.10.0"
|
||||
isahc = { optional = true, version = "1.7", features = ["json"] }
|
||||
revolt_a2 = { version = "0.10", default-features = false, features = ["ring"] }
|
||||
tokio = "1.39.2"
|
||||
async-trait = "0.1.81"
|
||||
ulid = "1.0.0"
|
||||
|
||||
authifier = { workspace = true }
|
||||
authifier = "1.0.16"
|
||||
|
||||
log = { workspace = true }
|
||||
pretty_env_logger = { workspace = true }
|
||||
|
||||
regex = { workspace = true }
|
||||
log = "0.4.11"
|
||||
pretty_env_logger = "0.4.0"
|
||||
|
||||
#serialization
|
||||
serde_json = { workspace = true }
|
||||
revolt_optional_struct = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
iso8601-timestamp = { workspace = true, features = ["serde", "bson"] }
|
||||
base64 = { workspace = true }
|
||||
serde_json = "1"
|
||||
revolt_optional_struct = "0.2.0"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
iso8601-timestamp = { version = "0.2.10", features = ["serde", "bson"] }
|
||||
base64 = "0.22.1"
|
||||
|
||||
@@ -3,7 +3,7 @@ use std::{
|
||||
hash::RandomState,
|
||||
};
|
||||
|
||||
use crate::{consumers::inbound::internal::*, utils};
|
||||
use crate::consumers::inbound::internal::*;
|
||||
use amqprs::{
|
||||
channel::{BasicPublishArguments, Channel},
|
||||
connection::Connection,
|
||||
@@ -17,7 +17,6 @@ use revolt_database::{
|
||||
MessageFlagsValue,
|
||||
};
|
||||
use revolt_models::v0::{MessageFlags, PushNotification};
|
||||
use revolt_result::ToRevoltError;
|
||||
|
||||
pub struct MassMessageConsumer {
|
||||
#[allow(dead_code)]
|
||||
@@ -130,17 +129,7 @@ impl MassMessageConsumer {
|
||||
) -> Result<()> {
|
||||
let config = revolt_config::config().await;
|
||||
let content = String::from_utf8(content)?;
|
||||
let mut payload: MassMessageSentPayload = serde_json::from_str(content.as_str())?;
|
||||
|
||||
for push in payload.notifications.iter_mut() {
|
||||
if let Ok(body) = utils::render_notification_content(push, &self.db)
|
||||
.await
|
||||
.to_internal_error()
|
||||
{
|
||||
push.raw_body = Some(push.body.clone());
|
||||
push.body = body;
|
||||
}
|
||||
}
|
||||
let payload: MassMessageSentPayload = serde_json::from_str(content.as_str())?;
|
||||
|
||||
debug!("Received mass message event");
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::{consumers::inbound::internal::*, utils};
|
||||
use crate::consumers::inbound::internal::*;
|
||||
use amqprs::{
|
||||
channel::{BasicPublishArguments, Channel},
|
||||
connection::Connection,
|
||||
@@ -11,7 +11,6 @@ use anyhow::Result;
|
||||
use async_trait::async_trait;
|
||||
use log::debug;
|
||||
use revolt_database::{events::rabbit::*, Database};
|
||||
use revolt_result::ToRevoltError;
|
||||
|
||||
pub struct MessageConsumer {
|
||||
#[allow(dead_code)]
|
||||
@@ -65,15 +64,7 @@ impl MessageConsumer {
|
||||
content: Vec<u8>,
|
||||
) -> Result<()> {
|
||||
let content = String::from_utf8(content)?;
|
||||
let mut payload: MessageSentPayload = serde_json::from_str(content.as_str())?;
|
||||
|
||||
if let Ok(body) = utils::render_notification_content(&payload.notification, &self.db)
|
||||
.await
|
||||
.to_internal_error()
|
||||
{
|
||||
payload.notification.raw_body = Some(payload.notification.body);
|
||||
payload.notification.body = body;
|
||||
}
|
||||
let payload: MessageSentPayload = serde_json::from_str(content.as_str())?;
|
||||
|
||||
debug!("Received message event on origin");
|
||||
|
||||
|
||||
@@ -5,8 +5,9 @@ use amqprs::{channel::Channel as AmqpChannel, consumer::AsyncConsumer, BasicProp
|
||||
use anyhow::{anyhow, bail, Result};
|
||||
use async_trait::async_trait;
|
||||
use fcm_v1::{
|
||||
android::{AndroidConfig, AndroidMessagePriority},
|
||||
auth::{Authenticator, ServiceAccountKey},
|
||||
message::Message,
|
||||
message::{Message, Notification},
|
||||
Client, Error as FcmError,
|
||||
};
|
||||
use revolt_config::config;
|
||||
@@ -14,102 +15,6 @@ use revolt_database::{events::rabbit::*, Database};
|
||||
use revolt_models::v0::{Channel, PushNotification};
|
||||
use serde_json::Value;
|
||||
|
||||
/// Custom notification data
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum NotificationData {
|
||||
FRReceived {
|
||||
id: String,
|
||||
username: String,
|
||||
},
|
||||
FRAccepted {
|
||||
id: String,
|
||||
username: String,
|
||||
},
|
||||
Generic {
|
||||
title: String,
|
||||
body: String,
|
||||
image: Option<String>,
|
||||
},
|
||||
Message {
|
||||
title: String,
|
||||
body: String,
|
||||
image: String,
|
||||
tag: String,
|
||||
},
|
||||
DmCallStartEnd {
|
||||
initiator_id: String,
|
||||
channel_id: String,
|
||||
started_at: String,
|
||||
ended: bool,
|
||||
duration: usize,
|
||||
},
|
||||
}
|
||||
|
||||
impl NotificationData {
|
||||
pub fn get_type(&self) -> &str {
|
||||
match self {
|
||||
NotificationData::FRReceived { .. } => "push.fr.receive",
|
||||
NotificationData::FRAccepted { .. } => "push.fr.accept",
|
||||
NotificationData::Generic { .. } => "push.generic",
|
||||
NotificationData::Message { .. } => "push.message",
|
||||
NotificationData::DmCallStartEnd { .. } => "push.dm.call",
|
||||
}
|
||||
}
|
||||
|
||||
pub fn into_payload(self) -> HashMap<String, Value> {
|
||||
let mut data = HashMap::new();
|
||||
data.insert(
|
||||
"type".to_string(),
|
||||
Value::String(self.get_type().to_string()),
|
||||
);
|
||||
|
||||
match self {
|
||||
NotificationData::FRReceived { id, username } => {
|
||||
data.insert("id".to_string(), Value::String(id));
|
||||
data.insert("username".to_string(), Value::String(username));
|
||||
}
|
||||
NotificationData::FRAccepted { id, username } => {
|
||||
data.insert("id".to_string(), Value::String(id));
|
||||
data.insert("username".to_string(), Value::String(username));
|
||||
}
|
||||
NotificationData::Generic { title, body, image } => {
|
||||
data.insert("title".to_string(), Value::String(title));
|
||||
data.insert("body".to_string(), Value::String(body));
|
||||
|
||||
if let Some(image) = image {
|
||||
data.insert("image".to_string(), Value::String(image));
|
||||
}
|
||||
}
|
||||
NotificationData::Message {
|
||||
title,
|
||||
body,
|
||||
image,
|
||||
tag,
|
||||
} => {
|
||||
data.insert("title".to_string(), Value::String(title));
|
||||
data.insert("body".to_string(), Value::String(body));
|
||||
data.insert("image".to_string(), Value::String(image));
|
||||
data.insert("tag".to_string(), Value::String(tag));
|
||||
}
|
||||
NotificationData::DmCallStartEnd {
|
||||
initiator_id,
|
||||
channel_id,
|
||||
started_at,
|
||||
ended,
|
||||
duration,
|
||||
} => {
|
||||
data.insert("initiator_id".to_string(), Value::String(initiator_id));
|
||||
data.insert("channel_id".to_string(), Value::String(channel_id));
|
||||
data.insert("started_at".to_string(), Value::String(started_at));
|
||||
data.insert("ended".to_string(), Value::Bool(ended));
|
||||
data.insert("duration".to_string(), Value::Number(duration.into()));
|
||||
}
|
||||
}
|
||||
|
||||
data
|
||||
}
|
||||
}
|
||||
|
||||
pub struct FcmOutboundConsumer {
|
||||
db: Database,
|
||||
client: Client,
|
||||
@@ -188,14 +93,17 @@ impl FcmOutboundConsumer {
|
||||
.clone()
|
||||
.ok_or_else(|| anyhow!("missing name"))?;
|
||||
|
||||
let data = NotificationData::FRReceived {
|
||||
id: alert.from_user.id,
|
||||
username: name,
|
||||
};
|
||||
let mut data = HashMap::new();
|
||||
data.insert(
|
||||
"type".to_string(),
|
||||
Value::String("push.fr.receive".to_string()),
|
||||
);
|
||||
data.insert("id".to_string(), Value::String(alert.from_user.id));
|
||||
data.insert("username".to_string(), Value::String(name));
|
||||
|
||||
let msg = Message {
|
||||
token: Some(payload.token),
|
||||
data: Some(data.into_payload()),
|
||||
data: Some(data),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
@@ -213,29 +121,30 @@ impl FcmOutboundConsumer {
|
||||
.clone()
|
||||
.ok_or_else(|| anyhow!("missing name"))?;
|
||||
|
||||
let data = NotificationData::FRAccepted {
|
||||
id: alert.accepted_user.id,
|
||||
username: name,
|
||||
};
|
||||
let mut data: HashMap<String, Value> = HashMap::new();
|
||||
data.insert(
|
||||
"type".to_string(),
|
||||
Value::String("push.fr.accept".to_string()),
|
||||
);
|
||||
data.insert("id".to_string(), Value::String(alert.accepted_user.id));
|
||||
data.insert("username".to_string(), Value::String(name));
|
||||
|
||||
let msg = Message {
|
||||
token: Some(payload.token),
|
||||
data: Some(data.into_payload()),
|
||||
data: Some(data),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
resp = self.client.send(&msg).await;
|
||||
}
|
||||
PayloadKind::Generic(alert) => {
|
||||
let data = NotificationData::Generic {
|
||||
title: alert.title,
|
||||
body: alert.body,
|
||||
image: alert.icon,
|
||||
};
|
||||
|
||||
let msg = Message {
|
||||
token: Some(payload.token),
|
||||
data: Some(data.into_payload()),
|
||||
notification: Some(Notification {
|
||||
title: Some(alert.title),
|
||||
body: Some(alert.body),
|
||||
image: alert.icon,
|
||||
}),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
@@ -243,16 +152,19 @@ impl FcmOutboundConsumer {
|
||||
}
|
||||
|
||||
PayloadKind::MessageNotification(alert) => {
|
||||
let data = NotificationData::Message {
|
||||
title: self.format_title(&alert),
|
||||
body: alert.body,
|
||||
image: alert.icon,
|
||||
tag: alert.tag,
|
||||
};
|
||||
let title = self.format_title(&alert);
|
||||
|
||||
let msg = Message {
|
||||
token: Some(payload.token),
|
||||
data: Some(data.into_payload()),
|
||||
notification: Some(Notification {
|
||||
title: Some(title),
|
||||
body: Some(alert.body),
|
||||
image: Some(alert.icon),
|
||||
}),
|
||||
android: Some(AndroidConfig {
|
||||
collapse_key: Some(alert.tag),
|
||||
..Default::default()
|
||||
}),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
@@ -260,17 +172,30 @@ impl FcmOutboundConsumer {
|
||||
}
|
||||
|
||||
PayloadKind::DmCallStartEnd(alert) => {
|
||||
let data = NotificationData::DmCallStartEnd {
|
||||
initiator_id: alert.initiator_id,
|
||||
channel_id: alert.channel_id,
|
||||
started_at: alert.started_at.unwrap_or_else(|| "".to_string()),
|
||||
ended: alert.ended,
|
||||
duration: config().await.api.livekit.call_ring_duration,
|
||||
};
|
||||
let mut data: HashMap<String, Value> = HashMap::new();
|
||||
data.insert(
|
||||
"initiator_id".to_string(),
|
||||
Value::String(alert.initiator_id),
|
||||
);
|
||||
data.insert("channel_id".to_string(), Value::String(alert.channel_id));
|
||||
data.insert(
|
||||
"started_at".to_string(),
|
||||
Value::String(alert.started_at.unwrap_or_else(|| "".to_string())),
|
||||
);
|
||||
data.insert("ended".to_string(), Value::Bool(alert.ended));
|
||||
|
||||
let msg = Message {
|
||||
token: Some(payload.token),
|
||||
data: Some(data.into_payload()),
|
||||
notification: None,
|
||||
data: Some(data),
|
||||
android: Some(AndroidConfig {
|
||||
priority: Some(AndroidMessagePriority::High),
|
||||
ttl: Some(format!(
|
||||
"{}s",
|
||||
config().await.api.livekit.call_ring_duration
|
||||
)),
|
||||
..Default::default()
|
||||
}),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ use revolt_config::{config, Settings};
|
||||
use tokio::sync::Notify;
|
||||
|
||||
mod consumers;
|
||||
mod utils;
|
||||
use consumers::{
|
||||
inbound::{
|
||||
ack::AckConsumer, dm_call::DmCallConsumer, fr_accepted::FRAcceptedConsumer,
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
mod renderer;
|
||||
pub use renderer::render_notification_content;
|
||||
@@ -1,272 +0,0 @@
|
||||
use redis_kiss::{get_connection as _get_conn, AsyncCommands, Conn};
|
||||
use regex::Regex;
|
||||
use revolt_config::config;
|
||||
use revolt_database::{Channel, Database};
|
||||
use revolt_models::v0::PushNotification;
|
||||
use revolt_parser::parse_message;
|
||||
use revolt_result::{create_error, Result, ToRevoltError};
|
||||
use std::{
|
||||
borrow::Cow,
|
||||
collections::{HashMap, HashSet},
|
||||
};
|
||||
use tokio::join;
|
||||
|
||||
async fn get_connection() -> Result<Conn> {
|
||||
_get_conn().await.map_err(|_| create_error!(InternalError))
|
||||
}
|
||||
|
||||
pub async fn render_notification_content(
|
||||
notification: &PushNotification,
|
||||
db: &Database,
|
||||
) -> Result<String> {
|
||||
let parsed = parse_message(¬ification.body);
|
||||
|
||||
let user_mentions: HashMap<String, String>;
|
||||
let channel_mentions: HashMap<String, String>;
|
||||
let emojis: HashMap<String, String>;
|
||||
let roles: HashMap<String, String>;
|
||||
|
||||
let server_id: Option<String> = get_channel_server_id(notification.channel.id(), db)
|
||||
.await
|
||||
.map(Some)
|
||||
.or(Ok(None))?;
|
||||
|
||||
if server_id.is_some() {
|
||||
(user_mentions, channel_mentions, emojis, roles) = join!(
|
||||
get_items(
|
||||
parsed.user_mentions,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_user_display_name,
|
||||
"Unknown User".to_string()
|
||||
),
|
||||
get_items(
|
||||
parsed.channel_mentions,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_channel_name,
|
||||
"Unknown Channel".to_string()
|
||||
),
|
||||
get_items(
|
||||
parsed.emojis,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_emoji_name,
|
||||
"Unknown Emoji".to_string()
|
||||
),
|
||||
get_items(
|
||||
parsed.role_mentions,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_role_name,
|
||||
"Unknown Role".to_string()
|
||||
),
|
||||
);
|
||||
} else {
|
||||
roles = HashMap::default();
|
||||
|
||||
(user_mentions, channel_mentions, emojis) = join!(
|
||||
get_items(
|
||||
parsed.user_mentions,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_user_display_name,
|
||||
"Unknown User".to_string()
|
||||
),
|
||||
get_items(
|
||||
parsed.channel_mentions,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_channel_name,
|
||||
"Unknown Channel".to_string()
|
||||
),
|
||||
get_items(
|
||||
parsed.emojis,
|
||||
server_id.as_deref(),
|
||||
db,
|
||||
get_emoji_name,
|
||||
"Unknown Emoji".to_string()
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
let mut body = Cow::Borrowed(notification.body.as_str());
|
||||
|
||||
for (uid, name) in user_mentions {
|
||||
replace_all_in_place(
|
||||
Regex::new(format!("<@{uid}>").as_str()).unwrap(),
|
||||
&mut body,
|
||||
format!("@{name}").as_str(),
|
||||
);
|
||||
}
|
||||
|
||||
for (uid, name) in channel_mentions {
|
||||
replace_all_in_place(
|
||||
Regex::new(format!("<#{uid}>").as_str()).unwrap(),
|
||||
&mut body,
|
||||
format!("#{name}").as_str(),
|
||||
);
|
||||
}
|
||||
|
||||
for (uid, name) in roles {
|
||||
replace_all_in_place(
|
||||
Regex::new(format!("<%{uid}>").as_str()).unwrap(),
|
||||
&mut body,
|
||||
format!("%{name}").as_str(),
|
||||
);
|
||||
}
|
||||
|
||||
for (uid, name) in emojis {
|
||||
replace_all_in_place(
|
||||
Regex::new(format!(":{uid}:").as_str()).unwrap(),
|
||||
&mut body,
|
||||
format!(":{name}:").as_str(),
|
||||
);
|
||||
}
|
||||
|
||||
Ok(body.to_string())
|
||||
}
|
||||
|
||||
async fn get_items<F>(
|
||||
items: HashSet<String>,
|
||||
server_id: Option<&str>,
|
||||
db: &Database,
|
||||
getter: F,
|
||||
invalid_string: String,
|
||||
) -> HashMap<String, String>
|
||||
where
|
||||
F: AsyncFn(&str, Option<&str>, &Database) -> Result<String>,
|
||||
{
|
||||
let mut resp = HashMap::default();
|
||||
|
||||
for obj_id in items {
|
||||
resp.insert(
|
||||
obj_id.clone(),
|
||||
getter(&obj_id, server_id, db)
|
||||
.await
|
||||
.unwrap_or(invalid_string.clone()),
|
||||
);
|
||||
}
|
||||
|
||||
resp
|
||||
}
|
||||
|
||||
// Getters
|
||||
|
||||
async fn get_user_display_name(id: &str, server: Option<&str>, db: &Database) -> Result<String> {
|
||||
let config = config().await;
|
||||
|
||||
let mut conn = get_connection().await?;
|
||||
let key = format!("pushd-user-cache:{}:{id}", server.unwrap_or("GLOBAL"));
|
||||
|
||||
if let Ok(name) = conn.get(key.clone()).await {
|
||||
return Ok(name);
|
||||
}
|
||||
|
||||
if let Some(server) = server {
|
||||
let member = db.fetch_member(server, id).await?;
|
||||
if let Some(nickname) = member.nickname {
|
||||
conn.set_ex::<_, _, ()>(key, nickname.clone(), config.pushd.render_cache_time)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
return Ok(nickname);
|
||||
}
|
||||
}
|
||||
|
||||
let user = db.fetch_user(id).await?;
|
||||
let name = user.display_name.unwrap_or(user.username);
|
||||
|
||||
conn.set_ex::<_, _, ()>(key, name.clone(), config.pushd.render_cache_time)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
Ok(name)
|
||||
}
|
||||
|
||||
async fn get_channel_name(id: &str, _server: Option<&str>, db: &Database) -> Result<String> {
|
||||
let config = config().await;
|
||||
|
||||
let mut conn = get_connection().await?;
|
||||
let key = format!("pushd-channel-cache:{id}");
|
||||
|
||||
if let Ok(name) = conn.get(key.clone()).await {
|
||||
return Ok(name);
|
||||
}
|
||||
|
||||
let channel = db.fetch_channel(id).await?;
|
||||
let name = match channel {
|
||||
Channel::DirectMessage { .. } => "DM Channel".to_string(),
|
||||
Channel::Group { name, .. } | Channel::TextChannel { name, .. } => name,
|
||||
Channel::SavedMessages { .. } => "Err".to_string(),
|
||||
};
|
||||
|
||||
conn.set_ex::<_, _, ()>(key, name.clone(), config.pushd.render_cache_time)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
Ok(name)
|
||||
}
|
||||
|
||||
async fn get_role_name(id: &str, server: Option<&str>, db: &Database) -> Result<String> {
|
||||
let server = server.unwrap(); // Must be passed, but the interface must stay the same as the other getters
|
||||
let config: revolt_config::Settings = config().await;
|
||||
|
||||
let mut conn = get_connection().await?;
|
||||
let key = format!("pushd-role-cache:{server}:{id}");
|
||||
|
||||
if let Ok(name) = conn.get(key.clone()).await {
|
||||
return Ok(name);
|
||||
}
|
||||
|
||||
let server = db.fetch_server(server).await?;
|
||||
let name = server
|
||||
.roles
|
||||
.get(id)
|
||||
.ok_or_else(|| create_error!(NotFound))?
|
||||
.name
|
||||
.clone();
|
||||
|
||||
conn.set_ex::<_, _, ()>(key, name.clone(), config.pushd.render_cache_time)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
Ok(name)
|
||||
}
|
||||
|
||||
async fn get_emoji_name(id: &str, _server: Option<&str>, db: &Database) -> Result<String> {
|
||||
let config: revolt_config::Settings = config().await;
|
||||
|
||||
let mut conn = get_connection().await?;
|
||||
let key = format!("pushd-emoji-cache:{id}");
|
||||
|
||||
if let Ok(name) = conn.get(key.clone()).await {
|
||||
return Ok(name);
|
||||
}
|
||||
|
||||
let emoji = db.fetch_emoji(id).await?;
|
||||
let name = emoji.name;
|
||||
|
||||
conn.set_ex::<_, _, ()>(key, name.clone(), config.pushd.render_cache_time)
|
||||
.await
|
||||
.to_internal_error()?;
|
||||
|
||||
Ok(name)
|
||||
}
|
||||
|
||||
// utility
|
||||
|
||||
async fn get_channel_server_id(channel_id: &str, db: &Database) -> Result<String> {
|
||||
match db.fetch_channel(channel_id).await? {
|
||||
Channel::DirectMessage { .. } | Channel::Group { .. } | Channel::SavedMessages { .. } => {
|
||||
Err(create_error!(NotFound))
|
||||
}
|
||||
Channel::TextChannel { server, .. } => Ok(server),
|
||||
}
|
||||
}
|
||||
|
||||
fn replace_all_in_place<R: regex::Replacer>(regex: Regex, s: &mut Cow<'_, str>, replacer: R) {
|
||||
let new = regex.replace_all(s, replacer);
|
||||
if let Cow::Owned(o) = new {
|
||||
*s = Cow::Owned(o);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-voice-ingress"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
license = "AGPL-3.0-or-later"
|
||||
edition = "2021"
|
||||
publish = false
|
||||
@@ -9,41 +9,41 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
# util
|
||||
log = { workspace = true }
|
||||
sentry = { workspace = true }
|
||||
lru = { workspace = true }
|
||||
ulid = { workspace = true }
|
||||
redis-kiss = { workspace = true }
|
||||
chrono = { workspace = true }
|
||||
log = "*"
|
||||
sentry = "0.31.5"
|
||||
lru = "0.7.6"
|
||||
ulid = "0.5.0"
|
||||
redis-kiss = "0.1.4"
|
||||
chrono = "0.4.15"
|
||||
|
||||
# Serde
|
||||
serde_json = { workspace = true }
|
||||
rmp-serde = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
serde_json = "1.0.79"
|
||||
rmp-serde = "1.0.0"
|
||||
serde = "1.0.136"
|
||||
|
||||
# Http
|
||||
rocket = { workspace = true, features = ["json"] }
|
||||
rocket_empty = { workspace = true }
|
||||
rocket = { version = "0.5.0-rc.2", features = ["json"] }
|
||||
rocket_empty = "0.1.1"
|
||||
|
||||
# Async
|
||||
futures = { workspace = true }
|
||||
async-std = { workspace = true, features = [
|
||||
futures = "0.3.21"
|
||||
async-std = { version = "1.8.0", features = [
|
||||
"tokio1",
|
||||
"tokio02",
|
||||
"attributes",
|
||||
] }
|
||||
|
||||
# Core
|
||||
revolt-result = { workspace = true, features = ["rocket"] }
|
||||
revolt-models = { workspace = true }
|
||||
revolt-config = { workspace = true }
|
||||
revolt-database = { workspace = true, features = ["voice"] }
|
||||
revolt-permissions = { workspace = true }
|
||||
revolt-result = { path = "../../core/result" }
|
||||
revolt-models = { path = "../../core/models" }
|
||||
revolt-config = { path = "../../core/config" }
|
||||
revolt-database = { path = "../../core/database", features = ["voice"] }
|
||||
revolt-permissions = { path = "../../core/permissions" }
|
||||
|
||||
# Voice
|
||||
livekit-api = { workspace = true }
|
||||
livekit-protocol = { workspace = true }
|
||||
livekit-runtime = { workspace = true, features = ["tokio"] }
|
||||
livekit-api = "0.4.4"
|
||||
livekit-protocol = "0.4.0"
|
||||
livekit-runtime = { version = "0.3.1", features = ["tokio"] }
|
||||
|
||||
# RabbitMQ
|
||||
amqprs = { workspace = true }
|
||||
amqprs = { version = "1.7.0" }
|
||||
|
||||
@@ -5,9 +5,8 @@ use revolt_database::{
|
||||
iso8601_timestamp::{Duration, Timestamp},
|
||||
util::reference::Reference,
|
||||
voice::{
|
||||
create_voice_state, delete_channel_voice_state, delete_voice_state,
|
||||
get_user_moved_from_voice, get_user_moved_to_voice, update_voice_state_tracks,
|
||||
RoomMetadata, UserVoiceChannel, VoiceClient,
|
||||
create_voice_state, delete_channel_node, delete_voice_state, get_user_moved_from_voice,
|
||||
get_user_moved_to_voice, get_voice_channel_members, update_voice_state_tracks, VoiceClient,
|
||||
},
|
||||
Database, AMQP,
|
||||
};
|
||||
@@ -51,34 +50,27 @@ pub async fn ingress(
|
||||
|
||||
let channel_id = event.room.as_ref().map(|r| &r.name);
|
||||
let user_id = event.participant.as_ref().map(|r| &r.identity);
|
||||
let room_metadata = if let Some(room) = event.room.as_ref() {
|
||||
Some(serde_json::from_str::<RoomMetadata>(&room.metadata).to_internal_error()?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
match event.event.as_str() {
|
||||
// User joined a channel
|
||||
"participant_joined" => {
|
||||
let channel_id = channel_id.to_internal_error()?;
|
||||
let user_id = user_id.to_internal_error()?;
|
||||
let server_id = room_metadata.to_internal_error()?.server;
|
||||
let channel = UserVoiceChannel {
|
||||
id: channel_id.clone(),
|
||||
server_id: server_id.clone(),
|
||||
};
|
||||
|
||||
let channel = Reference::from_unchecked(channel_id).as_channel(db).await?;
|
||||
|
||||
let joined_at = Timestamp::UNIX_EPOCH
|
||||
.checked_add(Duration::seconds(event.created_at))
|
||||
.unwrap();
|
||||
|
||||
let voice_state = create_voice_state(&channel, user_id, joined_at).await?;
|
||||
let voice_state =
|
||||
create_voice_state(channel_id, channel.server(), user_id, joined_at).await?;
|
||||
|
||||
// Only publish one event when a user is moved from one channel to another.
|
||||
if let Some(moved_from) = get_user_moved_to_voice(channel_id, user_id).await? {
|
||||
EventV1::VoiceChannelMove {
|
||||
user: user_id.to_string(),
|
||||
from: moved_from.id,
|
||||
from: moved_from,
|
||||
to: channel_id.to_string(),
|
||||
state: voice_state,
|
||||
}
|
||||
@@ -143,13 +135,10 @@ pub async fn ingress(
|
||||
"participant_left" => {
|
||||
let channel_id = channel_id.to_internal_error()?;
|
||||
let user_id = user_id.to_internal_error()?;
|
||||
let server_id = room_metadata.to_internal_error()?.server;
|
||||
let channel = UserVoiceChannel {
|
||||
id: channel_id.clone(),
|
||||
server_id: server_id.clone(),
|
||||
};
|
||||
|
||||
delete_voice_state(&channel, user_id).await?;
|
||||
let channel = Reference::from_unchecked(channel_id).as_channel(db).await?;
|
||||
|
||||
delete_voice_state(channel_id, channel.server(), user_id).await?;
|
||||
|
||||
// Dont send leave event when a user is moved
|
||||
if get_user_moved_from_voice(channel_id, user_id)
|
||||
@@ -170,6 +159,8 @@ pub async fn ingress(
|
||||
// let members = get_voice_channel_members(channel_id).await?;
|
||||
|
||||
// if members.is_none_or(|m| m.is_empty()) {
|
||||
// delete_channel_node(channel_id).await?;
|
||||
//
|
||||
// // The channel is empty so send out an "end" message for ringing
|
||||
// if let Err(e) = amqp
|
||||
// .dm_call_updated(user_id, channel_id, None, true, None)
|
||||
@@ -213,11 +204,8 @@ pub async fn ingress(
|
||||
let channel_id = channel_id.to_internal_error()?;
|
||||
let user_id = user_id.to_internal_error()?;
|
||||
let track = event.track.as_ref().to_internal_error()?;
|
||||
let server_id = room_metadata.to_internal_error()?.server;
|
||||
let channel = UserVoiceChannel {
|
||||
id: channel_id.clone(),
|
||||
server_id: server_id.clone(),
|
||||
};
|
||||
|
||||
let channel = Reference::from_unchecked(channel_id).as_channel(db).await?;
|
||||
|
||||
let user = Reference::from_unchecked(user_id).as_user(db).await?;
|
||||
|
||||
@@ -257,14 +245,15 @@ pub async fn ingress(
|
||||
log::debug!("Removing user {user_id} from channel {channel_id} {event:?} due to forbidden track.");
|
||||
|
||||
let _ = voice_client.remove_user(node, user_id, channel_id).await;
|
||||
delete_voice_state(&channel, user_id).await?;
|
||||
delete_voice_state(channel_id, channel.server(), user_id).await?;
|
||||
|
||||
return Ok(EmptyResponse);
|
||||
};
|
||||
};
|
||||
|
||||
let partial = update_voice_state_tracks(
|
||||
&channel,
|
||||
channel_id,
|
||||
channel.server(),
|
||||
user_id,
|
||||
event.event == "track_published" || event.event == "track_unmuted", // to avoid duplicating this entire case twice
|
||||
track.source,
|
||||
@@ -279,16 +268,6 @@ pub async fn ingress(
|
||||
.p(channel_id.clone())
|
||||
.await;
|
||||
}
|
||||
"room_finished" => {
|
||||
let channel_id = channel_id.to_internal_error()?;
|
||||
let server_id = room_metadata.to_internal_error()?.server;
|
||||
let channel = UserVoiceChannel {
|
||||
id: channel_id.clone(),
|
||||
server_id: server_id.clone(),
|
||||
};
|
||||
|
||||
delete_channel_voice_state(&channel, &[]).await?;
|
||||
}
|
||||
_ => {}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "revolt-delta"
|
||||
version = "0.13.3"
|
||||
version = "0.11.5"
|
||||
license = "AGPL-3.0-or-later"
|
||||
authors = ["Paul Makles <paulmakles@gmail.com>"]
|
||||
edition = "2018"
|
||||
@@ -10,83 +10,84 @@ publish = false
|
||||
|
||||
[dependencies]
|
||||
# Test
|
||||
rand = { workspace = true }
|
||||
redis-kiss = { workspace = true }
|
||||
rand = "0.8.5"
|
||||
redis-kiss = "0.1.4"
|
||||
|
||||
# Utility
|
||||
lru = { workspace = true }
|
||||
url = { workspace = true }
|
||||
log = { workspace = true }
|
||||
dashmap = { workspace = true }
|
||||
linkify = { workspace = true }
|
||||
once_cell = { workspace = true }
|
||||
lru = "0.7.0"
|
||||
url = "2.2.2"
|
||||
log = "0.4.11"
|
||||
dashmap = "5.2.0"
|
||||
linkify = "0.6.0"
|
||||
once_cell = "1.17.1"
|
||||
env_logger = "0.7.1"
|
||||
|
||||
# Lang. Utilities
|
||||
regex = { workspace = true }
|
||||
num_enum = { workspace = true }
|
||||
impl_ops = { workspace = true }
|
||||
bitfield = { workspace = true }
|
||||
regex = "1"
|
||||
num_enum = "0.5.1"
|
||||
impl_ops = "0.1.1"
|
||||
bitfield = "0.13.2"
|
||||
|
||||
# ID / key generation
|
||||
ulid = { workspace = true }
|
||||
nanoid = { workspace = true }
|
||||
ulid = "0.4.1"
|
||||
nanoid = "0.4.0"
|
||||
|
||||
# serde
|
||||
serde_json = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
validator = { workspace = true, features = ["derive"] }
|
||||
iso8601-timestamp = { workspace = true }
|
||||
serde_json = "1.0.57"
|
||||
serde = { version = "1.0.115", features = ["derive"] }
|
||||
validator = { version = "0.16", features = ["derive"] }
|
||||
iso8601-timestamp = { version = "0.2.11", features = [] }
|
||||
|
||||
# async
|
||||
futures = { workspace = true }
|
||||
chrono = { workspace = true }
|
||||
async-channel = { workspace = true }
|
||||
reqwest = { workspace = true, features = ["json"] }
|
||||
async-std = { workspace = true, features = [
|
||||
futures = "0.3.8"
|
||||
chrono = "0.4.15"
|
||||
async-channel = "1.6.1"
|
||||
reqwest = { version = "0.11.4", features = ["json"] }
|
||||
async-std = { version = "1.8.0", features = [
|
||||
"tokio1",
|
||||
"tokio02",
|
||||
"attributes",
|
||||
] }
|
||||
|
||||
# internal util
|
||||
lettre = { workspace = true }
|
||||
lettre = "0.10.0-alpha.4"
|
||||
|
||||
# web
|
||||
|
||||
rocket = { workspace = true, features = ["json"] }
|
||||
rocket_cors = { workspace = true }
|
||||
rocket_empty = { workspace = true, features = ["schema"] }
|
||||
rocket_authifier = { workspace = true }
|
||||
rocket_prometheus = { workspace = true }
|
||||
rocket = { version = "0.5.1", default-features = false, features = ["json"] }
|
||||
rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
|
||||
rocket_empty = { version = "0.1.1", features = ["schema"] }
|
||||
rocket_authifier = { version = "1.0.16" }
|
||||
rocket_prometheus = "0.10.0-rc.3"
|
||||
|
||||
# spec generation
|
||||
schemars = { workspace = true }
|
||||
revolt_rocket_okapi = { workspace = true, features = ["swagger"] }
|
||||
schemars = "0.8.8"
|
||||
revolt_rocket_okapi = { version = "0.10.0", features = ["swagger"] }
|
||||
|
||||
# rabbit
|
||||
amqprs = { workspace = true }
|
||||
amqprs = { version = "1.7.0" }
|
||||
|
||||
# core
|
||||
authifier = { workspace = true }
|
||||
revolt-config = { workspace = true }
|
||||
revolt-database = { workspace = true, features = [
|
||||
authifier = "1.0.16"
|
||||
revolt-config = { path = "../core/config" }
|
||||
revolt-database = { path = "../core/database", features = [
|
||||
"rocket-impl",
|
||||
"redis-is-patched",
|
||||
"voice",
|
||||
] }
|
||||
revolt-models = { workspace = true, features = [
|
||||
revolt-models = { path = "../core/models", features = [
|
||||
"schemas",
|
||||
"validator",
|
||||
"rocket",
|
||||
] }
|
||||
revolt-presence = { workspace = true }
|
||||
revolt-result = { workspace = true, features = ["rocket", "okapi"] }
|
||||
revolt-permissions = { workspace = true, features = ["schemas"] }
|
||||
revolt-ratelimits = { workspace = true, features = ["rocket"] }
|
||||
revolt-presence = { path = "../core/presence" }
|
||||
revolt-result = { path = "../core/result", features = ["rocket", "okapi"] }
|
||||
revolt-permissions = { path = "../core/permissions", features = ["schemas"] }
|
||||
revolt-ratelimits = { path = "../core/ratelimits", features = ["rocket"] }
|
||||
|
||||
# voice
|
||||
livekit-api = { workspace = true }
|
||||
livekit-protocol = { workspace = true }
|
||||
livekit-api = "0.4.4"
|
||||
livekit-protocol = "0.4.0"
|
||||
|
||||
[build-dependencies]
|
||||
vergen = { workspace = true }
|
||||
vergen = "7.5.0"
|
||||
|
||||
@@ -9,8 +9,7 @@ pub mod routes;
|
||||
pub mod util;
|
||||
|
||||
use revolt_config::config;
|
||||
use revolt_database::events::client::EventV1;
|
||||
use revolt_database::AMQP;
|
||||
use revolt_database::{AMQP, util::rabbit::{get_channel, get_channel_with_init, set_rabbitmq_connection}};
|
||||
use revolt_ratelimits::rocket as ratelimiter;
|
||||
use rocket::{Build, Rocket};
|
||||
use rocket_cors::{AllowedOrigins, CorsOptions};
|
||||
@@ -19,13 +18,11 @@ use std::net::Ipv4Addr;
|
||||
use std::str::FromStr;
|
||||
|
||||
use amqprs::{
|
||||
channel::ExchangeDeclareArguments,
|
||||
channel::{Channel, ExchangeDeclareArguments},
|
||||
connection::{Connection, OpenConnectionArguments},
|
||||
};
|
||||
use async_std::channel::unbounded;
|
||||
use authifier::AuthifierEvent;
|
||||
use revolt_database::voice::VoiceClient;
|
||||
use rocket::data::ToByteUnit;
|
||||
use revolt_database::voice::VoiceClient;
|
||||
|
||||
pub async fn web() -> Rocket<Build> {
|
||||
// Get settings
|
||||
@@ -39,28 +36,9 @@ pub async fn web() -> Rocket<Build> {
|
||||
log::info!("database_here {db:?}");
|
||||
db.migrate_database().await.unwrap();
|
||||
|
||||
// Setup Authifier event channel
|
||||
let (_, receiver) = unbounded();
|
||||
|
||||
// Setup Authifier
|
||||
let authifier = db.clone().to_authifier().await;
|
||||
|
||||
// Launch a listener for Authifier events
|
||||
async_std::task::spawn(async move {
|
||||
while let Ok(event) = receiver.recv().await {
|
||||
match &event {
|
||||
AuthifierEvent::CreateSession { .. } | AuthifierEvent::CreateAccount { .. } => {
|
||||
EventV1::Auth(event).global().await
|
||||
}
|
||||
AuthifierEvent::DeleteSession { user_id, .. }
|
||||
| AuthifierEvent::DeleteAllSessions { user_id, .. } => {
|
||||
let id = user_id.to_string();
|
||||
EventV1::Auth(event).private(id).await
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Configure CORS
|
||||
let cors = CorsOptions {
|
||||
allowed_origins: AllowedOrigins::All,
|
||||
@@ -93,6 +71,22 @@ pub async fn web() -> Rocket<Build> {
|
||||
)
|
||||
.into();
|
||||
|
||||
let swagger_0_8 = revolt_rocket_okapi::swagger_ui::make_swagger_ui(
|
||||
&revolt_rocket_okapi::swagger_ui::SwaggerUIConfig {
|
||||
url: "/0.8/openapi.json".to_owned(),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.into();
|
||||
|
||||
let swagger_0_8 = revolt_rocket_okapi::swagger_ui::make_swagger_ui(
|
||||
&revolt_rocket_okapi::swagger_ui::SwaggerUIConfig {
|
||||
url: "/0.8/openapi.json".to_owned(),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.into();
|
||||
|
||||
// Voice handler
|
||||
let voice_client = VoiceClient::new(config.api.livekit.nodes.clone());
|
||||
// Configure Rabbit
|
||||
@@ -105,24 +99,21 @@ pub async fn web() -> Rocket<Build> {
|
||||
.await
|
||||
.expect("Failed to connect to RabbitMQ");
|
||||
|
||||
let channel = connection
|
||||
.open_channel(None)
|
||||
.await
|
||||
.expect("Failed to open RabbitMQ channel");
|
||||
set_rabbitmq_connection(connection.clone());
|
||||
let channel = get_channel_with_init(|channel: Channel| async {
|
||||
channel
|
||||
.exchange_declare(
|
||||
ExchangeDeclareArguments::new(&config.pushd.exchange, "direct")
|
||||
.durable(true)
|
||||
.finish(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to declare exchange");
|
||||
|
||||
channel
|
||||
.exchange_declare(
|
||||
ExchangeDeclareArguments::new(&config.pushd.exchange, "direct")
|
||||
.durable(true)
|
||||
.finish(),
|
||||
)
|
||||
.await
|
||||
.expect("Failed to declare exchange");
|
||||
channel
|
||||
}).await;
|
||||
|
||||
let mut amqp = AMQP::new(connection, channel);
|
||||
// amqp.configure_channels()
|
||||
// .await
|
||||
// .expect("Failed to configure channels");
|
||||
let amqp = AMQP::new(connection, channel);
|
||||
|
||||
// Launch background task workers
|
||||
revolt_database::tasks::start_workers(db.clone(), amqp.clone());
|
||||
@@ -140,6 +131,7 @@ pub async fn web() -> Rocket<Build> {
|
||||
.mount("/", rocket_cors::catch_all_options_routes())
|
||||
.mount("/", ratelimiter::routes())
|
||||
.mount("/swagger/", swagger)
|
||||
.mount("/0.8/swagger/", swagger_0_8)
|
||||
.manage(authifier)
|
||||
.manage(db)
|
||||
.manage(amqp)
|
||||
|
||||
@@ -1,8 +1,4 @@
|
||||
use revolt_database::{
|
||||
util::reference::Reference,
|
||||
voice::{remove_user_from_voice_channels, VoiceClient},
|
||||
Database, User,
|
||||
};
|
||||
use revolt_database::{Database, User, util::reference::Reference, voice::{VoiceClient, remove_user_from_voice_channels}};
|
||||
use revolt_result::{create_error, Result};
|
||||
use rocket::State;
|
||||
use rocket_empty::EmptyResponse;
|
||||
@@ -11,21 +7,21 @@ use rocket_empty::EmptyResponse;
|
||||
///
|
||||
/// Delete a bot by its id.
|
||||
#[openapi(tag = "Bots")]
|
||||
#[delete("/<bot_id>")]
|
||||
#[delete("/<target>")]
|
||||
pub async fn delete_bot(
|
||||
db: &State<Database>,
|
||||
voice_client: &State<VoiceClient>,
|
||||
user: User,
|
||||
bot_id: Reference<'_>,
|
||||
target: Reference<'_>,
|
||||
) -> Result<EmptyResponse> {
|
||||
let bot = bot_id.as_bot(db).await?;
|
||||
let bot = target.as_bot(db).await?;
|
||||
if bot.owner != user.id {
|
||||
return Err(create_error!(NotFound));
|
||||
}
|
||||
|
||||
bot.delete(db).await?;
|
||||
|
||||
remove_user_from_voice_channels(voice_client, &bot.id).await?;
|
||||
remove_user_from_voice_channels(db, voice_client, &bot.id).await?;
|
||||
|
||||
Ok(EmptyResponse)
|
||||
}
|
||||
|
||||
@@ -10,11 +10,11 @@ use validator::Validate;
|
||||
///
|
||||
/// Edit bot details by its id.
|
||||
#[openapi(tag = "Bots")]
|
||||
#[patch("/<bot_id>", data = "<data>")]
|
||||
#[patch("/<target>", data = "<data>")]
|
||||
pub async fn edit_bot(
|
||||
db: &State<Database>,
|
||||
user: User,
|
||||
bot_id: Reference<'_>,
|
||||
target: Reference<'_>,
|
||||
data: Json<DataEditBot>,
|
||||
) -> Result<Json<v0::BotWithUserResponse>> {
|
||||
let data = data.into_inner();
|
||||
@@ -24,7 +24,7 @@ pub async fn edit_bot(
|
||||
})
|
||||
})?;
|
||||
|
||||
let mut bot = bot_id.as_bot(db).await?;
|
||||
let mut bot = target.as_bot(db).await?;
|
||||
if bot.owner != user.id {
|
||||
return Err(create_error!(NotFound));
|
||||
}
|
||||
|
||||
@@ -7,17 +7,17 @@ use rocket::{serde::json::Json, State};
|
||||
///
|
||||
/// Fetch details of a bot you own by its id.
|
||||
#[openapi(tag = "Bots")]
|
||||
#[get("/<bot_id>")]
|
||||
#[get("/<bot>")]
|
||||
pub async fn fetch_bot(
|
||||
db: &State<Database>,
|
||||
user: User,
|
||||
bot_id: Reference<'_>,
|
||||
bot: Reference<'_>,
|
||||
) -> Result<Json<FetchBotResponse>> {
|
||||
if user.bot.is_some() {
|
||||
return Err(create_error!(IsBot));
|
||||
}
|
||||
|
||||
let bot = bot_id.as_bot(db).await?;
|
||||
let bot = bot.as_bot(db).await?;
|
||||
if bot.owner != user.id {
|
||||
return Err(create_error!(NotFound));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use revolt_database::{
|
||||
util::{permissions::DatabasePermissionQuery, reference::Reference},
|
||||
Database, User, AMQP,
|
||||
Database, User,
|
||||
};
|
||||
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
|
||||
use revolt_result::{create_error, Result};
|
||||
@@ -14,7 +14,6 @@ use rocket_empty::EmptyResponse;
|
||||
#[put("/<target>/ack/<message>")]
|
||||
pub async fn ack(
|
||||
db: &State<Database>,
|
||||
amqp: &State<AMQP>,
|
||||
user: User,
|
||||
target: Reference<'_>,
|
||||
message: Reference<'_>,
|
||||
@@ -30,7 +29,7 @@ pub async fn ack(
|
||||
.throw_if_lacking_channel_permission(ChannelPermission::ViewChannel)?;
|
||||
|
||||
channel
|
||||
.ack(&user.id, message.id, amqp)
|
||||
.ack(&user.id, message.id)
|
||||
.await
|
||||
.map(|_| EmptyResponse)
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user