stefan230/akkoma
1
0
Fork 0
forked from YokaiRick/akkoma
Code Pull requests Activity

Refactor common functions to common.ex

Browse source
This commit is contained in:
Rin Toshaka 2018-12-06 18:01:28 +01:00
parent 4a2a7ce636
commit ca7b46fb3b
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/mix/tasks/pleroma/instance.ex
View file

@ -67,13 +67,19 @@ def run(["gen" | rest]) do
) )
name = name =
Common.get_option(options, :name, "What is the name of your instance? (e.g. Pleroma/Soykaf)") Common.get_option(
options,
:name,
"What is the name of your instance? (e.g. Pleroma/Soykaf)"
)
email = Common.get_option(options, :admin_email, "What is your admin email address?") email = Common.get_option(options, :admin_email, "What is your admin email address?")
dbhost = Common.get_option(options, :dbhost, "What is the hostname of your database?", "localhost") dbhost =
Common.get_option(options, :dbhost, "What is the hostname of your database?", "localhost")
dbname = Common.get_option(options, :dbname, "What is the name of your database?", "pleroma_dev") dbname =
Common.get_option(options, :dbname, "What is the name of your database?", "pleroma_dev")
dbuser = dbuser =
Common.get_option( Common.get_option(
@ -145,7 +151,4 @@ def run(["gen" | rest]) do
) )
end end
end end
end end

5
lib/mix/tasks/pleroma/relay.ex
View file

@ -20,7 +20,8 @@ defmodule Mix.Tasks.Pleroma.Relay do
Example: ``mix pleroma.relay unfollow https://example.org/relay`` Example: ``mix pleroma.relay unfollow https://example.org/relay``
""" """
def run(["follow", target]) do def run(["follow", target]) do
Common.start_pleroma Common.start_pleroma()
with {:ok, activity} <- Relay.follow(target) do with {:ok, activity} <- Relay.follow(target) do
# put this task to sleep to allow the genserver to push out the messages # put this task to sleep to allow the genserver to push out the messages
:timer.sleep(500) :timer.sleep(500)
@ -30,7 +31,7 @@ def run(["follow", target]) do
end end
def run(["unfollow", target]) do def run(["unfollow", target]) do
Common.start_pleroma Common.start_pleroma()
with {:ok, activity} <- Relay.follow(target) do with {:ok, activity} <- Relay.follow(target) do
# put this task to sleep to allow the genserver to push out the messages # put this task to sleep to allow the genserver to push out the messages