X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fbbs%2Fhandler.ex;h=0a381f5920c954517b3dfdf1a31bf022cb0b4601;hb=7ab2dbbdb60e08a6b142e62b2f50561427715bd4;hp=d999dcf76bab4d2560d21b110fcfd9925ef5ca71;hpb=10fdc080a0048a4776abb4bd1b5aa22d8c65e2da;p=akkoma
diff --git a/lib/pleroma/bbs/handler.ex b/lib/pleroma/bbs/handler.ex
index d999dcf76..0a381f592 100644
--- a/lib/pleroma/bbs/handler.ex
+++ b/lib/pleroma/bbs/handler.ex
@@ -1,15 +1,16 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.BBS.Handler do
- @moduledoc """
- An example implementation of `Sshd.ShellHandler`, implementing a very simple
- Read-Eval-Loop, that does nothing.
- """
use Sshd.ShellHandler
- alias Pleroma.Web.CommonAPI
+ alias Pleroma.Activity
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.CommonAPI
def on_shell(username, _pubkey, _ip, _port) do
:ok = IO.puts("Welcome to #{Pleroma.Config.get([:instance, :name])}!")
- user = Pleroma.User.get_by_nickname(to_string(username))
+ user = Pleroma.User.get_cached_by_nickname(to_string(username))
Logger.debug("#{inspect(user)}")
loop(run_state(user: user))
end
@@ -42,7 +43,7 @@ defmodule Pleroma.BBS.Handler do
def puts_activity(activity) do
status = Pleroma.Web.MastodonAPI.StatusView.render("status.json", %{activity: activity})
- IO.puts("#{status.id} by #{status.account.display_name} (#{status.account.acct}):")
+ IO.puts("-- #{status.id} by #{status.account.display_name} (#{status.account.acct})")
IO.puts(HtmlSanitizeEx.strip_tags(status.content))
IO.puts("")
end
@@ -52,11 +53,27 @@ defmodule Pleroma.BBS.Handler do
IO.puts("help - This help")
IO.puts("home - Show the home timeline")
IO.puts("p - Post the given text")
+ IO.puts("r - Reply to the post with the given id")
IO.puts("quit - Quit")
state
end
+ def handle_command(%{user: user} = state, "r " <> text) do
+ text = String.trim(text)
+ [activity_id, rest] = String.split(text, " ", parts: 2)
+
+ with %Activity{} <- Activity.get_by_id(activity_id),
+ {:ok, _activity} <-
+ CommonAPI.post(user, %{"status" => rest, "in_reply_to_status_id" => activity_id}) do
+ IO.puts("Replied!")
+ else
+ _e -> IO.puts("Could not reply...")
+ end
+
+ state
+ end
+
def handle_command(%{user: user} = state, "p " <> text) do
text = String.trim(text)
@@ -74,7 +91,7 @@ defmodule Pleroma.BBS.Handler do
params =
%{}
- |> Map.put("type", ["Create", "Announce"])
+ |> Map.put("type", ["Create"])
|> Map.put("blocking_user", user)
|> Map.put("muting_user", user)
|> Map.put("user", user)
@@ -82,8 +99,6 @@ defmodule Pleroma.BBS.Handler do
activities =
[user.ap_id | user.following]
|> ActivityPub.fetch_activities(params)
- |> ActivityPub.contain_timeline(user)
- |> Enum.reverse()
Enum.each(activities, fn activity ->
puts_activity(activity)
@@ -92,8 +107,9 @@ defmodule Pleroma.BBS.Handler do
state
end
- def handle_command(_state, command) do
+ def handle_command(state, command) do
IO.puts("Unknown command '#{command}'")
+ state
end
defp wait_input(state, input) do
@@ -104,7 +120,7 @@ defmodule Pleroma.BBS.Handler do
{:input, ^input, code} when is_binary(code) ->
code = String.trim(code)
- handle_command(state, code)
+ state = handle_command(state, code)
loop(%{state | counter: state.counter + 1})