From 81111c5937f0c6b14157f666d62cc851f7f613f0 Mon Sep 17 00:00:00 2001
From: Paul Makles <paulmakles@gmail.com>
Date: Tue, 25 Aug 2020 08:50:25 +0100
Subject: [PATCH] Fix guild creation, disable registration.
---
src/database/channel.rs | 2 +-
src/routes/account.rs | 6 ++++++
src/routes/guild.rs | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/database/channel.rs b/src/database/channel.rs
index 5f84510..c4c23e1 100644
--- a/src/database/channel.rs
+++ b/src/database/channel.rs
@@ -1,12 +1,12 @@
use super::get_collection;
use lru::LruCache;
+use std::sync::{Arc, Mutex};
use mongodb::bson::{doc, from_bson, Bson};
use rocket::http::RawStr;
use rocket::request::FromParam;
use rocket_contrib::json::JsonValue;
use serde::{Deserialize, Serialize};
-use std::sync::{Arc, Mutex};
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct LastMessage {
diff --git a/src/routes/account.rs b/src/routes/account.rs
index f3f213e..ed53e38 100644
--- a/src/routes/account.rs
+++ b/src/routes/account.rs
@@ -36,6 +36,12 @@ pub fn create(info: Json<Create>) -> Response {
);
}
+ if true {
+ return Response::BadRequest(
+ json!({ "error": "Registration disabled." })
+ );
+ }
+
let col = database::get_collection("users");
if info.username.len() < 2 || info.username.len() > 32 {
diff --git a/src/routes/guild.rs b/src/routes/guild.rs
index 516741f..0fc0752 100644
--- a/src/routes/guild.rs
+++ b/src/routes/guild.rs
@@ -537,6 +537,7 @@ pub fn create_guild(user: User, info: Json<CreateGuild>) -> Response {
"name": name,
"description": description,
"owner": &user.id,
+ "channels": [ channel_id.clone() ],
"invites": [],
"bans": [],
"default_permissions": 51,
--
GitLab