projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated...
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api.ex
diff --git
a/lib/pleroma/web/twitter_api/twitter_api.ex
b/lib/pleroma/web/twitter_api/twitter_api.ex
index 932bef5efa7a5127d14cc96bdbadb7550b7346a8..f4ab5bdc6902b4c4e1fbfdc297bd0ea0ab58141f 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api.ex
@@
-25,6
+25,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
content_html = add_user_links(content, mentions)
content_html = add_user_links(content, mentions)
+ date = make_date()
+
activity = %{
"type" => "Create",
"to" => to,
activity = %{
"type" => "Create",
"to" => to,
@@
-33,11
+35,11
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
"type" => "Note",
"to" => to,
"content" => content_html,
"type" => "Note",
"to" => to,
"content" => content_html,
- "published" =>
make_
date,
+ "published" => date,
"context" => context,
"attachment" => attachments
},
"context" => context,
"attachment" => attachments
},
- "published" =>
make_
date,
+ "published" => date,
"context" => context
}
"context" => context
}
@@
-67,7
+69,7
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def fetch_friend_statuses(user, opts \\ %{}) do
end
def fetch_friend_statuses(user, opts \\ %{}) do
- ActivityPub.fetch_activities(
user.following
, opts)
+ ActivityPub.fetch_activities(
[user.ap_id | user.following]
, opts)
|> activities_to_statuses(%{for: user})
end
|> activities_to_statuses(%{for: user})
end
@@
-101,15
+103,17
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def follow(%User{} = follower, followed_id) do
with %User{} = followed <- Repo.get(User, followed_id),
def follow(%User{} = follower, followed_id) do
with %User{} = followed <- Repo.get(User, followed_id),
-
{ :ok, follower } <- User.follow(follower, followed),
+ { :ok, follower } <- User.follow(follower, followed),
{ :ok, activity } <- ActivityPub.insert(%{
"type" => "Follow",
"actor" => follower.ap_id,
"object" => followed.ap_id,
{ :ok, activity } <- ActivityPub.insert(%{
"type" => "Follow",
"actor" => follower.ap_id,
"object" => followed.ap_id,
- "published" => make_date
+ "published" => make_date
()
})
do
{ :ok, follower, followed, activity }
})
do
{ :ok, follower, followed, activity }
+ else
+ err -> err
end
end
end
end
@@
-118,6
+122,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
{ :ok, follower } <- User.unfollow(follower, followed)
do
{ :ok, follower, followed }
{ :ok, follower } <- User.unfollow(follower, followed)
do
{ :ok, follower, followed }
+ else
+ err -> err
end
end
end
end