Merge pull request #678 from Peter253545/develop

FuelRats · Jul 18, 2023 · 32b9156 · 32b9156
2 parents fa33d16 + a04246e
commit 32b9156
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/classes/Anope.mjs b/src/classes/Anope.mjs
@@ -231,7 +231,8 @@ class Anope {
 
     account.user = await User.findOne({
       where: {
-        email: { iLike: account.email, status: 'active' },
+        email: { iLike: account.email },
+        status: 'active',
       },
     })
     return account
@@ -265,7 +266,8 @@ class Anope {
 
     account.user = await User.findOne({
       where: {
-        email: { iLike: account.email, status: 'active' },
+        email: { iLike: account.email },
+        status: 'active',
       },
     })
     return account

diff --git a/src/db/Rat.mjs b/src/db/Rat.mjs
@@ -62,7 +62,12 @@ export default class Rat extends Model {
           through: {
             attributes: [],
           },
-        }],
+        }, {
+          model: models.Ship.scope(undefined),
+          as: 'ships',
+          required: false,
+        }
+        ],
       }],
     }
   }

diff --git a/src/routes/Rats.mjs b/src/routes/Rats.mjs
@@ -182,7 +182,7 @@ export default class Rats extends APIResource {
    */
   isSelf ({ ctx, entity }) {
     if (entity.userId === ctx.state.user.id) {
-      return Permission.granted({ permissions: ['rat.write.me'], connection: ctx })
+      return Permission.granted({ permissions: ['rats.write.me'], connection: ctx })
     }
     return false
   }