diff --git a/set_version.sh b/set_version.sh index 8121b54113ff19d3c4ed825848f4d4063a435ada..7f52c3e0457cca319a9285e21b5323a5c9a71ec8 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 7c2a68b4149812be40fe1333c4871155114fa6a6..714c17ecb85ab13c78bfb4ea93325b0876936bd2 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 d7af889682d7455d2044f8b667f7f030cc2b37be..2681b8029394ea772cb10d0340c64bc72ec6b033 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 918a989a77ebf875569ab16010e24e4c483e7fc1..d73aeccd3e08d26bbda2a7988058e174399c128b 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";