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
2887f4ff
Commit
2887f4ff
authored
Nov 20, 2018
by
lain
Browse files
Fix formatter tests.
parent
fbb70d25
Pipeline
#4596
failed with stages
in 8 minutes and 2 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user.ex
View file @
2887f4ff
...
...
@@ -87,7 +87,7 @@ def remote_user_creation(params) do
info_cng
=
User
.
Info
.
remote_user_creation
(%
User
.
Info
{},
params
[
:info
])
changes
=
%
User
{
info:
%{}
}
%
User
{}
|>
cast
(
params
,
[
:bio
,
:name
,
:ap_id
,
:nickname
,
:avatar
])
|>
validate_required
([
:name
,
:ap_id
])
|>
unique_constraint
(
:nickname
)
...
...
@@ -718,7 +718,7 @@ def get_or_create_instance_user do
user
else
changes
=
%
User
{
info:
%{}}
%
User
{
info:
%
User
.
Info
{}}
|>
cast
(%{},
[
:ap_id
,
:nickname
,
:local
])
|>
put_change
(
:ap_id
,
relay_uri
)
|>
put_change
(
:nickname
,
nil
)
...
...
@@ -763,9 +763,9 @@ def insert_or_update_user(data) do
data
=
data
|>
Map
.
put
(
:name
,
blank?
(
data
[
:name
])
||
data
[
:nickname
])
|>
Map
.
put
(
:info
,
data
[
:info
]
||
%{})
cs
=
User
.
remote_user_creation
(
data
)
Repo
.
insert
(
cs
,
on_conflict:
:replace_all
,
conflict_target:
:nickname
)
end
...
...
lib/pleroma/user/info.ex
View file @
2887f4ff
...
...
@@ -89,7 +89,12 @@ def set_keys(info, keys) do
def
remote_user_creation
(
info
,
params
)
do
info
|>
cast
(
params
,
[
:source_data
])
|>
cast
(
params
,
[
:ap_enabled
,
:source_data
,
:banner
,
:locked
])
end
# Receives data from user_data_from_user_object
...
...
test/formatter_test.exs
View file @
2887f4ff
...
...
@@ -110,7 +110,7 @@ test "gives a replacement for user links" do
archaeme
=
insert
(
:user
,
%{
nickname:
"archaeme"
,
info:
%{
"
source_data
"
=>
%{
"url"
=>
"https://archeme/@archaeme"
}}
info:
%
Pleroma
.
User
.
Info
{
source_data
:
%{
"url"
=>
"https://archeme/@archaeme"
}}
})
archaeme_remote
=
insert
(
:user
,
%{
nickname:
"archaeme@archae.me"
})
...
...
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