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
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
Alex Gleason
pleroma
Commits
09478c9c
Commit
09478c9c
authored
4 years ago
by
Haelwenn
Browse files
Options
Downloads
Plain Diff
Merge branch '1258-anti-link-spam-exemption' into 'develop'
AntiSpamLinkPolicy: Exempt local users. Closes
#1258
See merge request
!2686
parents
6db9f7cd
04abee78
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
+4
-1
4 additions, 1 deletion
lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
test/web/activity_pub/mrf/anti_link_spam_policy_test.exs
+14
-2
14 additions, 2 deletions
test/web/activity_pub/mrf/anti_link_spam_policy_test.exs
with
18 additions
and
3 deletions
lib/pleroma/web/activity_pub/mrf/anti_link_spam_policy.ex
+
4
−
1
View file @
09478c9c
...
...
@@ -27,11 +27,14 @@ defp contains_links?(_), do: false
@impl
true
def
filter
(%{
"type"
=>
"Create"
,
"actor"
=>
actor
,
"object"
=>
object
}
=
message
)
do
with
{
:ok
,
%
User
{}
=
u
}
<-
User
.
get_or_fetch_by_ap_id
(
actor
),
with
{
:ok
,
%
User
{
local:
false
}
=
u
}
<-
User
.
get_or_fetch_by_ap_id
(
actor
),
{
:contains_links
,
true
}
<-
{
:contains_links
,
contains_links?
(
object
)},
{
:old_user
,
true
}
<-
{
:old_user
,
old_user?
(
u
)}
do
{
:ok
,
message
}
else
{
:ok
,
%
User
{
local:
true
}}
->
{
:ok
,
message
}
{
:contains_links
,
false
}
->
{
:ok
,
message
}
...
...
This diff is collapsed.
Click to expand it.
test/web/activity_pub/mrf/anti_link_spam_policy_test.exs
+
14
−
2
View file @
09478c9c
...
...
@@ -33,7 +33,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiLinkSpamPolicyTest do
describe
"with new user"
do
test
"it allows posts without links"
do
user
=
insert
(
:user
)
user
=
insert
(
:user
,
local:
false
)
assert
user
.
note_count
==
0
...
...
@@ -45,7 +45,7 @@ test "it allows posts without links" do
end
test
"it disallows posts with links"
do
user
=
insert
(
:user
)
user
=
insert
(
:user
,
local:
false
)
assert
user
.
note_count
==
0
...
...
@@ -55,6 +55,18 @@ test "it disallows posts with links" do
{
:reject
,
_
}
=
AntiLinkSpamPolicy
.
filter
(
message
)
end
test
"it allows posts with links for local users"
do
user
=
insert
(
:user
)
assert
user
.
note_count
==
0
message
=
@linkful_message
|>
Map
.
put
(
"actor"
,
user
.
ap_id
)
{
:ok
,
_message
}
=
AntiLinkSpamPolicy
.
filter
(
message
)
end
end
describe
"with old user"
do
...
...
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