Skip to content
Snippets Groups Projects
Commit 05b13c38 authored by Eugen Rochko's avatar Eugen Rochko
Browse files

Re-enable Webfinger for locked accounts but don't handle "follow" events

coming in via Salmon.

Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
parent f729cfc8
No related branches found
No related tags found
No related merge requests found
......@@ -13,7 +13,7 @@ class XrdController < ApplicationController
end
def webfinger
@account = Account.where(locked: false).find_local!(username_from_resource)
@account = Account.find_local!(username_from_resource)
@canonical_account_uri = "acct:#{@account.username}@#{Rails.configuration.x.local_domain}"
@magic_key = pem_to_magic_key(@account.keypair.public_key)
......
......@@ -30,7 +30,7 @@ class ProcessInteractionService < BaseService
case verb(xml)
when :follow
follow!(account, target_account)
follow!(account, target_account) unless target_account.locked?
when :unfollow
unfollow!(account, target_account)
when :favorite
......
......@@ -26,7 +26,7 @@ en:
reblog: Send e-mail when someone reblogs your status
hints:
defaults:
locked: Requires you to approve followers, defaults post privacy to followers-only and disables federation
locked: Requires you to approve followers and defaults post privacy to followers-only
'no': 'No'
required:
mark: "*"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment