projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
lib
/
pleroma
/
web
/
ostatus
/
handlers
/
follow_handler.ex
diff --git
a/lib/pleroma/web/ostatus/handlers/follow_handler.ex
b/lib/pleroma/web/ostatus/handlers/follow_handler.ex
index f5db5582b89f4549c59a474d1775ed8275d37c03..24513972e6bbdff7a53273718f00b593495a7432 100644
(file)
--- a/
lib/pleroma/web/ostatus/handlers/follow_handler.ex
+++ b/
lib/pleroma/web/ostatus/handlers/follow_handler.ex
@@
-1,16
+1,26
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.OStatus.FollowHandler do
defmodule Pleroma.Web.OStatus.FollowHandler do
- alias Pleroma.Web.{XML, OStatus}
- alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.User
alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.OStatus
+ alias Pleroma.Web.XML
def handle(entry, doc) do
def handle(entry, doc) do
- with {:ok, actor} <- OStatus.find_make_or_update_
use
r(doc),
+ with {:ok, actor} <- OStatus.find_make_or_update_
acto
r(doc),
id when not is_nil(id) <- XML.string_from_xpath("/entry/id", entry),
id when not is_nil(id) <- XML.string_from_xpath("/entry/id", entry),
- followed_uri when not is_nil(followed_uri) <- XML.string_from_xpath("/entry/activity:object/id", entry),
+ followed_uri when not is_nil(followed_uri) <-
+ XML.string_from_xpath("/entry/activity:object/id", entry),
{:ok, followed} <- OStatus.find_or_make_user(followed_uri),
{:ok, followed} <- OStatus.find_or_make_user(followed_uri),
+ {:locked, false} <- {:locked, followed.info.locked},
{:ok, activity} <- ActivityPub.follow(actor, followed, id, false) do
User.follow(actor, followed)
{:ok, activity}
{:ok, activity} <- ActivityPub.follow(actor, followed, id, false) do
User.follow(actor, followed)
{:ok, activity}
+ else
+ {:locked, true} ->
+ {:error, "It's not possible to follow locked accounts over OStatus"}
end
end
end
end
end
end