projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead...
[akkoma]
/
lib
/
pleroma
/
gopher
/
server.ex
diff --git
a/lib/pleroma/gopher/server.ex
b/lib/pleroma/gopher/server.ex
index d34037f4f69f7c05f47a098d06b057e248f7e65e..e6361a82ca78a5161851e9449d85a9466d030341 100644
(file)
--- a/
lib/pleroma/gopher/server.ex
+++ b/
lib/pleroma/gopher/server.ex
@@
-1,16
+1,16
@@
defmodule Pleroma.Gopher.Server do
use GenServer
require Logger
defmodule Pleroma.Gopher.Server do
use GenServer
require Logger
- @gopher Application.get_env(:pleroma, :gopher)
def start_link() do
def start_link() do
- ip = Keyword.get(@gopher, :ip, {0, 0, 0, 0})
- port = Keyword.get(@gopher, :port, 1234)
+ config = Pleroma.Config.get(:gopher, [])
+ ip = Keyword.get(config, :ip, {0, 0, 0, 0})
+ port = Keyword.get(config, :port, 1234)
GenServer.start_link(__MODULE__, [ip, port], [])
end
def init([ip, port]) do
GenServer.start_link(__MODULE__, [ip, port], [])
end
def init([ip, port]) do
- if
Keyword.get(@gopher, :enabled
, false) do
+ if
Pleroma.Config.get([:gopher, :enabled]
, false) do
Logger.info("Starting gopher server on #{port}")
:ranch.start_listener(
Logger.info("Starting gopher server on #{port}")
:ranch.start_listener(
@@
-37,9
+37,6
@@
defmodule Pleroma.Gopher.Server.ProtocolHandler do
alias Pleroma.Repo
alias Pleroma.HTML
alias Pleroma.Repo
alias Pleroma.HTML
- @instance Application.get_env(:pleroma, :instance)
- @gopher Application.get_env(:pleroma, :gopher)
-
def start_link(ref, socket, transport, opts) do
pid = spawn_link(__MODULE__, :init, [ref, socket, transport, opts])
{:ok, pid}
def start_link(ref, socket, transport, opts) do
pid = spawn_link(__MODULE__, :init, [ref, socket, transport, opts])
{:ok, pid}
@@
-62,7
+59,7
@@
defmodule Pleroma.Gopher.Server.ProtocolHandler do
def link(name, selector, type \\ 1) do
address = Pleroma.Web.Endpoint.host()
def link(name, selector, type \\ 1) do
address = Pleroma.Web.Endpoint.host()
- port =
Keyword.get(@gopher, :port
, 1234)
+ port =
Pleroma.Config.get([:gopher, :port]
, 1234)
"#{type}#{name}\t#{selector}\t#{address}\t#{port}\r\n"
end
"#{type}#{name}\t#{selector}\t#{address}\t#{port}\r\n"
end
@@
-85,7
+82,7
@@
defmodule Pleroma.Gopher.Server.ProtocolHandler do
end
def response("") do
end
def response("") do
- info("Welcome to #{
Keyword.get(@instance, :name
, "Pleroma")}!") <>
+ info("Welcome to #{
Pleroma.Config.get([:instance, :name]
, "Pleroma")}!") <>
link("Public Timeline", "/main/public") <>
link("Federated Timeline", "/main/all") <> ".\r\n"
end
link("Public Timeline", "/main/public") <>
link("Federated Timeline", "/main/all") <> ".\r\n"
end