Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 izzy
|
8ea8f50fb8 | ||
|
izzy
|
68bcfcb626 | ||
|
izzy
|
9632a0dc1b | ||
|
izzy
|
a4a0934475 | ||
|
izzy
|
2061794305 | ||
|
izzy
|
3a7ebad883 | ||
|
izzy
|
6daa8223b2 | ||
|
izzy
|
4a58d6eae0 | ||
|
izzy
|
a8a2e491b0 | ||
|
izzy
|
f98f09a5ea | ||
|
izzy
|
7a4e12a732 | ||
|
izzy
|
aa8f8575bc | ||
|
izzy
|
70d6a5ac08 | ||
|
izzy
|
7f85ad5e7b | ||
|
izzy
|
c785ae615d | ||
|
Paul Makles
|
9c8a362e9f | ||
 Kyle Kienapfel
|
e708c612cf |
+121
-69
@@ -2,24 +2,13 @@ name: Docker Test & Publish
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
# branches:
|
|
||||||
# - "main"
|
|
||||||
tags:
|
tags:
|
||||||
- "*"
|
- "*"
|
||||||
paths-ignore:
|
|
||||||
- ".github/**"
|
|
||||||
- "!.github/workflows/docker.yml"
|
|
||||||
- ".vscode/**"
|
|
||||||
- "doc/**"
|
|
||||||
- ".gitignore"
|
|
||||||
- "LICENSE"
|
|
||||||
- "README"
|
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- "main"
|
- "main"
|
||||||
paths:
|
paths:
|
||||||
- "Dockerfile"
|
- "Dockerfile"
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -27,8 +16,9 @@ permissions:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
base:
|
base:
|
||||||
|
name: Test base image build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build base image
|
if: github.event_name == 'pull_request'
|
||||||
steps:
|
steps:
|
||||||
# Configure build environment
|
# Configure build environment
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@@ -36,33 +26,21 @@ jobs:
|
|||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
# Authenticate with GHCR
|
# Build the image
|
||||||
- name: Login to Github Container Registry
|
|
||||||
if: ${{ github.event_name != 'pull_request' }}
|
|
||||||
uses: docker/login-action@v2
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build base image
|
- name: Build base image
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: false
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
tags: ghcr.io/${{ github.repository_owner }}/base:latest
|
tags: ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
cache-from: type=gha,scope=buildx-base-multi-arch
|
cache-from: type=gha,scope=buildx-base-multi-arch
|
||||||
cache-to: type=gha,scope=buildx-base-multi-arch,mode=max
|
cache-to: type=gha,scope=buildx-base-multi-arch,mode=max
|
||||||
|
|
||||||
publish:
|
publish:
|
||||||
needs: [base]
|
runs-on: self-hosted
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
strategy:
|
name: Publish Docker images
|
||||||
matrix:
|
|
||||||
project: [delta, bonfire, autumn, january, pushd]
|
|
||||||
name: Build ${{ matrix.project }} image
|
|
||||||
steps:
|
steps:
|
||||||
# Configure build environment
|
# Configure build environment
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@@ -77,6 +55,7 @@ jobs:
|
|||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Login to Github Container Registry
|
- name: Login to Github Container Registry
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
@@ -84,58 +63,131 @@ jobs:
|
|||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
# Resolve the correct project
|
# Build the image
|
||||||
- uses: kanga333/variable-mapper@master
|
- name: Build base image
|
||||||
id: export
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
key: "${{ matrix.project }}"
|
context: .
|
||||||
map: |
|
push: true
|
||||||
{
|
platforms: linux/amd64,linux/arm64
|
||||||
"delta": {
|
tags: ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
"path": "crates/delta",
|
|
||||||
"tag": "${{ github.repository_owner }}/server"
|
|
||||||
},
|
|
||||||
"bonfire": {
|
|
||||||
"path": "crates/bonfire",
|
|
||||||
"tag": "${{ github.repository_owner }}/bonfire"
|
|
||||||
},
|
|
||||||
"autumn": {
|
|
||||||
"path": "crates/services/autumn",
|
|
||||||
"tag": "${{ github.repository_owner }}/autumn"
|
|
||||||
},
|
|
||||||
"january": {
|
|
||||||
"path": "crates/services/january",
|
|
||||||
"tag": "${{ github.repository_owner }}/january"
|
|
||||||
},
|
|
||||||
"pushd": {
|
|
||||||
"path": "crates/daemons/pushd",
|
|
||||||
"tag": "${{ github.repository_owner }}/pushd"
|
|
||||||
},
|
|
||||||
"crond": {
|
|
||||||
"path": "crates/daemons/crond",
|
|
||||||
"tag": "${{ github.repository_owner }}/crond"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
export_to: output
|
|
||||||
|
|
||||||
# Configure metadata
|
# revoltchat/server
|
||||||
- name: Docker meta
|
- name: Docker meta
|
||||||
id: meta
|
id: meta-delta
|
||||||
uses: docker/metadata-action@v4
|
uses: docker/metadata-action@v4
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
docker.io/${{ steps.export.outputs.tag }}
|
docker.io/revoltchat/server
|
||||||
ghcr.io/${{ steps.export.outputs.tag }}
|
ghcr.io/revoltchat/server
|
||||||
|
|
||||||
# Build crate image
|
|
||||||
- name: Publish
|
- name: Publish
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
file: ${{ steps.export.outputs.path }}/Dockerfile
|
file: crates/delta/Dockerfile
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta-delta.outputs.tags }}
|
||||||
build-args: |
|
build-args: |
|
||||||
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta-delta.outputs.labels }}
|
||||||
|
|
||||||
|
# revoltchat/bonfire
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta-bonfire
|
||||||
|
uses: docker/metadata-action@v4
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
docker.io/revoltchat/bonfire
|
||||||
|
ghcr.io/revoltchat/bonfire
|
||||||
|
- name: Publish
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
file: crates/bonfire/Dockerfile
|
||||||
|
tags: ${{ steps.meta-bonfire.outputs.tags }}
|
||||||
|
build-args: |
|
||||||
|
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
|
labels: ${{ steps.meta-bonfire.outputs.labels }}
|
||||||
|
|
||||||
|
# revoltchat/autumn
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta-autumn
|
||||||
|
uses: docker/metadata-action@v4
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
docker.io/revoltchat/autumn
|
||||||
|
ghcr.io/revoltchat/autumn
|
||||||
|
- name: Publish
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
file: crates/services/autumn/Dockerfile
|
||||||
|
tags: ${{ steps.meta-autumn.outputs.tags }}
|
||||||
|
build-args: |
|
||||||
|
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
|
labels: ${{ steps.meta-autumn.outputs.labels }}
|
||||||
|
|
||||||
|
# revoltchat/january
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta-january
|
||||||
|
uses: docker/metadata-action@v4
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
docker.io/revoltchat/january
|
||||||
|
ghcr.io/revoltchat/january
|
||||||
|
- name: Publish
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
file: crates/services/january/Dockerfile
|
||||||
|
tags: ${{ steps.meta-january.outputs.tags }}
|
||||||
|
build-args: |
|
||||||
|
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
|
labels: ${{ steps.meta-january.outputs.labels }}
|
||||||
|
|
||||||
|
# revoltchat/crond
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta-crond
|
||||||
|
uses: docker/metadata-action@v4
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
docker.io/revoltchat/crond
|
||||||
|
ghcr.io/revoltchat/crond
|
||||||
|
- name: Publish
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
file: crates/daemons/crond/Dockerfile
|
||||||
|
tags: ${{ steps.meta-crond.outputs.tags }}
|
||||||
|
build-args: |
|
||||||
|
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
|
labels: ${{ steps.meta-crond.outputs.labels }}
|
||||||
|
|
||||||
|
# revoltchat/pushd
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta-pushd
|
||||||
|
uses: docker/metadata-action@v4
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
docker.io/revoltchat/pushd
|
||||||
|
ghcr.io/revoltchat/pushd
|
||||||
|
- name: Publish
|
||||||
|
uses: docker/build-push-action@v4
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
file: crates/daemons/pushd/Dockerfile
|
||||||
|
tags: ${{ steps.meta-pushd.outputs.tags }}
|
||||||
|
build-args: |
|
||||||
|
BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
|
||||||
|
labels: ${{ steps.meta-pushd.outputs.labels }}
|
||||||
|
|||||||
Generated
+25
-134
@@ -443,9 +443,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "authifier"
|
name = "authifier"
|
||||||
version = "1.0.10"
|
version = "1.0.13"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "edfe88c4a9fcf24b18a216b27c9766966af2a40603d24c7782237afd6ca0d5cd"
|
checksum = "ca26cb6b5ab776a1de5a8122fe6cc77fadd84fed30704c496f2aca451637877b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -454,7 +454,7 @@ dependencies = [
|
|||||||
"chrono",
|
"chrono",
|
||||||
"futures",
|
"futures",
|
||||||
"handlebars",
|
"handlebars",
|
||||||
"iso8601-timestamp 0.1.11",
|
"iso8601-timestamp",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"lettre",
|
"lettre",
|
||||||
"log",
|
"log",
|
||||||
@@ -470,6 +470,7 @@ dependencies = [
|
|||||||
"schemars",
|
"schemars",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
"sha1",
|
||||||
"totp-lite",
|
"totp-lite",
|
||||||
"ulid 0.5.0",
|
"ulid 0.5.0",
|
||||||
"validator 0.15.0",
|
"validator 0.15.0",
|
||||||
@@ -3647,17 +3648,6 @@ dependencies = [
|
|||||||
"waker-fn",
|
"waker-fn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "iso8601-timestamp"
|
|
||||||
version = "0.1.11"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b088f3296223f11d6bd70998132653b30b6f39e6ab4be055c0bda486fa8d11c7"
|
|
||||||
dependencies = [
|
|
||||||
"generic-array 0.14.7",
|
|
||||||
"serde",
|
|
||||||
"time",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iso8601-timestamp"
|
name = "iso8601-timestamp"
|
||||||
version = "0.2.17"
|
version = "0.2.17"
|
||||||
@@ -3996,16 +3986,6 @@ dependencies = [
|
|||||||
"pkg-config",
|
"pkg-config",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libloading"
|
|
||||||
version = "0.8.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"windows-targets 0.52.6",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libm"
|
name = "libm"
|
||||||
version = "0.2.11"
|
version = "0.2.11"
|
||||||
@@ -4499,43 +4479,6 @@ dependencies = [
|
|||||||
"tempfile",
|
"tempfile",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "neon"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7d75440242411c87dc39847b0e33e961ec1f10326a9d8ecf9c1ea64a3b3c13dc"
|
|
||||||
dependencies = [
|
|
||||||
"getrandom",
|
|
||||||
"libloading",
|
|
||||||
"neon-macros",
|
|
||||||
"once_cell",
|
|
||||||
"semver",
|
|
||||||
"send_wrapper",
|
|
||||||
"smallvec",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "neon-macros"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b"
|
|
||||||
dependencies = [
|
|
||||||
"quote 1.0.38",
|
|
||||||
"syn 2.0.94",
|
|
||||||
"syn-mid",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "neon-serde4"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8778b4afaa506e067da24566623873c38797987be593232a4f9ad82c84bb3eb3"
|
|
||||||
dependencies = [
|
|
||||||
"neon",
|
|
||||||
"num",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "new_debug_unreachable"
|
name = "new_debug_unreachable"
|
||||||
version = "1.0.6"
|
version = "1.0.6"
|
||||||
@@ -4577,19 +4520,6 @@ dependencies = [
|
|||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num"
|
|
||||||
version = "0.4.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
|
|
||||||
dependencies = [
|
|
||||||
"num-complex",
|
|
||||||
"num-integer",
|
|
||||||
"num-iter",
|
|
||||||
"num-rational",
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-bigint"
|
name = "num-bigint"
|
||||||
version = "0.4.6"
|
version = "0.4.6"
|
||||||
@@ -4617,15 +4547,6 @@ dependencies = [
|
|||||||
"zeroize",
|
"zeroize",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-complex"
|
|
||||||
version = "0.4.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-conv"
|
name = "num-conv"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@@ -5983,7 +5904,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-autumn"
|
name = "revolt-autumn"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"axum",
|
"axum",
|
||||||
"axum-macros",
|
"axum-macros",
|
||||||
@@ -6020,7 +5941,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-bonfire"
|
name = "revolt-bonfire"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-channel 2.3.1",
|
"async-channel 2.3.1",
|
||||||
"async-std",
|
"async-std",
|
||||||
@@ -6050,7 +5971,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-config"
|
name = "revolt-config"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"cached",
|
"cached",
|
||||||
@@ -6066,7 +5987,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-crond"
|
name = "revolt-crond"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"revolt-config",
|
"revolt-config",
|
||||||
@@ -6078,7 +5999,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-database"
|
name = "revolt-database"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"amqprs",
|
"amqprs",
|
||||||
"async-lock 2.8.0",
|
"async-lock 2.8.0",
|
||||||
@@ -6095,7 +6016,7 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"indexmap 1.9.3",
|
"indexmap 1.9.3",
|
||||||
"isahc",
|
"isahc",
|
||||||
"iso8601-timestamp 0.2.17",
|
"iso8601-timestamp",
|
||||||
"linkify 0.8.1",
|
"linkify 0.8.1",
|
||||||
"log",
|
"log",
|
||||||
"lru 0.11.1",
|
"lru 0.11.1",
|
||||||
@@ -6128,7 +6049,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-delta"
|
name = "revolt-delta"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"amqprs",
|
"amqprs",
|
||||||
"async-channel 1.9.0",
|
"async-channel 1.9.0",
|
||||||
@@ -6140,7 +6061,7 @@ dependencies = [
|
|||||||
"env_logger",
|
"env_logger",
|
||||||
"futures",
|
"futures",
|
||||||
"impl_ops",
|
"impl_ops",
|
||||||
"iso8601-timestamp 0.2.17",
|
"iso8601-timestamp",
|
||||||
"lettre",
|
"lettre",
|
||||||
"linkify 0.6.0",
|
"linkify 0.6.0",
|
||||||
"log",
|
"log",
|
||||||
@@ -6175,7 +6096,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-files"
|
name = "revolt-files"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm",
|
"aes-gcm",
|
||||||
"aws-config",
|
"aws-config",
|
||||||
@@ -6198,7 +6119,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-january"
|
name = "revolt-january"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-recursion",
|
"async-recursion",
|
||||||
"axum",
|
"axum",
|
||||||
@@ -6226,10 +6147,10 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-models"
|
name = "revolt-models"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap 1.9.3",
|
"indexmap 1.9.3",
|
||||||
"iso8601-timestamp 0.2.17",
|
"iso8601-timestamp",
|
||||||
"num_enum 0.6.1",
|
"num_enum 0.6.1",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"regex",
|
"regex",
|
||||||
@@ -6243,29 +6164,16 @@ dependencies = [
|
|||||||
"validator 0.16.1",
|
"validator 0.16.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "revolt-nodejs-bindings"
|
|
||||||
version = "0.8.4"
|
|
||||||
dependencies = [
|
|
||||||
"async-std",
|
|
||||||
"neon",
|
|
||||||
"neon-serde4",
|
|
||||||
"revolt-config",
|
|
||||||
"revolt-database",
|
|
||||||
"revolt-result",
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-parser"
|
name = "revolt-parser"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"logos",
|
"logos",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-permissions"
|
name = "revolt-permissions"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -6280,7 +6188,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-presence"
|
name = "revolt-presence"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"log",
|
"log",
|
||||||
@@ -6291,7 +6199,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-pushd"
|
name = "revolt-pushd"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"amqprs",
|
"amqprs",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -6299,7 +6207,7 @@ dependencies = [
|
|||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"fcm_v1",
|
"fcm_v1",
|
||||||
"isahc",
|
"isahc",
|
||||||
"iso8601-timestamp 0.2.17",
|
"iso8601-timestamp",
|
||||||
"log",
|
"log",
|
||||||
"pretty_env_logger",
|
"pretty_env_logger",
|
||||||
"revolt-config",
|
"revolt-config",
|
||||||
@@ -6317,7 +6225,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "revolt-result"
|
name = "revolt-result"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"axum",
|
"axum",
|
||||||
"revolt_okapi",
|
"revolt_okapi",
|
||||||
@@ -6517,12 +6425,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rocket_authifier"
|
name = "rocket_authifier"
|
||||||
version = "1.0.10"
|
version = "1.0.13"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c2aa1bfaee106d088b78de7c3cc2a8ab2c9e05a0286b6b912f0b18ea656b329e"
|
checksum = "0490f4a6f0a359a9ffff9acbdf4eddf49890ec94941b8ddd88163c16f6159f5a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"authifier",
|
"authifier",
|
||||||
"iso8601-timestamp 0.1.11",
|
"iso8601-timestamp",
|
||||||
"revolt_okapi",
|
"revolt_okapi",
|
||||||
"revolt_rocket_okapi",
|
"revolt_rocket_okapi",
|
||||||
"rocket",
|
"rocket",
|
||||||
@@ -7001,12 +6909,6 @@ version = "1.0.24"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
|
checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "send_wrapper"
|
|
||||||
version = "0.6.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sentry"
|
name = "sentry"
|
||||||
version = "0.31.8"
|
version = "0.31.8"
|
||||||
@@ -7597,17 +7499,6 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "syn-mid"
|
|
||||||
version = "0.6.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2",
|
|
||||||
"quote 1.0.38",
|
|
||||||
"syn 2.0.94",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sync_wrapper"
|
name = "sync_wrapper"
|
||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
|
|||||||
+3
-4
@@ -6,7 +6,6 @@ members = [
|
|||||||
"crates/bonfire",
|
"crates/bonfire",
|
||||||
"crates/core/*",
|
"crates/core/*",
|
||||||
"crates/services/*",
|
"crates/services/*",
|
||||||
"crates/bindings/*",
|
|
||||||
"crates/daemons/*",
|
"crates/daemons/*",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -16,6 +15,6 @@ redis23 = { package = "redis", version = "0.23.3", git = "https://github.com/rev
|
|||||||
# I'm 99% sure this is overloading the GitHub worker
|
# I'm 99% sure this is overloading the GitHub worker
|
||||||
# hence builds have been failing since, let's just
|
# hence builds have been failing since, let's just
|
||||||
# disable it for now. In the future, we could use this
|
# disable it for now. In the future, we could use this
|
||||||
# if we were rolling our own CI.
|
# if we were rolling our own CI (that is now).
|
||||||
# [profile.release]
|
[profile.release]
|
||||||
# lto = true
|
lto = true
|
||||||
|
|||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
# Build Stage
|
# Build Stage
|
||||||
FROM --platform="${BUILDPLATFORM}" rust:1.77.2-slim-bookworm
|
FROM --platform="${BUILDPLATFORM}" rust:1.86.0-slim-bookworm
|
||||||
USER 0:0
|
USER 0:0
|
||||||
WORKDIR /home/rust/src
|
WORKDIR /home/rust/src
|
||||||
|
|
||||||
@@ -17,13 +17,13 @@ RUN sh /tmp/build-image-layer.sh tools
|
|||||||
|
|
||||||
# Build all dependencies
|
# Build all dependencies
|
||||||
COPY Cargo.toml Cargo.lock ./
|
COPY Cargo.toml Cargo.lock ./
|
||||||
COPY crates/bindings/node/Cargo.toml ./crates/bindings/node/
|
|
||||||
COPY crates/bonfire/Cargo.toml ./crates/bonfire/
|
COPY crates/bonfire/Cargo.toml ./crates/bonfire/
|
||||||
COPY crates/delta/Cargo.toml ./crates/delta/
|
COPY crates/delta/Cargo.toml ./crates/delta/
|
||||||
COPY crates/core/config/Cargo.toml ./crates/core/config/
|
COPY crates/core/config/Cargo.toml ./crates/core/config/
|
||||||
COPY crates/core/database/Cargo.toml ./crates/core/database/
|
COPY crates/core/database/Cargo.toml ./crates/core/database/
|
||||||
COPY crates/core/files/Cargo.toml ./crates/core/files/
|
COPY crates/core/files/Cargo.toml ./crates/core/files/
|
||||||
COPY crates/core/models/Cargo.toml ./crates/core/models/
|
COPY crates/core/models/Cargo.toml ./crates/core/models/
|
||||||
|
COPY crates/core/parser/Cargo.toml ./crates/core/parser/
|
||||||
COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
|
COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
|
||||||
COPY crates/core/presence/Cargo.toml ./crates/core/presence/
|
COPY crates/core/presence/Cargo.toml ./crates/core/presence/
|
||||||
COPY crates/core/result/Cargo.toml ./crates/core/result/
|
COPY crates/core/result/Cargo.toml ./crates/core/result/
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Build Stage
|
# Build Stage
|
||||||
FROM rust:1.77.2-slim-bookworm
|
FROM rust:1.86.0-slim-bookworm
|
||||||
USER 0:0
|
USER 0:0
|
||||||
WORKDIR /home/rust/src
|
WORKDIR /home/rust/src
|
||||||
|
|
||||||
@@ -13,13 +13,13 @@ COPY scripts/build-image-layer.sh /tmp/
|
|||||||
|
|
||||||
# Build all dependencies
|
# Build all dependencies
|
||||||
COPY Cargo.toml Cargo.lock ./
|
COPY Cargo.toml Cargo.lock ./
|
||||||
COPY crates/bindings/node/Cargo.toml ./crates/bindings/node/
|
|
||||||
COPY crates/bonfire/Cargo.toml ./crates/bonfire/
|
COPY crates/bonfire/Cargo.toml ./crates/bonfire/
|
||||||
COPY crates/delta/Cargo.toml ./crates/delta/
|
COPY crates/delta/Cargo.toml ./crates/delta/
|
||||||
COPY crates/core/config/Cargo.toml ./crates/core/config/
|
COPY crates/core/config/Cargo.toml ./crates/core/config/
|
||||||
COPY crates/core/database/Cargo.toml ./crates/core/database/
|
COPY crates/core/database/Cargo.toml ./crates/core/database/
|
||||||
COPY crates/core/files/Cargo.toml ./crates/core/files/
|
COPY crates/core/files/Cargo.toml ./crates/core/files/
|
||||||
COPY crates/core/models/Cargo.toml ./crates/core/models/
|
COPY crates/core/models/Cargo.toml ./crates/core/models/
|
||||||
|
COPY crates/core/parser/Cargo.toml ./crates/core/parser/
|
||||||
COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
|
COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
|
||||||
COPY crates/core/presence/Cargo.toml ./crates/core/presence/
|
COPY crates/core/presence/Cargo.toml ./crates/core/presence/
|
||||||
COPY crates/core/result/Cargo.toml ./crates/core/result/
|
COPY crates/core/result/Cargo.toml ./crates/core/result/
|
||||||
|
|||||||
@@ -12,32 +12,31 @@
|
|||||||
The services and libraries that power the Revolt service.<br/>
|
The services and libraries that power the Revolt service.<br/>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
| Crate | Path | Description | |
|
| Crate | Path | Description | |
|
||||||
| ------------------ | -------------------------------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
| ------------------ | -------------------------------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
| `core/config` | [crates/core/config](crates/core/config) | Core: Configuration |     |
|
| `core/config` | [crates/core/config](crates/core/config) | Core: Configuration |     |
|
||||||
| `core/database` | [crates/core/database](crates/core/database) | Core: Database Implementation |     |
|
| `core/database` | [crates/core/database](crates/core/database) | Core: Database Implementation |     |
|
||||||
| `core/files` | [crates/core/files](crates/core/files) | Core: S3 and encryption subroutines |     |
|
| `core/files` | [crates/core/files](crates/core/files) | Core: S3 and encryption subroutines |     |
|
||||||
| `core/models` | [crates/core/models](crates/core/models) | Core: API Models |     |
|
| `core/models` | [crates/core/models](crates/core/models) | Core: API Models |     |
|
||||||
| `core/permissions` | [crates/core/permissions](crates/core/permissions) | Core: Permission Logic |     |
|
| `core/permissions` | [crates/core/permissions](crates/core/permissions) | Core: Permission Logic |     |
|
||||||
| `core/presence` | [crates/core/presence](crates/core/presence) | Core: User Presence |     |
|
| `core/presence` | [crates/core/presence](crates/core/presence) | Core: User Presence |     |
|
||||||
| `core/result` | [crates/core/result](crates/core/result) | Core: Result and Error types |     |
|
| `core/result` | [crates/core/result](crates/core/result) | Core: Result and Error types |     |
|
||||||
| `delta` | [crates/delta](crates/delta) | REST API server |  |
|
| `delta` | [crates/delta](crates/delta) | REST API server |  |
|
||||||
| `bonfire` | [crates/bonfire](crates/bonfire) | WebSocket events server |  |
|
| `bonfire` | [crates/bonfire](crates/bonfire) | WebSocket events server |  |
|
||||||
| `services/january` | [crates/services/january](crates/services/january) | Proxy server |  |
|
| `services/january` | [crates/services/january](crates/services/january) | Proxy server |  |
|
||||||
| `services/autumn` | [crates/services/autumn](crates/services/autumn) | File server |  |
|
| `services/autumn` | [crates/services/autumn](crates/services/autumn) | File server |  |
|
||||||
| `bindings/node` | [crates/bindings/node](crates/bindings/node) | Node.js bindings for the Revolt software |  |
|
| `daemons/crond` | [crates/daemons/crond](crates/daemons/crond) | Timed data clean up daemon server |  |
|
||||||
| `daemons/crond` | [crates/daemons/crond](crates/daemons/crond) | Timed data clean up daemon server |  |
|
| `daemons/pushd` | [crates/daemons/pushd](crates/daemons/pushd) | Push notification daemon server |  |
|
||||||
| `daemons/pushd` | [crates/daemons/pushd](crates/daemons/pushd) | Push notification daemon server |  |
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
## Minimum Supported Rust Version
|
## Minimum Supported Rust Version
|
||||||
|
|
||||||
Rust 1.76 or higher.
|
Rust 1.86.0 or higher.
|
||||||
|
|
||||||
> [!CAUTION]
|
> [!CAUTION]
|
||||||
> The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341).
|
> The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341). This is currently solved by build time options but we are looking for a proper fix.
|
||||||
|
|
||||||
## Development Guide
|
## Development Guide
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ from_address = "development@revolt.chat"
|
|||||||
reply_to = "support@revolt.chat"
|
reply_to = "support@revolt.chat"
|
||||||
port = 14025
|
port = 14025
|
||||||
use_tls = false
|
use_tls = false
|
||||||
|
use_starttls = false
|
||||||
|
|
||||||
[files.s3]
|
[files.s3]
|
||||||
# S3 protocol endpoint
|
# S3 protocol endpoint
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
target
|
|
||||||
index.node
|
|
||||||
**/node_modules
|
|
||||||
**/.DS_Store
|
|
||||||
npm-debug.log*
|
|
||||||
cargo.log
|
|
||||||
cross.log
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "revolt-nodejs-bindings"
|
|
||||||
version = "0.8.4"
|
|
||||||
description = "Node.js bindings for the Revolt software"
|
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
|
||||||
license = "MIT"
|
|
||||||
edition = "2021"
|
|
||||||
exclude = ["index.node"]
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
crate-type = ["cdylib"]
|
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
neon = "1.0.0"
|
|
||||||
neon-serde4 = "1.0.0"
|
|
||||||
|
|
||||||
serde = { version = "1", features = ["derive"] }
|
|
||||||
|
|
||||||
async-std = "1.12.0"
|
|
||||||
|
|
||||||
revolt-config = { version = "0.8.4", path = "../../core/config" }
|
|
||||||
revolt-result = { version = "0.8.4", path = "../../core/result" }
|
|
||||||
revolt-database = { version = "0.8.4", path = "../../core/database" }
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
# revolt.node
|
|
||||||
|
|
||||||
**revolt.node:** Node.js bindings for the Revolt software
|
|
||||||
|
|
||||||
This project was bootstrapped by [create-neon](https://www.npmjs.com/package/create-neon).
|
|
||||||
|
|
||||||
## Building revolt.node
|
|
||||||
|
|
||||||
Building revolt.node requires a [supported version of Node and Rust](https://github.com/neon-bindings/neon#platform-support).
|
|
||||||
|
|
||||||
To run the build, run:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
$ npm run build
|
|
||||||
```
|
|
||||||
|
|
||||||
This command uses the [@neon-rs/cli](https://www.npmjs.com/package/@neon-rs/cli) utility to assemble the binary Node addon from the output of `cargo`.
|
|
||||||
|
|
||||||
## Exploring revolt.node
|
|
||||||
|
|
||||||
After building revolt.node, you can explore its exports at the Node console:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
$ npm i
|
|
||||||
$ npm run build
|
|
||||||
$ node
|
|
||||||
> require('.').hello()
|
|
||||||
'hello node'
|
|
||||||
```
|
|
||||||
|
|
||||||
## Available Scripts
|
|
||||||
|
|
||||||
In the project directory, you can run:
|
|
||||||
|
|
||||||
#### `npm install`
|
|
||||||
|
|
||||||
Installs the project, including running `npm run build`.
|
|
||||||
|
|
||||||
#### `npm run build`
|
|
||||||
|
|
||||||
Builds the Node addon (`index.node`) from source, generating a release build with `cargo --release`.
|
|
||||||
|
|
||||||
Additional [`cargo build`](https://doc.rust-lang.org/cargo/commands/cargo-build.html) arguments may be passed to `npm run build` and similar commands. For example, to enable a [cargo feature](https://doc.rust-lang.org/cargo/reference/features.html):
|
|
||||||
|
|
||||||
```
|
|
||||||
npm run build -- --feature=beetle
|
|
||||||
```
|
|
||||||
|
|
||||||
#### `npm run debug`
|
|
||||||
|
|
||||||
Similar to `npm run build` but generates a debug build with `cargo`.
|
|
||||||
|
|
||||||
#### `npm run cross`
|
|
||||||
|
|
||||||
Similar to `npm run build` but uses [cross-rs](https://github.com/cross-rs/cross) to cross-compile for another platform. Use the [`CARGO_BUILD_TARGET`](https://doc.rust-lang.org/cargo/reference/config.html#buildtarget) environment variable to select the build target.
|
|
||||||
|
|
||||||
#### `npm test`
|
|
||||||
|
|
||||||
Runs the unit tests by calling `cargo test`. You can learn more about [adding tests to your Rust code](https://doc.rust-lang.org/book/ch11-01-writing-tests.html) from the [Rust book](https://doc.rust-lang.org/book/).
|
|
||||||
|
|
||||||
## Project Layout
|
|
||||||
|
|
||||||
The directory structure of this project is:
|
|
||||||
|
|
||||||
```
|
|
||||||
revolt.node/
|
|
||||||
├── Cargo.toml
|
|
||||||
├── README.md
|
|
||||||
├── src/
|
|
||||||
| └── lib.rs
|
|
||||||
├── index.node
|
|
||||||
├── package.json
|
|
||||||
└── target/
|
|
||||||
```
|
|
||||||
|
|
||||||
| Entry | Purpose |
|
|
||||||
|----------------|------------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `Cargo.toml` | The Cargo [manifest file](https://doc.rust-lang.org/cargo/reference/manifest.html), which informs the `cargo` command. |
|
|
||||||
| `README.md` | This file. |
|
|
||||||
| `src/` | The directory tree containing the Rust source code for the project. |
|
|
||||||
| `lib.rs` | Entry point for the Rust source code. |
|
|
||||||
| `index.node` | The main module, a [Node addon](https://nodejs.org/api/addons.html) generated by the build and pointed to by `"main"` in `package.json`. |
|
|
||||||
| `package.json` | The npm [manifest file](https://docs.npmjs.com/cli/v7/configuring-npm/package-json), which informs the `npm` command. |
|
|
||||||
| `target/` | Binary artifacts generated by the Rust build. |
|
|
||||||
|
|
||||||
## Learn More
|
|
||||||
|
|
||||||
Learn more about:
|
|
||||||
|
|
||||||
- [Neon](https://neon-bindings.com).
|
|
||||||
- [Rust](https://www.rust-lang.org).
|
|
||||||
- [Node](https://nodejs.org).
|
|
||||||
Vendored
-84
@@ -1,84 +0,0 @@
|
|||||||
import { Channel, User } from "revolt-api";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opaque type for Revolt database
|
|
||||||
*/
|
|
||||||
export declare interface Database {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opaque type for Revolt database
|
|
||||||
*/
|
|
||||||
export declare interface OpaqueUser {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error type from Revolt backend
|
|
||||||
*/
|
|
||||||
export declare interface Err {
|
|
||||||
type: string;
|
|
||||||
location: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialises background tasks and logging, must be called before anything else!
|
|
||||||
* Can be called multiple times!
|
|
||||||
*/
|
|
||||||
export declare function init();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a new handle to the Revolt database
|
|
||||||
* @returns {Database} Handle
|
|
||||||
*/
|
|
||||||
export declare function database(): Database;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch user from database
|
|
||||||
* @param {string} userId User's ID
|
|
||||||
* @this {Database}
|
|
||||||
*/
|
|
||||||
export declare function database_fetch_user(userId: string): OpaqueUser;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch user from database
|
|
||||||
* @param {string} username Username
|
|
||||||
* @param {string} discriminator Discriminator
|
|
||||||
* @this {Database}
|
|
||||||
*/
|
|
||||||
export declare function database_fetch_user_by_username(
|
|
||||||
username: string,
|
|
||||||
discriminator: string
|
|
||||||
): OpaqueUser;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets model data as JSON
|
|
||||||
* @this {OpaqueUser}
|
|
||||||
*/
|
|
||||||
export declare function model_data(): User;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets error if the model failed to fetch
|
|
||||||
* @this {OpaqueUser}
|
|
||||||
*/
|
|
||||||
export declare function model_error(): Err;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open a direct message channel between two users
|
|
||||||
* @param {string} userA User A ID
|
|
||||||
* @param {string} userB User B ID
|
|
||||||
* @returns Existing or newly created channel
|
|
||||||
*/
|
|
||||||
export declare function proc_channels_create_dm(
|
|
||||||
userA: string,
|
|
||||||
userB: string
|
|
||||||
): Promise<Channel & { error: Err }>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Suspend a user
|
|
||||||
* @param {string} user User
|
|
||||||
* @param {number} duration Duration (in days), set to 0 for indefinite
|
|
||||||
* @param {string} reason Pipe-separated list of reasons (e.g. reason1|reason2|reason3)
|
|
||||||
*/
|
|
||||||
export declare function proc_users_suspend(
|
|
||||||
user: OpaqueUser,
|
|
||||||
duration: number,
|
|
||||||
reason: string
|
|
||||||
): Promise<{ error: Err }>;
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "revolt-nodejs-bindings",
|
|
||||||
"version": "0.7.15-rev0.0.3",
|
|
||||||
"description": "Node.js bindings for the Revolt software",
|
|
||||||
"main": "index.node",
|
|
||||||
"scripts": {
|
|
||||||
"test": "cargo test",
|
|
||||||
"cargo-build": "cargo build --message-format=json > cargo.log",
|
|
||||||
"cross-build": "cross build --message-format=json > cross.log",
|
|
||||||
"postcargo-build": "neon dist < cargo.log",
|
|
||||||
"postcross-build": "neon dist -m /target < cross.log",
|
|
||||||
"debug": "npm run cargo-build --",
|
|
||||||
"build": "npm run cargo-build -- --release",
|
|
||||||
"cross": "npm run cross-build -- --release"
|
|
||||||
},
|
|
||||||
"author": "Paul Makles",
|
|
||||||
"license": "AGPL-3.0",
|
|
||||||
"devDependencies": {
|
|
||||||
"@neon-rs/cli": "0.1.73"
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git+https://github.com/revoltchat/backend"
|
|
||||||
},
|
|
||||||
"keywords": [
|
|
||||||
"revolt",
|
|
||||||
"chat"
|
|
||||||
],
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/revoltchat/backend/issues"
|
|
||||||
},
|
|
||||||
"homepage": "https://github.com/revoltchat/backend#readme",
|
|
||||||
"dependencies": {
|
|
||||||
"revolt-api": "^0.7.15"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Generated
-117
@@ -1,117 +0,0 @@
|
|||||||
lockfileVersion: '6.0'
|
|
||||||
|
|
||||||
settings:
|
|
||||||
autoInstallPeers: true
|
|
||||||
excludeLinksFromLockfile: false
|
|
||||||
|
|
||||||
dependencies:
|
|
||||||
revolt-api:
|
|
||||||
specifier: ^0.7.15
|
|
||||||
version: 0.7.15
|
|
||||||
|
|
||||||
devDependencies:
|
|
||||||
'@neon-rs/cli':
|
|
||||||
specifier: 0.1.73
|
|
||||||
version: 0.1.73
|
|
||||||
|
|
||||||
packages:
|
|
||||||
|
|
||||||
/@cargo-messages/android-arm-eabi@0.1.72:
|
|
||||||
resolution: {integrity: sha512-gGZxIM1mj+Y5x+ULND6ZCNr7f70OJi9wDlycSK8hGONy9wrChN6JAIHryddC5cqcwlYAoQ6IDcDFElnhAYbybA==}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [android]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@cargo-messages/darwin-arm64@0.1.72:
|
|
||||||
resolution: {integrity: sha512-EAzN5MLaXPljZKZDO5qR+aBs44eSq2ZbEnS7AI/FziE3MzeXbrGOS3fLba5+7yWPFXJyZolXzePm8N1EBv8ovg==}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [darwin]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@cargo-messages/darwin-x64@0.1.72:
|
|
||||||
resolution: {integrity: sha512-RLo6j8s3nYbjdd1LDct4wamfChyRit7zokUuxtIYCu9XOlltkN5vnj1vwnrPvoqCMZ/7CbbuHFwSTn9A71de/w==}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [darwin]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@cargo-messages/linux-arm-gnueabihf@0.1.72:
|
|
||||||
resolution: {integrity: sha512-tHsRshuzfjrX6SDW3jg6al8vMNLTMgczGnVYl5RuBZf/yrAUuwe30KxA9ge6w6mW6Ox797DyBchzAc9OLgTgmQ==}
|
|
||||||
cpu: [arm]
|
|
||||||
os: [linux]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@cargo-messages/linux-x64-gnu@0.1.72:
|
|
||||||
resolution: {integrity: sha512-VGtL6CCnUbhsP4aYuBNT5kfrAL7o0qjrxw97a+ax13t+nJd26tVEEIKHMu5drvvS/Nm/hn7sLT8zMnnCv0pvHg==}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [linux]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@cargo-messages/win32-arm64-msvc@0.1.72:
|
|
||||||
resolution: {integrity: sha512-V93Cgz39K+yqa3MveNbhh29pYCp8izK5uEavjPoxlNxAbsMCWH+s0verGDdUcfGxjR1H2V7oZ4FszPqR2SqMRQ==}
|
|
||||||
cpu: [arm64]
|
|
||||||
os: [win32]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@cargo-messages/win32-x64-msvc@0.1.72:
|
|
||||||
resolution: {integrity: sha512-knz3uSrO0OSbq3U5VWfCY8FB4NsM43BOWLZ7x4sfaMOC1XWv+IyvDdkLe6DhJx8KUw46KIAimYs9YROrp6l46Q==}
|
|
||||||
cpu: [x64]
|
|
||||||
os: [win32]
|
|
||||||
requiresBuild: true
|
|
||||||
dev: true
|
|
||||||
optional: true
|
|
||||||
|
|
||||||
/@neon-rs/cli@0.1.73:
|
|
||||||
resolution: {integrity: sha512-1kv8S/feB6UQWQQwsnGfkSkEBOtlFDNExnioL81E2BwvUWgjQPaseHgpi2EpWVgsPUgur5eBm4QowmlpWkD4/w==}
|
|
||||||
hasBin: true
|
|
||||||
optionalDependencies:
|
|
||||||
'@cargo-messages/android-arm-eabi': 0.1.72
|
|
||||||
'@cargo-messages/darwin-arm64': 0.1.72
|
|
||||||
'@cargo-messages/darwin-x64': 0.1.72
|
|
||||||
'@cargo-messages/linux-arm-gnueabihf': 0.1.72
|
|
||||||
'@cargo-messages/linux-x64-gnu': 0.1.72
|
|
||||||
'@cargo-messages/win32-arm64-msvc': 0.1.72
|
|
||||||
'@cargo-messages/win32-x64-msvc': 0.1.72
|
|
||||||
dev: true
|
|
||||||
|
|
||||||
/axios@0.26.1:
|
|
||||||
resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
|
|
||||||
dependencies:
|
|
||||||
follow-redirects: 1.15.6
|
|
||||||
transitivePeerDependencies:
|
|
||||||
- debug
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/follow-redirects@1.15.6:
|
|
||||||
resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
|
|
||||||
engines: {node: '>=4.0'}
|
|
||||||
peerDependencies:
|
|
||||||
debug: '*'
|
|
||||||
peerDependenciesMeta:
|
|
||||||
debug:
|
|
||||||
optional: true
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/lodash.defaultsdeep@4.6.1:
|
|
||||||
resolution: {integrity: sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==}
|
|
||||||
dev: false
|
|
||||||
|
|
||||||
/revolt-api@0.7.15:
|
|
||||||
resolution: {integrity: sha512-rWRnjBFvoXt/RHRxHg9KuP+x1Jk61KdsOpKOczVJg5tIqGDmqp/6QZHw5rJTtG+wCH3Ah3YKwY+MM5NHfg1W3Q==}
|
|
||||||
dependencies:
|
|
||||||
axios: 0.26.1
|
|
||||||
lodash.defaultsdeep: 4.6.1
|
|
||||||
transitivePeerDependencies:
|
|
||||||
- debug
|
|
||||||
dev: false
|
|
||||||
@@ -1,221 +0,0 @@
|
|||||||
#[macro_use]
|
|
||||||
extern crate serde;
|
|
||||||
|
|
||||||
use std::sync::OnceLock;
|
|
||||||
|
|
||||||
use neon::prelude::*;
|
|
||||||
use revolt_database::{Database, DatabaseInfo};
|
|
||||||
|
|
||||||
fn js_init(mut cx: FunctionContext) -> JsResult<JsUndefined> {
|
|
||||||
// static INIT: OnceLock<()> = OnceLock::new();
|
|
||||||
// if INIT.get().is_none() {
|
|
||||||
// INIT.get_or_init(|| {
|
|
||||||
// async_std::task::block_on(async {
|
|
||||||
// revolt_config::configure!(api);
|
|
||||||
|
|
||||||
// match DatabaseInfo::Auto.connect().await {
|
|
||||||
// Ok(db) => {
|
|
||||||
// let authifier_db = db.clone().to_authifier().await.database;
|
|
||||||
// revolt_database::tasks::start_workers(db, authifier_db);
|
|
||||||
// Ok(())
|
|
||||||
// }
|
|
||||||
// Err(err) => Err(err),
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// .or_else(|err| cx.throw_error(err))
|
|
||||||
// .unwrap();
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
Ok(cx.undefined())
|
|
||||||
}
|
|
||||||
|
|
||||||
struct DatabaseBinding(Database, Channel);
|
|
||||||
impl Finalize for DatabaseBinding {}
|
|
||||||
impl DatabaseBinding {
|
|
||||||
fn take(&self) -> (Database, Channel) {
|
|
||||||
(self.0.clone(), self.1.clone())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn js_database(mut cx: FunctionContext) -> JsResult<JsBox<DatabaseBinding>> {
|
|
||||||
let db = async_std::task::block_on(DatabaseInfo::Auto.connect())
|
|
||||||
.or_else(|err| cx.throw_error(err))?;
|
|
||||||
|
|
||||||
let channel = cx.channel();
|
|
||||||
Ok(cx.boxed(DatabaseBinding(db, channel)))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Implementations for models
|
|
||||||
#[derive(Clone)]
|
|
||||||
#[allow(clippy::large_enum_variant)]
|
|
||||||
enum Model {
|
|
||||||
User(revolt_database::User),
|
|
||||||
Error(revolt_result::Error),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Model {
|
|
||||||
fn give(&self) -> Model {
|
|
||||||
self.clone()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Finalize for Model {}
|
|
||||||
|
|
||||||
macro_rules! shim_boxed {
|
|
||||||
($cx: ident, $name: ident, $model: ident, $( $variable: ident $type: ident $id: expr )+, $cmd: ident, $( $arg: expr, )+) => {
|
|
||||||
fn $name(mut cx: FunctionContext) -> JsResult<JsPromise> {
|
|
||||||
$(
|
|
||||||
let $variable = cx.argument::<$type>($id)?.value(&mut cx);
|
|
||||||
)+
|
|
||||||
|
|
||||||
let (db, channel) = cx.this::<JsBox<DatabaseBinding>>()?.take();
|
|
||||||
let (deferred, promise) = cx.promise();
|
|
||||||
|
|
||||||
async_std::task::spawn(async move {
|
|
||||||
let result = db.$cmd($($arg,)+).await;
|
|
||||||
deferred.settle_with(&channel, move |mut cx| {
|
|
||||||
Ok(cx.boxed(match result {
|
|
||||||
Ok(value) => Model::$model(value),
|
|
||||||
Err(error) => Model::Error(error)
|
|
||||||
}))
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(promise)
|
|
||||||
}
|
|
||||||
|
|
||||||
$cx.export_function(stringify!($name), $name)?;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
fn js_data(mut cx: FunctionContext) -> JsResult<JsValue> {
|
|
||||||
match cx.this::<JsBox<Model>>()?.give() {
|
|
||||||
Model::Error(_) => neon_serde4::to_value(&mut cx, &None::<()>),
|
|
||||||
Model::User(user) => neon_serde4::to_value(&mut cx, &user),
|
|
||||||
}
|
|
||||||
.or_else(|e| cx.throw_error(e.to_string()))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn js_error(mut cx: FunctionContext) -> JsResult<JsValue> {
|
|
||||||
let value = match cx.this::<JsBox<Model>>()?.give() {
|
|
||||||
Model::Error(err) => Some(err),
|
|
||||||
_ => None,
|
|
||||||
};
|
|
||||||
|
|
||||||
neon_serde4::to_value(&mut cx, &value).or_else(|e| cx.throw_error(e.to_string()))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Basic data implementation
|
|
||||||
#[derive(Serialize, Deserialize)]
|
|
||||||
struct ResultBinding<T> {
|
|
||||||
#[serde(flatten)]
|
|
||||||
value: Option<T>,
|
|
||||||
error: Option<revolt_result::Error>,
|
|
||||||
}
|
|
||||||
|
|
||||||
macro_rules! shim {
|
|
||||||
($cx: ident, $name: ident, $( $variable: ident $type: ident $id: expr )*, $( $model: ident $modelType: ident $modelId: expr )*, | $db: ident | $closure: expr, $( $arg: expr, )+) => {
|
|
||||||
fn $name(mut cx: FunctionContext) -> JsResult<JsPromise> {
|
|
||||||
$(
|
|
||||||
let $variable = cx.argument::<$type>($id)?.value(&mut cx);
|
|
||||||
)*
|
|
||||||
|
|
||||||
$(
|
|
||||||
let mut $model = if let Model::$modelType(value) = cx.argument::<JsBox<Model>>($modelId)?.give() {
|
|
||||||
value
|
|
||||||
} else {
|
|
||||||
unreachable!()
|
|
||||||
};
|
|
||||||
)*
|
|
||||||
|
|
||||||
let (db, channel) = cx.this::<JsBox<DatabaseBinding>>()?.take();
|
|
||||||
let (deferred, promise) = cx.promise();
|
|
||||||
|
|
||||||
async_std::task::spawn(async move {
|
|
||||||
#[allow(clippy::redundant_closure_call)]
|
|
||||||
let result = (|$db: $crate::Database| $closure)(db.clone()).await;
|
|
||||||
deferred.settle_with(&channel, move |mut cx| {
|
|
||||||
neon_serde4::to_value(
|
|
||||||
&mut cx,
|
|
||||||
&match result {
|
|
||||||
Ok(value) => ResultBinding {
|
|
||||||
value: Some(value),
|
|
||||||
error: None,
|
|
||||||
},
|
|
||||||
Err(error) => ResultBinding {
|
|
||||||
value: None,
|
|
||||||
error: Some(error),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.or_else(|e| cx.throw_error(e.to_string()))
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(promise)
|
|
||||||
}
|
|
||||||
|
|
||||||
$cx.export_function(stringify!($name), $name)?;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#[neon::main]
|
|
||||||
fn main(mut cx: ModuleContext) -> NeonResult<()> {
|
|
||||||
// initialise required background stuff
|
|
||||||
cx.export_function("init", js_init)?;
|
|
||||||
|
|
||||||
// database & model stuff
|
|
||||||
cx.export_function("database", js_database)?;
|
|
||||||
cx.export_function("model_data", js_data)?;
|
|
||||||
cx.export_function("model_error", js_error)?;
|
|
||||||
|
|
||||||
shim_boxed!(
|
|
||||||
cx,
|
|
||||||
database_fetch_user,
|
|
||||||
User,
|
|
||||||
user_id JsString 0,
|
|
||||||
fetch_user,
|
|
||||||
&user_id,
|
|
||||||
);
|
|
||||||
|
|
||||||
shim_boxed!(
|
|
||||||
cx,
|
|
||||||
database_fetch_user_by_username,
|
|
||||||
User,
|
|
||||||
username JsString 0
|
|
||||||
discriminator JsString 1,
|
|
||||||
fetch_user_by_username,
|
|
||||||
&username, &discriminator,
|
|
||||||
);
|
|
||||||
|
|
||||||
// procedure calls
|
|
||||||
shim!(
|
|
||||||
cx,
|
|
||||||
proc_channels_create_dm,
|
|
||||||
user_a JsString 0
|
|
||||||
user_b JsString 1,
|
|
||||||
,
|
|
||||||
|db| async move {
|
|
||||||
let user_a = db.fetch_user(&user_a).await?;
|
|
||||||
let user_b = db.fetch_user(&user_b).await?;
|
|
||||||
revolt_database::Channel::create_dm(&db, &user_a, &user_b).await
|
|
||||||
},
|
|
||||||
&userA, &userB,
|
|
||||||
);
|
|
||||||
|
|
||||||
shim!(
|
|
||||||
cx,
|
|
||||||
proc_users_suspend,
|
|
||||||
duration JsNumber 1
|
|
||||||
reason JsString 2,
|
|
||||||
user User 0,
|
|
||||||
|db| async move {
|
|
||||||
let duration = duration as usize;
|
|
||||||
user.suspend(&db, if duration == 0 { None } else { Some(duration) }, Some(reason.split('|').map(|x| x.to_owned()).collect())).await
|
|
||||||
},
|
|
||||||
&user,
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
const Internal = require(".");
|
|
||||||
|
|
||||||
// playing around with class wrapper, not practical
|
|
||||||
class Model {
|
|
||||||
constructor(model) {
|
|
||||||
this.model = model;
|
|
||||||
}
|
|
||||||
|
|
||||||
data() {
|
|
||||||
return Internal.model_data.bind(this.model)();
|
|
||||||
}
|
|
||||||
|
|
||||||
error() {
|
|
||||||
return Internal.model_error.bind(this.model)();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class User extends Model {
|
|
||||||
constructor(db, user) {
|
|
||||||
super(user);
|
|
||||||
this.db = db;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class Database {
|
|
||||||
constructor() {
|
|
||||||
this.db = Internal.database();
|
|
||||||
}
|
|
||||||
|
|
||||||
async fetchUser(userId) {
|
|
||||||
return new User(
|
|
||||||
this,
|
|
||||||
await Internal.database_fetch_user.bind(this.db)(userId)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async fetchUserByUsername(username, discriminator) {
|
|
||||||
return new User(
|
|
||||||
this,
|
|
||||||
await Internal.database_fetch_user_by_username.bind(this.db)(
|
|
||||||
username,
|
|
||||||
discriminator
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const db = new Database();
|
|
||||||
db.fetchUserByUsername("dos", "7624").then((user) => console.info(user.data()));
|
|
||||||
db.fetchUserByUsername("dos", "1111").then((user) => console.info(user.data()));
|
|
||||||
db.fetchUserByUsername("dos", "1111").then((user) =>
|
|
||||||
console.info(user.error())
|
|
||||||
);
|
|
||||||
Generated
-6
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "bindings",
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-bonfire"
|
name = "revolt-bonfire"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
@@ -36,12 +36,12 @@ async-std = { version = "1.8.0", features = [
|
|||||||
] }
|
] }
|
||||||
|
|
||||||
# core
|
# core
|
||||||
authifier = { version = "1.0.10" }
|
authifier = { version = "1.0.13" }
|
||||||
revolt-result = { path = "../core/result" }
|
revolt-result = { path = "../core/result" }
|
||||||
revolt-models = { path = "../core/models" }
|
revolt-models = { path = "../core/models" }
|
||||||
revolt-config = { path = "../core/config" }
|
revolt-config = { path = "../core/config" }
|
||||||
revolt-database = { path = "../core/database" }
|
revolt-database = { path = "../core/database" }
|
||||||
revolt-permissions = { version = "0.8.4", path = "../core/permissions" }
|
revolt-permissions = { version = "0.8.5", path = "../core/permissions" }
|
||||||
revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
|
revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
|
||||||
|
|
||||||
# redis
|
# redis
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-config"
|
name = "revolt-config"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
@@ -34,4 +34,4 @@ pretty_env_logger = "0.4.0"
|
|||||||
sentry = "0.31.5"
|
sentry = "0.31.5"
|
||||||
|
|
||||||
# Core
|
# Core
|
||||||
revolt-result = { version = "0.8.4", path = "../result", optional = true }
|
revolt-result = { version = "0.8.5", path = "../result", optional = true }
|
||||||
|
|||||||
@@ -54,6 +54,8 @@ authifier_shield_key = ""
|
|||||||
voso_legacy_token = ""
|
voso_legacy_token = ""
|
||||||
# Whether services are behind the Cloudflare network
|
# Whether services are behind the Cloudflare network
|
||||||
trust_cloudflare = false
|
trust_cloudflare = false
|
||||||
|
# easypwned endpoint
|
||||||
|
easypwned = ""
|
||||||
|
|
||||||
[api.security.captcha]
|
[api.security.captcha]
|
||||||
# hCaptcha configuration
|
# hCaptcha configuration
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ pub struct ApiSmtp {
|
|||||||
pub reply_to: Option<String>,
|
pub reply_to: Option<String>,
|
||||||
pub port: Option<i32>,
|
pub port: Option<i32>,
|
||||||
pub use_tls: Option<bool>,
|
pub use_tls: Option<bool>,
|
||||||
|
pub use_starttls: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
@@ -168,6 +169,7 @@ pub struct ApiSecurity {
|
|||||||
pub voso_legacy_token: String,
|
pub voso_legacy_token: String,
|
||||||
pub captcha: ApiSecurityCaptcha,
|
pub captcha: ApiSecurityCaptcha,
|
||||||
pub trust_cloudflare: bool,
|
pub trust_cloudflare: bool,
|
||||||
|
pub easypwned: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
@@ -177,7 +179,7 @@ pub struct ApiWorkers {
|
|||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
pub struct ApiUsers {
|
pub struct ApiUsers {
|
||||||
pub early_adopter_cutoff: Option<u64>
|
pub early_adopter_cutoff: Option<u64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-database"
|
name = "revolt-database"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
@@ -24,19 +24,19 @@ default = ["mongodb", "async-std-runtime", "tasks"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# Core
|
# Core
|
||||||
revolt-config = { version = "0.8.4", path = "../config", features = [
|
revolt-config = { version = "0.8.5", path = "../config", features = [
|
||||||
"report-macros",
|
"report-macros",
|
||||||
] }
|
] }
|
||||||
revolt-result = { version = "0.8.4", path = "../result" }
|
revolt-result = { version = "0.8.5", path = "../result" }
|
||||||
revolt-models = { version = "0.8.4", path = "../models", features = [
|
revolt-models = { version = "0.8.5", path = "../models", features = [
|
||||||
"validator",
|
"validator",
|
||||||
] }
|
] }
|
||||||
revolt-presence = { version = "0.8.4", path = "../presence" }
|
revolt-presence = { version = "0.8.5", path = "../presence" }
|
||||||
revolt-permissions = { version = "0.8.4", path = "../permissions", features = [
|
revolt-permissions = { version = "0.8.5", path = "../permissions", features = [
|
||||||
"serde",
|
"serde",
|
||||||
"bson",
|
"bson",
|
||||||
] }
|
] }
|
||||||
revolt-parser = { version = "0.1.0", path = "../parser" }
|
revolt-parser = { version = "0.1.1", path = "../parser" }
|
||||||
|
|
||||||
# Utility
|
# Utility
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
@@ -97,7 +97,7 @@ web-push = "0.10.0"
|
|||||||
revolt_a2 = { version = "0.10", default-features = false, features = ["ring"] }
|
revolt_a2 = { version = "0.10", default-features = false, features = ["ring"] }
|
||||||
|
|
||||||
# Authifier
|
# Authifier
|
||||||
authifier = { version = "1.0.10", features = ["rocket_impl"] }
|
authifier = { version = "1.0.13", features = ["rocket_impl"] }
|
||||||
|
|
||||||
# RabbitMQ
|
# RabbitMQ
|
||||||
amqprs = { version = "1.7.0" }
|
amqprs = { version = "1.7.0" }
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ mod reference;
|
|||||||
|
|
||||||
use authifier::config::Captcha;
|
use authifier::config::Captcha;
|
||||||
use authifier::config::EmailVerificationConfig;
|
use authifier::config::EmailVerificationConfig;
|
||||||
|
use authifier::config::PasswordScanning;
|
||||||
use authifier::config::ResolveIp;
|
use authifier::config::ResolveIp;
|
||||||
use authifier::config::SMTPSettings;
|
use authifier::config::SMTPSettings;
|
||||||
use authifier::config::Shield;
|
use authifier::config::Shield;
|
||||||
@@ -102,6 +103,13 @@ impl Database {
|
|||||||
let config = config().await;
|
let config = config().await;
|
||||||
|
|
||||||
let mut auth_config = authifier::Config {
|
let mut auth_config = authifier::Config {
|
||||||
|
password_scanning: if config.api.security.easypwned.is_empty() {
|
||||||
|
Default::default()
|
||||||
|
} else {
|
||||||
|
PasswordScanning::EasyPwned {
|
||||||
|
endpoint: config.api.security.easypwned,
|
||||||
|
}
|
||||||
|
},
|
||||||
email_verification: if !config.api.smtp.host.is_empty() {
|
email_verification: if !config.api.smtp.host.is_empty() {
|
||||||
EmailVerificationConfig::Enabled {
|
EmailVerificationConfig::Enabled {
|
||||||
smtp: SMTPSettings {
|
smtp: SMTPSettings {
|
||||||
@@ -118,6 +126,7 @@ impl Database {
|
|||||||
),
|
),
|
||||||
port: config.api.smtp.port,
|
port: config.api.smtp.port,
|
||||||
use_tls: config.api.smtp.use_tls,
|
use_tls: config.api.smtp.use_tls,
|
||||||
|
use_starttls: config.api.smtp.use_starttls,
|
||||||
},
|
},
|
||||||
expiry: Default::default(),
|
expiry: Default::default(),
|
||||||
templates: if config.production {
|
templates: if config.production {
|
||||||
@@ -134,6 +143,15 @@ impl Database {
|
|||||||
url: format!("{}/login/reset/", config.hosts.app),
|
url: format!("{}/login/reset/", config.hosts.app),
|
||||||
html: Some(include_str!("../../templates/reset.html").into()),
|
html: Some(include_str!("../../templates/reset.html").into()),
|
||||||
},
|
},
|
||||||
|
reset_existing: Template {
|
||||||
|
title: "You already have a Revolt account, reset your password."
|
||||||
|
.into(),
|
||||||
|
text: include_str!("../../templates/reset-existing.txt").into(),
|
||||||
|
url: format!("{}/login/reset/", config.hosts.app),
|
||||||
|
html: Some(
|
||||||
|
include_str!("../../templates/reset-existing.html").into(),
|
||||||
|
),
|
||||||
|
},
|
||||||
deletion: Template {
|
deletion: Template {
|
||||||
title: "Confirm account deletion.".into(),
|
title: "Confirm account deletion.".into(),
|
||||||
text: include_str!("../../templates/deletion.txt").into(),
|
text: include_str!("../../templates/deletion.txt").into(),
|
||||||
@@ -156,9 +174,16 @@ impl Database {
|
|||||||
url: format!("{}/login/reset/", config.hosts.app),
|
url: format!("{}/login/reset/", config.hosts.app),
|
||||||
html: None,
|
html: None,
|
||||||
},
|
},
|
||||||
|
reset_existing: Template {
|
||||||
|
title: "Reset your password.".into(),
|
||||||
|
text: include_str!("../../templates/reset.whitelabel.txt").into(),
|
||||||
|
url: format!("{}/login/reset/", config.hosts.app),
|
||||||
|
html: None,
|
||||||
|
},
|
||||||
deletion: Template {
|
deletion: Template {
|
||||||
title: "Confirm account deletion.".into(),
|
title: "Confirm account deletion.".into(),
|
||||||
text: include_str!("../../templates/deletion.whitelabel.txt").into(),
|
text: include_str!("../../templates/deletion.whitelabel.txt")
|
||||||
|
.into(),
|
||||||
url: format!("{}/delete/", config.hosts.app),
|
url: format!("{}/delete/", config.hosts.app),
|
||||||
html: None,
|
html: None,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,188 @@
|
|||||||
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<!-- Compiled with Bootstrap Email version: 1.5.1 --><meta http-equiv="x-ua-compatible" content="ie=edge">
|
||||||
|
<meta name="x-apple-disable-message-reformatting">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<style type="text/css">
|
||||||
|
body,table,td{font-family:Helvetica,Arial,sans-serif !important}.ExternalClass{width:100%}.ExternalClass,.ExternalClass p,.ExternalClass span,.ExternalClass font,.ExternalClass td,.ExternalClass div{line-height:150%}a{text-decoration:none}*{color:inherit}a[x-apple-data-detectors],u+#body a,#MessageViewBody a{color:inherit;text-decoration:none;font-size:inherit;font-family:inherit;font-weight:inherit;line-height:inherit}img{-ms-interpolation-mode:bicubic}table:not([class^=s-]){font-family:Helvetica,Arial,sans-serif;mso-table-lspace:0pt;mso-table-rspace:0pt;border-spacing:0px;border-collapse:collapse}table:not([class^=s-]) td{border-spacing:0px;border-collapse:collapse}@media screen and (max-width: 600px){.w-full,.w-full>tbody>tr>td{width:100% !important}.w-24,.w-24>tbody>tr>td{width:96px !important}.p-lg-10:not(table),.p-lg-10:not(.btn)>tbody>tr>td,.p-lg-10.btn td a{padding:0 !important}.p-3:not(table),.p-3:not(.btn)>tbody>tr>td,.p-3.btn td a{padding:12px !important}.p-6:not(table),.p-6:not(.btn)>tbody>tr>td,.p-6.btn td a{padding:24px !important}*[class*=s-lg-]>tbody>tr>td{font-size:0 !important;line-height:0 !important;height:0 !important}.s-4>tbody>tr>td{font-size:16px !important;line-height:16px !important;height:16px !important}.s-6>tbody>tr>td{font-size:24px !important;line-height:24px !important;height:24px !important}.s-10>tbody>tr>td{font-size:40px !important;line-height:40px !important;height:40px !important}}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body class="bg-light" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
|
||||||
|
<table class="bg-light body" valign="top" role="presentation" border="0" cellpadding="0" cellspacing="0" style="outline: 0; width: 100%; min-width: 100%; height: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; font-family: Helvetica, Arial, sans-serif; line-height: 24px; font-weight: normal; font-size: 16px; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; color: #000000; margin: 0; padding: 0; border-width: 0;" bgcolor="#f7fafc">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td valign="top" style="line-height: 24px; font-size: 16px; margin: 0;" align="left" bgcolor="#f7fafc">
|
||||||
|
<table class="container" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td align="center" style="line-height: 24px; font-size: 16px; margin: 0; padding: 0 16px;">
|
||||||
|
<!--[if (gte mso 9)|(IE)]>
|
||||||
|
<table align="center" role="presentation">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td width="600">
|
||||||
|
<![endif]-->
|
||||||
|
<table align="center" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 600px; margin: 0 auto;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
|
||||||
|
<table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
|
||||||
|
<img class="w-24" src="https://app.revolt.chat/assets/logo_round.png" style="height: auto; line-height: 100%; outline: none; text-decoration: none; display: block; width: 96px; border-style: none; border-width: 0;" width="96">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="s-10 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 40px; font-size: 40px; width: 100%; height: 40px; margin: 0;" align="left" width="100%" height="40">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="card p-6 p-lg-10 space-y-4" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; width: 100%; overflow: hidden; border: 1px solid #e2e8f0;" bgcolor="#ffffff">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 16px; width: 100%; margin: 0; padding: 40px;" align="left" bgcolor="#ffffff">
|
||||||
|
<h1 class="h3 fw-700" style="padding-top: 0; padding-bottom: 0; font-weight: 700 !important; vertical-align: baseline; font-size: 28px; line-height: 33.6px; margin: 0;" align="left">Password Reset</h1>
|
||||||
|
<table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
|
||||||
|
You tried to create a new account with or try to re-verify this email
|
||||||
|
but there is already an existing verified account under this email.
|
||||||
|
</p>
|
||||||
|
<table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<p class="" style="line-height: 24px; font-size: 16px; width: 100%; margin: 0;" align="left">
|
||||||
|
If you wish, you can now proceed to reset the password on it, click
|
||||||
|
below to continue.
|
||||||
|
</p>
|
||||||
|
<table class="s-4 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 16px; font-size: 16px; width: 100%; height: 16px; margin: 0;" align="left" width="100%" height="16">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="btn btn-primary p-3 fw-700" role="presentation" border="0" cellpadding="0" cellspacing="0" style="border-radius: 6px; border-collapse: separate !important; font-weight: 700 !important;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 16px; border-radius: 6px; font-weight: 700 !important; margin: 0;" align="center" bgcolor="#0d6efd">
|
||||||
|
<a href="{{url}}" style="color: #ffffff; font-size: 16px; font-family: Helvetica, Arial, sans-serif; text-decoration: none; border-radius: 6px; line-height: 20px; display: block; font-weight: 700 !important; white-space: nowrap; background-color: #0d6efd; padding: 12px; border: 1px solid #0d6efd;">Reset</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<div class="text-muted text-center" style="color: #718096;" align="center">
|
||||||
|
This email is intended for {{email}}<br>
|
||||||
|
Sent from Revolt<br>
|
||||||
|
Made in Europe
|
||||||
|
</div>
|
||||||
|
<table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="ax-center" role="presentation" align="center" border="0" cellpadding="0" cellspacing="0" style="margin: 0 auto;">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 16px; margin: 0;" align="left">
|
||||||
|
<div class="text-muted text-xs" style="color: #718096; font-size: 12px; line-height: 14.4px;">
|
||||||
|
Revolt Platforms Ltd. is a company incorporated and registered under the
|
||||||
|
laws of England and Wales.<br>
|
||||||
|
Registered Company Number: 16260658<br>
|
||||||
|
Registered Office:<br>
|
||||||
|
Suite 5703 Unit 3A, 34-35 Hatton Garden,<br>
|
||||||
|
Holborn, United Kingdom, EC1N 8DX
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<table class="s-6 w-full" role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="line-height: 24px; font-size: 24px; width: 100%; height: 24px; margin: 0;" align="left" width="100%" height="24">
|
||||||
|
 
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<!--[if (gte mso 9)|(IE)]>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<![endif]-->
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
|
<style>
|
||||||
|
/* Add custom classes and styles that you want inlined here */
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body class="bg-light">
|
||||||
|
<div class="container">
|
||||||
|
<img
|
||||||
|
class="ax-center my-10 w-24"
|
||||||
|
src="https://app.revolt.chat/assets/logo_round.png"
|
||||||
|
/>
|
||||||
|
<div class="card p-6 p-lg-10 space-y-4">
|
||||||
|
<h1 class="h3 fw-700">Password Reset</h1>
|
||||||
|
<p>
|
||||||
|
You tried to create a new account with or try to re-verify this email
|
||||||
|
but there is already an existing verified account under this email.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
If you wish, you can now proceed to reset the password on it, click
|
||||||
|
below to continue.
|
||||||
|
</p>
|
||||||
|
<a class="btn btn-primary p-3 fw-700" href="{{url}}">Reset</a>
|
||||||
|
</div>
|
||||||
|
<div class="text-muted text-center my-6">
|
||||||
|
This email is intended for {{email}}<br />
|
||||||
|
Sent from Revolt<br />
|
||||||
|
Made in Europe
|
||||||
|
</div>
|
||||||
|
<div class="text-muted text-xs my-6 ax-center">
|
||||||
|
Revolt Platforms Ltd. is a company incorporated and registered under the
|
||||||
|
laws of England and Wales.<br />
|
||||||
|
Registered Company Number: 16260658<br />
|
||||||
|
Registered Office:<br />
|
||||||
|
Suite 5703 Unit 3A, 34-35 Hatton Garden,<br />
|
||||||
|
Holborn, United Kingdom, EC1N 8DX
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
You tried to create a new account with or try
|
||||||
|
to re-verify this email but there is already
|
||||||
|
an existing verified account under this email.
|
||||||
|
|
||||||
|
If you wish, you can now proceed to reset the
|
||||||
|
password on it, click below to continue.
|
||||||
|
|
||||||
|
Please navigate to: {{url}}
|
||||||
|
|
||||||
|
This email is intended for {{email}}
|
||||||
|
Sent by Revolt
|
||||||
|
Made in Europe
|
||||||
|
|
||||||
|
Revolt Platforms Ltd. is a company incorporated and registered under the laws of England and Wales.
|
||||||
|
|
||||||
|
Registration Number: 16260658
|
||||||
|
Registered Office:
|
||||||
|
Suite 5703 Unit 3A, 34-35 Hatton Garden,
|
||||||
|
Holborn, United Kingdom, EC1N 8DX
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-files"
|
name = "revolt-files"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
@@ -20,10 +20,10 @@ typenum = "1.17.0"
|
|||||||
aws-config = "1.5.5"
|
aws-config = "1.5.5"
|
||||||
aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
|
aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] }
|
||||||
|
|
||||||
revolt-config = { version = "0.8.4", path = "../config", features = [
|
revolt-config = { version = "0.8.5", path = "../config", features = [
|
||||||
"report-macros",
|
"report-macros",
|
||||||
] }
|
] }
|
||||||
revolt-result = { version = "0.8.4", path = "../result" }
|
revolt-result = { version = "0.8.5", path = "../result" }
|
||||||
|
|
||||||
# image processing
|
# image processing
|
||||||
jxl-oxide = "0.8.1"
|
jxl-oxide = "0.8.1"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-models"
|
name = "revolt-models"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
@@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# Core
|
# Core
|
||||||
revolt-config = { version = "0.8.4", path = "../config" }
|
revolt-config = { version = "0.8.5", path = "../config" }
|
||||||
revolt-permissions = { version = "0.8.4", path = "../permissions" }
|
revolt-permissions = { version = "0.8.5", path = "../permissions" }
|
||||||
|
|
||||||
# Utility
|
# Utility
|
||||||
regex = "1.11"
|
regex = "1.11"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-parser"
|
name = "revolt-parser"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
logos = { version = "*" }
|
logos = { version = "*" }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-permissions"
|
name = "revolt-permissions"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# Core
|
# Core
|
||||||
revolt-result = { version = "0.8.4", path = "../result" }
|
revolt-result = { version = "0.8.5", path = "../result" }
|
||||||
|
|
||||||
# Utility
|
# Utility
|
||||||
auto_ops = "0.3.0"
|
auto_ops = "0.3.0"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-presence"
|
name = "revolt-presence"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-result"
|
name = "revolt-result"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-crond"
|
name = "revolt-crond"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
authors = ["Paul Makles <me@insrt.uk>"]
|
authors = ["Paul Makles <me@insrt.uk>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
@@ -16,7 +16,7 @@ log = "0.4"
|
|||||||
tokio = { version = "1" }
|
tokio = { version = "1" }
|
||||||
|
|
||||||
# Core
|
# Core
|
||||||
revolt-database = { version = "0.8.4", path = "../../core/database" }
|
revolt-database = { version = "0.8.5", path = "../../core/database" }
|
||||||
revolt-result = { version = "0.8.4", path = "../../core/result" }
|
revolt-result = { version = "0.8.5", path = "../../core/result" }
|
||||||
revolt-config = { version = "0.8.4", path = "../../core/config" }
|
revolt-config = { version = "0.8.5", path = "../../core/config" }
|
||||||
revolt-files = { version = "0.8.4", path = "../../core/files" }
|
revolt-files = { version = "0.8.5", path = "../../core/files" }
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-pushd"
|
name = "revolt-pushd"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
revolt-config = { version = "0.8.4", path = "../../core/config" }
|
revolt-config = { version = "0.8.5", path = "../../core/config" }
|
||||||
revolt-database = { version = "0.8.4", path = "../../core/database" }
|
revolt-database = { version = "0.8.5", path = "../../core/database" }
|
||||||
revolt-models = { version = "0.8.4", path = "../../core/models", features = [
|
revolt-models = { version = "0.8.5", path = "../../core/models", features = [
|
||||||
"validator",
|
"validator",
|
||||||
] }
|
] }
|
||||||
revolt-presence = { version = "0.8.1", path = "../../core/presence", features = [
|
revolt-presence = { version = "0.8.5", path = "../../core/presence", features = [
|
||||||
"redis-is-patched",
|
"redis-is-patched",
|
||||||
] }
|
] }
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-delta"
|
name = "revolt-delta"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
authors = ["Paul Makles <paulmakles@gmail.com>"]
|
authors = ["Paul Makles <paulmakles@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
@@ -52,10 +52,11 @@ async-std = { version = "1.8.0", features = [
|
|||||||
lettre = "0.10.0-alpha.4"
|
lettre = "0.10.0-alpha.4"
|
||||||
|
|
||||||
# web
|
# web
|
||||||
|
|
||||||
rocket = { version = "0.5.1", default-features = false, features = ["json"] }
|
rocket = { version = "0.5.1", default-features = false, features = ["json"] }
|
||||||
rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
|
rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
|
||||||
rocket_empty = { version = "0.1.1", features = ["schema"] }
|
rocket_empty = { version = "0.1.1", features = ["schema"] }
|
||||||
rocket_authifier = { version = "1.0.10" }
|
rocket_authifier = { version = "1.0.13" }
|
||||||
rocket_prometheus = "0.10.0-rc.3"
|
rocket_prometheus = "0.10.0-rc.3"
|
||||||
|
|
||||||
# spec generation
|
# spec generation
|
||||||
@@ -66,7 +67,7 @@ revolt_rocket_okapi = { version = "0.10.0", features = ["swagger"] }
|
|||||||
amqprs = { version = "1.7.0" }
|
amqprs = { version = "1.7.0" }
|
||||||
|
|
||||||
# core
|
# core
|
||||||
authifier = "1.0.10"
|
authifier = "1.0.13"
|
||||||
revolt-config = { path = "../core/config" }
|
revolt-config = { path = "../core/config" }
|
||||||
revolt-database = { path = "../core/database", features = [
|
revolt-database = { path = "../core/database", features = [
|
||||||
"rocket-impl",
|
"rocket-impl",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-autumn"
|
name = "revolt-autumn"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|
||||||
@@ -43,12 +43,12 @@ tracing = "0.1"
|
|||||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||||
|
|
||||||
# Core crates
|
# Core crates
|
||||||
revolt-files = { version = "0.8.4", path = "../../core/files" }
|
revolt-files = { version = "0.8.5", path = "../../core/files" }
|
||||||
revolt-config = { version = "0.8.4", path = "../../core/config" }
|
revolt-config = { version = "0.8.5", path = "../../core/config" }
|
||||||
revolt-database = { version = "0.8.4", path = "../../core/database", features = [
|
revolt-database = { version = "0.8.5", path = "../../core/database", features = [
|
||||||
"axum-impl",
|
"axum-impl",
|
||||||
] }
|
] }
|
||||||
revolt-result = { version = "0.8.4", path = "../../core/result", features = [
|
revolt-result = { version = "0.8.5", path = "../../core/result", features = [
|
||||||
"utoipa",
|
"utoipa",
|
||||||
"axum",
|
"axum",
|
||||||
] }
|
] }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "revolt-january"
|
name = "revolt-january"
|
||||||
version = "0.8.4"
|
version = "0.8.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-or-later"
|
license = "AGPL-3.0-or-later"
|
||||||
|
|
||||||
@@ -32,13 +32,13 @@ tracing = "0.1"
|
|||||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||||
|
|
||||||
# Core crates
|
# Core crates
|
||||||
revolt-config = { version = "0.8.4", path = "../../core/config" }
|
revolt-config = { version = "0.8.5", path = "../../core/config" }
|
||||||
revolt-models = { version = "0.8.4", path = "../../core/models" }
|
revolt-models = { version = "0.8.5", path = "../../core/models" }
|
||||||
revolt-result = { version = "0.8.4", path = "../../core/result", features = [
|
revolt-result = { version = "0.8.5", path = "../../core/result", features = [
|
||||||
"utoipa",
|
"utoipa",
|
||||||
"axum",
|
"axum",
|
||||||
] }
|
] }
|
||||||
revolt-files = { version = "0.8.4", path = "../../core/files" }
|
revolt-files = { version = "0.8.5", path = "../../core/files" }
|
||||||
|
|
||||||
# Axum / web server
|
# Axum / web server
|
||||||
axum = { version = "0.7.5" }
|
axum = { version = "0.7.5" }
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ tools() {
|
|||||||
|
|
||||||
deps() {
|
deps() {
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
crates/bindings/node/src \
|
|
||||||
crates/bonfire/src \
|
crates/bonfire/src \
|
||||||
crates/delta/src \
|
crates/delta/src \
|
||||||
crates/core/config/src \
|
crates/core/config/src \
|
||||||
crates/core/database/src \
|
crates/core/database/src \
|
||||||
crates/core/files/src \
|
crates/core/files/src \
|
||||||
crates/core/models/src \
|
crates/core/models/src \
|
||||||
|
crates/core/parser/src \
|
||||||
crates/core/permissions/src \
|
crates/core/permissions/src \
|
||||||
crates/core/presence/src \
|
crates/core/presence/src \
|
||||||
crates/core/result/src \
|
crates/core/result/src \
|
||||||
@@ -44,19 +44,19 @@ deps() {
|
|||||||
tee crates/daemons/crond/src/main.rs |
|
tee crates/daemons/crond/src/main.rs |
|
||||||
tee crates/daemons/pushd/src/main.rs
|
tee crates/daemons/pushd/src/main.rs
|
||||||
echo '' |
|
echo '' |
|
||||||
tee crates/bindings/node/src/lib.rs |
|
|
||||||
tee crates/core/config/src/lib.rs |
|
tee crates/core/config/src/lib.rs |
|
||||||
tee crates/core/database/src/lib.rs |
|
tee crates/core/database/src/lib.rs |
|
||||||
tee crates/core/files/src/lib.rs |
|
tee crates/core/files/src/lib.rs |
|
||||||
tee crates/core/models/src/lib.rs |
|
tee crates/core/models/src/lib.rs |
|
||||||
|
tee crates/core/parser/src/lib.rs |
|
||||||
tee crates/core/permissions/src/lib.rs |
|
tee crates/core/permissions/src/lib.rs |
|
||||||
tee crates/core/presence/src/lib.rs |
|
tee crates/core/presence/src/lib.rs |
|
||||||
tee crates/core/result/src/lib.rs
|
tee crates/core/result/src/lib.rs
|
||||||
|
|
||||||
if [ -z "$TARGETARCH" ]; then
|
if [ -z "$TARGETARCH" ]; then
|
||||||
cargo build --locked --release
|
cargo build -j 10 --locked --release
|
||||||
else
|
else
|
||||||
cargo build --locked --release --target "${BUILD_TARGET}"
|
cargo build -j 10 --locked --release --target "${BUILD_TARGET}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,14 +69,15 @@ apps() {
|
|||||||
crates/core/config/src/lib.rs \
|
crates/core/config/src/lib.rs \
|
||||||
crates/core/database/src/lib.rs \
|
crates/core/database/src/lib.rs \
|
||||||
crates/core/models/src/lib.rs \
|
crates/core/models/src/lib.rs \
|
||||||
|
crates/core/parser/src/lib.rs \
|
||||||
crates/core/permissions/src/lib.rs \
|
crates/core/permissions/src/lib.rs \
|
||||||
crates/core/presence/src/lib.rs \
|
crates/core/presence/src/lib.rs \
|
||||||
crates/core/result/src/lib.rs
|
crates/core/result/src/lib.rs
|
||||||
|
|
||||||
if [ -z "$TARGETARCH" ]; then
|
if [ -z "$TARGETARCH" ]; then
|
||||||
cargo build --locked --release
|
cargo build -j 10 --locked --release
|
||||||
else
|
else
|
||||||
cargo build --locked --release --target "${BUILD_TARGET}"
|
cargo build -j 10 --locked --release --target "${BUILD_TARGET}"
|
||||||
mv target _target && mv _target/"${BUILD_TARGET}" target
|
mv target _target && mv _target/"${BUILD_TARGET}" target
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user