diff options
author | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
commit | 76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch) | |
tree | 34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/pleroma/gopher | |
parent | a3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff) | |
parent | bb864e96ad4e0be470da78baa000019f571e30db (diff) | |
download | pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz |
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
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}) |