From fed8dd5a898b104807e9ad4e9228a90b52e22271 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 1 Jul 2021 22:27:57 +0200
Subject: [PATCH 01/16] update deps and fix typo in docs

---
 docs/changelog.md |  1 +
 package.json      | 16 ++++++++-----
 yarn.lock         | 60 ++++++++---------------------------------------
 3 files changed, 21 insertions(+), 56 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index edabdc76..a4e2692b 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
   - improve AP resource UI
   - fix Docker setup
   - update deps
+
 ### 1.0 (alpha)
 This release is a complete rewrite of frontend UI and many internals, main changes are:
 
diff --git a/package.json b/package.json
index 418a0ba6..8071215c 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "pg": "^8.6.0",
     "pg-native": "3.0.0",
     "prom-client": "^13.1.0",
-    "sequelize": "^6.6.2",
+    "sequelize": "^6.6.4",
     "sequelize-cli": "^6.2.0",
     "sequelize-slugify": "^1.5.0",
     "sharp": "^0.28.2",
@@ -83,7 +83,7 @@
     "v-calendar": "2.3.0",
     "vue": "^2.6.14",
     "vue-clipboard2": "^0.3.1",
-    "vue-i18n": "^8.24.4",
+    "vue-i18n": "^8.24.5",
     "vue-server-renderer": "^2.6.14",
     "vue-template-compiler": "^2.6.14",
     "winston": "^3.3.3",
@@ -110,14 +110,14 @@
     "eslint-plugin-vue": "^7.10.0",
     "fibers": "^5.0.0",
     "less-loader": "7",
-    "prettier": "^2.3.0",
+    "prettier": "^2.3.2",
     "pug": "^3.0.2",
     "pug-plain-loader": "^1.1.0",
     "sass": "^1.32.12",
     "sass-loader": "10",
-    "typescript": "^4.3.4",
+    "typescript": "^4.3.5",
     "vue-cli-plugin-vuetify": "~2.4.0",
-    "vuetify": "^2.5.4",
+    "vuetify": "^2.5.6",
     "vuetify-loader": "^1.7.1",
     "webpack": "4",
     "webpack-cli": "^4.7.2"
@@ -130,7 +130,11 @@
     "jimp": "0.16.1",
     "resize-img": "2.0.0",
     "underscore": "1.13.1",
