fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 14:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
coming in via Salmon.

Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
This commit is contained in:
Eugen Rochko 2016-12-22 23:17:57 +01:00
parent f729cfc881
commit 05b13c38b5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/xrd_controller.rb
View file

@ -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)

2
app/services/process_interaction_service.rb
View file

@ -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

2
config/locales/simple_form.en.yml
View file

@ -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: "*"