hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pipeline: Always run common_pipeline in a transaction for now.

Browse source
This commit is contained in:
lain 2020-04-29 13:45:50 +02:00
commit e055b8d203
4 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

52
lib/pleroma/web/common_api/common_api.ex
View file

@ -9,7 +9,6 @@ defmodule Pleroma.Web.CommonAPI do
alias Pleroma.FollowingRelationship
alias Pleroma.Formatter
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.ThreadMute
alias Pleroma.User
alias Pleroma.UserRelationship
@ -26,36 +25,27 @@ defmodule Pleroma.Web.CommonAPI do
require Logger
def post_chat_message(%User{} = user, %User{} = recipient, content) do
transaction =
Repo.transaction(fn ->
with {_, true} <-
{:content_length,
String.length(content) <= Pleroma.Config.get([:instance, :chat_limit])},
{_, {:ok, chat_message_data, _meta}} <-
{:build_object,
Builder.chat_message(
user,
recipient.ap_id,
content |> Formatter.html_escape("text/plain")
)},
{_, {:ok, create_activity_data, _meta}} <-
{:build_create_activity,
Builder.create(user, chat_message_data, [recipient.ap_id])},
{_, {:ok, %Activity{} = activity, _meta}} <-
{:common_pipeline,
Pipeline.common_pipeline(create_activity_data,
local: true
)} do
{:ok, activity}
else
{:content_length, false} -> {:error, :content_too_long}
e -> e
end
end)
case transaction do
{:ok, value} -> value
error -> error
with {_, true} <-
{:content_length,
String.length(content) <= Pleroma.Config.get([:instance, :chat_limit])},
{_, {:ok, chat_message_data, _meta}} <-
{:build_object,
Builder.chat_message(
user,
recipient.ap_id,
content |> Formatter.html_escape("text/plain")
)},
{_, {:ok, create_activity_data, _meta}} <-
{:build_create_activity, Builder.create(user, chat_message_data, [recipient.ap_id])},
{_, {:ok, %Activity{} = activity, _meta}} <-
{:common_pipeline,
Pipeline.common_pipeline(create_activity_data,
local: true
)} do
{:ok, activity}
else
{:content_length, false} -> {:error, :content_too_long}
e -> e
end
end