moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address incoming messages to followers.

This commit is contained in:
Roger Braun 2017-05-06 14:23:39 +02:00
parent bda389d7d9
commit 7db76a0f0e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -143,7 +143,8 @@ def handle_note(entry, doc \\ nil) do
end end
to = [ to = [
"https://www.w3.org/ns/activitystreams#Public" "https://www.w3.org/ns/activitystreams#Public",
User.ap_followers(actor)
] ]
mentions = :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry) mentions = :xmerl_xpath.string('//link[@rel="mentioned" and @ostatus:object-type="http://activitystrea.ms/schema/1.0/person"]', entry)

4
test/web/ostatus/ostatus_test.exs
View File

@ -2,7 +2,7 @@ defmodule Pleroma.Web.OStatusTest do
use Pleroma.DataCase use Pleroma.DataCase
alias Pleroma.Web.OStatus alias Pleroma.Web.OStatus
alias Pleroma.Web.XML alias Pleroma.Web.XML
alias Pleroma.{Object, Repo} alias Pleroma.{Object, Repo, User}
import Pleroma.Factory import Pleroma.Factory
test "don't insert create notes twice" do test "don't insert create notes twice" do
@ -32,6 +32,8 @@ test "handle incoming notes - GS, subscription" do
assert activity.data["object"]["type"] == "Note" assert activity.data["object"]["type"] == "Note"
assert activity.data["object"]["actor"] == "https://social.heldscal.la/user/23211" assert activity.data["object"]["actor"] == "https://social.heldscal.la/user/23211"
assert activity.data["object"]["content"] == "Will it blend?" assert activity.data["object"]["content"] == "Will it blend?"
user = User.get_cached_by_ap_id(activity.data["actor"])
assert User.ap_followers(user) in activity.data["to"]
end end
test "handle incoming notes with attachments - GS, subscription" do test "handle incoming notes with attachments - GS, subscription" do