moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

This commit is contained in:
lain 2018-04-07 16:41:47 +02:00
parent 70bcdf32bd d41bfd1d47
commit 8f9bcc4ab0
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View File

@ -182,13 +182,13 @@ def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do
def follow_import(%{assigns: %{user: user}} = conn, %{"list" => list}) do
Task.start(fn ->
String.split(list)
|> Enum.map(fn nick ->
|> Enum.map(fn account ->
with %User{} = follower <- User.get_cached_by_ap_id(user.ap_id),
%User{} = followed <- User.get_or_fetch_by_nickname(nick),
%User{} = followed <- User.get_or_fetch(account),
{:ok, follower} <- User.follow(follower, followed) do
ActivityPub.follow(follower, followed)
else
_e -> Logger.debug("follow_import: following #{nick} failed")
_e -> Logger.debug("follow_import: following #{account} failed")
end
end)
end)

6
lib/pleroma/web/xml/xml.ex
View File

@ -4,6 +4,7 @@ defmodule Pleroma.Web.XML do
def string_from_xpath(_, :error), do: nil
def string_from_xpath(xpath, doc) do
try do
{:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
res =
@ -12,6 +13,11 @@ def string_from_xpath(xpath, doc) do
|> String.trim()
if res == "", do: nil, else: res
catch
e ->
Logger.debug("Couldn't find xpath #{xpath} in XML doc")
nil
end
end
def parse_document(text) do