From 36b215a4525868b87ab44e95d198d15ebc8541d7 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 6 Nov 2019 12:48:41 +0100
Subject: [PATCH] upgrade deps and add user summary

---
 package.json                 | 19 ++++++++++---------
 server/federation/helpers.js |  3 ---
 server/federation/users.js   |  1 +
 server/notifier.js           |  1 -
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index c767ff18..4b0a0d25 100644
--- a/package.json
+++ b/package.json
@@ -45,12 +45,12 @@
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.3",
     "bootstrap": "^4.3.1",
-    "config": "^3.2.0",
+    "config": "^3.2.4",
     "consola": "^2.10.1",
     "cookie-parser": "^1.4.4",
     "cors": "^2.8.5",
     "cross-env": "^6.0.0",
-    "dayjs": "^1.8.16",
+    "dayjs": "^1.8.17",
     "element-ui": "^2.12.0",
     "email-templates": "^6.0.2",
     "express": "^4.17.1",
@@ -71,13 +71,13 @@
     "nuxt-express-module": "^0.0.11",
     "pg": "^7.12.1",
     "sass-loader": "^8.0.0",
-    "sequelize": "^5.21.1",
+    "sequelize": "^5.21.2",
     "sequelize-cli": "^5.5.1",
-    "sharp": "^0.23.0",
+    "sharp": "^0.23.2",
     "sqlite3": "^4.1.0",
     "url": "^0.11.0",
     "v-calendar": "^1.0.0-beta.16",
-    "vue-awesome": "^3.5.3",
+    "vue-awesome": "^4.0.0",
     "vue-clipboard2": "^0.3.1",
     "vue-i18n": "^8.15.0",
     "yargs": "^14.0.0"
@@ -85,22 +85,23 @@
   "devDependencies": {
     "@nuxtjs/eslint-config": "^1.1.2",
     "babel-eslint": "^10.0.3",
-    "eslint": "^6.4.0",
-    "eslint-config-prettier": "^6.3.0",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.5.0",
     "eslint-config-standard": ">=14.1.0",
     "eslint-loader": "^3.0.0",
     "eslint-plugin-import": ">=2.17.3",
-    "eslint-plugin-jest": ">=22.20.0",
+    "eslint-plugin-jest": ">=23.0.2",
     "eslint-plugin-node": ">=10.0.0",
     "eslint-plugin-nuxt": ">=0.4.2",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-promise": ">=4.0.1",
     "eslint-plugin-standard": ">=4.0.1",
     "eslint-plugin-vue": "^5.2.2",
+    "jsdoc": "^3.6.3",
     "less-loader": "^5.0.0",
     "nodemon": "^1.19.4",
     "prettier": "^1.17.1",
     "pug-plain-loader": "^1.0.0",
-    "webpack-cli": "^3.3.9"
+    "webpack-cli": "^3.3.10"
   }
 }
diff --git a/server/federation/helpers.js b/server/federation/helpers.js
index 1242c7dc..8c5004a9 100644
--- a/server/federation/helpers.js
+++ b/server/federation/helpers.js
@@ -137,10 +137,7 @@ const Helpers = {
     if (!force) {
       fedi_user = await FedUsers.findByPk(URL, { include: Instances })
       if (fedi_user) {
-        debug(fedi_user)
         if (!fedi_user.instances) {
-          debug(fedi_user.instances)
-          debug(instance.name)
           fedi_user.setInstance(instance)
         }
         return fedi_user.object
diff --git a/server/federation/users.js b/server/federation/users.js
index d88f1438..7b192093 100644
--- a/server/federation/users.js
+++ b/server/federation/users.js
@@ -14,6 +14,7 @@ module.exports = {
         'https://www.w3.org/ns/activitystreams',
         'https://w3id.org/security/v1'
       ],
+      summary: config.description,
       id: `${config.baseurl}/federation/u/${name}`,
       type: 'Person',
       name: user.display_name || user.username,
diff --git a/server/notifier.js b/server/notifier.js
index 56ef9c96..a89ffc7a 100644
--- a/server/notifier.js
+++ b/server/notifier.js
@@ -28,7 +28,6 @@ const notifier = {
   },
   async notifyEvent (action, eventId) {
     const event = await Event.findByPk(eventId, {
-
       include: [ Tag, Place, Notification, { model: User, include: { model: FedUsers, as: 'followers' } } ]
     })