hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix cws.

Browse source
This commit is contained in:
Roger Braun 2017-05-11 17:59:11 +02:00
commit dd12cf7296
7 changed files with 455 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/user.ex
View file

@ -136,9 +136,13 @@ defmodule Pleroma.User do
Enum.member?(follower.following, User.ap_followers(followed))
end
def get_by_ap_id(ap_id) do
Repo.get_by(User, ap_id: ap_id)
end
def get_cached_by_ap_id(ap_id) do
key = "ap_id:#{ap_id}"
Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, ap_id: ap_id) end)
Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
end
def get_cached_by_nickname(nickname) do

8
lib/pleroma/web/ostatus/ostatus.ex
View file

@ -81,11 +81,11 @@ defmodule Pleroma.Web.OStatus do
end
def get_or_try_fetching(entry) do
Logger.debug("Trying to fetch entry")
Logger.debug("Trying to get entry from db")
with id when not is_nil(id) <- string_from_xpath("//activity:object[1]/id", entry),
%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
{:ok, activity}
else _e ->
else e ->
Logger.debug("Couldn't get, will try to fetch")
with href when not is_nil(href) <- string_from_xpath("//activity:object[1]/link[@type=\"text/html\"]/@href", entry),
{:ok, [favorited_activity]} <- fetch_activity_from_html_url(href) do
@ -126,7 +126,7 @@ defmodule Pleroma.Web.OStatus do
base_content = string_from_xpath("//content", entry)
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
cw when not is_nil(cw) <- string_from_xpath("/*/summary", entry) do
"<span class='mastodon-cw'>#{cw}</span><br>#{base_content}"
else _e -> base_content
end
@ -297,7 +297,7 @@ defmodule Pleroma.Web.OStatus do
with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true),
{:ok, atom_url} <- get_atom_url(body),
{:ok, %{status_code: code, body: body}} when code in 200..299 <- @httpoison.get(atom_url, [], follow_redirect: true) do
Logger.debug("Got #{url}, handling...")
Logger.debug("Got document from #{url}, handling...")
handle_incoming(body)
else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
end