X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=bc7f2601fb725b71e124b782caa46107a20ae20d;hb=279e1ce556f063fa9725375622896f8f091be3c4;hp=ddf66cee95ee4840d9823851921f362ed881e252;hpb=8cf97ee8e15a36cbbf0964d5be53c88d29798163;p=akkoma diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index ddf66cee9..bc7f2601f 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -150,11 +150,12 @@ defmodule Pleroma.User do def follow(%User{} = follower, %User{info: info} = followed) do ap_followers = followed.follower_address + if following?(follower, followed) or info["deactivated"] do {:error, "Could not follow user: #{followed.nickname} is already on your list."} else - if !followed.local && follower.local do + if !followed.local && follower.local && !ap_enabled?(followed) do Websub.subscribe(follower, followed) end @@ -227,12 +228,21 @@ defmodule Pleroma.User do Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end) end + def fetch_by_nickname(nickname) do + ap_try = ActivityPub.make_user_from_nickname(nickname) + + case ap_try do + {:ok, user} -> {:ok, user} + _ -> OStatus.make_user(nickname) + end + end + def get_or_fetch_by_nickname(nickname) do with %User{} = user <- get_by_nickname(nickname) do user else _e -> with [_nick, _domain] <- String.split(nickname, "@"), - {:ok, user} <- OStatus.make_user(nickname) do + {:ok, user} <- fetch_by_nickname(nickname) do user else _e -> nil end @@ -294,7 +304,7 @@ defmodule Pleroma.User do update_and_set_cache(cs) end - def get_notified_from_activity(%Activity{data: %{"to" => to}}) do + def get_notified_from_activity(%Activity{recipients: to}) do query = from u in User, where: u.ap_id in ^to, where: u.local == true @@ -302,7 +312,7 @@ defmodule Pleroma.User do Repo.all(query) end - def get_recipients_from_activity(%Activity{data: %{"to" => to}}) do + def get_recipients_from_activity(%Activity{recipients: to}) do query = from u in User, where: u.ap_id in ^to, or_where: fragment("? \\\?| ?", u.following, ^to) @@ -416,8 +426,15 @@ defmodule Pleroma.User do end end + defp blank?(""), do: nil + defp blank?(n), do: n + def insert_or_update_user(data) do + data = data + |> Map.put(:name, blank?(data[:name]) || data[:nickname]) cs = User.remote_user_creation(data) Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname) end + + def ap_enabled?(%User{info: info}), do: info["ap_enabled"] end