aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/gopher/server.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-03-27 15:41:40 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-03-27 15:41:40 +0300
commit20e0f3660541f19cf878b789aa9f5b9d5ce8cddb (patch)
tree08cb90d62e431beb7ee6a2261dc679b725aec1f1 /lib/pleroma/gopher/server.ex
parent2a95014b9d7142aa2549e70f428293af78fae8eb (diff)
parent15aa94f40f73444d67da7cb71ec219b97ec5142e (diff)
downloadpleroma-20e0f3660541f19cf878b789aa9f5b9d5ce8cddb.tar.gz
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
Diffstat (limited to 'lib/pleroma/gopher/server.ex')
-rw-r--r--lib/pleroma/gopher/server.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex
index 6baacc566..3b9629d77 100644
--- a/lib/pleroma/gopher/server.ex
+++ b/lib/pleroma/gopher/server.ex
@@ -66,7 +66,8 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
def link(name, selector, type \\ 1) do
address = Pleroma.Web.Endpoint.host()
port = Pleroma.Config.get([:gopher, :port], 1234)
- "#{type}#{name}\t#{selector}\t#{address}\t#{port}\r\n"
+ dstport = Pleroma.Config.get([:gopher, :dstport], port)
+ "#{type}#{name}\t#{selector}\t#{address}\t#{dstport}\r\n"
end
def render_activities(activities) do