From 0a9d5de369d5f8cc4fa7be0c58bd231883520a12 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Mon, 29 Mar 2021 10:14:25 +0100
Subject: [PATCH] Don't unwrap on subscription errors.
---
Cargo.toml | 2 +-
Dockerfile | 1 +
src/database/entities/message.rs | 3 +--
src/routes/root.rs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index b43a5be..c849473 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "revolt"
-version = "0.3.3-alpha.7"
+version = "0.3.3-alpha.7-patch.0"
authors = ["Paul Makles <paulmakles@gmail.com>"]
edition = "2018"
diff --git a/Dockerfile b/Dockerfile
index 56763d7..475bc96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
# Build Stage
FROM ekidd/rust-musl-builder:nightly-2021-01-01 AS builder
+USER 0:0
WORKDIR /home/rust/src
RUN USER=root cargo new --bin revolt
diff --git a/src/database/entities/message.rs b/src/database/entities/message.rs
index bdce178..1bb174e 100644
--- a/src/database/entities/message.rs
+++ b/src/database/entities/message.rs
@@ -179,8 +179,7 @@ impl Message {
builder.set_vapid_signature(signature);
builder.set_payload(ContentEncoding::AesGcm, enc.as_bytes());
let m = builder.build().unwrap();
- let response = client.send(m).await.unwrap();
- dbg!(response);
+ let response = client.send(m).await.ok();
}
}
diff --git a/src/routes/root.rs b/src/routes/root.rs
index 9fc8e1c..9943908 100644
--- a/src/routes/root.rs
+++ b/src/routes/root.rs
@@ -9,7 +9,7 @@ use rocket_contrib::json::JsonValue;
#[get("/")]
pub async fn root() -> JsonValue {
json!({
- "revolt": "0.3.3-alpha.7",
+ "revolt": "0.3.3-alpha.7-patch.0",
"features": {
"registration": !*DISABLE_REGISTRATION,
"captcha": {
--
GitLab