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
c0ca9f82
Commit
c0ca9f82
authored
May 25, 2018
by
kaniini
Browse files
mastodon api: properly track if an account is locked or not
parent
1f3eb0f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user.ex
View file @
c0ca9f82
...
...
@@ -67,7 +67,8 @@ def user_info(%User{} = user) do
%{
following_count:
length
(
user
.
following
)
-
oneself
,
note_count:
user
.
info
[
"note_count"
]
||
0
,
follower_count:
user
.
info
[
"follower_count"
]
||
0
follower_count:
user
.
info
[
"follower_count"
]
||
0
,
locked:
user
.
info
[
"locked"
]
||
false
}
end
...
...
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
c0ca9f82
...
...
@@ -464,6 +464,7 @@ def user_data_from_user_object(data) do
"url"
=>
[%{
"href"
=>
data
[
"image"
][
"url"
]}]
}
locked
=
data
[
"manuallyApprovesFollowers"
]
||
false
data
=
Transmogrifier
.
maybe_fix_user_object
(
data
)
user_data
=
%{
...
...
@@ -471,7 +472,8 @@ def user_data_from_user_object(data) do
info:
%{
"ap_enabled"
=>
true
,
"source_data"
=>
data
,
"banner"
=>
banner
"banner"
=>
banner
,
"locked"
=>
locked
},
avatar:
avatar
,
nickname:
"
#{
data
[
"preferredUsername"
]
}
@
#{
URI
.
parse
(
data
[
"id"
])
.
host
}
"
,
...
...
lib/pleroma/web/activity_pub/views/user_view.ex
View file @
c0ca9f82
...
...
@@ -26,7 +26,7 @@ def render("user.json", %{user: user}) do
"name"
=>
user
.
name
,
"summary"
=>
user
.
bio
,
"url"
=>
user
.
ap_id
,
"manuallyApprovesFollowers"
=>
false
,
"manuallyApprovesFollowers"
=>
user
.
info
[
"locked"
]
||
false
,
"publicKey"
=>
%{
"id"
=>
"
#{
user
.
ap_id
}
#main-key"
,
"owner"
=>
user
.
ap_id
,
...
...
lib/pleroma/web/mastodon_api/views/account_view.ex
View file @
c0ca9f82
...
...
@@ -19,7 +19,7 @@ def render("account.json", %{user: user}) do
username:
hd
(
String
.
split
(
user
.
nickname
,
"@"
)),
acct:
user
.
nickname
,
display_name:
user
.
name
||
user
.
nickname
,
locked:
false
,
locked:
user_info
.
locked
,
created_at:
Utils
.
to_masto_date
(
user
.
inserted_at
),
followers_count:
user_info
.
follower_count
,
following_count:
user_info
.
following_count
,
...
...
Write
Preview
Markdown
is supported
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