Merge pull request #680 from Peter253545/main

Bug fixes
FuelRats · Nov 5, 2024 · 351843f · 351843f
2 parents 849842b + 533f7b8
commit 351843f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/classes/Anope.mjs b/src/classes/Anope.mjs
@@ -453,7 +453,6 @@ class Anope {
           KILLPROTECT: 1,
           MEMO_RECEIVE: 1,
           MEMO_SIGNON: 1,
-          NS_NO_EXPIRE: 1,
           NS_PRIVATE: 1,
           NS_SECURE: 1,
           display: nick,
@@ -472,6 +471,7 @@ class Anope {
         vhost_creator: 'API',
         vhost_time: createdUnixTime,
         vhost_host: vhost,
+        NS_NO_EXPIRE: 1,
       }).into('anope_db_NickAlias')
 
       await transaction.commit()

diff --git a/src/helpers/Validators.mjs b/src/helpers/Validators.mjs
@@ -4,7 +4,7 @@ import { UnprocessableEntityAPIError } from '../classes/APIError'
 import RegexLiteral from './RegexLiteral'
 
 
-const forbiddenCMDRNameComponents = ['[pc]', '[xb]', '[ps]', 'CMDR']
+const forbiddenCMDRNameComponents = ['[pc]', '[xb]', '[ps]', 'cmdr']
 const requiredQuoteFields = [
   'message',
   'author',

diff --git a/src/routes/APIResource.mjs b/src/routes/APIResource.mjs
@@ -360,7 +360,7 @@ export default class APIResource extends API {
         return undefined
       }
 
-      if (!Reflect.apply(changeRelationship.hasPermission, this, [ctx, entity, relationship.id])) {
+      if (!Reflect.apply(changeRelationship.hasPermission, this, [ctx, entity, data.id])) {
         throw new ForbiddenAPIError({ pointer: '/data' })
       }
       return changeRelationship.patch({ entity, id: data.id, ctx, transaction })

diff --git a/src/routes/Clients.mjs b/src/routes/Clients.mjs
@@ -201,8 +201,8 @@ export default class Clients extends APIResource {
     if (relationship === 'user') {
       return {
         many: false,
-        hasPermission (connection, entity, id) {
-          return (!entity.userId && id === connection.state.user.id) || Permission.granted({
+        hasPermission (connection) {
+          return Permission.granted({
             permissions: ['clients.write'],
             connection,
           })