Merge branch 'patch-1' into 'develop'

[akkoma] / lib / pleroma / user_relationship.ex

diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex
index 24c724549ed7bc41ff7f841f88297a5318a9d705..393947942304d0a4356e9599a9fc91bad1552b2a 100644 (file)
--- a/lib/pleroma/user_relationship.ex
+++ b/lib/pleroma/user_relationship.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.UserRelationship do
@@ -58,7 +58,7 @@ defmodule Pleroma.UserRelationship do
       target_id: target.id
     })
     |> Repo.insert(
-      on_conflict: :replace_all_except_primary_key,
+      on_conflict: {:replace_all_except, [:id]},
       conflict_target: [:source_id, :relationship_type, :target_id]
     )
   end