diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-05-06 18:42:31 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-05-06 18:42:31 +0000 |
commit | 6c2903d9a175cfbf3785d5c1a43e6fcac6b0e9f5 (patch) | |
tree | 6fec6e0ab38db719b2a826640a700c3746be7097 /lib/pleroma/gopher | |
parent | 2b708f76e05b4ece7a189d5c74adaf252c2e8b97 (diff) | |
parent | 7a884d70d8fd92a44c35911509b248a902275e07 (diff) | |
download | pleroma-6c2903d9a175cfbf3785d5c1a43e6fcac6b0e9f5.tar.gz |
Merge branch 'feld-warnings' into 'develop'
Clean up warnings
See merge request pleroma/pleroma!144
Diffstat (limited to 'lib/pleroma/gopher')
-rw-r--r-- | lib/pleroma/gopher/server.ex | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex index 82e241f21..f6abcd4d0 100644 --- a/lib/pleroma/gopher/server.ex +++ b/lib/pleroma/gopher/server.ex @@ -65,12 +65,6 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do "#{type}#{name}\t#{selector}\t#{address}\t#{port}\r\n" end - def response("") do - info("Welcome to #{Keyword.get(@instance, :name, "Pleroma")}!") <> - link("Public Timeline", "/main/public") <> - link("Federated Timeline", "/main/all") <> ".\r\n" - end - def render_activities(activities) do activities |> Enum.reverse() @@ -93,6 +87,12 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do |> Enum.join("\r\n") end + def response("") do + info("Welcome to #{Keyword.get(@instance, :name, "Pleroma")}!") <> + link("Public Timeline", "/main/public") <> + link("Federated Timeline", "/main/all") <> ".\r\n" + end + def response("/main/public") do posts = ActivityPub.fetch_public_activities(%{"type" => ["Create"], "local_only" => true}) |