Browse Source

[Credo] Remove parentesis on argument-less functions

tags/v1.1.4
Haelwenn (lanodan) Monnier 5 years ago
parent
commit
fb82f6fc7c
No known key found for this signature in database GPG Key ID: D5B7A8E43C997DEE
19 changed files with 40 additions and 40 deletions
  1. +8
    -8
      lib/pleroma/application.ex
  2. +2
    -2
      lib/pleroma/captcha/captcha.ex
  3. +1
    -1
      lib/pleroma/captcha/kocaptcha.ex
  4. +2
    -2
      lib/pleroma/clippy.ex
  5. +1
    -1
      lib/pleroma/config/deprecation_warnings.ex
  6. +4
    -4
      lib/pleroma/emoji.ex
  7. +2
    -2
      lib/pleroma/flake_id.ex
  8. +1
    -1
      lib/pleroma/gopher/server.ex
  9. +1
    -1
      lib/pleroma/html.ex
  10. +1
    -1
      lib/pleroma/uploaders/swift/keystone.ex
  11. +1
    -1
      lib/pleroma/user.ex
  12. +2
    -2
      lib/pleroma/user/welcome_message.ex
  13. +1
    -1
      lib/pleroma/web/activity_pub/mrf.ex
  14. +1
    -1
      lib/pleroma/web/chat_channel.ex
  15. +2
    -2
      lib/pleroma/web/federator/federator.ex
  16. +5
    -5
      lib/pleroma/web/federator/retry_queue.ex
  17. +1
    -1
      lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
  18. +3
    -3
      lib/pleroma/web/push/push.ex
  19. +1
    -1
      test/support/captcha_mock.ex

+ 8
- 8
lib/pleroma/application.ex View File

@@ -11,10 +11,10 @@ defmodule Pleroma.Application do
@repository Mix.Project.config()[:source_url]
def name, do: @name
def version, do: @version
def named_version(), do: @name <> " " <> @version
def named_version, do: @name <> " " <> @version
def repository, do: @repository

def user_agent() do
def user_agent do
info = "#{Pleroma.Web.base_url()} <#{Pleroma.Config.get([:instance, :email], "")}>"
named_version() <> "; " <> info
end
@@ -127,7 +127,7 @@ defmodule Pleroma.Application do
Supervisor.start_link(children, opts)
end

def enabled_hackney_pools() do
def enabled_hackney_pools do
[:media] ++
if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
[:federation]
@@ -142,14 +142,14 @@ defmodule Pleroma.Application do
end

if Mix.env() == :test do
defp streamer_child(), do: []
defp chat_child(), do: []
defp streamer_child, do: []
defp chat_child, do: []
else
defp streamer_child() do
defp streamer_child do
[worker(Pleroma.Web.Streamer, [])]
end

defp chat_child() do
defp chat_child do
if Pleroma.Config.get([:chat, :enabled]) do
[worker(Pleroma.Web.ChatChannel.ChatChannelState, [])]
else
@@ -158,7 +158,7 @@ defmodule Pleroma.Application do
end
end

defp hackney_pool_children() do
defp hackney_pool_children do
for pool <- enabled_hackney_pools() do
options = Pleroma.Config.get([:hackney_pools, pool])
:hackney_pool.child_spec(pool, options)


+ 2
- 2
lib/pleroma/captcha/captcha.ex View File

@@ -10,7 +10,7 @@ defmodule Pleroma.Captcha do
use GenServer

@doc false
def start_link() do
def start_link do
GenServer.start_link(__MODULE__, [], name: __MODULE__)
end

@@ -22,7 +22,7 @@ defmodule Pleroma.Captcha do
@doc """
Ask the configured captcha service for a new captcha
"""
def new() do
def new do
GenServer.call(__MODULE__, :new)
end



+ 1
- 1
lib/pleroma/captcha/kocaptcha.ex View File

@@ -7,7 +7,7 @@ defmodule Pleroma.Captcha.Kocaptcha do
@behaviour Service

@impl Service
def new() do
def new do
endpoint = Pleroma.Config.get!([__MODULE__, :endpoint])

case Tesla.get(endpoint <> "/new") do


+ 2
- 2
lib/pleroma/clippy.ex View File

