mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 12:05:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2, add rake task for PuSH-unsubscribing from remote users who have no

Browse Source 
local followers. Remote users' usernames SHOULD be case-sensitive
This commit is contained in:
Eugen Rochko 2016-03-17 11:59:18 +01:00
parent af7ae348d7
commit 323474c97e
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/api/accounts_controller.rb
View File

@ -19,12 +19,17 @@ class Api::AccountsController < ApiController
end
def follow
@follow = current_user.account.follow!(@account)
if @account.local?
@follow = current_user.account.follow!(@account)
else
@follow = FollowService.new.(current_user.account, @account.acct)
end
render action: :show
end
def unfollow
@unfollow = current_user.account.unfollow!(@account)
@unfollow = UnfollowService.new.(current_user.account, @account)
render action: :show
end

3
app/models/account.rb
View File

@ -1,7 +1,8 @@
class Account < ActiveRecord::Base
# Local users
has_one :user, inverse_of: :account
validates :username, uniqueness: { scope: :domain, case_sensitive: false }
validates :username, uniqueness: { scope: :domain, case_sensitive: false }, if: 'local?'
validates :username, uniqueness: { scope: :domain, case_sensitive: true }, unless: 'local?'
# Avatar upload
attr_reader :avatar_remote_url

13
lib/tasks/subscriptions.rake Normal file
View File

@ -0,0 +1,13 @@
namespace :subscriptions do
desc "For all remote accounts that have no local followers, unsubscribe from PuSH"
task clear: :environment do
accounts = Account.where('(select count(f.id) from follows as f where f.target_account_id = accounts.id) = 0').where.not(domain: nil)
accounts.each do |a|
a.subscription(api_subscription_url(a.id)).unsubscribe
a.update!(verify_token: '', secret: '')
end
end
end