projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'notification-pleroma-settings' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api_controller.ex
diff --git
a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 6ea0b110ba7f74a82ee19906c22d97a409649109..a7ec9949cb43de42d4313cf8d15b3dd59fb7c4b4 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@
-16,6
+16,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.TwitterAPI.ActivityView
alias Pleroma.Web.TwitterAPI.NotificationView
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.TwitterAPI.ActivityView
alias Pleroma.Web.TwitterAPI.NotificationView
@@
-269,7
+270,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
end
def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
end
def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
- with %Activity{} = activity <-
Repo.get(Activity,
id),
+ with %Activity{} = activity <-
Activity.get_by_id(
id),
true <- Visibility.visible_for_user?(activity, user) do
conn
|> put_view(ActivityView)
true <- Visibility.visible_for_user?(activity, user) do
conn
|> put_view(ActivityView)
@@
-278,7
+279,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
end
def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
end
def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
- with context when is_binary(context) <-
TwitterAPI
.conversation_id_to_context(id),
+ with context when is_binary(context) <-
Utils
.conversation_id_to_context(id),
activities <-
ActivityPub.fetch_activities_for_context(context, %{
"blocking_user" => user,
activities <-
ActivityPub.fetch_activities_for_context(context, %{
"blocking_user" => user,
@@
-341,7
+342,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
end
def get_by_id_or_ap_id(id) do
end
def get_by_id_or_ap_id(id) do
- activity =
Repo.get(Activity,
id) || Activity.get_create_by_object_ap_id(id)
+ activity =
Activity.get_by_id(
id) || Activity.get_create_by_object_ap_id(id)
if activity.data["type"] == "Create" do
activity
if activity.data["type"] == "Create" do
activity
@@
-433,7
+434,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
end
def confirm_email(conn, %{"user_id" => uid, "token" => token}) do
end
def confirm_email(conn, %{"user_id" => uid, "token" => token}) do
- with %User{} = user <-
Repo.get(User,
uid),
+ with %User{} = user <-
User.get_by_id(
uid),
true <- user.local,
true <- user.info.confirmation_pending,
true <- user.info.confirmation_token == token,
true <- user.local,
true <- user.info.confirmation_pending,
true <- user.info.confirmation_token == token,
@@
-586,7
+587,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
def approve_friend_request(conn, %{"user_id" => uid} = _params) do
with followed <- conn.assigns[:user],
def approve_friend_request(conn, %{"user_id" => uid} = _params) do
with followed <- conn.assigns[:user],
- %User{} = follower <-
Repo.get(User,
uid),
+ %User{} = follower <-
User.get_by_id(
uid),
{:ok, follower} <- CommonAPI.accept_follow_request(follower, followed) do
conn
|> put_view(UserView)
{:ok, follower} <- CommonAPI.accept_follow_request(follower, followed) do
conn
|> put_view(UserView)
@@
-598,7
+599,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
def deny_friend_request(conn, %{"user_id" => uid} = _params) do
with followed <- conn.assigns[:user],
def deny_friend_request(conn, %{"user_id" => uid} = _params) do
with followed <- conn.assigns[:user],
- %User{} = follower <-
Repo.get(User,
uid),
+ %User{} = follower <-
User.get_by_id(
uid),
{:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do
conn
|> put_view(UserView)
{:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do
conn
|> put_view(UserView)