@@ -7,13 +7,13 @@ defmodule Pleroma.Clippy do
# No software is complete until they have a Clippy implementation.
# A ballmer peak _may_ be required to change this module.

def tip() do
def tip do
tips()
|> Enum.random()
|> puts()
end

def tips() do
def tips do
host = Pleroma.Config.get([Pleroma.Web.Endpoint, :url, :host])

[


+ 1
- 1
lib/pleroma/config/deprecation_warnings.ex View File

@@ -5,7 +5,7 @@
defmodule Pleroma.Config.DeprecationWarnings do
require Logger

def check_frontend_config_mechanism() do
def check_frontend_config_mechanism do
if Pleroma.Config.get(:fe) do
Logger.warn("""
!!!DEPRECATION WARNING!!!


+ 4
- 4
lib/pleroma/emoji.ex View File

@@ -17,13 +17,13 @@ defmodule Pleroma.Emoji do
@ets_options [:ordered_set, :protected, :named_table, {:read_concurrency, true}]

@doc false
def start_link() do
def start_link do
GenServer.start_link(__MODULE__, [], name: __MODULE__)
end

@doc "Reloads the emojis from disk."
@spec reload() :: :ok
def reload() do
def reload do
GenServer.call(__MODULE__, :reload)
end

@@ -38,7 +38,7 @@ defmodule Pleroma.Emoji do

@doc "Returns all the emojos!!"
@spec get_all() :: [{String.t(), String.t()}, ...]
def get_all() do
def get_all do
:ets.tab2list(@ets)
end

@@ -72,7 +72,7 @@ defmodule Pleroma.Emoji do
{:ok, state}
end

defp load() do
defp load do
emojis =
(load_finmoji(Keyword.get(Application.get_env(:pleroma, :instance), :finmoji_enabled)) ++
load_from_file("config/emoji.txt") ++


+ 2
- 2
lib/pleroma/flake_id.ex View File

@@ -85,7 +85,7 @@ defmodule Pleroma.FlakeId do
{:ok, FlakeId.from_string(value)}
end

def autogenerate(), do: get()
def autogenerate, do: get()

# -- GenServer API
def start_link do
@@ -165,7 +165,7 @@ defmodule Pleroma.FlakeId do
1_000_000_000 * mega_seconds + seconds * 1000 + :erlang.trunc(micro_seconds / 1000)
end

defp worker_id() do
defp worker_id do
<<worker::integer-size(48)>> = :crypto.strong_rand_bytes(6)
worker
end


+ 1
- 1
lib/pleroma/gopher/server.ex View File

@@ -6,7 +6,7 @@ defmodule Pleroma.Gopher.Server do
use GenServer
require Logger

def start_link() do
def start_link do
config = Pleroma.Config.get(:gopher, [])
ip = Keyword.get(config, :ip, {0, 0, 0, 0})
port = Keyword.get(config, :port, 1234)


+ 1
- 1
lib/pleroma/html.ex View File

@@ -9,7 +9,7 @@ defmodule Pleroma.HTML do
defp get_scrubbers(scrubbers) when is_list(scrubbers), do: scrubbers
defp get_scrubbers(_), do: [Pleroma.HTML.Scrubber.Default]

def get_scrubbers() do
def get_scrubbers do
Pleroma.Config.get([:markup, :scrub_policy])
|> get_scrubbers
end


+ 1
- 1
lib/pleroma/uploaders/swift/keystone.ex View File

@@ -17,7 +17,7 @@ defmodule Pleroma.Uploaders.Swift.Keystone do
|> Poison.decode!()
end

def get_token() do
def get_token do
settings = Pleroma.Config.get(Pleroma.Uploaders.Swift)
username = Keyword.fetch!(settings, :username)
password = Keyword.fetch!(settings, :password)


+ 1
- 1
lib/pleroma/user.ex View File

@@ -1340,7 +1340,7 @@ defmodule Pleroma.User do
|> Enum.map(&String.downcase(&1))
end

defp local_nickname_regex() do
defp local_nickname_regex do
if Pleroma.Config.get([:instance, :extended_nickname_format]) do
@extended_local_nickname_regex
else


+ 2
- 2
lib/pleroma/user/welcome_message.ex View File

@@ -14,7 +14,7 @@ defmodule Pleroma.User.WelcomeMessage do
end
end

defp welcome_user() do
defp welcome_user do
with nickname when is_binary(nickname) <-
Pleroma.Config.get([:instance, :welcome_user_nickname]),
%User{local: true} = user <- User.get_cached_by_nickname(nickname) do
@@ -24,7 +24,7 @@ defmodule Pleroma.User.WelcomeMessage do
end
end

defp welcome_message() do
defp welcome_message do
Pleroma.Config.get([:instance, :welcome_message])
end
end

+ 1
- 1
lib/pleroma/web/activity_pub/mrf.ex View File

@@ -16,7 +16,7 @@ defmodule Pleroma.Web.ActivityPub.MRF do
end)
end

def get_policies() do
def get_policies do
Application.get_env(:pleroma, :instance, [])
|> Keyword.get(:rewrite_policy, [])
|> get_policies()


+ 1
- 1
lib/pleroma/web/chat_channel.ex View File

@@ -48,7 +48,7 @@ defmodule Pleroma.Web.ChatChannel.ChatChannelState do
end)
end

def messages() do
def messages do
Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse() end)
end
end

+ 2
- 2
lib/pleroma/web/federator/federator.ex View File

@@ -22,7 +22,7 @@ defmodule Pleroma.Web.Federator do
@websub Application.get_env(:pleroma, :websub)
@ostatus Application.get_env(:pleroma, :ostatus)

def init() do
def init do
# 1 minute
Process.sleep(1000 * 60)
refresh_subscriptions()
@@ -58,7 +58,7 @@ defmodule Pleroma.Web.Federator do
Jobs.enqueue(:federator_outgoing, __MODULE__, [:request_subscription, sub])
end

def refresh_subscriptions() do
def refresh_subscriptions do
Jobs.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions])
end



+ 5
- 5
lib/pleroma/web/federator/retry_queue.ex View File

@@ -13,7 +13,7 @@ defmodule Pleroma.Web.Federator.RetryQueue do
{:ok, %{args | queue_table: queue_table, running_jobs: :sets.new()}}
end

def start_link() do
def start_link do
enabled =
if Mix.env() == :test, do: true, else: Pleroma.Config.get([__MODULE__, :enabled], false)

@@ -39,11 +39,11 @@ defmodule Pleroma.Web.Federator.RetryQueue do
GenServer.cast(__MODULE__, {:maybe_enqueue, data, transport, retries + 1})
end

def get_stats() do
def get_stats do
GenServer.call(__MODULE__, :get_stats)
end

def reset_stats() do
def reset_stats do
GenServer.call(__MODULE__, :reset_stats)
end

@@ -55,7 +55,7 @@ defmodule Pleroma.Web.Federator.RetryQueue do
end
end

def get_retry_timer_interval() do
def get_retry_timer_interval do
Pleroma.Config.get([:retry_queue, :interval], 1000)
end

@@ -231,7 +231,7 @@ defmodule Pleroma.Web.Federator.RetryQueue do
end
end

defp maybe_kickoff_timer() do
defp maybe_kickoff_timer do
GenServer.cast(__MODULE__, :kickoff_timer)
end
end

+ 1
- 1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex View File

@@ -1274,7 +1274,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
end

defp get_or_make_app() do
defp get_or_make_app do
find_attrs = %{client_name: @local_mastodon_name, redirect_uris: "."}
scopes = ["read", "write", "follow", "push"]



+ 3
- 3
lib/pleroma/web/push/push.ex View File

@@ -13,15 +13,15 @@ defmodule Pleroma.Web.Push do
# Client API #
##############

def start_link() do
def start_link do
GenServer.start_link(__MODULE__, :ok, name: __MODULE__)
end

def vapid_config() do
def vapid_config do
Application.get_env(:web_push_encryption, :vapid_details, [])
end

def enabled() do
def enabled do
case vapid_config() do
[] -> false
list when is_list(list) -> true


+ 1
- 1
test/support/captcha_mock.ex View File

@@ -7,7 +7,7 @@ defmodule Pleroma.Captcha.Mock do
@behaviour Service

@impl Service
def new(), do: %{type: :mock}
def new, do: %{type: :mock}

@impl Service
def validate(_token, _captcha, _data), do: :ok


Loading…
Cancel
Save