projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-recipients-from-activity' into 'develop'
[akkoma]
/
lib
/
pleroma
/
config.ex
diff --git
a/lib/pleroma/config.ex
b/lib/pleroma/config.ex
index 3876ddf1f303573088f9c7059b86b258ece48f04..fcc0397101368e26d3eb22c5734160eaa017a205 100644
(file)
--- a/
lib/pleroma/config.ex
+++ b/
lib/pleroma/config.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Config do
defmodule Error do
defexception [:message]
defmodule Pleroma.Config do
defmodule Error do
defexception [:message]
@@
-8,8
+12,12
@@
defmodule Pleroma.Config do
def get([key], default), do: get(key, default)
def get([parent_key | keys], default) do
def get([key], default), do: get(key, default)
def get([parent_key | keys], default) do
- Application.get_env(:pleroma, parent_key)
- |> get_in(keys) || default
+ case :pleroma
+ |> Application.get_env(parent_key)
+ |> get_in(keys) do
+ nil -> default
+ any -> any
+ end
end
def get(key, default) do
end
def get(key, default) do
@@
-30,7
+38,7
@@
defmodule Pleroma.Config do
def put([parent_key | keys], value) do
parent =
def put([parent_key | keys], value) do
parent =
- Application.get_env(:pleroma, parent_key)
+ Application.get_env(:pleroma, parent_key
, []
)
|> put_in(keys, value)
Application.put_env(:pleroma, parent_key, parent)
|> put_in(keys, value)
Application.put_env(:pleroma, parent_key, parent)
@@
-53,4
+61,8
@@
defmodule Pleroma.Config do
def delete(key) do
Application.delete_env(:pleroma, key)
end
def delete(key) do
Application.delete_env(:pleroma, key)
end
+
+ def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], [])
+
+ def oauth_consumer_enabled?, do: oauth_consumer_strategies() != []
end
end