From 54f2974555e74ff09c5bec8161a51a87c2675e9e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 23 Jun 2021 15:12:58 +0200
Subject: [PATCH 1/3] Fix issues in posts repair step

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 priv/repo/migrations/20210622133516_cleanup_posts.exs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/priv/repo/migrations/20210622133516_cleanup_posts.exs b/priv/repo/migrations/20210622133516_cleanup_posts.exs
index 80831acfc..387507c96 100644
--- a/priv/repo/migrations/20210622133516_cleanup_posts.exs
+++ b/priv/repo/migrations/20210622133516_cleanup_posts.exs
@@ -17,7 +17,7 @@ defmodule Mobilizon.Storage.Repo.Migrations.CleanupPosts do
         Mobilizon.Storage.Repo,
         "SELECT * FROM (
           SELECT id, url,
-          ROW_NUMBER() OVER(PARTITION BY url ORDER BY id asc) AS Row
+          ROW_NUMBER() OVER(PARTITION BY url ORDER BY inserted_at asc) AS Row
           FROM posts
         ) dups
         WHERE dups.Row > 1;"
@@ -50,7 +50,7 @@ defmodule Mobilizon.Storage.Repo.Migrations.CleanupPosts do
   defp repair_post_medias(id, first_id) do
     Ecto.Adapters.SQL.query!(
       Mobilizon.Storage.Repo,
-      "UPDATE post_medias SET post_id = $1 WHERE post_id = $2",
+      "UPDATE posts_medias SET post_id = $1 WHERE post_id = $2",
       [first_id, id]
     )
   end
@@ -58,7 +58,7 @@ defmodule Mobilizon.Storage.Repo.Migrations.CleanupPosts do
   defp repair_post_tags(id, first_id) do
     Ecto.Adapters.SQL.query!(
       Mobilizon.Storage.Repo,
-      "UPDATE post_tags SET post_id = $1 WHERE post_id = $2",
+      "UPDATE posts_tags SET post_id = $1 WHERE post_id = $2",
       [first_id, id]
     )
   end

From b02fecfc78fc2eb8f29bb2779ae42436b90f7d2b Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 23 Jun 2021 16:06:35 +0200
Subject: [PATCH 2/3] Hide some warnings from apollo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/apollo/utils.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/src/apollo/utils.ts b/js/src/apollo/utils.ts
index e7dbd2d1f..694db7d6e 100644
--- a/js/src/apollo/utils.ts
+++ b/js/src/apollo/utils.ts
@@ -34,6 +34,11 @@ export const possibleTypes = types.reduce((acc, type) => {
   return acc;
 }, {} as Record<string, string[]>);
 
+const replaceMergePolicy = <TExisting = any, TIncoming = any>(
+  _existing: TExisting,
+  incoming: TIncoming
+): TIncoming => incoming;
+
 export const typePolicies: TypePolicies = {
   Discussion: {
     fields: {
@@ -61,6 +66,8 @@ export const typePolicies: TypePolicies = {
       participants: paginatedLimitPagination<IParticipant>(["roles"]),
       comments: pageLimitPagination<IComment>(),
       relatedEvents: pageLimitPagination<IEvent>(),
+      options: { merge: replaceMergePolicy },
+      participantStats: { merge: replaceMergePolicy },
     },
   },
   RootQueryType: {

From 4dde5b8275e1461367ee201170c8a6ff887dcff0 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 23 Jun 2021 16:12:47 +0200
Subject: [PATCH 3/3] Fix actorId query sometimes being lost when creating an
 event from group

Closes #712

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Event/OrganizerPickerWrapper.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/src/components/Event/OrganizerPickerWrapper.vue b/js/src/components/Event/OrganizerPickerWrapper.vue
index 9bfaa8c91..96063fe78 100644
--- a/js/src/components/Event/OrganizerPickerWrapper.vue
+++ b/js/src/components/Event/OrganizerPickerWrapper.vue
@@ -190,7 +190,6 @@ export default class OrganizerPickerWrapper extends Vue {
   setInitialActor(): void {
     if (this.$route.query?.actorId) {
       const actorId = this.$route.query?.actorId as string;
-      this.$router.replace({ query: undefined });
       const actor = this.userMemberships.elements.find(
         ({ parent: { id }, role }) =>
           actorId === id && MEMBER_ROLES.includes(role)