-    "@nuxtjs/vuetify/**/sass": "1.32.12"
+    "@nuxtjs/vuetify/**/sass": "1.32.12",
+    "css-what": "5.0.1",
+    "postcss": "7.0.36",
+    "glob-parent": "5.1.2",
+    "core-js": "3.14.0"
   },
   "bin": {
     "gancio": "server/cli.js"
diff --git a/yarn.lock b/yarn.lock
index f669623e..69efa8f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3711,21 +3711,11 @@ core-js-compat@^3.12.1, core-js-compat@^3.14.0, core-js-compat@^3.15.0:
     browserslist "^4.16.6"
     semver "7.0.0"
 
-core-js@3.14.0:
+core-js@3.14.0, core-js@^2.6.5, core-js@^3.6.5:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c"
   integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==
 
-core-js@^2.6.5:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-js@^3.6.5:
-  version "3.15.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
-  integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -3930,17 +3920,7 @@ css-tree@^1.1.2:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
-
-css-what@^3.2.1:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
-  integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
-
-css-what@^5.0.0, css-what@^5.0.1:
+css-what@2.1, css-what@5.0.1, css-what@^3.2.1, css-what@^5.0.0, css-what@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
   integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
@@ -5726,15 +5706,7 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
 
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -6571,7 +6543,7 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
@@ -6603,13 +6575,6 @@ is-generator@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-generator/-/is-generator-1.0.3.tgz#c14c21057ed36e328db80347966c693f886389f3"
   integrity sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -8799,11 +8764,6 @@ path-browserify@0.0.1:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
   integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -9656,7 +9616,7 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6:
+postcss@7.0.36, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.36"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
   integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
@@ -9738,7 +9698,7 @@ prettier@^1.18.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-prettier@^2.3.0:
+prettier@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
   integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
@@ -10813,7 +10773,7 @@ sequelize-slugify@^1.5.0:
   dependencies:
     sluglife "^0.9.8"
 
-sequelize@^6.6.2:
+sequelize@^6.6.4:
   version "6.6.4"
   resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-6.6.4.tgz#616072aa5e7226db1050cc485942ee2fd04d475f"
   integrity sha512-SOSu3tclOjHJfvuIITUlAsh2Q642gFxjpNN+IM1quFZ7jU5Pep7FIAwBK8UWgTpNc9TK9rUr1cyLB/G25CGicA==
@@ -11987,7 +11947,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^4.3.4:
+typescript@^4.3.5:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
   integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
@@ -12354,7 +12314,7 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-vue-i18n@^8.24.4:
+vue-i18n@^8.24.5:
   version "8.24.5"
   resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.24.5.tgz#7127a666d5be2199be69be39e439a419a90ff931"
   integrity sha512-p8W5xOmniuZ8fj76VXe0vBL3bRWVU87jHuC/v8VwmhKVH2iMQsKnheB1U+umxDBqC/5g9K+NwzokepcLxnBAVQ==
@@ -12436,7 +12396,7 @@ vuetify-loader@^1.7.1, vuetify-loader@^1.7.2:
     file-loader "^6.2.0"
     loader-utils "^2.0.0"
 
-vuetify@^2.5.3, vuetify@^2.5.4:
+vuetify@^2.5.3, vuetify@^2.5.6:
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.6.tgz#9cbb1eacece6c42028216312b9be23e35a7f5cf4"
   integrity sha512-2T8ML5PYuJ/AdMVH3ZIvzHnsM0nX8t4Xzj+0HFFGfLT7jLlptCFpG+JE8+kyrgGZlbUgulyOwCUu8hJkVsReFA==

From 283aa21aba149ae09d761f216780cff13b39ed31 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Fri, 2 Jul 2021 17:30:20 +0200
Subject: [PATCH 02/16] clean WPGancio readme

---
 wp-plugin/readme.txt | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/wp-plugin/readme.txt b/wp-plugin/readme.txt
index a705fa08..98c6d73e 100644
--- a/wp-plugin/readme.txt
+++ b/wp-plugin/readme.txt
@@ -1,10 +1,10 @@
 === WPGancio ===
 Contributors: lesion
 Donate link: https://gancio.org
-Tags: events, gancio
+Tags: events, gancio, fediverse, AP, activity pub
 Requires at least: 4.7
 Tested up to: 5.4
-Stable tag: 4.3
+Stable tag: 1.0
 Requires PHP: 7.0
 License: AGPLv3 or later
 License URI: https://www.gnu.org/licenses/agpl-3.0.html
@@ -13,36 +13,12 @@ Connect a gancio instance to a Wordpress user so that published events are autom
 
 == Description ==
 
+This plugin connects a [Gancio](https://gancio.org) instance to a Wordpress website to automatically push events published on Wordpress.
 
-
-== Frequently Asked Questions ==
-
-= A question that someone might have =
-
-An answer to that question.
-
-= What about foo bar? =
-
-Answer to foo bar dilemma.
-
-== Screenshots ==
-
-1. This screen shot description corresponds to screenshot-1.(png|jpg|jpeg|gif). Note that the screenshot is stored in the /assets directory.
-2. This is the second screen shot
+It requires an event manager plugin, only [Event Organiser[(https://wp-event-organiser.com/) is supported but adding another plugin it's an easy task.
+ 
 
 == Changelog ==
 
 = 1.0 =
-* A change since the previous version.
-* Another change.
-
-= 0.5 =
-* List versions from most recent at top to oldest at bottom.
-
-== Upgrade Notice ==
-
-= 1.0 =
-Upgrade notices describe the reason a user should upgrade.  No more than 300 characters.
-
-= 0.5 =
-This version fixes a security related bug.  Upgrade immediately.
+* First release

From 3a56b6422b5961f033bbe4270145aa9cd9c13998 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Fri, 2 Jul 2021 22:33:41 +0200
Subject: [PATCH 03/16] [WP] support tags, fix #114

---
 wp-plugin/gancio.php |  1 -
 wp-plugin/oauth.php  | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/wp-plugin/gancio.php b/wp-plugin/gancio.php
index b39d0f1b..60ea1e42 100644
--- a/wp-plugin/gancio.php
+++ b/wp-plugin/gancio.php
@@ -5,7 +5,6 @@ Plugin URI:  https://gancio.org
 Description: Connects an user of a gancio instance to a Wordpress user so that published events are automatically pushed with Gancio API.
 Version:     1.0
 Author:      Gancio
-Author URI:  https://gancio.org
 License:  AGPL 3.0
 
 WPGancio is free software: you can redistribute it and/or modify it under the
diff --git a/wp-plugin/oauth.php b/wp-plugin/oauth.php
index 75470b52..1c902278 100644
--- a/wp-plugin/oauth.php
+++ b/wp-plugin/oauth.php
@@ -27,6 +27,13 @@ function delete_post ($post_id) {
 function wpgancio_save_event ($post_id) {
   $event = get_post( $post_id );
 
+  function tagName ($tag) {
+    return $tag->name;
+  }
+
+  $tmp_tags = get_the_terms( $event, 'event-tag' );
+  $tags = array_map('tagName', $tmp_tags);
+
   // do not save if it's a draft
   if ($event->post_status != 'publish') {
     return;
@@ -45,6 +52,7 @@ function wpgancio_save_event ($post_id) {
 
   $body = array (
     'title' => $event->post_title,
+    'tags' => $tags,
     'description' => $event->post_content,
     'start_datetime' => intval($date),
     'place_name' => $place_name,
@@ -64,13 +72,15 @@ function wpgancio_save_event ($post_id) {
     $response = $http->request( $instance_url . '/api/event', array(
       'method' => 'PUT',
       'headers' => array (
-        'Authorization' => 'Bearer ' . get_option('wpgancio_token')
-      ), 'body' => $body ));
+        'Authorization' => 'Bearer ' . get_option('wpgancio_token'),
+        'Content-Type' => 'application/json'
+      ), 'body' => wp_json_encode($body) ));
   } else { // or create
     $response = wp_remote_post($instance_url . '/api/event', array(
       'headers' => array (
-        'Authorization' => 'Bearer ' . get_option('wpgancio_token')
-      ), 'body' => $body ));
+        'Authorization' => 'Bearer ' . get_option('wpgancio_token'),
+        'Content-Type' => 'application/json'
+      ), 'body' => wp_json_encode($body) ));
   }
 
   if ( is_wp_error( $response ) ) {

From 8e53a1f26a12fc2f3fdbabe45a318e2f5d26d3da Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sat, 3 Jul 2021 22:41:59 +0200
Subject: [PATCH 04/16] [WPGancio] Tested Up To Value is Out of Date

---
 wp-plugin/readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-plugin/readme.txt b/wp-plugin/readme.txt
index 98c6d73e..c1315b70 100644
--- a/wp-plugin/readme.txt
+++ b/wp-plugin/readme.txt
@@ -3,7 +3,7 @@ Contributors: lesion
 Donate link: https://gancio.org
 Tags: events, gancio, fediverse, AP, activity pub
 Requires at least: 4.7
-Tested up to: 5.4
+Tested up to: 5.7.2
 Stable tag: 1.0
 Requires PHP: 7.0
 License: AGPLv3 or later

From 7acd34f4964c9d7f972f706f6f5018a7739d4b96 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 4 Jul 2021 00:45:17 +0200
Subject: [PATCH 05/16] [WPGancio] Sanitize / validate input/output

---
 wp-plugin/oauth.php    | 19 +++++++++----------
 wp-plugin/settings.php | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/wp-plugin/oauth.php b/wp-plugin/oauth.php
index 1c902278..45da5e48 100644
--- a/wp-plugin/oauth.php
+++ b/wp-plugin/oauth.php
@@ -4,16 +4,15 @@ defined( 'ABSPATH' ) or die( 'Nope, not accessing this' );
 // eventorganizer / triggered after an event has been updated
 // http://codex.wp-event-organiser.com/hook-eventorganiser_save_event.html
 add_action('eventorganiser_save_event', 'wpgancio_save_event', 15);
-add_action('wp_trash_post', 'delete_post', 15);
+add_action('wp_trash_post', 'wpgancio_delete_post', 15);
 
-function delete_post ($post_id) {
+function wpgancio_delete_post ($post_id) {
   $post = get_post($post_id);
   $instance_url = get_option('wpgancio_instance_url');
 
   if ($post->post_type == 'event') {
-    $gancio_id = get_post_meta($post_id, 'gancio_id', TRUE);
+    $gancio_id = get_post_meta($post_id, 'wpgancio_gancio_id', TRUE);
     if ($gancio_id) {
-      $body['id'] = $gancio_id;
       $http = _wp_http_get_object();
       $response = $http->request( "${instance_url}/api/event/${gancio_id}", array(
         'method' => 'DELETE',
@@ -28,7 +27,7 @@ function wpgancio_save_event ($post_id) {
   $event = get_post( $post_id );
 
   function tagName ($tag) {
-    return $tag->name;
+    return sanitize_title($tag->name);
   }
 
   $tmp_tags = get_the_terms( $event, 'event-tag' );
@@ -39,9 +38,9 @@ function wpgancio_save_event ($post_id) {
     return;
   }
 
-  $gancio_id = get_post_meta($post_id, 'gancio_id', TRUE);
+  $gancio_id = get_post_meta($post_id, 'wpgancio_gancio_id', TRUE);
 
-  // image_path
+  // when
   $date = eo_get_schedule_start( 'U', $post_id );
 
   // get place details
@@ -62,7 +61,7 @@ function wpgancio_save_event ($post_id) {
   // add image if specified
   $image_url = get_the_post_thumbnail_url($post_id);
   if ($image_url) {
-    $body['image_url'] = $image_url;
+    $body['image_url'] = esc_url($image_url);
   }
 
   // update
@@ -84,10 +83,10 @@ function wpgancio_save_event ($post_id) {
   }
 
   if ( is_wp_error( $response ) ) {
-    $error_message = $response->get_error_message();
+    $error_message = esc_html($response->get_error_message());
     echo "<div class='error notice'><p>${error_message}</p></div>";
     return;
   }
   $data = json_decode(wp_remote_retrieve_body($response));
-  update_post_meta($post_id, 'gancio_id', $data->id);
+  update_post_meta($post_id, 'wpgancio_gancio_id', intval($data->id));
 }
diff --git a/wp-plugin/settings.php b/wp-plugin/settings.php
index 55e57712..d0900540 100644
--- a/wp-plugin/settings.php
+++ b/wp-plugin/settings.php
@@ -22,7 +22,7 @@ function wpgancio_update_options ($old_value, $instance_url) {
   $redirect_uri = get_site_url(null, '/wp-admin/options-general.php?page=wpgancio' );
   $query = join('&', array(
     'response_type=code',
-    'redirect_uri=' . esc_html($redirect_uri),
+    'redirect_uri=' . esc_url($redirect_uri),
     'scope=event:write',
     'client_id=' . get_option('wpgancio_client_id'),
   ));
@@ -53,8 +53,8 @@ function wpgancio_instance_url_validate ($instance_url) {
       $response->get_error_message());
   } else {
     $data = json_decode( wp_remote_retrieve_body($response), true);
-    update_option('wpgancio_client_secret', $data['client_secret']);
-    update_option('wpgancio_client_id', $data['client_id']);
+    update_option('wpgancio_client_secret', sanitize_key($data['client_secret']));
+    update_option('wpgancio_client_id', sanitize_key($data['client_id']));
     return $instance_url;
   }
 }
@@ -88,7 +88,7 @@ function wpgancio_instance_url_cb( $args ) {
     name="wpgancio_instance_url">
 
   <p class="description">
-    <?php esc_html_e( 'Insert your gancio instance URL', 'wpgancio' ); ?>
+    <?php esc_html( 'Insert your gancio instance URL', 'wpgancio' ); ?>
   </p>
 
   <?php
@@ -104,9 +104,7 @@ function wpgancio_options_page_html() {
   if ( ! current_user_can( 'manage_options' ) ) { return; }
 
   // show error/update messages
-  //settings_errors( 'wpgancio_messages' );
-
-  $code = $_GET['code'];
+  $code = sanitize_key($_GET['code']);
   if ( $code ) {
     update_option('wpgancio_code', $code);
     $instance_url = get_option( 'wpgancio_instance_url' );
@@ -127,8 +125,8 @@ function wpgancio_options_page_html() {
       settings_errors( 'wpgancio_messages' );
     } else {
       $data = json_decode( wp_remote_retrieve_body($response), true);
-      update_option('wpgancio_token', $data['access_token']);
-      update_option('wpgancio_refresh', $data['refresh_token']);
+      update_option('wpgancio_token', sanitize_key($data['access_token']));
+      update_option('wpgancio_refresh', sanitize_key($data['refresh_token']));
       add_settings_error('wpgancio_messages', 'wpgancio_messages', 'Association completed!', 'success');
       settings_errors( 'wpgancio_messages' );
     }
@@ -141,11 +139,14 @@ function wpgancio_options_page_html() {
  <h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
  <form action="options.php" method="post">
  <?php
+
   // output security fields for the registered setting "wpgancio"
   settings_fields( 'wpgancio' );
+
   // output setting sections and their fields
   // (sections are registered for "wpgancio", each field is registered to a specific section)
   do_settings_sections( 'wpgancio' );
+
   // output save settings button
   submit_button( 'Save Settings' );
  ?>

From 94db206c2c2a2d6f4fd38d2fc6871b43ddd4e7b9 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 4 Jul 2021 00:46:08 +0200
Subject: [PATCH 06/16] minor on dialog layout / authorize form

---
 layouts/default.vue          |  4 ++--
 pages/Authorize.vue          | 29 ++++++++++++++---------------
 server/federation/helpers.js |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 103829f9..d2eca62d 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,10 +1,10 @@
 <template lang='pug'>
-  v-app
+  v-app(app)
     Snackbar
     Confirm
     Nav
 
-    v-main
+    v-main(app)
       v-fade-transition(hide-on-leave)
         nuxt
 
diff --git a/pages/Authorize.vue b/pages/Authorize.vue
index ffb8dc09..43f3e7e9 100644
--- a/pages/Authorize.vue
+++ b/pages/Authorize.vue
@@ -1,19 +1,18 @@
 <template lang='pug'>
-  v-row.mt-5(align='center' justify='center')
-    v-col(cols='12' md="6" lg="5" xl="4")
-      v-card(light)
-        v-card-title {{settings.title}} - {{$t('common.authorize')}}
-        v-card-text
-          u {{$auth.user.email}}
-          div
-            p(v-html="$t('oauth.authorization_request', { app: client.name, instance_name: settings.title })")
-            ul
-              li(v-for="s in scope.split(' ')") {{$t(`oauth.scopes.${scope}`)}}
-            span(v-html="$t('oauth.redirected_to', {url: $route.query.redirect_uri})")
-        v-card-actions
-          v-spacer
-          v-btn(color='error' to='/') {{$t('common.cancel')}}
-          v-btn(:href='authorizeURL' color='success') {{$t('common.authorize')}}
+  .d-flex.justify-space-around
+    v-card.mt-5(max-width='600px')
+      v-card-title {{settings.title}} - {{$t('common.authorize')}}
+      v-card-text
+        u {{$auth.user.email}}
+        div
+          p(v-html="$t('oauth.authorization_request', { app: client.name, instance_name: settings.title })")
+          ul.mb-2
+            li(v-for="s in scope.split(' ')") {{$t(`oauth.scopes.${scope}`)}}
+          span(v-html="$t('oauth.redirected_to', {url: $route.query.redirect_uri})")
+      v-card-actions
+        v-spacer
+        v-btn(color='error' to='/') {{$t('common.cancel')}}
+        v-btn(:href='authorizeURL' color='success') {{$t('common.authorize')}}
 </template>
 
 <script>
diff --git a/server/federation/helpers.js b/server/federation/helpers.js
index 6160bf5d..5c9f7931 100644
--- a/server/federation/helpers.js
+++ b/server/federation/helpers.js
@@ -195,7 +195,7 @@ const Helpers = {
     //   .update(req.body)
     //   .digest('base64')
     // if (`SHA-256=${digest}` !== req.headers.signature) {
-    //   log.warning(`Signature mismatch ${req.headers.signature} - ${digest}`)
+    //   log.warn(`Signature mismatch ${req.headers.signature} - ${digest}`)
     //   return res.status(401).send('Signature mismatch')
     // }
 

From 43fe3a45e8300ca562b20b900cbc2885c8166ec5 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 4 Jul 2021 00:46:55 +0200
Subject: [PATCH 07/16] add small validation on event

---
 server/api/controller/event.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 792f47f8..d9fb5986 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -264,7 +264,7 @@ const eventController = {
   async add (req, res) {
     // req.err comes from multer streaming error
     if (req.err) {
-      log.info(req.err)
+      log.warn(req.err)
       return res.status(400).json(req.err.toString())
     }
 
@@ -272,6 +272,11 @@ const eventController = {
       const body = req.body
       const recurrent = body.recurrent ? JSON.parse(body.recurrent) : null
 
+      if (!body.place_name) {
+        log.warn('Place is required')
+        return res.status(400).send('Place is required')
+      }
+
       const eventDetails = {
         title: body.title,
         // remove html tags

From f6f3264508adf0715985bf9d5a76b3e8f3962af1 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 4 Jul 2021 20:27:36 +0200
Subject: [PATCH 08/16] minor with nginx docs

---
 docs/install/debian.md |  4 ++--
 docs/install/docker.md |  2 +-
 docs/install/nginx.md  | 26 +++-----------------------
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/docs/install/debian.md b/docs/install/debian.md
index 0079f240..b61c84d8 100644
--- a/docs/install/debian.md
+++ b/docs/install/debian.md
@@ -19,7 +19,7 @@ apt-get update && apt-get install yarn
 
 1. Install Gancio
 ```bash
-yarn global add --silent {{site.url}}{% link /latest.tgz %} 2> /dev/null
+yarn global add --silent {{site.url}}/latest.tgz 2> /dev/null
 ```
 
 1. Setup with postgreSQL __(optional as you can choose sqlite)__
@@ -64,6 +64,6 @@ sudo pm2 startup -u gancio
 
 ## Upgrade
 ```bash
-sudo yarn global add --silent {{site.url}}{% link /latest.tgz %}  2> /dev/null
+sudo yarn global add --silent {{site.url}}/latest.tgz  2> /dev/null
 sudo service pm2 restart
 ```
diff --git a/docs/install/docker.md b/docs/install/docker.md
index 3dd7ecab..d1c0b0c0 100644
--- a/docs/install/docker.md
+++ b/docs/install/docker.md
@@ -66,7 +66,7 @@ docker-compose up -d
 tail -f  data/logs/gancio.log
 ```
 
-1. [Setup nginx as a proxy]({% link install/nginx.md %}
+1. [Setup nginx as a proxy]({% link install/nginx.md %})
 
 1. Point your web browser to [http://localhost:13120](http://localhost:13120) or where you specified during setup and enjoy :tada:
 
diff --git a/docs/install/nginx.md b/docs/install/nginx.md
index 862b386d..87434ae2 100644
--- a/docs/install/nginx.md
+++ b/docs/install/nginx.md
@@ -8,34 +8,14 @@ parent: Install
 
 
 ##  Nginx proxy configuration
-This is the default nginx configuration for gancio, please modify at least the **server_name** and **ssl_certificate**'s path.  
-Note that this does not include a cache configuration and that gancio does
-not use a cache control at all, if you can help with this task you're
-welcome.
+This is the default nginx configuration for gancio, it does not include **HTTPS** setup but you can easily use [certbot](https://certbot.eff.org/) for that.
+
 
 ```nginx
 server {
   listen 80;
   listen [::]:80;
-  server_name gancio.cisti.org;
-  root /var/www/letsencrypt;
-  location /.well-known/acme-challenge/ { allow all; }
-  location / { return 301 https://$host$request_uri; }
-}
-
-server {
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-  server_name gancio.cisti.org;
-
-  ssl_protocols TLSv1.2;
-  ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA;
-  ssl_prefer_server_ciphers on;
-  ssl_session_cache shared:SSL:10m;
-
-  # Uncomment these lines once you acquire a certificate:
-  # ssl_certificate     /etc/letsencrypt/live/gancio.cisti.org/fullchain.pem;
-  # ssl_certificate_key /etc/letsencrypt/live/gancio.cisti.org/privkey.pem;
+  server_name <<YOUR_DOMAIN>>;
 
   keepalive_timeout    70;
   sendfile             on;

From c7182a9270f78aaba424bf3262179197f0c0c29a Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 4 Jul 2021 20:34:27 +0200
Subject: [PATCH 09/16] add some contacts

---
 docs/contact.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/contact.md b/docs/contact.md
index c6274cb6..219d21fe 100644
--- a/docs/contact.md
+++ b/docs/contact.md
@@ -7,5 +7,8 @@ nav_order: 9
 
 ## Contacts
 
-### :elephant: Mastodon ⇒  [@gancio@mastodon.cisti.org](https://mastodon.cisti.org/@gancio)
+
+- :elephant: Mastodon ⇒  [@gancio@mastodon.cisti.org](https://mastodon.cisti.org/@gancio)
+- :email: Email ⇒ [info@cisti.org](mailto:info@cisti.org)
+- IRC ⇒ #gancio @ irc.autistici.org (sometimes...)
 

From 36c29976637644a547da98b75533ecd09ed927fa Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Sun, 4 Jul 2021 20:54:05 +0200
Subject: [PATCH 10/16] cleaning nginx setup

---
 docs/install/nginx.md | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/docs/install/nginx.md b/docs/install/nginx.md
index 87434ae2..8f62bfeb 100644
--- a/docs/install/nginx.md
+++ b/docs/install/nginx.md
@@ -8,7 +8,7 @@ parent: Install
 
 
 ##  Nginx proxy configuration
-This is the default nginx configuration for gancio, it does not include **HTTPS** setup but you can easily use [certbot](https://certbot.eff.org/) for that.
+This is the default nginx configuration for gancio, please modify at least <<YOUR_DOMAIN>>. Note that it does not include **HTTPS** setup but you can easily use [certbot](https://certbot.eff.org/) for that.
 
 
 ```nginx
@@ -21,35 +21,13 @@ server {
   sendfile             on;
   client_max_body_size 80m;
 
-  gzip on;
-  gzip_disable "msie6";
-  gzip_vary on;
-  gzip_proxied any;
-  gzip_comp_level 6;
-  gzip_buffers 16 8k;
-  gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-
-  add_header Strict-Transport-Security "max-age=31536000";
-
   location / {
     try_files $uri @proxy;
   }
 
   location @proxy {
     proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Proto https;
-    proxy_set_header Proxy "";
-    proxy_pass_header Server;
-
     proxy_pass http://127.0.0.1:13120;
-    proxy_buffering on;
-    proxy_redirect off;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $connection_upgrade;
-
-    tcp_nodelay on;
   }
 }
 

From 2b44971d00f17e7160a6704a47a062dba5054c16 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 7 Jul 2021 15:50:00 +0200
Subject: [PATCH 11/16] minor

---
 assets/style.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/style.less b/assets/style.less
index 984fe181..7eb095ff 100644
--- a/assets/style.less
+++ b/assets/style.less
@@ -72,7 +72,7 @@ li {
     overflow: hidden;
     margin: 0.5rem 1rem 0.5rem 1rem;
     font-size: 1.1em !important;
-    line-height: 1em !important;
+    line-height: 1.1em !important;
   }
 
   .body {

From 816ed058a32454463d629202c2d9fe11899b0d0e Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 8 Jul 2021 20:31:32 +0200
Subject: [PATCH 12/16] [WPGancio] fix

---
 wp-plugin/oauth.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-plugin/oauth.php b/wp-plugin/oauth.php
index 45da5e48..e243e333 100644
--- a/wp-plugin/oauth.php
+++ b/wp-plugin/oauth.php
@@ -83,8 +83,8 @@ function wpgancio_save_event ($post_id) {
   }
 
   if ( is_wp_error( $response ) ) {
-    $error_message = esc_html($response->get_error_message());
-    echo "<div class='error notice'><p>${error_message}</p></div>";
+    $error_message = $response->get_error_message();
+    echo "<div class='error notice'><p>" . esc_html($error_message) . "</p></div>";
     return;
   }
   $data = json_decode(wp_remote_retrieve_body($response));

From 1cd43f89929d6831cc08d8db672fb81cc688bd81 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 8 Jul 2021 20:32:09 +0200
Subject: [PATCH 13/16] fix css-what version to fix h-event import

---
 package.json |  1 -
 yarn.lock    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8071215c..1754bed5 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,6 @@
     "resize-img": "2.0.0",
     "underscore": "1.13.1",
     "@nuxtjs/vuetify/**/sass": "1.32.12",
-    "css-what": "5.0.1",
     "postcss": "7.0.36",
     "glob-parent": "5.1.2",
     "core-js": "3.14.0"
diff --git a/yarn.lock b/yarn.lock
index 69efa8f1..eded2f63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3920,7 +3920,17 @@ css-tree@^1.1.2:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-what@2.1, css-what@5.0.1, css-what@^3.2.1, css-what@^5.0.0, css-what@^5.0.1:
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
+css-what@^3.2.1:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
+  integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
+
+css-what@^5.0.0, css-what@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
   integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==

From 9cf2b41f7c44ce67d143b21b8e64a29992be3e36 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 8 Jul 2021 20:41:56 +0200
Subject: [PATCH 14/16] improve error logging

---
 server/api/controller/event.js    | 10 ++++++----
 server/api/controller/oauth.js    |  2 +-
 server/api/controller/settings.js |  4 ++--
 server/api/controller/user.js     |  6 +++---
 server/api/index.js               |  2 +-
 server/api/mail.js                |  2 +-
 server/api/oauth.js               |  2 +-
 server/api/storage.js             |  8 +++-----
 server/federation/helpers.js      |  2 +-
 server/federation/webfinger.js    |  2 +-
 server/helpers.js                 |  4 ++--
 server/log.js                     | 22 ++++++++++------------
 server/notifier.js                |  4 ++--
 server/routes.js                  |  2 +-
 14 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index d9fb5986..096a020e 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -118,7 +118,7 @@ const eventController = {
         order: [[Resource, 'id', 'DESC']]
       })
     } catch (e) {
-      log.error(e)
+      log.error('[EVENT]', e)
       return res.sendStatus(400)
     }
 
@@ -194,7 +194,7 @@ const eventController = {
       const notifier = require('../../notifier')
       notifier.notifyEvent('Create', event.id)
     } catch (e) {
-      log.error(e)
+      log.error('[EVENT]', e)
       res.sendStatus(404)
     }
   },
@@ -334,7 +334,7 @@ const eventController = {
         notifier.notifyEvent('Create', event.id)
       }
     } catch (e) {
-      log.error(e)
+      log.error('[EVENT ADD]', e)
       res.sendStatus(400)
     }
   },
@@ -419,6 +419,7 @@ const eventController = {
       }
       const notifier = require('../../notifier')
       await notifier.notifyEvent('Delete', event.id)
+      log.debug('[EVENT REMOVED]', event.title)
       await event.destroy()
       res.sendStatus(200)
     } else {
@@ -474,7 +475,8 @@ const eventController = {
         { model: Place, required: true, attributes: ['id', 'name', 'address'] }
       ]
     }).catch(e => {
-      log.error(e)
+      log.error('[EVENT]', e)
+      return []
     })
 
     return events.map(e => {
diff --git a/server/api/controller/oauth.js b/server/api/controller/oauth.js
index c792ae81..0822e66f 100644
--- a/server/api/controller/oauth.js
+++ b/server/api/controller/oauth.js
@@ -42,7 +42,7 @@ const oauthController = {
       delete client.id
       res.json(client)
     } catch (e) {
-      log.error(e)
+      log.error('[OAUTH CLIENT]', e)
       res.status(400).json(e)
     }
   },
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 7a80a24e..0f15d797 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -103,7 +103,7 @@ const settingsController = {
       settingsController[is_secret ? 'secretSettings' : 'settings'][key] = value
       return true
     } catch (e) {
-      log.error(e)
+      log.error('[SETTING SET]', e)
       return false
     }
   },
@@ -129,7 +129,7 @@ const settingsController = {
       .png({ quality: 90 })
       .toFile(baseImgPath + '.png', async (err, info) => {
         if (err) {
-          log.error(err)
+          log.error('[LOGO]', err)
         }
         const image = await readFile(baseImgPath + '.png')
         const favicon = await toIco([image], { sizes: [64], resize: true })
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index a8d1ada0..dd5d3107 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -103,7 +103,7 @@ const userController = {
       mail.send(config.admin_email, 'admin_register', { user, config })
       res.sendStatus(200)
     } catch (e) {
-      log.error('Registration error: "%s"', e)
+      log.error('Registration error:', e)
       res.status(404).json(e)
     }
   },
@@ -116,7 +116,7 @@ const userController = {
       mail.send(user.email, 'user_confirm', { user, config }, req.settings.locale)
       res.json(user)
     } catch (e) {
-      log.error('User creation error: %s', e)
+      log.error('User creation error:', e)
       res.status(404).json(e)
     }
   },
@@ -127,7 +127,7 @@ const userController = {
       user.destroy()
       res.sendStatus(200)
     } catch (e) {
-      log.error('User removal error: "%s"', e)
+      log.error('User removal error:"', e)
       res.status(404).json(e)
     }
   }
diff --git a/server/api/index.js b/server/api/index.js
index f971a01c..1e64001e 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -145,7 +145,7 @@ api.use((req, res) => res.sendStatus(404))
 
 // Handle 500
 api.use((error, req, res, next) => {
-  log.error(error)
+  log.error('[API ERROR]', error)
   res.status(500).send('500: Internal Server Error')
 })
 
diff --git a/server/api/mail.js b/server/api/mail.js
index 5e1302aa..105e68ca 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -61,7 +61,7 @@ const mail = {
     }
     return email.send(msg)
       .catch(e => {
-        log.error('Error sending email => %s', e)
+        log.error('[MAIL]', e)
       })
   }
 }
diff --git a/server/api/oauth.js b/server/api/oauth.js
index 9a4dbc28..0f1dd709 100644
--- a/server/api/oauth.js
+++ b/server/api/oauth.js
@@ -34,7 +34,7 @@ oauth.use((req, res) => res.sendStatus(404))
 
 oauth.use((err, req, res, next) => {
   const error_msg = err.toString()
-  log.error(error_msg)
+  log.error('[OAUTH USE]', error_msg)
   res.status(500).send(error_msg)
 })
 
diff --git a/server/api/storage.js b/server/api/storage.js
index 34aa1f29..e44f7d8f 100644
--- a/server/api/storage.js
+++ b/server/api/storage.js
@@ -8,9 +8,7 @@ const config = require('config')
 
 try {
   mkdirp.sync(config.upload_path + '/thumb')
-} catch (e) {
-  log.error(e)
-}
+} catch (e) {}
 
 const DiskStorage = {
   _handleFile (req, file, cb) {
@@ -25,11 +23,11 @@ const DiskStorage = {
     let onError = false
     const err = e => {
       if (onError) {
-        log.error(err)
+        log.error('[UPLOAD]', err)
         return
       }
       onError = true
-      log.error(e)
+      log.error('[UPLOAD]', e)
       req.err = e
       cb(null)
     }
diff --git a/server/federation/helpers.js b/server/federation/helpers.js
index 5c9f7931..a08463fb 100644
--- a/server/federation/helpers.js
+++ b/server/federation/helpers.js
@@ -126,7 +126,7 @@ const Helpers = {
         return res.data
       })
       .catch(e => {
-        log.error(`${URL}: ${e}`)
+        log.error(`get Actor ${URL}`, e)
         return false
       })
 
diff --git a/server/federation/webfinger.js b/server/federation/webfinger.js
index d833995f..8390aed6 100644
--- a/server/federation/webfinger.js
+++ b/server/federation/webfinger.js
@@ -140,7 +140,7 @@ router.use((req, res) => {
 
 // Handle 500
 router.use((error, req, res, next) => {
-  log.error(error)
+  log.error('[WEBFINGER]', error)
   res.status(500).send('500: Internal Server Error')
 })
 
diff --git a/server/helpers.js b/server/helpers.js
index 3666ffe5..a9675809 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -163,8 +163,8 @@ module.exports = {
         }))
       }
     } catch (e) {
-      log.error(e)
-      res.status(400).json(e.toString)
+      log.error('[Import URL]', e)
+      res.status(400).json(e.toString())
     }
   },
 
diff --git a/server/log.js b/server/log.js
index 4a4dd824..b4aaf0be 100644
--- a/server/log.js
+++ b/server/log.js
@@ -1,10 +1,14 @@
 const { createLogger, transports, format } = require('winston')
 const DailyRotateFile = require('winston-daily-rotate-file')
-const dayjs = require('dayjs')
+// const dayjs = require('dayjs')
 const config = require('config')
 
-const gancioFormat = format.printf(({ timestamp, level, message, error }) => {
-  return `${dayjs(timestamp).format('DD MMM YYYY HH:mm:ss')} ${level}: ${message}`
+const gancioFormat = format.printf(info => {
+  if (info.stack) {
+    return `${info.timestamp} ${info.level}: ${info.message} \r\n${info.stack}`
+  } else {
+    return `${info.timestamp} ${info.level}: ${info.message}`
+  }
 })
 
 const logger = createLogger({
@@ -12,15 +16,11 @@ const logger = createLogger({
   transports: process.env.NODE_ENV !== 'production'
     ? [new transports.Console(
         {
-          handleExceptions: true,
-          handleRejections: true,
           level: 'debug',
-          format: format.combine(format.errors({ stack: true }), format.timestamp(), format.colorize(), format.splat(), gancioFormat)
+          format: format.combine(format.splat(), format.timestamp(), format.colorize(), gancioFormat)
         }
       )]
     : [new DailyRotateFile({
-        handleExceptions: true,
-        handleRejections: true,
         level: config.log_level || 'info',
         filename: config.log_path + '/gancio.%DATE%.log',
         symlinkName: 'gancio.log',
@@ -28,14 +28,12 @@ const logger = createLogger({
         zippedArchive: true,
         maxSize: '10m',
         maxFiles: '10d',
-        format: format.combine(format.timestamp(), format.splat(), gancioFormat)
+        format: format.combine(format.timestamp(), gancioFormat)
       }),
       new transports.Console(
         {
-          handleExceptions: true,
-          handleRejections: true,
           level: config.log_level || 'info',
-          format: format.combine(format.timestamp(), format.splat(), format.colorize(), gancioFormat)
+          format: format.combine(format.timestamp(), format.colorize(), gancioFormat)
         }
       )]
 })
diff --git a/server/notifier.js b/server/notifier.js
index ac105aab..6405a797 100644
--- a/server/notifier.js
+++ b/server/notifier.js
@@ -51,7 +51,7 @@ const notifier = {
         await notifier.sendNotification(notification, event)
         notification.event_notification.status = 'sent'
       } catch (err) {
-        log.error(err)
+        log.error('[NOTIFY EVENT]', err)
         notification.event_notification.status = 'error'
       }
       return notification.event_notification.save()
@@ -71,7 +71,7 @@ const notifier = {
         e.status = 'sent'
         return e.save()
       } catch (err) {
-        log.error(err)
+        log.error('[NOTIFY]', err)
         e.status = 'error'
         e.error = err
         return e.save()
diff --git a/server/routes.js b/server/routes.js
index 20ab4eee..4bfa6f4e 100644
--- a/server/routes.js
+++ b/server/routes.js
@@ -61,7 +61,7 @@ app.use('/oauth', oauth)
 
 // // Handle 500
 app.use((error, req, res, next) => {
-  log.error(error)
+  log.error('[ERROR]', error)
   res.status(500).send('500: Internal Server Error')
 })
 

From 7740ce6ed6f3663dae84ee099a90bd91230d769b Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 8 Jul 2021 22:31:52 +0200
Subject: [PATCH 15/16] ignore internal svn WP repo

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7f07453b..9ae85b79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 
 ### Gancio dev configuration
+wp-plugin/wpgancio
 config/development.json
 gancio_config.json
 config.json

From 44cfe4a74af1b6986e5088527f05b97888c88509 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 8 Jul 2021 22:32:24 +0200
Subject: [PATCH 16/16] minor

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 9ae85b79..982f1d78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 
 ### Gancio dev configuration
+releases
 wp-plugin/wpgancio
 config/development.json
 gancio_config.json