X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=dc66e27adba77965769539eed976b15a7daa8cdf;hb=19e8421947472eb2207caa299bc4bf5947ce3cca;hp=e31a2cc7623b9ff2827fa6d220519fd2e291598c;hpb=069daf644d984c479eae6483595a3307e923950b;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index e31a2cc76..dc66e27ad 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def to_for_user_and_mentions(user, mentions, inReplyTo) do
     default_to = [
-      User.ap_followers(user),
+      user.follower_address,
       "https://www.w3.org/ns/activitystreams#Public"
     ]
 
@@ -39,7 +39,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
          context <- make_context(inReplyTo),
          tags <- Formatter.parse_tags(status),
          object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags) do
-      ActivityPub.create(to, user, context, object)
+      res = ActivityPub.create(to, user, context, object)
+      User.update_note_count(user)
+      res
     end
   end
 
@@ -282,10 +284,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   def context_to_conversation_id(context) do
     with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
       id
-    else _e ->
-      changeset = Object.context_mapping(context)
-      {:ok, %{id: id}} = Repo.insert(changeset)
-      id
+      else _e ->
+        changeset = Object.context_mapping(context)
+        case Repo.insert(changeset) do
+          {:ok, %{id: id}} -> id
+          # This should be solved by an upsert, but it seems ecto
+          # has problems accessing the constraint inside the jsonb.
+          {:error, _} -> Object.get_cached_by_ap_id(context).id
+        end
     end
   end