Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
8f9bcc4a
Commit
8f9bcc4a
authored
Apr 07, 2018
by
lain
Browse files
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
parents
70bcdf32
d41bfd1d
Pipeline
#1122
passed with stage
in 2 minutes and 18 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file @
8f9bcc4a
...
...
@@ -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
)
...
...
lib/pleroma/web/xml/xml.ex
View file @
8f9bcc4a
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment