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
56577d8b
Commit
56577d8b
authored
Sep 22, 2018
by
kaniini
Browse files
twitter api: add no_rich_text option to userview for account prefs
parent
ec6a7799
Pipeline
#3821
passed with stages
in 5 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/views/user_view.ex
View file @
56577d8b
...
...
@@ -64,7 +64,8 @@ def render("user.json", %{user: user = %User{}} = assigns) do
"background_image"
=>
image_url
(
user
.
info
[
"background"
])
|>
MediaProxy
.
url
(),
"is_local"
=>
user
.
local
,
"locked"
=>
!!user
.
info
[
"locked"
],
"default_scope"
=>
user
.
info
[
"default_scope"
]
||
"public"
"default_scope"
=>
user
.
info
[
"default_scope"
]
||
"public"
,
"no_rich_text"
=>
user
.
info
[
"no_rich_text"
]
||
false
}
if
assigns
[
:token
]
do
...
...
test/web/twitter_api/views/user_view_test.exs
View file @
56577d8b
...
...
@@ -87,7 +87,8 @@ test "A user" do
"background_image"
=>
nil
,
"is_local"
=>
true
,
"locked"
=>
false
,
"default_scope"
=>
"public"
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
}
assert
represented
==
UserView
.
render
(
"show.json"
,
%{
user:
user
})
...
...
@@ -126,7 +127,8 @@ test "A user for a given other follower", %{user: user} do
"background_image"
=>
nil
,
"is_local"
=>
true
,
"locked"
=>
false
,
"default_scope"
=>
"public"
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
}
assert
represented
==
UserView
.
render
(
"show.json"
,
%{
user:
user
,
for:
follower
})
...
...
@@ -166,7 +168,8 @@ test "A user that follows you", %{user: user} do
"background_image"
=>
nil
,
"is_local"
=>
true
,
"locked"
=>
false
,
"default_scope"
=>
"public"
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
}
assert
represented
==
UserView
.
render
(
"show.json"
,
%{
user:
follower
,
for:
user
})
...
...
@@ -213,7 +216,8 @@ test "A blocked user for the blocker" do
"background_image"
=>
nil
,
"is_local"
=>
true
,
"locked"
=>
false
,
"default_scope"
=>
"public"
"default_scope"
=>
"public"
,
"no_rich_text"
=>
false
}
blocker
=
Repo
.
get
(
User
,
blocker
.
id
)
...
...
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