Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jeff
pleroma
Commits
5021b783
Commit
5021b783
authored
6 years ago
by
vaartis
Browse files
Options
Downloads
Patches
Plain Diff
Fetch user's outbox posts on first federation with that user
parent
39b766cc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
config/config.exs
+4
-0
4 additions, 0 deletions
config/config.exs
docs/config.md
+4
-0
4 additions, 0 deletions
docs/config.md
lib/pleroma/user.ex
+37
-10
37 additions, 10 deletions
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/utils.ex
+39
-0
39 additions, 0 deletions
lib/pleroma/web/activity_pub/utils.ex
with
84 additions
and
10 deletions
config/config.exs
+
4
−
0
View file @
5021b783
...
...
@@ -348,6 +348,10 @@ config :pleroma, Pleroma.Jobs,
federator_outgoing:
[
max_jobs:
50
],
mailer:
[
max_jobs:
10
]
config
:pleroma
,
:fetch_initial_posts
,
enabled:
false
,
pages:
5
config
:auto_linker
,
opts:
[
scheme:
true
,
...
...
This diff is collapsed.
Click to expand it.
docs/config.md
+
4
−
0
View file @
5021b783
...
...
@@ -285,6 +285,10 @@ This config contains two queues: `federator_incoming` and `federator_outgoing`.
## :rich_media
*
`enabled`
: if enabled the instance will parse metadata from attached links to generate link previews
## :fetch_initial_posts
*
`enabled`
: if enabled, when a new user is federated with, fetch some of their latest posts
*
`pages`
: the amount of pages to fetch
## :hackney_pools
Advanced. Tweaks Hackney (http client) connections pools.
...
...
This diff is collapsed.
Click to expand it.
lib/pleroma/user.ex
+
37
−
10
View file @
5021b783
...
...
@@ -532,6 +532,10 @@ defmodule Pleroma.User do
_e
->
with
[
_nick
,
_domain
]
<-
String
.
split
(
nickname
,
"@"
),
{
:ok
,
user
}
<-
fetch_by_nickname
(
nickname
)
do
if
Pleroma
.
Config
.
get
([
:fetch_initial_posts
,
:enabled
])
do
{
:ok
,
_
}
=
Task
.
start
(
__MODULE__
,
:fetch_initial_posts
,
[
user
])
end
user
else
_e
->
nil
...
...
@@ -539,6 +543,17 @@ defmodule Pleroma.User do
end
end
@doc
"Fetch some posts when the user has just been federated with"
def
fetch_initial_posts
(
user
)
do
pages
=
Pleroma
.
Config
.
get!
([
:fetch_initial_posts
,
:pages
])
Enum
.
each
(
# Insert all the posts in reverse order, so they're in the right order on the timeline
Enum
.
reverse
(
Utils
.
fetch_ordered_collection
(
user
.
info
.
source_data
[
"outbox"
],
pages
)),
&
Pleroma
.
Web
.
Federator
.
incoming_ap_doc
/
1
)
end
def
get_followers_query
(%
User
{
id:
id
,
follower_address:
follower_address
},
nil
)
do
from
(
u
in
User
,
...
...
@@ -1108,24 +1123,36 @@ defmodule Pleroma.User do
def
html_filter_policy
(
_
),
do
:
@default_scrubbers
def
fetch_by_ap_id
(
ap_id
)
do
ap_try
=
ActivityPub
.
make_user_from_ap_id
(
ap_id
)
case
ap_try
do
{
:ok
,
user
}
->
user
_
->
case
OStatus
.
make_user
(
ap_id
)
do
{
:ok
,
user
}
->
user
_
->
{
:error
,
"Could not fetch by AP id"
}
end
end
end
def
get_or_fetch_by_ap_id
(
ap_id
)
do
user
=
get_by_ap_id
(
ap_id
)
if
!is_nil
(
user
)
and
!User
.
needs_update?
(
user
)
do
user
else
ap_try
=
ActivityPub
.
make_user_from_ap_id
(
ap_id
)
case
ap_try
do
{
:ok
,
user
}
->
user
user
=
fetch_by_ap_id
(
ap_id
)
_
->
case
OStatus
.
make_user
(
ap_id
)
do
{
:ok
,
user
}
->
user
_
->
{
:error
,
"Could not fetch by AP id"
}
end
if
Pleroma
.
Config
.
get
([
:fetch_initial_posts
,
:enabled
])
do
with
%
User
{}
=
user
do
{
:ok
,
_
}
=
Task
.
start
(
__MODULE__
,
:fetch_initial_posts
,
[
user
])
end
end
user
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/pleroma/web/activity_pub/utils.ex
+
39
−
0
View file @
5021b783
...
...
@@ -633,4 +633,43 @@ defmodule Pleroma.Web.ActivityPub.Utils do
}
|>
Map
.
merge
(
additional
)
end
@doc
"""
Fetches the OrderedCollection/OrderedCollectionPage from `from`, limiting the amount of pages fetched after
the first one to `pages_left` pages.
If the amount of pages is higher than the collection has, it returns whatever was there.
"""
def
fetch_ordered_collection
(
from
,
pages_left
,
acc
\\
[])
do
with
{
:ok
,
response
}
<-
Tesla
.
get
(
from
),
{
:ok
,
collection
}
<-
Poison
.
decode
(
response
.
body
)
do
case
collection
[
"type"
]
do
"OrderedCollection"
->
# If we've encountered the OrderedCollection and not the page,
# just call the same function on the page address
fetch_ordered_collection
(
collection
[
"first"
],
pages_left
)
"OrderedCollectionPage"
->
if
pages_left
>
0
do
# There are still more pages
if
Map
.
has_key?
(
collection
,
"next"
)
do
# There are still more pages, go deeper saving what we have into the accumulator
fetch_ordered_collection
(
collection
[
"next"
],
pages_left
-
1
,
acc
++
collection
[
"orderedItems"
]
)
else
# No more pages left, just return whatever we already have
acc
++
collection
[
"orderedItems"
]
end
else
# Got the amount of pages needed, add them all to the accumulator
acc
++
collection
[
"orderedItems"
]
end
_
->
{
:error
,
"Not an OrderedCollection or OrderedCollectionPage"
}
end
end
end
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment