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
c4038ede
Verified
Commit
c4038ede
authored
Jun 23, 2018
by
squidboi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mind-crushingly dumb syntax error
parent
f4990283
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
lib/pleroma/user.ex
lib/pleroma/user.ex
+4
-4
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub.ex
+3
-3
No files found.
lib/pleroma/user.ex
View file @
c4038ede
...
...
@@ -169,8 +169,8 @@ defmodule Pleroma.User do
end
def
maybe_direct_follow
(%
User
{}
=
follower
,
%
User
{
info:
info
}
=
followed
)
do
user_config
Application
.
get_env
(
:pleroma
,
:user
)
deny_follow_blocked
Keyword
.
get
(
user_config
,
:deny_follow_blocked
)
user_config
=
Application
.
get_env
(
:pleroma
,
:user
)
deny_follow_blocked
=
Keyword
.
get
(
user_config
,
:deny_follow_blocked
)
user_info
=
user_info
(
followed
)
...
...
@@ -210,8 +210,8 @@ defmodule Pleroma.User do
end
def
follow
(%
User
{}
=
follower
,
%
User
{
info:
info
}
=
followed
)
do
user_config
Application
.
get_env
(
:pleroma
,
:user
)
deny_follow_blocked
Keyword
.
get
(
user_config
,
:deny_follow_blocked
)
user_config
=
Application
.
get_env
(
:pleroma
,
:user
)
deny_follow_blocked
=
Keyword
.
get
(
user_config
,
:deny_follow_blocked
)
ap_followers
=
followed
.
follower_address
...
...
lib/pleroma/web/activity_pub/activity_pub.ex
View file @
c4038ede
...
...
@@ -243,9 +243,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
def
block
(
blocker
,
blocked
,
activity_id
\\
nil
,
local
\\
true
)
do
ap_config
Application
.
get_env
(
:pleroma
,
:activitypub
)
unfollow_blocked
Keyword
.
get
(
ap_config
,
:unfollow_blocked
)
outgoing_blocks
Keyword
.
get
(
ap_config
,
:outgoing_blocks
)
ap_config
=
Application
.
get_env
(
:pleroma
,
:activitypub
)
unfollow_blocked
=
Keyword
.
get
(
ap_config
,
:unfollow_blocked
)
outgoing_blocks
=
Keyword
.
get
(
ap_config
,
:outgoing_blocks
)
with
true
<-
unfollow_blocked
do
follow_activity
=
fetch_latest_follow
(
blocker
,
blocked
)
...
...
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