[refactoring] s/comment/resource

server/api/models/comment.js

@@ -1,26 +0,0 @@
-'use strict'
-module.exports = (sequelize, DataTypes) => {
-  const comment = sequelize.define('comment', {
-    activitypub_id: {
-      type: DataTypes.STRING,
-      index: true,
-      unique: true
-    },
-    hidden: DataTypes.BOOLEAN,
-    fedUserApId: {
-      type: DataTypes.STRING,
-      references: {
-        model: 'fed_users',
-        key: 'ap_id'
-      },
-      onUpdate: 'CASCADE',
-      onDelete: 'CASCADE'
-    },
-    data: DataTypes.JSON
-  }, {})
-  comment.associate = function (models) {
-    comment.belongsTo(models.event)
-    comment.belongsTo(models.fed_users)
-  }
-  return comment
-}

server/api/models/event.js

@@ -2,7 +2,7 @@ const config = require('config')
 const moment = require('moment')
 
 module.exports = (sequelize, DataTypes) => {
-  const event = sequelize.define('event', {
+  const Event = sequelize.define('event', {
     id: {
       allowNull: false,
       type: DataTypes.INTEGER,
@@ -29,15 +29,15 @@ module.exports = (sequelize, DataTypes) => {
     boost: { type: DataTypes.JSON, defaultValue: [] }
   }, {})
 
-  event.associate = function (models) {
-    event.belongsTo(models.place)
-    event.belongsTo(models.user)
-    event.belongsToMany(models.tag, { through: 'event_tags' })
-    event.belongsToMany(models.notification, { through: 'event_notification' })
-    event.hasMany(models.comment)
+  Event.associate = function (models) {
+    Event.belongsTo(models.place)
+    Event.belongsTo(models.user)
+    Event.belongsToMany(models.tag, { through: 'event_tags' })
+    Event.belongsToMany(models.notification, { through: 'event_notification' })
+    Event.hasMany(models.resource)
   }
 
-  event.prototype.toAP = function (username, follower = []) {
+  Event.prototype.toNoteAP = function (username, follower = []) {
     const tags = this.tags && this.tags.map(t => t.tag.replace(/[ #]/g, ' '))
     const tag_links = tags.map(t => {
       return `<a href='/tags/${t}' class='mention hashtag status-link' rel='tag'><span>#${t}</span></a>`
@@ -82,5 +82,5 @@ module.exports = (sequelize, DataTypes) => {
     }
   }
 
-  return event
+  return Event
 }

server/api/models/resource.js

@@ -0,0 +1,20 @@
+module.exports = (sequelize, DataTypes) => {
+
+  const Resource = sequelize.define('resource', {
+    activitypub_id: {
+      type: DataTypes.STRING,
+      index: true,
+      unique: true
+    },
+    hidden: DataTypes.BOOLEAN,
+    data: DataTypes.JSON
+  }, {})
+
+  Resource.associate = function (models) {
+    // Resource.belongsTo(models.instance)
+    Resource.belongsTo(models.event)
+    Resource.belongsTo(models.ap_user)
+  }
+
+  return Resource
+}