mix format
This commit is contained in:
parent
bcc8b1e296
commit
573134ac6c
5 changed files with 16 additions and 5 deletions
|
|
@ -24,7 +24,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.AntiFollowbotPolicy do
|
|||
defp score_displayname("fedibot"), do: 1.0
|
||||
defp score_displayname(_), do: 0.0
|
||||
|
||||
defp determine_if_followbot(%User{nickname: nickname, name: displayname, actor_type: actor_type}) do
|
||||
defp determine_if_followbot(%User{
|
||||
nickname: nickname,
|
||||
name: displayname,
|
||||
actor_type: actor_type
|
||||
}) do
|
||||
# nickname will be a binary string except when following a relay
|
||||
nick_score =
|
||||
if is_binary(nickname) do
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
|
|||
end
|
||||
|
||||
defp intersection(list1, list2) do
|
||||
list1 -- list1 -- list2
|
||||
list1 -- (list1 -- list2)
|
||||
end
|
||||
|
||||
defp check_followers_only(%{host: actor_host} = _actor_info, activity) do
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ defmodule Pleroma.Workers.MailerWorker do
|
|||
use Oban.Worker, queue: :background
|
||||
|
||||
@impl true
|
||||
def perform(%Job{args: %{"op" => "email", "encoded_email" => encoded_email, "config" => config}}) do
|
||||
def perform(%Job{
|
||||
args: %{"op" => "email", "encoded_email" => encoded_email, "config" => config}
|
||||
}) do
|
||||
encoded_email
|
||||
|> Base.decode64!()
|
||||
|> :erlang.binary_to_term()
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContentTest do
|
|||
|
||||
test "adds mentions to post content" do
|
||||
[lain, coolboymew, dielan, hakui, fence] = [
|
||||
insert(:user, ap_id: "https://lain.com/users/lain", nickname: "lain@lain.com", local: false),
|
||||
insert(:user,
|
||||
ap_id: "https://lain.com/users/lain",
|
||||
nickname: "lain@lain.com",
|
||||
local: false
|
||||
),
|
||||
insert(:user,
|
||||
ap_id: "https://shitposter.club/users/coolboymew",
|
||||
nickname: "coolboymew@shitposter.club",
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@ defmodule Pleroma.Web.OAuth.TokenControllerTest do
|
|||
|> hd()
|
||||
|> Map.keys()
|
||||
|
||||
assert Enum.sort(keys) == Enum.sort(["id", "app_name", "valid_until", "scopes", "is_current_token"])
|
||||
assert Enum.sort(keys) ==
|
||||
Enum.sort(["id", "app_name", "valid_until", "scopes", "is_current_token"])
|
||||
end
|
||||
|
||||
test "marks which token is being used for the request" do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue