keyword muting and local only tooting WIP

master
beatrix-bitrot 8 years ago
parent c0a665865e
commit 93fc8aa14c
  1. 6
      app/lib/feed_manager.rb
  2. 5
      app/services/post_status_service.rb
  3. 5
      app/services/reblog_service.rb

@ -95,6 +95,12 @@ class FeedManager
end end
def filter_from_home?(status, receiver_id) def filter_from_home?(status, receiver_id)
# extremely violent filtering code BEGIN
#filter_string = 'e'
#reggie = Regexp.new(filter_string)
#return true if reggie === status.content || reggie === status.spoiler_text
# extremely violent filtering code END
return true if status.reply? && status.in_reply_to_id.nil? return true if status.reply? && status.in_reply_to_id.nil?
check_for_mutes = [status.account_id] check_for_mutes = [status.account_id]

@ -36,7 +36,10 @@ class PostStatusService < BaseService
LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
DistributionWorker.perform_async(status.id) DistributionWorker.perform_async(status.id)
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
unless /👁$/.match?(status.content)
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
end
if options[:idempotency].present? if options[:idempotency].present?
redis.setex("idempotency:status:#{account.id}:#{options[:idempotency]}", 3_600, status.id) redis.setex("idempotency:status:#{account.id}:#{options[:idempotency]}", 3_600, status.id)

@ -20,7 +20,10 @@ class ReblogService < BaseService
reblog = account.statuses.create!(reblog: reblogged_status, text: '') reblog = account.statuses.create!(reblog: reblogged_status, text: '')
DistributionWorker.perform_async(reblog.id) DistributionWorker.perform_async(reblog.id)
Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id) unless /👁$/.match?(reblogged_status.content)
Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
end
if reblogged_status.local? if reblogged_status.local?
NotifyService.new.call(reblog.reblog.account, reblog) NotifyService.new.call(reblog.reblog.account, reblog)

Loading…
Cancel
Save