hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
signup-info-prompt
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 end
def webfinger 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}" @canonical_account_uri = "acct:#{@account.username}@#{Rails.configuration.x.local_domain}"
@magic_key = pem_to_magic_key(@account.keypair.public_key) @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) case verb(xml)
when :follow when :follow
follow!(account, target_account) follow!(account, target_account) unless target_account.locked?
when :unfollow when :unfollow
unfollow!(account, target_account) unfollow!(account, target_account)
when :favorite 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 reblog: Send e-mail when someone reblogs your status
hints: hints:
defaults: 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' 'no': 'No'
required: required:
mark: "*" mark: "*"