projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
[akkoma]
/
lib
/
pleroma
/
gopher
/
server.ex
diff --git
a/lib/pleroma/gopher/server.ex
b/lib/pleroma/gopher/server.ex
index 3d56d50a9d16765a1d61574edabbda2066363879..e9f54c4c0077ec276131d69054ed02d69690cd95 100644
(file)
--- a/
lib/pleroma/gopher/server.ex
+++ b/
lib/pleroma/gopher/server.ex
@@
-96,16
+96,18
@@
defmodule Pleroma.Gopher.Server.ProtocolHandler do
def response("/main/public") do
posts =
def response("/main/public") do
posts =
- ActivityPub.fetch_public_activities(%{"type" => ["Create"], "local_only" => true})
- |> render_activities
+ %{type: ["Create"], local_only: true}
+ |> ActivityPub.fetch_public_activities()
+ |> render_activities()
info("Welcome to the Public Timeline!") <> posts <> ".\r\n"
end
def response("/main/all") do
posts =
info("Welcome to the Public Timeline!") <> posts <> ".\r\n"
end
def response("/main/all") do
posts =
- ActivityPub.fetch_public_activities(%{"type" => ["Create"]})
- |> render_activities
+ %{type: ["Create"]}
+ |> ActivityPub.fetch_public_activities()
+ |> render_activities()
info("Welcome to the Federated Timeline!") <> posts <> ".\r\n"
end
info("Welcome to the Federated Timeline!") <> posts <> ".\r\n"
end
@@
-130,13
+132,14
@@
defmodule Pleroma.Gopher.Server.ProtocolHandler do
def response("/users/" <> nickname) do
with %User{} = user <- User.get_cached_by_nickname(nickname) do
params = %{
def response("/users/" <> nickname) do
with %User{} = user <- User.get_cached_by_nickname(nickname) do
params = %{
-
"type" =>
["Create"],
-
"actor_id" =>
user.ap_id
+
type:
["Create"],
+
actor_id:
user.ap_id
}
activities =
}
activities =
- ActivityPub.fetch_public_activities(params)
- |> render_activities
+ params
+ |> ActivityPub.fetch_public_activities()
+ |> render_activities()
info("Posts by #{user.nickname}") <> activities <> ".\r\n"
else
info("Posts by #{user.nickname}") <> activities <> ".\r\n"
else