X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus.ex;h=c35ba42bee6d5bc263d72da8769bbc1128eee5cd;hb=189e9d63bc462fe5c0f97d70ffd4bac54aeeae05;hp=745539b3e0f68790ceeee8e20c3b73aff26dd3ee;hpb=fb5aa34092cf8aa04b3b7001e81cf1585ee0041a;p=akkoma diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex index 745539b3e..c35ba42be 100644 --- a/lib/pleroma/web/ostatus/ostatus.ex +++ b/lib/pleroma/web/ostatus/ostatus.ex @@ -22,6 +22,10 @@ defmodule Pleroma.Web.OStatus do "#{user.ap_id}/salmon" end + def remote_follow_path do + "#{Web.base_url}/ostatus_subscribe?acct={uri}" + end + def handle_incoming(xml_string) do with doc when doc != :error <- parse_document(xml_string) do entries = :xmerl_xpath.string('//entry', doc) @@ -159,8 +163,7 @@ defmodule Pleroma.Web.OStatus do Get the cw that mastodon uses. """ def get_cw(entry) do - with scope when not is_nil(scope) <- string_from_xpath("//mastodon:scope", entry), - cw when not is_nil(cw) <- string_from_xpath("/*/summary", entry) do + with cw when not is_nil(cw) <- string_from_xpath("/*/summary", entry) do cw else _e -> nil end