Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)
				
					
				
			This commit is contained in:
		@@ -11,7 +11,6 @@ module AccountAssociations
 | 
			
		||||
    has_many :identity_proofs, class_name: 'AccountIdentityProof', dependent: :destroy, inverse_of: :account
 | 
			
		||||
 | 
			
		||||
    # Timelines
 | 
			
		||||
    has_many :stream_entries, inverse_of: :account, dependent: :destroy
 | 
			
		||||
    has_many :statuses, inverse_of: :account, dependent: :destroy
 | 
			
		||||
    has_many :favourites, inverse_of: :account, dependent: :destroy
 | 
			
		||||
    has_many :mentions, inverse_of: :account, dependent: :destroy
 | 
			
		||||
 
 | 
			
		||||
@@ -1,43 +0,0 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
module Streamable
 | 
			
		||||
  extend ActiveSupport::Concern
 | 
			
		||||
 | 
			
		||||
  included do
 | 
			
		||||
    has_one :stream_entry, as: :activity
 | 
			
		||||
 | 
			
		||||
    after_create do
 | 
			
		||||
      account.stream_entries.create!(activity: self, hidden: hidden?) if needs_stream_entry?
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def title
 | 
			
		||||
    super
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def content
 | 
			
		||||
    title
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def target
 | 
			
		||||
    super
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def object_type
 | 
			
		||||
    :activity
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def thread
 | 
			
		||||
    super
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def hidden?
 | 
			
		||||
    false
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  private
 | 
			
		||||
 | 
			
		||||
  def needs_stream_entry?
 | 
			
		||||
    account.local?
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Reference in New Issue
	
	Block a user