projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into stable
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
rate_limiter.ex
diff --git
a/lib/pleroma/web/plugs/rate_limiter.ex
b/lib/pleroma/web/plugs/rate_limiter.ex
index 5bebe0ad53fa2ba7d28ddd681eea2a055e0c2955..3c82654b4eb264859c5675d20007a8426a6c9330 100644
(file)
--- a/
lib/pleroma/web/plugs/rate_limiter.ex
+++ b/
lib/pleroma/web/plugs/rate_limiter.ex
@@
-197,12
+197,18
@@
defmodule Pleroma.Web.Plugs.RateLimiter do
})
end
})
end
- defp ip(%{remote_ip: remote_ip}) do
+ defp ip(%{remote_ip: remote_ip}) when is_binary(remote_ip) do
+ remote_ip
+ end
+
+ defp ip(%{remote_ip: remote_ip}) when is_tuple(remote_ip) do
remote_ip
|> Tuple.to_list()
|> Enum.join(".")
end
remote_ip
|> Tuple.to_list()
|> Enum.join(".")
end
+ defp ip(_), do: nil
+
defp render_throttled_error(conn) do
conn
|> render_error(:too_many_requests, "Throttled")
defp render_throttled_error(conn) do
conn
|> render_error(:too_many_requests, "Throttled")