Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
de114ffb
Commit
de114ffb
authored
Mar 25, 2019
by
kaniini
Browse files
activitypub: remove contain_timeline()
parent
0387f521
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
de114ffb
...
...
@@ -980,12 +980,4 @@ def contain_broken_threads(%Activity{} = activity, %User{} = user) do
def
contain_activity
(%
Activity
{}
=
activity
,
%
User
{}
=
user
)
do
contain_broken_threads
(
activity
,
user
)
end
# do post-processing on a timeline
def
contain_timeline
(
timeline
,
user
)
do
timeline
|>
Enum
.
filter
(
fn
activity
->
contain_activity
(
activity
,
user
)
end
)
end
end
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file @
de114ffb
...
...
@@ -303,7 +303,6 @@ def home_timeline(%{assigns: %{user: user}} = conn, params) do
activities
=
[
user
.
ap_id
|
user
.
following
]
|>
ActivityPub
.
fetch_activities
(
params
)
|>
ActivityPub
.
contain_timeline
(
user
)
|>
Enum
.
reverse
()
conn
...
...
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
de114ffb
...
...
@@ -101,9 +101,7 @@ def friends_timeline(%{assigns: %{user: user}} = conn, params) do
|>
Map
.
put
(
"blocking_user"
,
user
)
|>
Map
.
put
(
"user"
,
user
)
activities
=
ActivityPub
.
fetch_activities
([
user
.
ap_id
|
user
.
following
],
params
)
|>
ActivityPub
.
contain_timeline
(
user
)
activities
=
ActivityPub
.
fetch_activities
([
user
.
ap_id
|
user
.
following
],
params
)
conn
|>
put_view
(
ActivityView
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment