Compare commits

...

4 Commits

Author SHA1 Message Date
Paul Makles
ee9622251a chore: bump quark 2022-05-18 21:27:54 +01:00
Paul Makles
d13573eb45 chore: bump version 2022-05-17 20:31:23 +01:00
Paul Makles
20e93b9838 chore: bump quark and rauth 2022-05-16 19:14:14 +01:00
JandereDev
dc6ce96aa2 fix: uploading server banners was broken 2022-05-15 18:10:45 +01:00
6 changed files with 129 additions and 13 deletions

129
Cargo.lock generated
View File

@@ -792,6 +792,16 @@ dependencies = [
"tokio 1.18.0",
]
[[package]]
name = "debugid"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6ee87af31d84ef885378aebca32be3d682b0e0dc119d5b4860a2c5bb5046730"
dependencies = [
"serde",
"uuid",
]
[[package]]
name = "derivative"
version = "2.2.0"
@@ -2750,7 +2760,7 @@ dependencies = [
[[package]]
name = "rauth"
version = "1.0.0"
source = "git+https://github.com/insertish/rauth?rev=611b11baa9e199bcefd0ca5bd3302f9d6904a2c6#611b11baa9e199bcefd0ca5bd3302f9d6904a2c6"
source = "git+https://github.com/insertish/rauth?rev=001a9698c56cea79e69e4ae71d7bc2cb48aec1a6#001a9698c56cea79e69e4ae71d7bc2cb48aec1a6"
dependencies = [
"async-std",
"base32",
@@ -2999,7 +3009,7 @@ dependencies = [
[[package]]
name = "revolt-quark"
version = "0.1.0"
source = "git+https://github.com/revoltchat/quark?rev=45706b93d4da11cf3e0f3ca41514c73945bb348d#45706b93d4da11cf3e0f3ca41514c73945bb348d"
source = "git+https://github.com/revoltchat/quark?rev=788ea6c4aa376e9f0ff7df097cd5ab98e9831f17#788ea6c4aa376e9f0ff7df097cd5ab98e9831f17"
dependencies = [
"async-recursion",
"async-std",
@@ -3029,6 +3039,7 @@ dependencies = [
"rocket",
"rocket_okapi",
"schemars",
"sentry",
"serde",
"serde_json",
"ulid 0.5.0",
@@ -3222,7 +3233,16 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
dependencies = [
"semver",
"semver 0.9.0",
]
[[package]]
name = "rustc_version"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver 1.0.9",
]
[[package]]
@@ -3231,8 +3251,8 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
dependencies = [
"rustc_version",
"semver",
"rustc_version 0.2.3",
"semver 0.9.0",
]
[[package]]
@@ -3395,12 +3415,98 @@ dependencies = [
"semver-parser",
]
[[package]]
name = "semver"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
[[package]]
name = "semver-parser"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "sentry"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2d23af89cf3e40dffb53f974e9a21653353b3e21cf51633aa58006f2a0caf8a"
dependencies = [
"httpdate 1.0.2",
"reqwest",
"sentry-backtrace",
"sentry-contexts",
"sentry-core",
"sentry-panic",
"tokio 1.18.0",
]
[[package]]
name = "sentry-backtrace"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8158a446429420acdf6a4f75192ee8929da16a0c41c89a1c34b2e0f1eaebcc02"
dependencies = [
"backtrace",
"lazy_static",
"regex",
"sentry-core",
]
[[package]]
name = "sentry-contexts"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3bda8a1e3213f1944da2d42f3081ea9f3717105bb2a6b0a8fe4f5e603010a3"
dependencies = [
"hostname",
"libc",
"rustc_version 0.4.0",
"sentry-core",
"uname",
]
[[package]]
name = "sentry-core"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56333f11be3a78131c67637f7611339df8af7ad9af831226585a457df75f9e3b"
dependencies = [
"lazy_static",
"rand 0.8.5",
"sentry-types",
"serde",
"serde_json",
]
[[package]]
name = "sentry-panic"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b957b1965c450acd220a27806fe1f2dec998d393973ebae797936b12df1c7416"
dependencies = [
"sentry-backtrace",
"sentry-core",
]
[[package]]
name = "sentry-types"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "825fd3382e2397007499a910e0184e55f7837cb0df4af30ae62bd2123e2ebcd6"
dependencies = [
"debugid",
"getrandom 0.2.6",
"hex",
"serde",
"serde_json",
"thiserror",
"time 0.3.9",
"url",
"uuid",
]
[[package]]
name = "serde"
version = "1.0.136"
@@ -3670,7 +3776,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
dependencies = [
"discard",
"rustc_version",
"rustc_version 0.2.3",
"stdweb-derive",
"stdweb-internal-macros",
"stdweb-internal-runtime",
@@ -3873,6 +3979,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
dependencies = [
"itoa 1.0.1",
"libc",
"num_threads",
"time-macros 0.2.4",
@@ -4333,6 +4440,15 @@ dependencies = [
"rand 0.8.5",
]
[[package]]
name = "uname"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
dependencies = [
"libc",
]
[[package]]
name = "uncased"
version = "0.9.6"
@@ -4411,6 +4527,7 @@ dependencies = [
"idna",
"matches",
"percent-encoding",
"serde",
]
[[package]]

View File

@@ -46,7 +46,7 @@ async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"]
# internal util
lettre = "0.10.0-alpha.4"
rauth = { git = "https://github.com/insertish/rauth", rev = "611b11baa9e199bcefd0ca5bd3302f9d6904a2c6" }
rauth = { git = "https://github.com/insertish/rauth", rev = "001a9698c56cea79e69e4ae71d7bc2cb48aec1a6" }
# redis
redis = { version = "0.21.2", features = ["async-std-comp"] }
@@ -64,5 +64,5 @@ schemars = "0.8.8"
rocket_okapi = { git = "https://github.com/insertish/okapi", rev = "dcf0df115596ee07a587a7a543cddf3d7944645b", features = [ "swagger" ] }
# quark
revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "45706b93d4da11cf3e0f3ca41514c73945bb348d" }
revolt-quark = { git = "https://github.com/revoltchat/quark", rev = "788ea6c4aa376e9f0ff7df097cd5ab98e9831f17" }
# revolt-quark = { path = "../quark" }

View File

@@ -1,3 +1,3 @@
#!/bin/bash
export version=0.5.3-2
export version=0.5.3-5
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs

View File

@@ -27,8 +27,7 @@ use std::str::FromStr;
#[async_std::main]
async fn main() {
dotenv::dotenv().ok();
env_logger::init_from_env(env_logger::Env::default().filter_or("RUST_LOG", "info"));
let _guard = revolt_quark::setup_logging();
info!(
"Starting Revolt server [version {}].",

View File

@@ -139,7 +139,7 @@ pub async fn req(
// 3. Apply new banner
if let Some(banner) = banner {
partial.banner = Some(File::use_server_icon(db, &banner, &server.id).await?);
partial.banner = Some(File::use_banner(db, &banner, &server.id).await?);
server.banner = partial.banner.clone();
}

View File

@@ -1 +1 @@
pub const VERSION: &str = "0.5.3-2";
pub const VERSION: &str = "0.5.3-5";