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
d23804f1
Commit
d23804f1
authored
Jul 09, 2020
by
feld
Browse files
Use the Pleroma.Config alias
parent
6b14f0c5
Pipeline
#28343
passed with stages
in 13 minutes and 58 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/mix/tasks/pleroma/instance.ex
View file @
d23804f1
...
...
@@ -145,7 +145,7 @@ def run(["gen" | rest]) do
options
,
:uploads_dir
,
"What directory should media uploads go in (when using the local uploader)?"
,
Pleroma
.
Config
.
get
([
Pleroma
.
Uploaders
.
Local
,
:uploads
])
Config
.
get
([
Pleroma
.
Uploaders
.
Local
,
:uploads
])
)
|>
Path
.
expand
()
...
...
@@ -154,7 +154,7 @@ def run(["gen" | rest]) do
options
,
:static_dir
,
"What directory should custom public files be read from (custom emojis, frontend bundle overrides, robots.txt, etc.)?"
,
Pleroma
.
Config
.
get
([
:instance
,
:static_dir
])
Config
.
get
([
:instance
,
:static_dir
])
)
|>
Path
.
expand
()
...
...
lib/pleroma/application.ex
View file @
d23804f1
...
...
@@ -35,7 +35,7 @@ def user_agent do
# See http://elixir-lang.org/docs/stable/elixir/Application.html
# for more information on OTP Applications
def
start
(
_type
,
_args
)
do
Pleroma
.
Config
.
Holder
.
save_default
()
Config
.
Holder
.
save_default
()
Pleroma
.
HTML
.
compile_scrubbers
()
Config
.
DeprecationWarnings
.
warn
()
Pleroma
.
Plugs
.
HTTPSecurityPlug
.
warn_if_disabled
()
...
...
lib/pleroma/emails/admin_email.ex
View file @
d23804f1
...
...
@@ -10,7 +10,7 @@ defmodule Pleroma.Emails.AdminEmail do
alias
Pleroma
.
Config
alias
Pleroma
.
Web
.
Router
.
Helpers
defp
instance_config
,
do
:
Pleroma
.
Config
.
get
(
:instance
)
defp
instance_config
,
do
:
Config
.
get
(
:instance
)
defp
instance_name
,
do
:
instance_config
()[
:name
]
defp
instance_notify_email
do
...
...
lib/pleroma/emoji/loader.ex
View file @
d23804f1
...
...
@@ -108,7 +108,7 @@ defp load_pack(pack_dir, emoji_groups) do
if
File
.
exists?
(
emoji_txt
)
do
load_from_file
(
emoji_txt
,
emoji_groups
)
else
extensions
=
Pleroma
.
Config
.
get
([
:emoji
,
:pack_extensions
])
extensions
=
Config
.
get
([
:emoji
,
:pack_extensions
])
Logger
.
info
(
"No emoji.txt found for pack
\"
#{
pack_name
}
\"
, assuming all
#{
...
...
lib/pleroma/plugs/http_security_plug.ex
View file @
d23804f1
...
...
@@ -82,14 +82,14 @@ defp csp_string do
connect_src
=
[
"connect-src 'self' blob: "
,
static_url
,
?
\
s
,
websocket_url
]
connect_src
=
if
Pleroma
.
Config
.
get
(
:env
)
==
:dev
do
if
Config
.
get
(
:env
)
==
:dev
do
[
connect_src
,
" http://localhost:3035/"
]
else
connect_src
end
script_src
=
if
Pleroma
.
Config
.
get
(
:env
)
==
:dev
do
if
Config
.
get
(
:env
)
==
:dev
do
"script-src 'self' 'unsafe-eval'"
else
"script-src 'self'"
...
...
lib/pleroma/user.ex
View file @
d23804f1
...
...
@@ -388,8 +388,8 @@ defp fix_follower_address(%{nickname: nickname} = params),
defp
fix_follower_address
(
params
),
do
:
params
def
remote_user_changeset
(
struct
\\
%
User
{
local:
false
},
params
)
do
bio_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:user_bio_length
],
5000
)
name_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:user_name_length
],
100
)
bio_limit
=
Config
.
get
([
:instance
,
:user_bio_length
],
5000
)
name_limit
=
Config
.
get
([
:instance
,
:user_name_length
],
100
)
name
=
case
params
[
:name
]
do
...
...
@@ -448,8 +448,8 @@ def remote_user_changeset(struct \\ %User{local: false}, params) do
end
def
update_changeset
(
struct
,
params
\\
%{})
do
bio_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:user_bio_length
],
5000
)
name_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:user_name_length
],
100
)
bio_limit
=
Config
.
get
([
:instance
,
:user_bio_length
],
5000
)
name_limit
=
Config
.
get
([
:instance
,
:user_name_length
],
100
)
struct
|>
cast
(
...
...
@@ -618,12 +618,12 @@ def force_password_reset_async(user) do
def
force_password_reset
(
user
),
do
:
update_password_reset_pending
(
user
,
true
)
def
register_changeset
(
struct
,
params
\\
%{},
opts
\\
[])
do
bio_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:user_bio_length
],
5000
)
name_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:user_name_length
],
100
)
bio_limit
=
Config
.
get
([
:instance
,
:user_bio_length
],
5000
)
name_limit
=
Config
.
get
([
:instance
,
:user_name_length
],
100
)
need_confirmation?
=
if
is_nil
(
opts
[
:need_confirmation
])
do
Pleroma
.
Config
.
get
([
:instance
,
:account_activation_required
])
Config
.
get
([
:instance
,
:account_activation_required
])
else
opts
[
:need_confirmation
]
end
...
...
@@ -644,7 +644,7 @@ def register_changeset(struct, params \\ %{}, opts \\ []) do
|>
validate_confirmation
(
:password
)
|>
unique_constraint
(
:email
)
|>
unique_constraint
(
:nickname
)
|>
validate_exclusion
(
:nickname
,
Pleroma
.
Config
.
get
([
User
,
:restricted_nicknames
]))
|>
validate_exclusion
(
:nickname
,
Config
.
get
([
User
,
:restricted_nicknames
]))
|>
validate_format
(
:nickname
,
local_nickname_regex
())
|>
validate_format
(
:email
,
@email_regex
)
|>
validate_length
(
:bio
,
max:
bio_limit
)
...
...
@@ -659,7 +659,7 @@ def register_changeset(struct, params \\ %{}, opts \\ []) do
def
maybe_validate_required_email
(
changeset
,
true
),
do
:
changeset
def
maybe_validate_required_email
(
changeset
,
_
)
do
if
Pleroma
.
Config
.
get
([
:instance
,
:account_activation_required
])
do
if
Config
.
get
([
:instance
,
:account_activation_required
])
do
validate_required
(
changeset
,
[
:email
])
else
changeset
...
...
@@ -679,7 +679,7 @@ defp put_following_and_follower_address(changeset) do
end
defp
autofollow_users
(
user
)
do
candidates
=
Pleroma
.
Config
.
get
([
:instance
,
:autofollowed_nicknames
])
candidates
=
Config
.
get
([
:instance
,
:autofollowed_nicknames
])
autofollowed_users
=
User
.
Query
.
build
(%{
nickname:
candidates
,
local:
true
,
deactivated:
false
})
...
...
@@ -706,7 +706,7 @@ def post_register_action(%User{} = user) do
def
try_send_confirmation_email
(%
User
{}
=
user
)
do
if
user
.
confirmation_pending
&&
Pleroma
.
Config
.
get
([
:instance
,
:account_activation_required
])
do
Config
.
get
([
:instance
,
:account_activation_required
])
do
user
|>
Pleroma
.
Emails
.
UserEmail
.
account_confirmation_email
()
|>
Pleroma
.
Emails
.
Mailer
.
deliver_async
()
...
...
@@ -763,7 +763,7 @@ def follow_all(follower, followeds) do
defdelegate
following
(
user
),
to:
FollowingRelationship
def
follow
(%
User
{}
=
follower
,
%
User
{}
=
followed
,
state
\\
:follow_accept
)
do
deny_follow_blocked
=
Pleroma
.
Config
.
get
([
:user
,
:deny_follow_blocked
])
deny_follow_blocked
=
Config
.
get
([
:user
,
:deny_follow_blocked
])
cond
do
followed
.
deactivated
->
...
...
@@ -964,7 +964,7 @@ def get_cached_by_nickname(nickname) do
end
def
get_cached_by_nickname_or_id
(
nickname_or_id
,
opts
\\
[])
do
restrict_to_local
=
Pleroma
.
Config
.
get
([
:instance
,
:limit_to_local_content
])
restrict_to_local
=
Config
.
get
([
:instance
,
:limit_to_local_content
])
cond
do
is_integer
(
nickname_or_id
)
or
FlakeId
.
flake_id?
(
nickname_or_id
)
->
...
...
@@ -1160,7 +1160,7 @@ defp follow_information_changeset(user, params) do
@spec
update_follower_count
(
User
.
t
())
::
{
:ok
,
User
.
t
()}
def
update_follower_count
(%
User
{}
=
user
)
do
if
user
.
local
or
!
Pleroma
.
Config
.
get
([
:instance
,
:external_user_synchronization
])
do
if
user
.
local
or
!Config
.
get
([
:instance
,
:external_user_synchronization
])
do
follower_count
=
FollowingRelationship
.
follower_count
(
user
)
user
...
...
@@ -1173,7 +1173,7 @@ def update_follower_count(%User{} = user) do
@spec
update_following_count
(
User
.
t
())
::
{
:ok
,
User
.
t
()}
def
update_following_count
(%
User
{
local:
false
}
=
user
)
do
if
Pleroma
.
Config
.
get
([
:instance
,
:external_user_synchronization
])
do
if
Config
.
get
([
:instance
,
:external_user_synchronization
])
do
{
:ok
,
maybe_fetch_follow_information
(
user
)}
else
{
:ok
,
user
}
...
...
@@ -1260,7 +1260,7 @@ def unmute(%User{} = muter, %User{} = mutee) do
end
def
subscribe
(%
User
{}
=
subscriber
,
%
User
{}
=
target
)
do
deny_follow_blocked
=
Pleroma
.
Config
.
get
([
:user
,
:deny_follow_blocked
])
deny_follow_blocked
=
Config
.
get
([
:user
,
:deny_follow_blocked
])
if
blocks?
(
target
,
subscriber
)
and
deny_follow_blocked
do
{
:error
,
"Could not subscribe:
#{
target
.
nickname
}
is blocking you"
}
...
...
@@ -1651,7 +1651,7 @@ def html_filter_policy(%User{no_rich_text: true}) do
Pleroma
.
HTML
.
Scrubber
.
TwitterText
end
def
html_filter_policy
(
_
),
do
:
Pleroma
.
Config
.
get
([
:markup
,
:scrub_policy
])
def
html_filter_policy
(
_
),
do
:
Config
.
get
([
:markup
,
:scrub_policy
])
def
fetch_by_ap_id
(
ap_id
),
do
:
ActivityPub
.
make_user_from_ap_id
(
ap_id
)
...
...
@@ -1833,7 +1833,7 @@ defp normalize_tags(tags) do
end
defp
local_nickname_regex
do
if
Pleroma
.
Config
.
get
([
:instance
,
:extended_nickname_format
])
do
if
Config
.
get
([
:instance
,
:extended_nickname_format
])
do
@extended_local_nickname_regex
else
@strict_local_nickname_regex
...
...
@@ -1961,8 +1961,8 @@ def get_mascot(%{mascot: %{} = mascot}) when not is_nil(mascot) do
def
get_mascot
(%{
mascot:
mascot
})
when
is_nil
(
mascot
)
do
# use instance-default
config
=
Pleroma
.
Config
.
get
([
:assets
,
:mascots
])
default_mascot
=
Pleroma
.
Config
.
get
([
:assets
,
:default_mascot
])
config
=
Config
.
get
([
:assets
,
:mascots
])
default_mascot
=
Config
.
get
([
:assets
,
:default_mascot
])
mascot
=
Keyword
.
get
(
config
,
default_mascot
)
%{
...
...
@@ -2057,7 +2057,7 @@ def roles(%{is_moderator: is_moderator, is_admin: is_admin}) do
def
validate_fields
(
changeset
,
remote?
\\
false
)
do
limit_name
=
if
remote?
,
do
:
:max_remote_account_fields
,
else
:
:max_account_fields
limit
=
Pleroma
.
Config
.
get
([
:instance
,
limit_name
],
0
)
limit
=
Config
.
get
([
:instance
,
limit_name
],
0
)
changeset
|>
validate_length
(
:fields
,
max:
limit
)
...
...
@@ -2071,8 +2071,8 @@ def validate_fields(changeset, remote? \\ false) do
end
defp
valid_field?
(%{
"name"
=>
name
,
"value"
=>
value
})
do
name_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:account_field_name_length
],
255
)
value_limit
=
Pleroma
.
Config
.
get
([
:instance
,
:account_field_value_length
],
255
)
name_limit
=
Config
.
get
([
:instance
,
:account_field_name_length
],
255
)
value_limit
=
Config
.
get
([
:instance
,
:account_field_value_length
],
255
)
is_binary
(
name
)
&&
is_binary
(
value
)
&&
String
.
length
(
name
)
<=
name_limit
&&
String
.
length
(
value
)
<=
value_limit
...
...
@@ -2082,10 +2082,10 @@ defp valid_field?(_), do: false
defp
truncate_field
(%{
"name"
=>
name
,
"value"
=>
value
})
do
{
name
,
_chopped
}
=
String
.
split_at
(
name
,
Pleroma
.
Config
.
get
([
:instance
,
:account_field_name_length
],
255
))
String
.
split_at
(
name
,
Config
.
get
([
:instance
,
:account_field_name_length
],
255
))
{
value
,
_chopped
}
=
String
.
split_at
(
value
,
Pleroma
.
Config
.
get
([
:instance
,
:account_field_value_length
],
255
))
String
.
split_at
(
value
,
Config
.
get
([
:instance
,
:account_field_value_length
],
255
))
%{
"name"
=>
name
,
"value"
=>
value
}
end
...
...
@@ -2140,7 +2140,7 @@ def confirmation_changeset(user, need_confirmation: need_confirmation?) do
def
add_pinnned_activity
(
user
,
%
Pleroma
.
Activity
{
id:
id
})
do
if
id
not
in
user
.
pinned_activities
do
max_pinned_statuses
=
Pleroma
.
Config
.
get
([
:instance
,
:max_pinned_statuses
],
0
)
max_pinned_statuses
=
Config
.
get
([
:instance
,
:max_pinned_statuses
],
0
)
params
=
%{
pinned_activities:
user
.
pinned_activities
++
[
id
]}
user
...
...
lib/pleroma/web/activity_pub/mrf/object_age_policy.ex
View file @
d23804f1
...
...
@@ -98,7 +98,7 @@ def filter(message), do: {:ok, message}
@impl
true
def
describe
do
mrf_object_age
=
Pleroma
.
Config
.
get
(
:mrf_object_age
)
Config
.
get
(
:mrf_object_age
)
|>
Enum
.
into
(%{})
{
:ok
,
%{
mrf_object_age:
mrf_object_age
}}
...
...
lib/pleroma/web/activity_pub/mrf/reject_non_public.ex
View file @
d23804f1
...
...
@@ -47,5 +47,5 @@ def filter(object), do: {:ok, object}
@impl
true
def
describe
,
do
:
{
:ok
,
%{
mrf_rejectnonpublic:
Pleroma
.
Config
.
get
(
:mrf_rejectnonpublic
)
|>
Enum
.
into
(%{})}}
do
:
{
:ok
,
%{
mrf_rejectnonpublic:
Config
.
get
(
:mrf_rejectnonpublic
)
|>
Enum
.
into
(%{})}}
end
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View file @
d23804f1
...
...
@@ -155,7 +155,7 @@ def filter(%{"type" => "Delete", "actor" => actor} = object) do
%{
host:
actor_host
}
=
URI
.
parse
(
actor
)
reject_deletes
=
Pleroma
.
Config
.
get
([
:mrf_simple
,
:reject_deletes
])
Config
.
get
([
:mrf_simple
,
:reject_deletes
])
|>
MRF
.
subdomains_regex
()
if
MRF
.
subdomain_match?
(
reject_deletes
,
actor_host
)
do
...
...
lib/pleroma/web/common_api/utils.ex
View file @
d23804f1
...
...
@@ -143,7 +143,7 @@ def make_poll_data(%{"poll" => %{"expires_in" => expires_in}} = data)
def
make_poll_data
(%{
poll:
%{
options:
options
,
expires_in:
expires_in
}}
=
data
)
when
is_list
(
options
)
do
limits
=
Pleroma
.
Config
.
get
([
:instance
,
:poll_limits
])
limits
=
Config
.
get
([
:instance
,
:poll_limits
])
with
:ok
<-
validate_poll_expiration
(
expires_in
,
limits
),
:ok
<-
validate_poll_options_amount
(
options
,
limits
),
...
...
@@ -502,7 +502,7 @@ def maybe_extract_mentions(_), do: []
def
make_report_content_html
(
nil
),
do
:
{
:ok
,
{
nil
,
[],
[]}}
def
make_report_content_html
(
comment
)
do
max_size
=
Pleroma
.
Config
.
get
([
:instance
,
:max_report_comment_size
],
1000
)
max_size
=
Config
.
get
([
:instance
,
:max_report_comment_size
],
1000
)
if
String
.
length
(
comment
)
<=
max_size
do
{
:ok
,
format_input
(
comment
,
"text/plain"
)}
...
...
@@ -564,7 +564,7 @@ def validate_character_limit("" = _full_payload, [] = _attachments) do
end
def
validate_character_limit
(
full_payload
,
_attachments
)
do
limit
=
Pleroma
.
Config
.
get
([
:instance
,
:limit
])
limit
=
Config
.
get
([
:instance
,
:limit
])
length
=
String
.
length
(
full_payload
)
if
length
<=
limit
do
...
...
lib/pleroma/web/media_proxy/media_proxy.ex
View file @
d23804f1
...
...
@@ -106,7 +106,7 @@ def filename(url_or_path) do
def
build_url
(
sig_base64
,
url_base64
,
filename
\\
nil
)
do
[
Pleroma
.
Config
.
get
([
:media_proxy
,
:base_url
],
Web
.
base_url
()),
Config
.
get
([
:media_proxy
,
:base_url
],
Web
.
base_url
()),
"proxy"
,
sig_base64
,
url_base64
,
...
...
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file @
d23804f1
...
...
@@ -83,7 +83,7 @@ def notifications_read(%{assigns: %{user: user}} = conn, %{"id" => notification_
def
frontend_configurations
(
conn
,
_params
)
do
config
=
Pleroma
.
Config
.
get
(
:frontend_configurations
,
%{})
Config
.
get
(
:frontend_configurations
,
%{})
|>
Enum
.
into
(%{})
json
(
conn
,
config
)
...
...
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