Merge branch 'upstream/mrf-followbot' into 'develop'
Upstream/mrf followbot See merge request pleroma/pleroma!3060
This commit is contained in:
commit
4c16f5d2ca
@ -75,6 +75,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||||||
- Ability to define custom HTTP headers per each frontend
|
- Ability to define custom HTTP headers per each frontend
|
||||||
- MRF (`NoEmptyPolicy`): New MRF Policy which will deny empty statuses or statuses of only mentions from being created by local users
|
- MRF (`NoEmptyPolicy`): New MRF Policy which will deny empty statuses or statuses of only mentions from being created by local users
|
||||||
- New users will receive a simple email confirming their registration if no other emails will be dispatched. (e.g., Welcome, Confirmation, or Approval Required)
|
- New users will receive a simple email confirming their registration if no other emails will be dispatched. (e.g., Welcome, Confirmation, or Approval Required)
|
||||||
|
- MRF (`FollowBotPolicy`): New MRF Policy which makes a designated local Bot account attempt to follow all users in public Notes received by your instance. Users who require approving follower requests or have #nobot in their profile are excluded.
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary>API Changes</summary>
|
<summary>API Changes</summary>
|
||||||
|
@ -409,6 +409,8 @@
|
|||||||
threshold: 604_800,
|
threshold: 604_800,
|
||||||
actions: [:delist, :strip_followers]
|
actions: [:delist, :strip_followers]
|
||||||
|
|
||||||
|
config :pleroma, :mrf_follow_bot, follower_nickname: nil
|
||||||
|
|
||||||
config :pleroma, :rich_media,
|
config :pleroma, :rich_media,
|
||||||
enabled: true,
|
enabled: true,
|
||||||
ignore_hosts: [],
|
ignore_hosts: [],
|
||||||
|
@ -2942,6 +2942,23 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
%{
|
||||||
|
group: :pleroma,
|
||||||
|
key: :mrf_follow_bot,
|
||||||
|
tab: :mrf,
|
||||||
|
related_policy: "Pleroma.Web.ActivityPub.MRF.FollowBotPolicy",
|
||||||
|
label: "MRF FollowBot Policy",
|
||||||
|
type: :group,
|
||||||
|
description: "Automatically follows newly discovered accounts.",
|
||||||
|
children: [
|
||||||
|
%{
|
||||||
|
key: :follower_nickname,
|
||||||
|
type: :string,
|
||||||
|
description: "The name of the bot account to use for following newly discovered users.",
|
||||||
|
suggestions: ["followbot"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
%{
|
%{
|
||||||
group: :pleroma,
|
group: :pleroma,
|
||||||
key: :modules,
|
key: :modules,
|
||||||
|
@ -124,6 +124,7 @@ To add configuration to your config file, you can copy it from the base config.
|
|||||||
* `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
|
* `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
|
||||||
* `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
|
* `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.Workers.PurgeExpiredActivity` to be enabled for processing the scheduled delections.
|
||||||
* `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
|
* `Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy`: Makes all bot posts to disappear from public timelines.
|
||||||
|
* `Pleroma.Web.ActivityPub.MRF.FollowBotPolicy`: Automatically follows newly discovered users from the specified bot account. Local accounts, locked accounts, and users with "#nobot" in their bio are respected and excluded from being followed.
|
||||||
* `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
|
* `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
|
||||||
* `transparency_exclusions`: Exclude specific instance names from MRF transparency. The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
|
* `transparency_exclusions`: Exclude specific instance names from MRF transparency. The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
|
||||||
|
|
||||||
@ -220,6 +221,11 @@ Notes:
|
|||||||
- The hashtags in the configuration do not have a leading `#`.
|
- The hashtags in the configuration do not have a leading `#`.
|
||||||
- This MRF Policy is always enabled, if you want to disable it you have to set empty lists
|
- This MRF Policy is always enabled, if you want to disable it you have to set empty lists
|
||||||
|
|
||||||
|
#### :mrf_follow_bot
|
||||||
|
|
||||||
|
* `follower_nickname`: The name of the bot account to use for following newly discovered users. Using `followbot` or similar is strongly suggested.
|
||||||
|
|
||||||
|
|
||||||
### :activitypub
|
### :activitypub
|
||||||
* `unfollow_blocked`: Whether blocks result in people getting unfollowed
|
* `unfollow_blocked`: Whether blocks result in people getting unfollowed
|
||||||
* `outgoing_blocks`: Whether to federate blocks to other instances
|
* `outgoing_blocks`: Whether to federate blocks to other instances
|
||||||
|
59
lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
Normal file
59
lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicy do
|
||||||
|
@behaviour Pleroma.Web.ActivityPub.MRF
|
||||||
|
alias Pleroma.Config
|
||||||
|
alias Pleroma.User
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def filter(message) do
|
||||||
|
with follower_nickname <- Config.get([:mrf_follow_bot, :follower_nickname]),
|
||||||
|
%User{actor_type: "Service"} = follower <-
|
||||||
|
User.get_cached_by_nickname(follower_nickname),
|
||||||
|
%{"type" => "Create", "object" => %{"type" => "Note"}} <- message do
|
||||||
|
try_follow(follower, message)
|
||||||
|
else
|
||||||
|
nil ->
|
||||||
|
Logger.warn(
|
||||||
|
"#{__MODULE__} skipped because of missing `:mrf_follow_bot, :follower_nickname` configuration, the :follower_nickname
|
||||||
|
account does not exist, or the account is not correctly configured as a bot."
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, message}
|
||||||
|
|
||||||
|
_ ->
|
||||||
|
{:ok, message}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp try_follow(follower, message) do
|
||||||
|
to = Map.get(message, "to", [])
|
||||||
|
cc = Map.get(message, "cc", [])
|
||||||
|
actor = [message["actor"]]
|
||||||
|
|
||||||
|
Enum.concat([to, cc, actor])
|
||||||
|
|> List.flatten()
|
||||||
|
|> Enum.uniq()
|
||||||
|
|> User.get_all_by_ap_id()
|
||||||
|
|> Enum.each(fn user ->
|
||||||
|
with false <- user.local,
|
||||||
|
false <- User.following?(follower, user),
|
||||||
|
false <- User.locked?(user),
|
||||||
|
false <- (user.bio || "") |> String.downcase() |> String.contains?("nobot") do
|
||||||
|
Logger.debug(
|
||||||
|
"#{__MODULE__}: Follow request from #{follower.nickname} to #{user.nickname}"
|
||||||
|
)
|
||||||
|
|
||||||
|
CommonAPI.follow(follower, user)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
{:ok, message}
|
||||||
|
end
|
||||||
|
|
||||||
|
@impl true
|
||||||
|
def describe do
|
||||||
|
{:ok, %{}}
|
||||||
|
end
|
||||||
|
end
|
126
test/pleroma/web/activity_pub/mrf/follow_bot_policy_test.exs
Normal file
126
test/pleroma/web/activity_pub/mrf/follow_bot_policy_test.exs
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.ActivityPub.MRF.FollowBotPolicyTest do
|
||||||
|
use Pleroma.DataCase, async: true
|
||||||
|
|
||||||
|
alias Pleroma.User
|
||||||
|
alias Pleroma.Web.ActivityPub.MRF.FollowBotPolicy
|
||||||
|
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
describe "FollowBotPolicy" do
|
||||||
|
test "follows remote users" do
|
||||||
|
bot = insert(:user, actor_type: "Service")
|
||||||
|
remote_user = insert(:user, local: false)
|
||||||
|
clear_config([:mrf_follow_bot, :follower_nickname], bot.nickname)
|
||||||
|
|
||||||
|
message = %{
|
||||||
|
"@context" => "https://www.w3.org/ns/activitystreams",
|
||||||
|
"to" => [remote_user.follower_address],
|
||||||
|
"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
|
||||||
|
"type" => "Create",
|
||||||
|
"object" => %{
|
||||||
|
"content" => "Test post",
|
||||||
|
"type" => "Note",
|
||||||
|
"attributedTo" => remote_user.ap_id,
|
||||||
|
"inReplyTo" => nil
|
||||||
|
},
|
||||||
|
"actor" => remote_user.ap_id
|
||||||
|
}
|
||||||
|
|
||||||
|
refute User.following?(bot, remote_user)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(remote_user) |> length == 0
|
||||||
|
|
||||||
|
FollowBotPolicy.filter(message)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(remote_user) |> length == 1
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not follow users with #nobot in bio" do
|
||||||
|
bot = insert(:user, actor_type: "Service")
|
||||||
|
remote_user = insert(:user, %{local: false, bio: "go away bots! #nobot"})
|
||||||
|
clear_config([:mrf_follow_bot, :follower_nickname], bot.nickname)
|
||||||
|
|
||||||
|
message = %{
|
||||||
|
"@context" => "https://www.w3.org/ns/activitystreams",
|
||||||
|
"to" => [remote_user.follower_address],
|
||||||
|
"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
|
||||||
|
"type" => "Create",
|
||||||
|
"object" => %{
|
||||||
|
"content" => "I don't like follow bots",
|
||||||
|
"type" => "Note",
|
||||||
|
"attributedTo" => remote_user.ap_id,
|
||||||
|
"inReplyTo" => nil
|
||||||
|
},
|
||||||
|
"actor" => remote_user.ap_id
|
||||||
|
}
|
||||||
|
|
||||||
|
refute User.following?(bot, remote_user)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(remote_user) |> length == 0
|
||||||
|
|
||||||
|
FollowBotPolicy.filter(message)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(remote_user) |> length == 0
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not follow local users" do
|
||||||
|
bot = insert(:user, actor_type: "Service")
|
||||||
|
local_user = insert(:user, local: true)
|
||||||
|
clear_config([:mrf_follow_bot, :follower_nickname], bot.nickname)
|
||||||
|
|
||||||
|
message = %{
|
||||||
|
"@context" => "https://www.w3.org/ns/activitystreams",
|
||||||
|
"to" => [local_user.follower_address],
|
||||||
|
"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
|
||||||
|
"type" => "Create",
|
||||||
|
"object" => %{
|
||||||
|
"content" => "Hi I'm a local user",
|
||||||
|
"type" => "Note",
|
||||||
|
"attributedTo" => local_user.ap_id,
|
||||||
|
"inReplyTo" => nil
|
||||||
|
},
|
||||||
|
"actor" => local_user.ap_id
|
||||||
|
}
|
||||||
|
|
||||||
|
refute User.following?(bot, local_user)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(local_user) |> length == 0
|
||||||
|
|
||||||
|
FollowBotPolicy.filter(message)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(local_user) |> length == 0
|
||||||
|
end
|
||||||
|
|
||||||
|
test "does not follow users requiring follower approval" do
|
||||||
|
bot = insert(:user, actor_type: "Service")
|
||||||
|
remote_user = insert(:user, %{local: false, is_locked: true})
|
||||||
|
clear_config([:mrf_follow_bot, :follower_nickname], bot.nickname)
|
||||||
|
|
||||||
|
message = %{
|
||||||
|
"@context" => "https://www.w3.org/ns/activitystreams",
|
||||||
|
"to" => [remote_user.follower_address],
|
||||||
|
"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
|
||||||
|
"type" => "Create",
|
||||||
|
"object" => %{
|
||||||
|
"content" => "I don't like randos following me",
|
||||||
|
"type" => "Note",
|
||||||
|
"attributedTo" => remote_user.ap_id,
|
||||||
|
"inReplyTo" => nil
|
||||||
|
},
|
||||||
|
"actor" => remote_user.ap_id
|
||||||
|
}
|
||||||
|
|
||||||
|
refute User.following?(bot, remote_user)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(remote_user) |> length == 0
|
||||||
|
|
||||||
|
FollowBotPolicy.filter(message)
|
||||||
|
|
||||||
|
assert User.get_follow_requests(remote_user) |> length == 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user