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
Hakaba Hitoyo
pleroma
Commits
aed0f902
Commit
aed0f902
authored
Dec 18, 2018
by
Ivan Tashkinov
Browse files
[#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
parent
b86057cc
Changes
4
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/mastodon_api/views/account_view.ex
View file @
aed0f902
...
...
@@ -62,6 +62,7 @@ def render("account.json", %{user: user} = opts) do
# Pleroma extension
pleroma:
%{
confirmation_pending:
user_info
.
confirmation_pending
,
tags:
user
.
tags
}
}
...
...
lib/pleroma/web/twitter_api/views/user_view.ex
View file @
aed0f902
...
...
@@ -81,6 +81,7 @@ def render("user.json", %{user: user = %User{}} = assigns) do
# Pleroma extension
"pleroma"
=>
%{
"confirmation_pending"
=>
user_info
.
confirmation_pending
,
"tags"
=>
user
.
tags
}
}
...
...
test/web/mastodon_api/account_view_test.exs
View file @
aed0f902
...
...
@@ -55,7 +55,10 @@ test "Represent a user account" do
privacy:
"public"
,
sensitive:
false
},
pleroma:
%{
tags:
[]}
pleroma:
%{
confirmation_pending:
false
,
tags:
[]
}
}
assert
expected
==
AccountView
.
render
(
"account.json"
,
%{
user:
user
})
...
...
@@ -93,7 +96,10 @@ test "Represent a Service(bot) account" do
privacy:
"public"
,
sensitive:
false
},
pleroma:
%{
tags:
[]}
pleroma:
%{
confirmation_pending:
false
,
tags:
[]
}
}
assert
expected
==
AccountView
.
render
(
"account.json"
,
%{
user:
user
})
...
...
test/web/twitter_api/views/user_view_test.exs
View file @
aed0f902
...
...
@@ -96,7 +96,10 @@ test "A user" do
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
,
"fields"
=>
[],
"pleroma"
=>
%{
"tags"
=>
[]}
"pleroma"
=>
%{
"confirmation_pending"
=>
false
,
"tags"
=>
[]
}
}
assert
represented
==
UserView
.
render
(
"show.json"
,
%{
user:
user
})
...
...
@@ -138,7 +141,10 @@ test "A user for a given other follower", %{user: user} do
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
,
"fields"
=>
[],
"pleroma"
=>
%{
"tags"
=>
[]}
"pleroma"
=>
%{
"confirmation_pending"
=>
false
,
"tags"
=>
[]
}
}
assert
represented
==
UserView
.
render
(
"show.json"
,
%{
user:
user
,
for:
follower
})
...
...
@@ -181,7 +187,10 @@ test "A user that follows you", %{user: user} do
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
,
"fields"
=>
[],
"pleroma"
=>
%{
"tags"
=>
[]}
"pleroma"
=>
%{
"confirmation_pending"
=>
false
,
"tags"
=>
[]
}
}
assert
represented
==
UserView
.
render
(
"show.json"
,
%{
user:
follower
,
for:
user
})
...
...
@@ -231,7 +240,10 @@ test "A blocked user for the blocker" do
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
,
"fields"
=>
[],
"pleroma"
=>
%{
"tags"
=>
[]}
"pleroma"
=>
%{
"confirmation_pending"
=>
false
,
"tags"
=>
[]
}
}
blocker
=
Repo
.
get
(
User
,
blocker
.
id
)
...
...
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