diff options
author | Wim Vanderbauwhede <wim.vanderbauwhede@mail.be> | 2019-02-14 16:41:40 +0000 |
---|---|---|
committer | Wim Vanderbauwhede <wim.vanderbauwhede@mail.be> | 2019-02-14 16:41:40 +0000 |
commit | 04b1c135543965860029557fc216eb38fd63b6c7 (patch) | |
tree | c1fb60376eeb35539704c23d282af7777895d4ea /lib/pleroma/gopher | |
parent | bf5b1c7f06c9f8882c40cf2385439bee3b74522c (diff) | |
parent | 1d17082ab2523eb75ee0ca4a49e45da0d0edabd7 (diff) | |
download | pleroma-04b1c135543965860029557fc216eb38fd63b6c7.tar.gz |
Merge remote-tracking branch 'upstream/develop' into patch-image-description
Diffstat (limited to 'lib/pleroma/gopher')
-rw-r--r-- | lib/pleroma/gopher/server.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex index 336142e9b..32cb817d2 100644 --- a/lib/pleroma/gopher/server.ex +++ b/lib/pleroma/gopher/server.ex @@ -37,17 +37,17 @@ end defmodule Pleroma.Gopher.Server.ProtocolHandler do alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.User alias Pleroma.Activity - alias Pleroma.Repo alias Pleroma.HTML + alias Pleroma.User + alias Pleroma.Repo def start_link(ref, socket, transport, opts) do pid = spawn_link(__MODULE__, :init, [ref, socket, transport, opts]) {:ok, pid} end - def init(ref, socket, transport, _Opts = []) do + def init(ref, socket, transport, [] = _Opts) do :ok = :ranch.accept_ack(ref) loop(socket, transport) end |