fix: objection.js 2.0 compat fixes

server/graph/resolvers/page.js

@@ -61,11 +61,9 @@ module.exports = {
         'createdAt',
         'updatedAt'
       ])
-        .eagerAlgorithm(WIKI.models.Objection.Model.JoinEagerAlgorithm)
+        .withGraphJoined('tags')
-        .eager('tags(selectTags)', {
+        .modifyGraph('tags', builder => {
-          selectTags: builder => {
+          builder.select('tag')
-            builder.select('tag')
-          }
         })
         .modify(queryBuilder => {
           if (args.limit) {

server/models/pages.js

@@ -704,11 +704,9 @@ module.exports = class Page extends Model {
         ])
         .joinRelated('author')
         .joinRelated('creator')
-        .eagerAlgorithm(Model.JoinEagerAlgorithm)
+        .withGraphJoined('tags')
-        .eager('tags(selectTags)', {
+        .modifyGraph('tags', builder => {
-          selectTags: builder => {
+          builder.select('tag', 'title')
-            builder.select('tag', 'title')
-          }
         })
         .where(queryModeID ? {
           'pages.id': opts

server/models/userKeys.js

@@ -56,7 +56,7 @@ module.exports = class UserKey extends Model {
   }
 
   static async validateToken ({ kind, token }, context) {
-    const res = await WIKI.models.userKeys.query().findOne({ kind, token }).eager('user')
+    const res = await WIKI.models.userKeys.query().findOne({ kind, token }).withGraphJoined('user')
     if (res) {
       await WIKI.models.userKeys.query().deleteById(res.id)
       if (moment.utc().isAfter(moment.utc(res.validUntil))) {

server/models/users.js

@@ -705,7 +705,7 @@ module.exports = class User extends Model {
   }
 
   static async getGuestUser () {
-    const user = await WIKI.models.users.query().findById(2).eager('groups').modifyEager('groups', builder => {
+    const user = await WIKI.models.users.query().findById(2).withGraphJoined('groups').modifyGraph('groups', builder => {
       builder.select('groups.id', 'permissions')
     })
     if (!user) {