From: William Pitcock Date: Mon, 10 Sep 2018 00:28:40 +0000 (+0000) Subject: formatting X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=e82ce2a4b396e448181c7729db6dd850944db140;p=akkoma formatting --- diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex index 1ad27ef27..d34037f4f 100644 --- a/lib/pleroma/gopher/server.ex +++ b/lib/pleroma/gopher/server.ex @@ -79,11 +79,7 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <> info("#{like_count} likes, #{announcement_count} repeats") <> "i\tfake\t(NULL)\t0\r\n" <> - info( - HTML.strip_tags( - String.replace(activity.data["object"]["content"], "
", "\r") - ) - ) + info(HTML.strip_tags(String.replace(activity.data["object"]["content"], "
", "\r"))) end) |> Enum.join("i\tfake\t(NULL)\t0\r\n") end diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index d67ef5f74..f2641047f 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -39,8 +39,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do data = %{ "created_at" => user.inserted_at |> Utils.format_naive_asctime(), - "description" => - HTML.strip_tags((user.bio || "") |> String.replace("
", "\n")), + "description" => HTML.strip_tags((user.bio || "") |> String.replace("
", "\n")), "description_html" => HTML.filter_tags(user.bio), "favourites_count" => 0, "followers_count" => user_info[:follower_count],