From 27a9fc3e21d69c8eca1ee28d709cd4e4b97ba3ac Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Wed, 14 Jul 2021 11:21:53 +0100
Subject: [PATCH] Fix username block list.
---
set_version.sh | 2 +-
src/database/entities/user.rs | 2 +-
src/database/permissions/server.rs | 4 ++--
src/version.rs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/set_version.sh b/set_version.sh
index 8121b54..7f52c3e 100755
--- a/set_version.sh
+++ b/set_version.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-export version=0.5.1-alpha.8
+export version=0.5.1-alpha.8-patch.0
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
diff --git a/src/database/entities/user.rs b/src/database/entities/user.rs
index 7c2a68b..714c17e 100644
--- a/src/database/entities/user.rs
+++ b/src/database/entities/user.rs
@@ -159,7 +159,7 @@ impl User {
/// Utility function for checking claimed usernames.
pub async fn is_username_taken(username: &str) -> Result<bool> {
- if username.to_lowercase() == "revolt" && username.to_lowercase() == "admin" {
+ if username.to_lowercase() == "revolt" || username.to_lowercase() == "admin" {
return Ok(true);
}
diff --git a/src/database/permissions/server.rs b/src/database/permissions/server.rs
index d7af889..2681b80 100644
--- a/src/database/permissions/server.rs
+++ b/src/database/permissions/server.rs
@@ -18,8 +18,8 @@ pub enum ServerPermission {
// 6 bits of space
ChangeNickname = 0b00000000000000000001000000000000, // 4096
ManageNicknames = 0b00000000000000000010000000000000, // 8192
- ChangeAvatar = 0b00000000000000000100000000000000, // 16392
- RemoveAvatars = 0b00000000000000001000000000000000, // 32784
+ ChangeAvatar = 0b00000000000000000100000000000000, // 16382
+ RemoveAvatars = 0b00000000000000001000000000000000, // 32768
// 16 bits of space
}
diff --git a/src/version.rs b/src/version.rs
index 918a989..d73aecc 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -1 +1 @@
-pub const VERSION: &str = "0.5.1-alpha.8";
+pub const VERSION: &str = "0.5.1-alpha.8-patch.0";
--
GitLab