Skip to content
GitLab
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
dd8aee33
Commit
dd8aee33
authored
Dec 04, 2018
by
Maksim
Browse files
formatting the code
parent
5c6d4761
Changes
6
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/http/connection.ex
View file @
dd8aee33
defmodule
Pleroma
.
HTTP
.
Connection
do
@moduledoc
"""
Connection for http-requests.
"""
@hackney_options
[
pool:
:default
]
@adapter
Application
.
get_env
(
:tesla
,
:adapter
)
...
...
lib/pleroma/http/http.ex
View file @
dd8aee33
defmodule
Pleroma
.
HTTP
do
require
HTTPoison
alias
Pleroma
.
HTTP
.
Connection
alias
Pleroma
.
HTTP
.
RequestBuilder
,
as:
Builder
@doc
"""
Builds and perform http request.
"""
def
request
(
method
,
url
,
body
\\
""
,
headers
\\
[],
options
\\
[])
do
options
=
process_request_options
(
options
)
...
...
@@ -19,6 +21,7 @@ def request(method, url, body \\ "", headers \\ [], options \\ []) do
end
defp
process_sni_options
(
options
,
nil
),
do
:
options
defp
process_sni_options
(
options
,
url
)
do
uri
=
URI
.
parse
(
url
)
host
=
uri
.
host
|>
to_charlist
()
...
...
test/formatter_test.exs
View file @
dd8aee33
...
...
@@ -4,6 +4,7 @@ defmodule Pleroma.FormatterTest do
use
Pleroma
.
DataCase
import
Pleroma
.
Factory
setup_all
do
Tesla
.
Mock
.
mock_global
(
fn
env
->
apply
(
HttpRequestMock
,
:request
,
[
env
])
end
)
:ok
...
...
test/support/http_request_mock.ex
View file @
dd8aee33
...
...
@@ -14,7 +14,7 @@ def request(
res
else
{
_
,
r
}
=
error
->
#Logger.warn(r)
#
Logger.warn(r)
error
end
end
...
...
@@ -27,13 +27,17 @@ def get("https://osada.macgirvin.com/channel/mike", _, _, _) do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
body:
File
.
read!
(
"test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json"
)
body:
File
.
read!
(
"test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json"
)
}}
end
def
get
(
"https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@osada.macgirvin.com"
,
_
,
_
,
[
Accept:
"application/xrd+xml,application/jrd+json"
])
do
def
get
(
"https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@osada.macgirvin.com"
,
_
,
_
,
Accept:
"application/xrd+xml,application/jrd+json"
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
@@ -41,8 +45,12 @@ def get("https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@os
}}
end
def
get
(
"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/29191"
,
_
,
_
,
[
Accept:
"application/xrd+xml,application/jrd+json"
])
do
def
get
(
"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/29191"
,
_
,
_
,
Accept:
"application/xrd+xml,application/jrd+json"
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
@@ -58,8 +66,12 @@ def get("https://pawoo.net/users/pekorino.atom", _, _, _) do
}}
end
def
get
(
"https://pawoo.net/.well-known/webfinger?resource=acct:https://pawoo.net/users/pekorino"
,
_
,
_
,
[
Accept:
"application/xrd+xml,application/jrd+json"
])
do
def
get
(
"https://pawoo.net/.well-known/webfinger?resource=acct:https://pawoo.net/users/pekorino"
,
_
,
_
,
Accept:
"application/xrd+xml,application/jrd+json"
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
@@ -67,7 +79,12 @@ def get("https://pawoo.net/.well-known/webfinger?resource=acct:https://pawoo.net
}}
end
def
get
(
"https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom"
,
_
,
_
,
_
)
do
def
get
(
"https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom"
,
_
,
_
,
_
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
@@ -75,8 +92,12 @@ def get("https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/
}}
end
def
get
(
"https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource=acct:https://social.stopwatchingus-heidelberg.de/user/18330"
,
_
,
_
,
[
Accept:
"application/xrd+xml,application/jrd+json"
])
do
def
get
(
"https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource=acct:https://social.stopwatchingus-heidelberg.de/user/18330"
,
_
,
_
,
Accept:
"application/xrd+xml,application/jrd+json"
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
@@ -92,8 +113,12 @@ def get("https://mamot.fr/users/Skruyb.atom", _, _, _) do
}}
end
def
get
(
"https://mamot.fr/.well-known/webfinger?resource=acct:https://mamot.fr/users/Skruyb"
,
_
,
_
,
[
Accept:
"application/xrd+xml,application/jrd+json"
])
do
def
get
(
"https://mamot.fr/.well-known/webfinger?resource=acct:https://mamot.fr/users/Skruyb"
,
_
,
_
,
Accept:
"application/xrd+xml,application/jrd+json"
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
@@ -101,7 +126,12 @@ def get("https://mamot.fr/.well-known/webfinger?resource=acct:https://mamot.fr/u
}}
end
def
get
(
"https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@social.heldscal.la"
,
_
,
_
,
[
Accept:
"application/xrd+xml,application/jrd+json"
])
do
def
get
(
"https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@social.heldscal.la"
,
_
,
_
,
Accept:
"application/xrd+xml,application/jrd+json"
)
do
{
:ok
,
%
Tesla
.
Env
{
status:
200
,
...
...
test/web/activity_pub/activity_pub_controller_test.exs
View file @
dd8aee33
...
...
@@ -4,10 +4,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
alias
Pleroma
.
Web
.
ActivityPub
.
{
UserView
,
ObjectView
}
alias
Pleroma
.
{
Repo
,
User
}
alias
Pleroma
.
Activity
setup_all
do
Tesla
.
Mock
.
mock_global
(
fn
env
->
apply
(
HttpRequestMock
,
:request
,
[
env
])
end
)
:ok
end
describe
"/relay"
do
test
"with the relay active, it returns the relay user"
,
%{
conn:
conn
}
do
res
=
...
...
test/web/activity_pub/transmogrifier_test.exs
View file @
dd8aee33
...
...
@@ -11,6 +11,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
import
Pleroma
.
Factory
alias
Pleroma
.
Web
.
CommonAPI
setup_all
do
Tesla
.
Mock
.
mock_global
(
fn
env
->
apply
(
HttpRequestMock
,
:request
,
[
env
])
end
)
:ok
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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