From 6f1c5e3efa3b77e72172592a0b5e4ea52158e642 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 11:04:23 +0200
Subject: [PATCH 01/11] Set hasMore to false when returned Posts are equal to
 pageSize

- this was causing bugs on User profile page, and saves a database call
---
 backend/src/seed/seed-db.js        | 92 ++++++++++++++++--------------
 webapp/pages/index.vue             |  4 +-
 webapp/pages/profile/_id/_slug.vue |  2 +-
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 8c87a3214..de4628891 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -24,10 +24,8 @@ import { gql } from '../jest/helpers'
     })
     const { mutate } = createTestClient(server)
 
-    const f = Factory()
-
     const [Hamburg, Berlin, Germany, Paris, France] = await Promise.all([
-      f.create('Location', {
+      factory.create('Location', {
         id: 'region.5127278006398860',
         name: 'Hamburg',
         type: 'region',
@@ -42,7 +40,7 @@ import { gql } from '../jest/helpers'
         nameNL: 'Hamburg',
         namePL: 'Hamburg',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'region.14880313158564380',
         type: 'region',
         name: 'Berlin',
@@ -57,7 +55,7 @@ import { gql } from '../jest/helpers'
         nameNL: 'Berlijn',
         namePL: 'Berlin',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'country.10743216036480410',
         name: 'Germany',
         type: 'country',
@@ -70,7 +68,7 @@ import { gql } from '../jest/helpers'
         nameIT: 'Germania',
         nameEN: 'Germany',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'region.9397217726497330',
         name: 'Paris',
         type: 'region',
@@ -85,7 +83,7 @@ import { gql } from '../jest/helpers'
         nameNL: 'Parijs',
         namePL: 'Paryż',
       }),
-      f.create('Location', {
+      factory.create('Location', {
         id: 'country.9759535382641660',
         name: 'France',
         type: 'country',
@@ -106,27 +104,27 @@ import { gql } from '../jest/helpers'
     ])
 
     const [racoon, rabbit, wolf, bear, turtle, rhino] = await Promise.all([
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_racoon',
         icon: '/img/badges/indiegogo_en_racoon.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_rabbit',
         icon: '/img/badges/indiegogo_en_rabbit.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_wolf',
-        icon: '/img/badges/indiegogo_en_wolf.svg',
+        icon: '/img/badges/indiegogo_en_wolfactory.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_bear',
         icon: '/img/badges/indiegogo_en_bear.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_turtle',
         icon: '/img/badges/indiegogo_en_turtle.svg',
       }),
-      f.create('Badge', {
+      factory.create('Badge', {
         id: 'indiegogo_en_rhino',
         icon: '/img/badges/indiegogo_en_rhino.svg',
       }),
@@ -141,49 +139,49 @@ import { gql } from '../jest/helpers'
       louie,
       dagobert,
     ] = await Promise.all([
-      f.create('User', {
+      factory.create('User', {
         id: 'u1',
         name: 'Peter Lustig',
         slug: 'peter-lustig',
         role: 'admin',
         email: 'admin@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u2',
         name: 'Bob der Baumeister',
         slug: 'bob-der-baumeister',
         role: 'moderator',
         email: 'moderator@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u3',
         name: 'Jenny Rostock',
         slug: 'jenny-rostock',
         role: 'user',
         email: 'user@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u4',
         name: 'Huey',
         slug: 'huey',
         role: 'user',
         email: 'huey@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u5',
         name: 'Dewey',
         slug: 'dewey',
         role: 'user',
         email: 'dewey@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u6',
         name: 'Louie',
         slug: 'louie',
         role: 'user',
         email: 'louie@example.org',
       }),
-      f.create('User', {
+      factory.create('User', {
         id: 'u7',
         name: 'Dagobert',
         slug: 'dagobert',
@@ -226,97 +224,97 @@ import { gql } from '../jest/helpers'
     ])
 
     await Promise.all([
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat1',
         name: 'Just For Fun',
         slug: 'just-for-fun',
         icon: 'smile',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat2',
         name: 'Happiness & Values',
         slug: 'happiness-values',
         icon: 'heart-o',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat3',
         name: 'Health & Wellbeing',
         slug: 'health-wellbeing',
         icon: 'medkit',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat4',
         name: 'Environment & Nature',
         slug: 'environment-nature',
         icon: 'tree',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat5',
         name: 'Animal Protection',
         slug: 'animal-protection',
         icon: 'paw',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat6',
         name: 'Human Rights & Justice',
         slug: 'human-rights-justice',
         icon: 'balance-scale',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat7',
         name: 'Education & Sciences',
         slug: 'education-sciences',
         icon: 'graduation-cap',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat8',
         name: 'Cooperation & Development',
         slug: 'cooperation-development',
         icon: 'users',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat9',
         name: 'Democracy & Politics',
         slug: 'democracy-politics',
         icon: 'university',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat10',
         name: 'Economy & Finances',
         slug: 'economy-finances',
         icon: 'money',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat11',
         name: 'Energy & Technology',
         slug: 'energy-technology',
         icon: 'flash',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat12',
         name: 'IT, Internet & Data Privacy',
         slug: 'it-internet-data-privacy',
         icon: 'mouse-pointer',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat13',
         name: 'Art, Culture & Sport',
         slug: 'art-culture-sport',
         icon: 'paint-brush',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat14',
         name: 'Freedom of Speech',
         slug: 'freedom-of-speech',
         icon: 'bullhorn',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat15',
         name: 'Consumption & Sustainability',
         slug: 'consumption-sustainability',
         icon: 'shopping-cart',
       }),
-      f.create('Category', {
+      factory.create('Category', {
         id: 'cat16',
         name: 'Global Peace & Nonviolence',
         slug: 'global-peace-nonviolence',
@@ -325,16 +323,16 @@ import { gql } from '../jest/helpers'
     ])
 
     const [environment, nature, democracy, freedom] = await Promise.all([
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Environment',
       }),
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Nature',
       }),
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Democracy',
       }),
-      f.create('Tag', {
+      factory.create('Tag', {
         id: 'Freedom',
       }),
     ])
@@ -684,10 +682,18 @@ import { gql } from '../jest/helpers'
 
     await Promise.all(
       [...Array(30).keys()].map(i => {
-        return f.create('User')
+        return factory.create('User')
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(30).keys()].map(() => {
+        return factory.create('Post', {
+          author: jennyRostock,
+          image: faker.image.unsplash.objects(),
+        })
       }),
     )
-
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     process.exit(0)
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 31e07f382..d41e7d440 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -50,7 +50,7 @@
       :infinite-scroll-throttle-delay="800"
       :infinite-scroll-immediate-check="true"
     >
-      <hc-load-more v-if="true" :loading="$apollo.loading" @click="showMoreContributions" />
+      <hc-load-more :loading="$apollo.loading" @click="showMoreContributions" />
     </div>
   </div>
 </template>
@@ -151,7 +151,7 @@ export default {
           orderBy: this.sorting,
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 29a94022d..8879190f5 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -385,7 +385,7 @@ export default {
           orderBy: this.sorting,
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {

From a6d86f78f4700428e0f4174315bca7a8dfb47220 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 3 Oct 2019 12:04:07 +0200
Subject: [PATCH 02/11] Fix lint

---
 backend/src/seed/seed-db.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index de4628891..afdd6adef 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -685,7 +685,7 @@ import { gql } from '../jest/helpers'
         return factory.create('User')
       }),
     )
-    
+
     await Promise.all(
       [...Array(30).keys()].map(() => {
         return factory.create('Post', {

From 3b5e39c54dafc2e701eb3ce1e830737a9b4bcf82 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 11:42:55 +0200
Subject: [PATCH 03/11] Update orderBy, remove >=, more realistic seed data

---
 backend/src/seed/seed-db.js        | 210 ++++++++++++++++++++++++++++-
 webapp/pages/index.vue             |   2 +-
 webapp/pages/profile/_id/_slug.vue |   8 +-
 3 files changed, 214 insertions(+), 6 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index afdd6adef..d64aa998c 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -114,7 +114,7 @@ import { gql } from '../jest/helpers'
       }),
       factory.create('Badge', {
         id: 'indiegogo_en_wolf',
-        icon: '/img/badges/indiegogo_en_wolfactory.svg',
+        icon: '/img/badges/indiegogo_en_wolf.svg',
       }),
       factory.create('Badge', {
         id: 'indiegogo_en_bear',
@@ -694,6 +694,214 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
+    
+    await Promise.all(
+      [...Array(6).keys()].map(() => {
+        return factory.create('Comment', {
+          author: jennyRostock,
+          postId: 'p2',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(4).keys()].map(() => {
+        return factory.create('Comment', {
+          author: jennyRostock,
+          postId: 'p15',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(2).keys()].map(() => {
+        return factory.create('Comment', {
+          author: jennyRostock,
+          postId: 'p4',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(21).keys()].map(() => {
+        return factory.create('Post', {
+          author: peterLustig,
+          image: faker.image.unsplash.buildings(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(3).keys()].map(() => {
+        return factory.create('Comment', {
+          author: peterLustig,
+          postId: 'p4',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(5).keys()].map(() => {
+        return factory.create('Comment', {
+          author: peterLustig,
+          postId: 'p14',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(6).keys()].map(() => {
+        return factory.create('Comment', {
+          author: peterLustig,
+          postId: 'p0',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(11).keys()].map(() => {
+        return factory.create('Post', {
+          author: dewey,
+          image: faker.image.unsplash.food(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(7).keys()].map(() => {
+        return factory.create('Comment', {
+          author: dewey,
+          postId: 'p2',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(5).keys()].map(() => {
+        return factory.create('Comment', {
+          author: dewey,
+          postId: 'p6',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(2).keys()].map(() => {
+        return factory.create('Comment', {
+          author: dewey,
+          postId: 'p9',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(16).keys()].map(() => {
+        return factory.create('Post', {
+          author: louie,
+          image: faker.image.unsplash.technology(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(4).keys()].map(() => {
+        return factory.create('Comment', {
+          author: louie,
+          postId: 'p1',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(8).keys()].map(() => {
+        return factory.create('Comment', {
+          author: louie,
+          postId: 'p10',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(5).keys()].map(() => {
+        return factory.create('Comment', {
+          author: louie,
+          postId: 'p13',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(45).keys()].map(() => {
+        return factory.create('Post', {
+          author: bobDerBaumeister,
+          image: faker.image.unsplash.people(),
+        })
+      }),
+    )
+    
+    await Promise.all(
+      [...Array(2).keys()].map(() => {
+        return factory.create('Comment', {
+          author: bobDerBaumeister,
+          postId: 'p2',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(3).keys()].map(() => {
+        return factory.create('Comment', {
+          author: bobDerBaumeister,
+          postId: 'p12',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(7).keys()].map(() => {
+        return factory.create('Comment', {
+          author: bobDerBaumeister,
+          postId: 'p13',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(8).keys()].map(() => {
+        return factory.create('Post', {
+          author: huey,
+          image: faker.image.unsplash.nature(),
+        })
+      }),
+    )
+
+    await Promise.all(
+      [...Array(6).keys()].map(() => {
+        return factory.create('Comment', {
+          author: huey,
+          postId: 'p0',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(8).keys()].map(() => {
+        return factory.create('Comment', {
+          author: huey,
+          postId: 'p13',
+        })
+      })
+    )
+
+    await Promise.all(
+      [...Array(9).keys()].map(() => {
+        return factory.create('Comment', {
+          author: huey,
+          postId: 'p15',
+        })
+      })
+    )
+
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     process.exit(0)
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d41e7d440..360a72303 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -151,7 +151,7 @@ export default {
           orderBy: this.sorting,
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 8879190f5..abcb1dcda 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -251,7 +251,7 @@
           </template>
         </masonry-grid>
         <div
-          v-if="hasMore"
+          v-if="hasMore && posts.length >= pageSize"
           v-infinite-scroll="showMoreContributions"
           :infinite-scroll-disabled="$apollo.loading"
           :infinite-scroll-distance="10"
@@ -375,17 +375,17 @@ export default {
     showMoreContributions() {
       const { Post: PostQuery } = this.$apollo.queries
       if (!PostQuery) return // seems this can be undefined on subpages
-
       this.offset += this.pageSize
+
       PostQuery.fetchMore({
         variables: {
           offset: this.offset,
           filter: this.filter,
           first: this.pageSize,
-          orderBy: this.sorting,
+          orderBy: 'createdAt_desc',
         },
         updateQuery: (previousResult, { fetchMoreResult }) => {
-          if (!fetchMoreResult || fetchMoreResult.Post.length <= this.pageSize) {
+          if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) {
             this.hasMore = false
           }
           const result = Object.assign({}, previousResult, {

From c9219f0be3da3e1821b765ed2d72d87df9f9b243 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 12:09:22 +0200
Subject: [PATCH 04/11] Fix lint

---
 backend/src/seed/seed-db.js | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index d64aa998c..1c57dd19b 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -694,14 +694,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(6).keys()].map(() => {
         return factory.create('Comment', {
           author: jennyRostock,
           postId: 'p2',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -710,7 +710,7 @@ import { gql } from '../jest/helpers'
           author: jennyRostock,
           postId: 'p15',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -719,7 +719,7 @@ import { gql } from '../jest/helpers'
           author: jennyRostock,
           postId: 'p4',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -730,14 +730,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(3).keys()].map(() => {
         return factory.create('Comment', {
           author: peterLustig,
           postId: 'p4',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -746,7 +746,7 @@ import { gql } from '../jest/helpers'
           author: peterLustig,
           postId: 'p14',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -755,7 +755,7 @@ import { gql } from '../jest/helpers'
           author: peterLustig,
           postId: 'p0',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -766,14 +766,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(7).keys()].map(() => {
         return factory.create('Comment', {
           author: dewey,
           postId: 'p2',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -782,7 +782,7 @@ import { gql } from '../jest/helpers'
           author: dewey,
           postId: 'p6',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -791,7 +791,7 @@ import { gql } from '../jest/helpers'
           author: dewey,
           postId: 'p9',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -802,14 +802,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(4).keys()].map(() => {
         return factory.create('Comment', {
           author: louie,
           postId: 'p1',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -818,7 +818,7 @@ import { gql } from '../jest/helpers'
           author: louie,
           postId: 'p10',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -827,7 +827,7 @@ import { gql } from '../jest/helpers'
           author: louie,
           postId: 'p13',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -838,14 +838,14 @@ import { gql } from '../jest/helpers'
         })
       }),
     )
-    
+
     await Promise.all(
       [...Array(2).keys()].map(() => {
         return factory.create('Comment', {
           author: bobDerBaumeister,
           postId: 'p2',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -854,7 +854,7 @@ import { gql } from '../jest/helpers'
           author: bobDerBaumeister,
           postId: 'p12',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -863,7 +863,7 @@ import { gql } from '../jest/helpers'
           author: bobDerBaumeister,
           postId: 'p13',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -881,7 +881,7 @@ import { gql } from '../jest/helpers'
           author: huey,
           postId: 'p0',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -890,7 +890,7 @@ import { gql } from '../jest/helpers'
           author: huey,
           postId: 'p13',
         })
-      })
+      }),
     )
 
     await Promise.all(
@@ -899,7 +899,7 @@ import { gql } from '../jest/helpers'
           author: huey,
           postId: 'p15',
         })
-      })
+      }),
     )
 
     /* eslint-disable-next-line no-console */

From fd388fc1ba0b1b5cc709d50d33695fcd862c9f6a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 4 Oct 2019 12:34:48 +0200
Subject: [PATCH 05/11] Fix tests for changed implementation

- we do not display a load more button when there are clearly no more
posts to load... if there are at least 6, the pageSize, we display it
because there might or might not be posts to load
---
 webapp/pages/profile/_id/_slug.spec.js | 35 +++++++++++++-------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index 6470bb69a..f7eba10cc 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -139,7 +139,23 @@ describe('ProfileSlug', () => {
               wrapper.setData({ posts, hasMore: true })
             })
 
-            it('displays a "load more" button', () => {
+            it('does not display a "load more" button', () => {
+              expect(wrapper.find('.load-more').exists()).toBe(false)
+            })
+          })
+
+          describe('pagination returned at least as many posts as pageSize', () => {
+            beforeEach(() => {
+              const posts = [1, 2, 3, 4, 5, 6].map(id => {
+                return {
+                  ...aPost,
+                  id,
+                }
+              })
+              wrapper.setData({ posts })
+            })
+
+            it('displays "load more" button', () => {
               expect(wrapper.find('.load-more').exists()).toBe(true)
             })
 
@@ -157,23 +173,6 @@ describe('ProfileSlug', () => {
               })
             })
           })
-
-          describe('pagination returned as many posts as available', () => {
-            beforeEach(() => {
-              const posts = [1, 2, 3, 4, 5, 6].map(id => {
-                return {
-                  ...aPost,
-                  id,
-                }
-              })
-
-              wrapper.setData({ posts, hasMore: false })
-            })
-
-            it('displays no "load more" button', () => {
-              expect(wrapper.find('.load-more').exists()).toBe(false)
-            })
-          })
         })
       })
     })

From 0e6e8f4e018dabd369180d3b2749c4d000b284ff Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 11 Oct 2019 00:58:26 +0200
Subject: [PATCH 06/11] fix: security vulnerability with yarn resolutions

---
 package.json |  3 +++
 yarn.lock    | 20 +++++---------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 18a46e56d..6b51d9cca 100644
--- a/package.json
+++ b/package.json
@@ -33,5 +33,8 @@
     "neode": "^0.3.3",
     "npm-run-all": "^4.1.5",
     "slug": "^1.1.0"
+  },
+  "resolutions": {
+    "set-value": "^2.0.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 231e6100e..bd9d62653 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2947,7 +2947,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -4248,20 +4248,10 @@ set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^0.4.3, set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"

From c1a696577bf361dca85044a29b2f282f851294ef Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 11 Oct 2019 02:40:21 +0200
Subject: [PATCH 07/11] fix: search for email case-insensitively

---
 webapp/pages/admin/users.spec.js | 6 ++++++
 webapp/pages/admin/users.vue     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/pages/admin/users.spec.js b/webapp/pages/admin/users.spec.js
index e6b84cad9..f477aab1d 100644
--- a/webapp/pages/admin/users.spec.js
+++ b/webapp/pages/admin/users.spec.js
@@ -49,6 +49,12 @@ describe('Users', () => {
           expect(wrapper.vm.email).toEqual('email@example.org')
           expect(wrapper.vm.filter).toBe(null)
         })
+
+        it('email address is case-insensitive', async () => {
+          const wrapper = await searchAction(Wrapper(), { query: 'eMaiL@example.org' })
+          expect(wrapper.vm.email).toEqual('email@example.org')
+          expect(wrapper.vm.filter).toBe(null)
+        })
       })
 
       describe('query is just text', () => {
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index d5590f474..f46ef23df 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -170,7 +170,7 @@ export default {
       this.offset = 0
       const { query } = formData
       if (isemail.validate(query)) {
-        this.email = query
+        this.email = query.toLowerCase()
         this.filter = null
       } else {
         this.email = null

From 1cf3295e0bea1898959beb3133ec517b8738cfd1 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 11 Oct 2019 02:03:09 +0200
Subject: [PATCH 08/11] update version to 0.1.4

---
 CHANGELOG.md | 200 +++++++++++++--------------------------------------
 1 file changed, 49 insertions(+), 151 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bcffad4f..404129bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,164 +2,62 @@
 
 ## [Unreleased](https://github.com/Human-Connection/Human-Connection/tree/HEAD)
 
-[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.0...HEAD)
-
-**Fixed bugs:**
-
-- 🐛 \[Bug\] Update maintenance page email [\#1731](https://github.com/Human-Connection/Human-Connection/issues/1731)
-- 🐛 \[Bug\] Editing comments is not reactive again [\#1718](https://github.com/Human-Connection/Human-Connection/issues/1718)
-- 🐛 \[Bug\] Comments with mentions in the end not displayed [\#1665](https://github.com/Human-Connection/Human-Connection/issues/1665)
-- 🐛 \[Bug\] Moderators and Admins can be blocked [\#1663](https://github.com/Human-Connection/Human-Connection/issues/1663)
-- 🐛 \[Bug\] Links in Comments don't show up [\#1661](https://github.com/Human-Connection/Human-Connection/issues/1661)
-- 🐛 \[Bug\] Delete the Sleep Icon [\#1659](https://github.com/Human-Connection/Human-Connection/issues/1659)
-- 🐛 \[Bug\] Mail Layout German/English not working in Webmail [\#1656](https://github.com/Human-Connection/Human-Connection/issues/1656)
-- 🐛 \[Bug\] Far to less Characters per Contribution \(2000\) [\#1639](https://github.com/Human-Connection/Human-Connection/issues/1639)
-- 🐛 \[Bug\] Notifications do just update with page reload [\#1637](https://github.com/Human-Connection/Human-Connection/issues/1637)
-- 🐛 \[Bug\] Admin statistics entries are missing [\#1633](https://github.com/Human-Connection/Human-Connection/issues/1633)
-- 🐛 \[Bug\] Can no users used all hashtags be correct? [\#1632](https://github.com/Human-Connection/Human-Connection/issues/1632)
-- 🐛 \[Bug\] Create account has no info about email, no localisation, no HC logo [\#1631](https://github.com/Human-Connection/Human-Connection/issues/1631)
-- 🐛 \[Bug\] Embeds are displayed when creating comments but get removed [\#1547](https://github.com/Human-Connection/Human-Connection/issues/1547)
-- 🐛 \[Bug\] One cypress test fails but it does not fail the build [\#1312](https://github.com/Human-Connection/Human-Connection/issues/1312)
-- 🐛 \[Bug\] TypeError: Cannot read property 'offsetTop' of null [\#1273](https://github.com/Human-Connection/Human-Connection/issues/1273)
+[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.4...HEAD)
 
 **Closed issues:**
 
-- 🚀 \[Feature\] Extend Emoticons [\#1745](https://github.com/Human-Connection/Human-Connection/issues/1745)
-- 🚀 \[Feature\] Show "Edited" on comments and Posts [\#1669](https://github.com/Human-Connection/Human-Connection/issues/1669)
-- 🚀 \[Feature\] Change slug [\#1650](https://github.com/Human-Connection/Human-Connection/issues/1650)
-- 🚀 \[Feature\] Make the slug more visible and usable [\#1486](https://github.com/Human-Connection/Human-Connection/issues/1486)
-- 🚀 \[Feature\] Report with reason [\#1469](https://github.com/Human-Connection/Human-Connection/issues/1469)
-- 🚀 \[Feature\] Update `lastActiveAt` on every JWT token check [\#1305](https://github.com/Human-Connection/Human-Connection/issues/1305)
-- 🚀 \[Feature\] Make Invite an Registration E-Mails translatable and pretty [\#1186](https://github.com/Human-Connection/Human-Connection/issues/1186)
-- 🚀 \[Feature\] @Username: Unique user identification if identical profile names exist [\#1069](https://github.com/Human-Connection/Human-Connection/issues/1069)
-- 🚀 \[Feature\] UserSettings - YourData - Email [\#407](https://github.com/Human-Connection/Human-Connection/issues/407)
+- 🚀 \[Feature\] Register as a new User [\#1785](https://github.com/Human-Connection/Human-Connection/issues/1785)
 
 **Merged pull requests:**
 
-- fixes\#1305 lastActiveAt [\#1809](https://github.com/Human-Connection/Human-Connection/pull/1809) ([iylim](https://github.com/iylim))
-- Show that a Post/Comment has been edited [\#1807](https://github.com/Human-Connection/Human-Connection/pull/1807) ([mattwr18](https://github.com/mattwr18))
-- fix invites count calculation for admin dashboard [\#1806](https://github.com/Human-Connection/Human-Connection/pull/1806) ([vbelolapotkov](https://github.com/vbelolapotkov))
+- Refactor embed settings page [\#1861](https://github.com/Human-Connection/Human-Connection/pull/1861) ([roschaefer](https://github.com/roschaefer))
+- Implement public registration [\#1814](https://github.com/Human-Connection/Human-Connection/pull/1814) ([roschaefer](https://github.com/roschaefer))
+
+## [0.1.4](https://github.com/Human-Connection/Human-Connection/tree/0.1.4) (2019-10-10)
+[Full Changelog](https://github.com/Human-Connection/Human-Connection/compare/0.1.3...0.1.4)
+
+**Fixed bugs:**
+
+- 🐛 \[Bug\] extend Title to 100 characters [\#1812](https://github.com/Human-Connection/Human-Connection/issues/1812)
+
+**Closed issues:**
+
+- 🚀 \[Feature\] Make Email of a User visible for Moderators [\#1704](https://github.com/Human-Connection/Human-Connection/issues/1704)
+- 🚀 \[Feature\] save embeds iframe permanently [\#1684](https://github.com/Human-Connection/Human-Connection/issues/1684)
+
+**Merged pull requests:**
+
+- Add Hall of Fame to README [\#1859](https://github.com/Human-Connection/Human-Connection/pull/1859) ([roschaefer](https://github.com/roschaefer))
+- build\(deps-dev\): bump cypress-cucumber-preprocessor from 1.16.1 to 1.16.2 [\#1855](https://github.com/Human-Connection/Human-Connection/pull/1855) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump nodemailer from 6.3.0 to 6.3.1 in /backend [\#1854](https://github.com/Human-Connection/Human-Connection/pull/1854) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Save user setting to show embed code II [\#1852](https://github.com/Human-Connection/Human-Connection/pull/1852) ([ogerly](https://github.com/ogerly))
+- Title character increased from 64 to 100 [\#1850](https://github.com/Human-Connection/Human-Connection/pull/1850) ([ogerly](https://github.com/ogerly))
+- build\(deps-dev\): bump @babel/core from 7.6.2 to 7.6.3 in /webapp [\#1848](https://github.com/Human-Connection/Human-Connection/pull/1848) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @babel/cli from 7.6.2 to 7.6.3 in /backend [\#1847](https://github.com/Human-Connection/Human-Connection/pull/1847) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @babel/preset-env from 7.6.2 to 7.6.3 in /backend [\#1846](https://github.com/Human-Connection/Human-Connection/pull/1846) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @babel/node from 7.6.2 to 7.6.3 in /backend [\#1843](https://github.com/Human-Connection/Human-Connection/pull/1843) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump styleguide from `808b3c5` to `d46fc15` [\#1839](https://github.com/Human-Connection/Human-Connection/pull/1839) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @storybook/addon-actions from 5.2.1 to 5.2.3 in /webapp [\#1838](https://github.com/Human-Connection/Human-Connection/pull/1838) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.11.0-alpine to 12.11.1-alpine in /backend [\#1837](https://github.com/Human-Connection/Human-Connection/pull/1837) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @storybook/addon-a11y from 5.2.1 to 5.2.3 in /webapp [\#1836](https://github.com/Human-Connection/Human-Connection/pull/1836) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.11.0-alpine to 12.11.1-alpine in /webapp [\#1835](https://github.com/Human-Connection/Human-Connection/pull/1835) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump @storybook/vue from 5.2.1 to 5.2.3 in /webapp [\#1834](https://github.com/Human-Connection/Human-Connection/pull/1834) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump cucumber from 6.0.1 to 6.0.2 in /backend [\#1833](https://github.com/Human-Connection/Human-Connection/pull/1833) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Fix typo in email template [\#1829](https://github.com/Human-Connection/Human-Connection/pull/1829) ([alina-beck](https://github.com/alina-beck))
+- build\(deps-dev\): bump cucumber from 5.1.0 to 6.0.1 in /backend [\#1827](https://github.com/Human-Connection/Human-Connection/pull/1827) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.10.0-alpine to 12.11.0-alpine in /backend [\#1826](https://github.com/Human-Connection/Human-Connection/pull/1826) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump node from 12.10.0-alpine to 12.11.0-alpine in /webapp [\#1824](https://github.com/Human-Connection/Human-Connection/pull/1824) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump apollo-server-testing from 2.9.4 to 2.9.5 in /backend [\#1823](https://github.com/Human-Connection/Human-Connection/pull/1823) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump tiptap-extensions from 1.28.0 to 1.28.3 in /webapp [\#1822](https://github.com/Human-Connection/Human-Connection/pull/1822) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump tiptap from 1.26.0 to 1.26.3 in /webapp [\#1821](https://github.com/Human-Connection/Human-Connection/pull/1821) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump eslint-config-prettier from 6.3.0 to 6.4.0 in /webapp [\#1819](https://github.com/Human-Connection/Human-Connection/pull/1819) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump eslint-config-prettier from 6.3.0 to 6.4.0 in /backend [\#1818](https://github.com/Human-Connection/Human-Connection/pull/1818) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps\): bump @hapi/joi from 16.1.5 to 16.1.7 in /backend [\#1817](https://github.com/Human-Connection/Human-Connection/pull/1817) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- build\(deps-dev\): bump cypress-cucumber-preprocessor from 1.16.0 to 1.16.1 [\#1816](https://github.com/Human-Connection/Human-Connection/pull/1816) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Update to 0.1.3 [\#1813](https://github.com/Human-Connection/Human-Connection/pull/1813) ([mattwr18](https://github.com/mattwr18))
+- Display user email for administrators [\#1808](https://github.com/Human-Connection/Human-Connection/pull/1808) ([aonomike](https://github.com/aonomike))
 - build\(deps\): bump nuxt from 2.9.2 to 2.10.0 in /webapp [\#1804](https://github.com/Human-Connection/Human-Connection/pull/1804) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /webapp [\#1803](https://github.com/Human-Connection/Human-Connection/pull/1803) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump @hapi/joi from 16.1.4 to 16.1.5 in /backend [\#1802](https://github.com/Human-Connection/Human-Connection/pull/1802) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump cross-env from 6.0.2 to 6.0.3 in /backend [\#1801](https://github.com/Human-Connection/Human-Connection/pull/1801) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps-dev\): bump cross-env from 6.0.2 to 6.0.3 [\#1800](https://github.com/Human-Connection/Human-Connection/pull/1800) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Remove language toggle from email template [\#1798](https://github.com/Human-Connection/Human-Connection/pull/1798) ([alina-beck](https://github.com/alina-beck))
-- Max aspect ratio of 1:1 for Post index page [\#1796](https://github.com/Human-Connection/Human-Connection/pull/1796) ([mattwr18](https://github.com/mattwr18))
-- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /backend [\#1794](https://github.com/Human-Connection/Human-Connection/pull/1794) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps-dev\): bump cross-env from 6.0.0 to 6.0.2 [\#1793](https://github.com/Human-Connection/Human-Connection/pull/1793) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump metascraper-description from 5.7.5 to 5.7.6 in /backend [\#1792](https://github.com/Human-Connection/Human-Connection/pull/1792) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump cross-env from 6.0.0 to 6.0.2 in /webapp [\#1791](https://github.com/Human-Connection/Human-Connection/pull/1791) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- build\(deps\): bump @nuxtjs/apollo from 4.0.0-rc13.1 to 4.0.0-rc14 in /webapp [\#1790](https://github.com/Human-Connection/Human-Connection/pull/1790) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Update Post query for blockedByUsers [\#1788](https://github.com/Human-Connection/Human-Connection/pull/1788) ([mattwr18](https://github.com/mattwr18))
-- Update neo4j to Enterprise edition [\#1787](https://github.com/Human-Connection/Human-Connection/pull/1787) ([mattwr18](https://github.com/mattwr18))
-- Update to 0.1.2 [\#1786](https://github.com/Human-Connection/Human-Connection/pull/1786) ([mattwr18](https://github.com/mattwr18))
-- Bump metascraper-logo from 5.7.5 to 5.7.6 in /backend [\#1783](https://github.com/Human-Connection/Human-Connection/pull/1783) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-url from 5.7.5 to 5.7.6 in /backend [\#1782](https://github.com/Human-Connection/Human-Connection/pull/1782) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql-middleware from 3.0.5 to 4.0.1 in /backend [\#1781](https://github.com/Human-Connection/Human-Connection/pull/1781) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint from 6.4.0 to 6.5.1 in /backend [\#1780](https://github.com/Human-Connection/Human-Connection/pull/1780) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-audio from 5.7.5 to 5.7.6 in /backend [\#1779](https://github.com/Human-Connection/Human-Connection/pull/1779) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-publisher from 5.7.4 to 5.7.6 in /backend [\#1778](https://github.com/Human-Connection/Human-Connection/pull/1778) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-youtube from 5.7.5 to 5.7.6 in /backend [\#1777](https://github.com/Human-Connection/Human-Connection/pull/1777) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/preset-env from 7.6.0 to 7.6.2 in /backend [\#1776](https://github.com/Human-Connection/Human-Connection/pull/1776) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-soundcloud from 5.7.4 to 5.7.6 in /backend [\#1775](https://github.com/Human-Connection/Human-Connection/pull/1775) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-author from 5.7.4 to 5.7.6 in /backend [\#1774](https://github.com/Human-Connection/Human-Connection/pull/1774) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Fix failing test [\#1772](https://github.com/Human-Connection/Human-Connection/pull/1772) ([aonomike](https://github.com/aonomike))
-- Bump metascraper-date from 5.7.4 to 5.7.6 in /backend [\#1771](https://github.com/Human-Connection/Human-Connection/pull/1771) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp [\#1770](https://github.com/Human-Connection/Human-Connection/pull/1770) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump date-fns from 2.3.0 to 2.4.1 in /backend [\#1769](https://github.com/Human-Connection/Human-Connection/pull/1769) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump date-fns from 2.4.0 to 2.4.1 in /webapp [\#1768](https://github.com/Human-Connection/Human-Connection/pull/1768) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql-middleware-sentry from 3.2.0 to 3.2.1 in /backend [\#1767](https://github.com/Human-Connection/Human-Connection/pull/1767) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-lang from 5.7.4 to 5.7.6 in /backend [\#1766](https://github.com/Human-Connection/Human-Connection/pull/1766) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump tiptap from 1.25.0 to 1.26.0 in /webapp [\#1765](https://github.com/Human-Connection/Human-Connection/pull/1765) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-video from 5.7.5 to 5.7.6 in /backend [\#1764](https://github.com/Human-Connection/Human-Connection/pull/1764) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump apollo-server from 2.9.3 to 2.9.4 in /backend [\#1762](https://github.com/Human-Connection/Human-Connection/pull/1762) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-image from 5.7.5 to 5.7.6 in /backend [\#1761](https://github.com/Human-Connection/Human-Connection/pull/1761) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint-loader from 3.0.1 to 3.0.2 in /webapp [\#1760](https://github.com/Human-Connection/Human-Connection/pull/1760) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-title from 5.7.5 to 5.7.6 in /backend [\#1759](https://github.com/Human-Connection/Human-Connection/pull/1759) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump nodemon from 1.19.2 to 1.19.3 in /backend [\#1758](https://github.com/Human-Connection/Human-Connection/pull/1758) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- fix email middleware transport config [\#1757](https://github.com/Human-Connection/Human-Connection/pull/1757) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- 1273 fix post page nav suggestions [\#1756](https://github.com/Human-Connection/Human-Connection/pull/1756) ([roschaefer](https://github.com/roschaefer))
-- docs: moves storybook into webapp/README.md [\#1755](https://github.com/Human-Connection/Human-Connection/pull/1755) ([roschaefer](https://github.com/roschaefer))
-- Bump date-fns from 2.2.1 to 2.4.0 in /webapp [\#1752](https://github.com/Human-Connection/Human-Connection/pull/1752) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- fix: Github's security vulnerability warning [\#1751](https://github.com/Human-Connection/Human-Connection/pull/1751) ([roschaefer](https://github.com/roschaefer))
-- update neo4j docker-compose config [\#1750](https://github.com/Human-Connection/Human-Connection/pull/1750) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- 🍰 Try to fix VSCode format works against ESLint [\#1749](https://github.com/Human-Connection/Human-Connection/pull/1749) ([Tirokk](https://github.com/Tirokk))
-- Bump neo4j from 3.5.9 to 3.5.11 in /neo4j [\#1739](https://github.com/Human-Connection/Human-Connection/pull/1739) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql from 14.5.7 to 14.5.8 in /backend [\#1738](https://github.com/Human-Connection/Human-Connection/pull/1738) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-youtube from 5.7.4 to 5.7.5 in /backend [\#1737](https://github.com/Human-Connection/Human-Connection/pull/1737) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Update to 0.1.1 [\#1734](https://github.com/Human-Connection/Human-Connection/pull/1734) ([roschaefer](https://github.com/roschaefer))
-- Update maintenance page email to support@... [\#1732](https://github.com/Human-Connection/Human-Connection/pull/1732) ([mattwr18](https://github.com/mattwr18))
-- Bump @babel/register from 7.6.0 to 7.6.2 in /backend [\#1730](https://github.com/Human-Connection/Human-Connection/pull/1730) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql from 14.5.7 to 14.5.8 in /webapp [\#1729](https://github.com/Human-Connection/Human-Connection/pull/1729) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/core from 7.6.0 to 7.6.2 in /backend [\#1728](https://github.com/Human-Connection/Human-Connection/pull/1728) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint-loader from 3.0.0 to 3.0.1 in /webapp [\#1727](https://github.com/Human-Connection/Human-Connection/pull/1727) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump apollo-server-express from 2.9.3 to 2.9.4 in /backend [\#1726](https://github.com/Human-Connection/Human-Connection/pull/1726) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/node from 7.6.1 to 7.6.2 in /backend [\#1725](https://github.com/Human-Connection/Human-Connection/pull/1725) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Fix bug UpdateComment, Fix styling on Comment [\#1719](https://github.com/Human-Connection/Human-Connection/pull/1719) ([mattwr18](https://github.com/mattwr18))
-- Bump apollo-server-testing from 2.9.3 to 2.9.4 in /backend [\#1717](https://github.com/Human-Connection/Human-Connection/pull/1717) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-title from 5.7.4 to 5.7.5 in /backend [\#1715](https://github.com/Human-Connection/Human-Connection/pull/1715) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump date-fns from 2.2.1 to 2.3.0 in /backend [\#1714](https://github.com/Human-Connection/Human-Connection/pull/1714) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/cli from 7.6.0 to 7.6.2 in /backend [\#1713](https://github.com/Human-Connection/Human-Connection/pull/1713) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- \[WIP\]1706 refactor shout spec [\#1712](https://github.com/Human-Connection/Human-Connection/pull/1712) ([aonomike](https://github.com/aonomike))
-- 407 change your email address [\#1711](https://github.com/Human-Connection/Human-Connection/pull/1711) ([roschaefer](https://github.com/roschaefer))
-- Remove repetitive labels from emote button [\#1702](https://github.com/Human-Connection/Human-Connection/pull/1702) ([roschaefer](https://github.com/roschaefer))
-- fix the bug with scrolling post comments into view [\#1701](https://github.com/Human-Connection/Human-Connection/pull/1701) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- Bump metascraper-description from 5.7.4 to 5.7.5 in /backend [\#1700](https://github.com/Human-Connection/Human-Connection/pull/1700) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-logo from 5.7.4 to 5.7.5 in /backend [\#1698](https://github.com/Human-Connection/Human-Connection/pull/1698) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-video from 5.7.4 to 5.7.5 in /backend [\#1697](https://github.com/Human-Connection/Human-Connection/pull/1697) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/core from 7.6.0 to 7.6.2 in /webapp [\#1696](https://github.com/Human-Connection/Human-Connection/pull/1696) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-image from 5.7.4 to 5.7.5 in /backend [\#1695](https://github.com/Human-Connection/Human-Connection/pull/1695) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @babel/preset-env from 7.6.0 to 7.6.2 in /webapp [\#1694](https://github.com/Human-Connection/Human-Connection/pull/1694) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-audio from 5.7.4 to 5.7.5 in /backend [\#1693](https://github.com/Human-Connection/Human-Connection/pull/1693) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump metascraper-url from 5.7.4 to 5.7.5 in /backend [\#1692](https://github.com/Human-Connection/Human-Connection/pull/1692) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bugfix create user page - missing submit buttons [\#1690](https://github.com/Human-Connection/Human-Connection/pull/1690) ([roschaefer](https://github.com/roschaefer))
-- Remove sleep icon from comments list [\#1689](https://github.com/Human-Connection/Human-Connection/pull/1689) ([alina-beck](https://github.com/alina-beck))
-- Configure docker to work with storybook [\#1688](https://github.com/Human-Connection/Human-Connection/pull/1688) ([mattwr18](https://github.com/mattwr18))
-- Add Comment story, add spacing above user info [\#1685](https://github.com/Human-Connection/Human-Connection/pull/1685) ([mattwr18](https://github.com/mattwr18))
-- Fix create account page has no logo, localisation [\#1681](https://github.com/Human-Connection/Human-Connection/pull/1681) ([roschaefer](https://github.com/roschaefer))
-- Fix intermittent backend specs [\#1679](https://github.com/Human-Connection/Human-Connection/pull/1679) ([roschaefer](https://github.com/roschaefer))
-- Improve comments output [\#1678](https://github.com/Human-Connection/Human-Connection/pull/1678) ([mattwr18](https://github.com/mattwr18))
-- Fix intermittent failing test [\#1677](https://github.com/Human-Connection/Human-Connection/pull/1677) ([mattwr18](https://github.com/mattwr18))
-- Bump graphql from 14.5.6 to 14.5.7 in /webapp [\#1676](https://github.com/Human-Connection/Human-Connection/pull/1676) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump graphql from 14.5.6 to 14.5.7 in /backend [\#1675](https://github.com/Human-Connection/Human-Connection/pull/1675) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cookie-universal-nuxt from 2.0.17 to 2.0.18 in /webapp [\#1674](https://github.com/Human-Connection/Human-Connection/pull/1674) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @hapi/joi from 16.1.2 to 16.1.4 in /backend [\#1673](https://github.com/Human-Connection/Human-Connection/pull/1673) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump helmet from 3.21.0 to 3.21.1 in /backend [\#1672](https://github.com/Human-Connection/Human-Connection/pull/1672) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cypress-file-upload from 3.3.3 to 3.3.4 [\#1671](https://github.com/Human-Connection/Human-Connection/pull/1671) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump codecov from 3.6.0 to 3.6.1 [\#1670](https://github.com/Human-Connection/Human-Connection/pull/1670) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Make Human Connection a Progressive Web App [\#1668](https://github.com/Human-Connection/Human-Connection/pull/1668) ([roschaefer](https://github.com/roschaefer))
-- Remove contentExcerpt from comments [\#1667](https://github.com/Human-Connection/Human-Connection/pull/1667) ([mattwr18](https://github.com/mattwr18))
-- Remove follow type enum [\#1660](https://github.com/Human-Connection/Human-Connection/pull/1660) ([vbelolapotkov](https://github.com/vbelolapotkov))
-- 🍰 Notifications self update and refactoring [\#1658](https://github.com/Human-Connection/Human-Connection/pull/1658) ([Tirokk](https://github.com/Tirokk))
-- Bump mustache from 3.0.3 to 3.1.0 in /backend [\#1655](https://github.com/Human-Connection/Human-Connection/pull/1655) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @hapi/joi from 16.1.1 to 16.1.2 in /backend [\#1654](https://github.com/Human-Connection/Human-Connection/pull/1654) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @nuxtjs/apollo from 4.0.0-rc13 to 4.0.0-rc13.1 in /webapp [\#1653](https://github.com/Human-Connection/Human-Connection/pull/1653) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump codecov from 3.5.0 to 3.6.0 [\#1652](https://github.com/Human-Connection/Human-Connection/pull/1652) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Change your own slug [\#1651](https://github.com/Human-Connection/Human-Connection/pull/1651) ([roschaefer](https://github.com/roschaefer))
-- Fix bug where short comments scrub links [\#1649](https://github.com/Human-Connection/Human-Connection/pull/1649) ([mattwr18](https://github.com/mattwr18))
-- Fix styling issue in comments list [\#1648](https://github.com/Human-Connection/Human-Connection/pull/1648) ([mattwr18](https://github.com/mattwr18))
-- Provider list approval hard cut [\#1647](https://github.com/Human-Connection/Human-Connection/pull/1647) ([ogerly](https://github.com/ogerly))
-- Point the changelog to Github [\#1646](https://github.com/Human-Connection/Human-Connection/pull/1646) ([roschaefer](https://github.com/roschaefer))
-- Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /webapp [\#1643](https://github.com/Human-Connection/Human-Connection/pull/1643) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump eslint-plugin-prettier from 3.1.0 to 3.1.1 in /backend [\#1642](https://github.com/Human-Connection/Human-Connection/pull/1642) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Fix \#1639 - No limits for post length [\#1641](https://github.com/Human-Connection/Human-Connection/pull/1641) ([roschaefer](https://github.com/roschaefer))
-- 1486 make slug more usable [\#1640](https://github.com/Human-Connection/Human-Connection/pull/1640) ([roschaefer](https://github.com/roschaefer))
-- Update de.json [\#1636](https://github.com/Human-Connection/Human-Connection/pull/1636) ([datenbrei](https://github.com/datenbrei))
-- Exclude broken maintenance-worker docker image [\#1635](https://github.com/Human-Connection/Human-Connection/pull/1635) ([roschaefer](https://github.com/roschaefer))
-- Fix bug where about must not be empty string [\#1630](https://github.com/Human-Connection/Human-Connection/pull/1630) ([mattwr18](https://github.com/mattwr18))
-- Bump @storybook/addon-a11y from 5.2.0 to 5.2.1 in /webapp [\#1627](https://github.com/Human-Connection/Human-Connection/pull/1627) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @storybook/addon-actions from 5.2.0 to 5.2.1 in /webapp [\#1625](https://github.com/Human-Connection/Human-Connection/pull/1625) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @storybook/vue from 5.2.0 to 5.2.1 in /webapp [\#1624](https://github.com/Human-Connection/Human-Connection/pull/1624) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cross-env from 5.2.1 to 6.0.0 in /backend [\#1623](https://github.com/Human-Connection/Human-Connection/pull/1623) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump @hapi/joi from 16.0.1 to 16.1.1 in /backend [\#1622](https://github.com/Human-Connection/Human-Connection/pull/1622) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump cross-env from 5.2.1 to 6.0.0 [\#1621](https://github.com/Human-Connection/Human-Connection/pull/1621) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- 1612 refactor moderator spec [\#1620](https://github.com/Human-Connection/Human-Connection/pull/1620) ([aonomike](https://github.com/aonomike))
-- Fix disappearing embeds on comments [\#1618](https://github.com/Human-Connection/Human-Connection/pull/1618) ([mattwr18](https://github.com/mattwr18))
-- links\_to\_imprint\_and\_privacy\_policy\_changed\_to\_human-connection.org [\#1615](https://github.com/Human-Connection/Human-Connection/pull/1615) ([ogerly](https://github.com/ogerly))
-- Bump metascraper-author from 5.6.6 to 5.7.4 in /backend [\#1610](https://github.com/Human-Connection/Human-Connection/pull/1610) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Configure emails [\#1599](https://github.com/Human-Connection/Human-Connection/pull/1599) ([alina-beck](https://github.com/alina-beck))
-- Improve follow/ufollow mutation [\#1596](https://github.com/Human-Connection/Human-Connection/pull/1596) ([vbelolapotkov](https://github.com/vbelolapotkov))
+- \[TEST\] Save user setting to show embed code [\#1686](https://github.com/Human-Connection/Human-Connection/pull/1686) ([ogerly](https://github.com/ogerly))
 
 
 

From dab05d9e67ec1acc171adba7600f02f5fcea3cc5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 11 Oct 2019 14:01:39 +0200
Subject: [PATCH 09/11] Fix embeds settings page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Dockerfile was not copying providers.json
- Fix file path to providers.json
- Update template to show message based on allowEmbedIframes

Co-authored-by: Robert Schäfer <git@roschaefer.de>
Co-authored-by: Mike Aono <aonomike@gmail.com>
---
 backend/Dockerfile                            |   1 +
 .../schema/resolvers/embeds/providers.json    | 257 ------------------
 webapp/locales/de.json                        |   4 +-
 webapp/locales/en.json                        |   4 +-
 webapp/pages/settings/embeds.vue              |  11 +-
 5 files changed, 13 insertions(+), 264 deletions(-)
 delete mode 100644 backend/src/schema/resolvers/embeds/providers.json

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 0d040a753..1df199c1f 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -24,4 +24,5 @@ FROM base as production
 ENV NODE_ENV=production
 COPY --from=build-and-test /nitro-backend/dist ./dist
 COPY ./public/img/ ./public/img/
+COPY ./public/providers.json ./public/providers.json
 RUN yarn install --production=true --frozen-lockfile --non-interactive --no-cache
diff --git a/backend/src/schema/resolvers/embeds/providers.json b/backend/src/schema/resolvers/embeds/providers.json
deleted file mode 100644
index ef9f04bff..000000000
--- a/backend/src/schema/resolvers/embeds/providers.json
+++ /dev/null
@@ -1,257 +0,0 @@
-[
-    {
-        "provider_name": "Codepen",
-        "provider_url": "https:\/\/codepen.io",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/codepen.io\/*",
-                    "https:\/\/codepen.io\/*"
-                ],
-                "url": "http:\/\/codepen.io\/api\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "DTube",
-        "provider_url": "https:\/\/d.tube\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/d.tube\/v\/*"
-                ],
-                "url": "https:\/\/api.d.tube\/oembed",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Facebook (Post)",
-        "provider_url": "https:\/\/www.facebook.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/www.facebook.com\/*\/posts\/*",
-                    "https:\/\/www.facebook.com\/photos\/*",
-                    "https:\/\/www.facebook.com\/*\/photos\/*",
-                    "https:\/\/www.facebook.com\/photo.php*",
-                    "https:\/\/www.facebook.com\/photo.php",
-                    "https:\/\/www.facebook.com\/*\/activity\/*",
-                    "https:\/\/www.facebook.com\/permalink.php",
-                    "https:\/\/www.facebook.com\/media\/set?set=*",
-                    "https:\/\/www.facebook.com\/questions\/*",
-                    "https:\/\/www.facebook.com\/notes\/*\/*\/*"
-                ],
-                "url": "https:\/\/www.facebook.com\/plugins\/post\/oembed.json",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Facebook (Video)",
-        "provider_url": "https:\/\/www.facebook.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/www.facebook.com\/*\/videos\/*",
-                    "https:\/\/www.facebook.com\/video.php"
-                ],
-                "url": "https:\/\/www.facebook.com\/plugins\/video\/oembed.json",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Flickr",
-        "provider_url": "https:\/\/www.flickr.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/*.flickr.com\/photos\/*",
-                    "http:\/\/flic.kr\/p\/*",
-                    "https:\/\/*.flickr.com\/photos\/*",
-                    "https:\/\/flic.kr\/p\/*"
-                ],
-                "url": "https:\/\/www.flickr.com\/services\/oembed\/",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "GIPHY",
-        "provider_url": "https:\/\/giphy.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/giphy.com\/gifs\/*",
-                    "http:\/\/gph.is\/*",
-                    "https:\/\/media.giphy.com\/media\/*\/giphy.gif"
-                ],
-                "url": "https:\/\/giphy.com\/services\/oembed",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "Instagram",
-        "provider_url": "https:\/\/instagram.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/instagram.com\/p\/*",
-                    "http:\/\/instagr.am\/p\/*",
-                    "http:\/\/www.instagram.com\/p\/*",
-                    "http:\/\/www.instagr.am\/p\/*",
-                    "https:\/\/instagram.com\/p\/*",
-                    "https:\/\/instagr.am\/p\/*",
-                    "https:\/\/www.instagram.com\/p\/*",
-                    "https:\/\/www.instagr.am\/p\/*"
-                ],
-                "url": "https:\/\/api.instagram.com\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "Meetup",
-        "provider_url": "http:\/\/www.meetup.com",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/meetup.com\/*",
-                    "https:\/\/www.meetup.com\/*",
-                    "https:\/\/meetup.com\/*",
-                    "http:\/\/meetu.ps\/*"
-                ],
-                "url": "https:\/\/api.meetup.com\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "MixCloud",
-        "provider_url": "https:\/\/mixcloud.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/www.mixcloud.com\/*\/*\/",
-                    "https:\/\/www.mixcloud.com\/*\/*\/"
-                ],
-                "url": "https:\/\/www.mixcloud.com\/oembed\/"
-            }
-        ]
-    },
-    {
-        "provider_name": "Reddit",
-        "provider_url": "https:\/\/reddit.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/reddit.com\/r\/*\/comments\/*\/*",
-                    "https:\/\/www.reddit.com\/r\/*\/comments\/*\/*"
-                ],
-                "url": "https:\/\/www.reddit.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "SlideShare",
-        "provider_url": "http:\/\/www.slideshare.net\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/www.slideshare.net\/*\/*",
-                    "http:\/\/fr.slideshare.net\/*\/*",
-                    "http:\/\/de.slideshare.net\/*\/*",
-                    "http:\/\/es.slideshare.net\/*\/*",
-                    "http:\/\/pt.slideshare.net\/*\/*"
-                ],
-                "url": "http:\/\/www.slideshare.net\/api\/oembed\/2",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "SoundCloud",
-        "provider_url": "http:\/\/soundcloud.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/soundcloud.com\/*",
-                    "https:\/\/soundcloud.com\/*"
-                ],
-                "url": "https:\/\/soundcloud.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "Twitch",
-        "provider_url": "https:\/\/www.twitch.tv",
-        "endpoints": [
-            {
-                "schemes": [
-                    "http:\/\/clips.twitch.tv\/*",
-                    "https:\/\/clips.twitch.tv\/*",
-                    "http:\/\/www.twitch.tv\/*",
-                    "https:\/\/www.twitch.tv\/*",
-                    "http:\/\/twitch.tv\/*",
-                    "https:\/\/twitch.tv\/*"
-                ],
-                "url": "https:\/\/api.twitch.tv\/v4\/oembed",
-                "formats": [
-                    "json"
-                ]
-            }
-        ]
-    },
-    {
-        "provider_name": "Twitter",
-        "provider_url": "http:\/\/www.twitter.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/twitter.com\/*\/status\/*",
-                    "https:\/\/*.twitter.com\/*\/status\/*"
-                ],
-                "url": "https:\/\/publish.twitter.com\/oembed"
-            }
-        ]
-    },
-    {
-        "provider_name": "Vimeo",
-        "provider_url": "https:\/\/vimeo.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/vimeo.com\/*",
-                    "https:\/\/vimeo.com\/album\/*\/video\/*",
-                    "https:\/\/vimeo.com\/channels\/*\/*",
-                    "https:\/\/vimeo.com\/groups\/*\/videos\/*",
-                    "https:\/\/vimeo.com\/ondemand\/*\/*",
-                    "https:\/\/player.vimeo.com\/video\/*"
-                ],
-                "url": "https:\/\/vimeo.com\/api\/oembed.{format}",
-                "discovery": true
-            }
-        ]
-    },
-    {
-        "provider_name": "YouTube",
-        "provider_url": "https:\/\/www.youtube.com\/",
-        "endpoints": [
-            {
-                "schemes": [
-                    "https:\/\/*.youtube.com\/watch*",
-                    "https:\/\/*.youtube.com\/v\/*",
-                    "https:\/\/youtu.be\/*"
-                ],
-                "url": "https:\/\/www.youtube.com\/oembed",
-                "discovery": true
-            }
-        ]
-    }
-]
\ No newline at end of file
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 3f9ed718e..c9788e591 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -244,8 +244,8 @@
       "status": {
         "description": "Als Grundeinstellung für dich wird eingebetter Fremdcode von Drittanbietern",
         "disabled": {
-          "false": "zunächst nicht angezeigt",
-          "true": "sofort angezeigt"
+          "off": "zunächst nicht angezeigt",
+          "on": "sofort angezeigt"
         },
         "change": {
           "question": "Soll eingebetter Fremdcode von Dritten für dich immer angezeigt werden?",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9ed1d8d40..9d68ae6a0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -245,8 +245,8 @@
       "status": {
         "description": "As a default for you, embedded code of third-party providers is",
         "disabled": {
-          "false": "initially not displayed",
-          "true": "displayed immediately"
+          "off": "initially not displayed",
+          "on": "displayed immediately"
         },
         "change": {
           "question": "Should embedded source code from third parties always be displayed to you?",
diff --git a/webapp/pages/settings/embeds.vue b/webapp/pages/settings/embeds.vue
index 7b85295c0..9314bb4ba 100644
--- a/webapp/pages/settings/embeds.vue
+++ b/webapp/pages/settings/embeds.vue
@@ -4,7 +4,12 @@
       <ds-text>
         {{ $t('settings.embeds.status.description') }}
         <ds-text bold>
-          {{ $t(`settings.embeds.status.disabled.${disabled}`) }}
+          <template v-if="disabled">
+            {{ $t(`settings.embeds.status.disabled.on`) }}
+          </template>
+          <template v-else>
+            {{ $t(`settings.embeds.status.disabled.off`) }}
+          </template>
         </ds-text>
         .
       </ds-text>
@@ -52,10 +57,10 @@ export default {
     }
   },
   mounted() {
-    axios.get('../api/providers.json').then(response => {
+    axios.get('/api/providers.json').then(response => {
       this.providers = response.data
     })
-    this.disabled = this.currentUser.allowEmbedIframes
+    if (this.currentUser.allowEmbedIframes) this.disabled = this.currentUser.allowEmbedIframes
   },
   methods: {
     ...mapMutations({

From b0e7ef34ed9d91116b03bf89585825528cf665ef Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 11 Oct 2019 14:43:14 +0200
Subject: [PATCH 10/11] Update findProviders.json path

---
 backend/src/schema/resolvers/embeds/findProvider.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/embeds/findProvider.js b/backend/src/schema/resolvers/embeds/findProvider.js
index a4240895f..8575599e1 100644
--- a/backend/src/schema/resolvers/embeds/findProvider.js
+++ b/backend/src/schema/resolvers/embeds/findProvider.js
@@ -2,7 +2,10 @@ import fs from 'fs'
 import path from 'path'
 import minimatch from 'minimatch'
 
-let oEmbedProvidersFile = fs.readFileSync(path.join(__dirname, './providers.json'), 'utf8')
+let oEmbedProvidersFile = fs.readFileSync(
+  path.join(__dirname, '../../../../public/providers.json'),
+  'utf8',
+)
 
 // some providers allow a format parameter
 // we need JSON

From a8a4d837ebf7bcc58d8f5ca756cf001d64b024f6 Mon Sep 17 00:00:00 2001
From: Janeth <janethavishka@gmail.com>
Date: Sun, 13 Oct 2019 09:22:26 +0530
Subject: [PATCH 11/11] Fix translation error in login page

---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c9788e591..b2f1313da 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -103,7 +103,7 @@
     "email": "Deine E-Mail",
     "password": "Dein Passwort",
     "forgotPassword": "Passwort vergessen?",
-    "no-account": "Du hast noch keinen Benutzerkonto?",
+    "no-account": "Du hast noch kein Benutzerkonto?",
     "register": "Benutzerkonto erstellen",
     "moreInfo": "Was ist Human Connection?",
     "moreInfoURL": "https://human-connection.org",