Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Pleroma
pleroma
Merge requests
!1094
activitypub: transmogrifier: send reject follow if following does not succeed
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
activitypub: transmogrifier: send reject follow if following does not succeed
feature/auto-reject-follow-requests-blocked
into
develop
Overview
5
Commits
1
Pipelines
5
Changes
2
Merged
kaniini
requested to merge
feature/auto-reject-follow-requests-blocked
into
develop
5 years ago
Overview
5
Commits
1
Pipelines
5
Changes
2
Expand
2
0
Merge request reports
Viewing commit
65156abf
Show latest version
2 files
+
50
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
65156abf
activitypub: transmogrifier: send reject follow if following does not succeed
· 65156abf
kaniini
authored
5 years ago
lib/pleroma/web/activity_pub/transmogrifier.ex
+
30
−
4
Options
@@ -438,20 +438,46 @@ def handle_incoming(
with
%
User
{
local:
true
}
=
followed
<-
User
.
get_cached_by_ap_id
(
followed
),
%
User
{}
=
follower
<-
User
.
get_or_fetch_by_ap_id
(
follower
),
{
:ok
,
activity
}
<-
ActivityPub
.
follow
(
follower
,
followed
,
id
,
false
)
do
if
not
User
.
locked?
(
followed
)
do
with
deny_follow_blocked
<-
Pleroma
.
Config
.
get
([
:user
,
:deny_follow_blocked
]),
{
:user_blocked
,
false
}
<-
{
:user_blocked
,
User
.
blocks?
(
followed
,
follower
)
&&
deny_follow_blocked
},
{
:user_locked
,
false
}
<-
{
:user_locked
,
User
.
locked?
(
followed
)},
{
:follow
,
{
:ok
,
follower
}}
<-
User
.
follow
(
follower
,
followed
)
do
ActivityPub
.
accept
(%{
to:
[
follower
.
ap_id
],
actor:
followed
,
object:
data
,
local:
true
})
User
.
follow
(
follower
,
followed
)
else
{
:user_blocked
,
true
}
->
{
:ok
,
_
}
=
Utils
.
update_follow_state
(
activity
,
"reject"
)
ActivityPub
.
reject
(%{
to:
[
follower
.
ap_id
],
actor:
followed
,
object:
data
,
local:
true
})
{
:follow
,
{
:error
,
_
}}
->
{
:ok
,
_
}
=
Utils
.
update_follow_state
(
activity
,
"reject"
)
ActivityPub
.
reject
(%{
to:
[
follower
.
ap_id
],
actor:
followed
,
object:
data
,
local:
true
})
{
:user_locked
,
true
}
->
:noop
end
{
:ok
,
activity
}
else
_e
->
:error
_e
->
:error
end
end
Loading