Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
noyuno
pleroma
Commits
6160a1b3
Commit
6160a1b3
authored
Jun 24, 2018
by
Vivian Lim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mix format
parent
1299bccc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
+1
-1
test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
+1
-0
No files found.
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View file @
6160a1b3
...
...
@@ -6,7 +6,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
@accept
Keyword
.
get
(
@mrf_policy
,
:accept
)
defp
check_accept
(
actor_info
,
object
)
do
if
length
(
@accept
)
>
0
and
not
actor_info
.
host
in
@accept
do
if
length
(
@accept
)
>
0
and
not
(
actor_info
.
host
in
@accept
)
do
{
:reject
,
nil
}
else
{
:ok
,
object
}
...
...
test/web/twitter_api/twitter_api_controller_test.exs
View file @
6160a1b3
...
...
@@ -504,6 +504,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
conn
|>
with_credentials
(
current_user
.
nickname
,
"test"
)
|>
get
(
"/api/qvitter/mutes.json"
)
current_user
=
Repo
.
get
(
User
,
current_user
.
id
)
assert
[]
=
json_response
(
conn
,
200
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment