upgrade sequelize

server/api/controller/announce.js

@@ -1,4 +1,4 @@
-const { announcement: Announcement } = require('../models')
+const Announcement = require('../models/announcement')
 const debug = require('debug')('announcement:controller')
 
 const announceController = {

server/api/controller/ap_user.js

@@ -1,4 +1,4 @@
-const { ap_user: APUser } = require('../models')
+const APUser = require('../models/ap_user')
 
 const apUserController = {
   async toggleBlock (req, res) {

server/api/controller/event.js

@@ -9,14 +9,13 @@ const helpers = require('../../helpers')
 const linkifyHtml = require('linkifyjs/html')
 const Sequelize = require('sequelize')
 
-const {
-  event: Event,
-  resource: Resource,
-  tag: Tag,
-  place: Place,
-  notification: Notification,
-  ap_user: APUser
-} = require('../models')
+const Event = require('../models/event')
+const Resource = require('../models/resource')
+const Tag = require('../models/tag')
+const Place = require('../models/place')
+const Notification = require('../models/notification')
+const APUser = require('../models/ap_user')
+
 const exportController = require('./export')
 
 const debug = require('debug')('controller:event')
@@ -301,15 +300,14 @@ const eventController = {
         await event.setUser(req.user)
       }
 
+      // return created event to the client
+      res.json(event)
+
       // create recurrent instances of event if needed
       // without waiting for the task manager
       if (event.recurrent) {
         eventController._createRecurrent()
       }
-
-      // return created event to the client
-      res.json(event)
-
       // send notifications (mastodon / email)
       const notifier = require('../../notifier')
       notifier.notifyEvent('Create', event.id)

server/api/controller/export.js

@@ -1,4 +1,7 @@
-const { event: Event, place: Place, tag: Tag } = require('../models')
+const Event = require('../models/event')
+const Place = require('../models/place')
+const Tag = require('../models/tag')
+
 const { Op } = require('sequelize')
 const moment = require('moment-timezone')
 const ics = require('ics')

server/api/controller/instance.js

@@ -1,9 +1,7 @@
-const {
-  ap_user: APUser,
-  instance: Instance,
-  resource: Resource
-  // event: Event
-} = require('../models')
+const APUser = require('../models/ap_user')
+const Instance = require('../models/instance')
+const Resource = require('../models/resource')
+
 // const { Op } = require('sequelize')
 
 const instancesController = {

server/api/controller/oauth.js

@@ -1,10 +1,12 @@
 const crypto = require('crypto')
 const { promisify } = require('util')
 const randomBytes = promisify(crypto.randomBytes)
-const {
-  oauth_client: OAuthClient, oauth_token: OAuthToken,
-  oauth_code: OAuthCode, user: User
-} = require('../models')
+
+const OAuthClient = require('../models/oauth_client')
+const OAuthToken = require('../models/oauth_token')
+const OAuthCode = require('../models/oauth_code')
+const User = require('../models/user')
+
 const debug = require('debug')('oauth')
 const moment = require('moment')
 

server/api/controller/resource.js

@@ -1,4 +1,4 @@
-const { resource: Resource } = require('../models')
+const Resource = require('../models/resource')
 
 const resourceController = {
   async hide (req, res) {

server/api/controller/settings.js

@@ -1,4 +1,4 @@
-const { setting: Setting } = require('../models')
+const Setting = require('../models/setting')
 const config = require('config')
 const consola = require('consola')
 const path = require('path')

server/api/controller/user.js

@@ -2,7 +2,7 @@ const crypto = require('crypto')
 const { Op } = require('sequelize')
 const config = require('config')
 const mail = require('../mail')
-const { user: User } = require('../models')
+const User = require('../models/user')
 const settingsController = require('./settings')
 const debug = require('debug')('user:controller')
 const linkify = require('linkifyjs')