Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
		
			
				
	
	
		
			62 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			62 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| module AccountAssociations
 | |
|   extend ActiveSupport::Concern
 | |
| 
 | |
|   included do
 | |
|     # Local users
 | |
|     has_one :user, inverse_of: :account, dependent: :destroy
 | |
| 
 | |
|     # 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 :bookmarks, inverse_of: :account, dependent: :destroy
 | |
|     has_many :mentions, inverse_of: :account, dependent: :destroy
 | |
|     has_many :notifications, inverse_of: :account, dependent: :destroy
 | |
|     has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
 | |
|     has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
 | |
| 
 | |
|     # Pinned statuses
 | |
|     has_many :status_pins, inverse_of: :account, dependent: :destroy
 | |
|     has_many :pinned_statuses, -> { reorder('status_pins.created_at DESC') }, through: :status_pins, class_name: 'Status', source: :status
 | |
| 
 | |
|     # Endorsements
 | |
|     has_many :account_pins, inverse_of: :account, dependent: :destroy
 | |
|     has_many :endorsed_accounts, through: :account_pins, class_name: 'Account', source: :target_account
 | |
| 
 | |
|     # Media
 | |
|     has_many :media_attachments, dependent: :destroy
 | |
| 
 | |
|     # PuSH subscriptions
 | |
|     has_many :subscriptions, dependent: :destroy
 | |
| 
 | |
|     # Report relationships
 | |
|     has_many :reports, dependent: :destroy, inverse_of: :account
 | |
|     has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
 | |
| 
 | |
|     has_many :report_notes, dependent: :destroy
 | |
|     has_many :custom_filters, inverse_of: :account, dependent: :destroy
 | |
| 
 | |
|     # Moderation notes
 | |
|     has_many :account_moderation_notes, dependent: :destroy, inverse_of: :account
 | |
|     has_many :targeted_moderation_notes, class_name: 'AccountModerationNote', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
 | |
|     has_many :account_warnings, dependent: :destroy, inverse_of: :account
 | |
|     has_many :targeted_account_warnings, class_name: 'AccountWarning', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
 | |
| 
 | |
|     # Lists (that the account is on, not owned by the account)
 | |
|     has_many :list_accounts, inverse_of: :account, dependent: :destroy
 | |
|     has_many :lists, through: :list_accounts
 | |
| 
 | |
|     # Lists (owned by the account)
 | |
|     has_many :owned_lists, class_name: 'List', dependent: :destroy, inverse_of: :account
 | |
| 
 | |
|     # Account migrations
 | |
|     belongs_to :moved_to_account, class_name: 'Account', optional: true
 | |
| 
 | |
|     # Hashtags
 | |
|     has_and_belongs_to_many :tags
 | |
|     has_many :featured_tags, -> { includes(:tag) }, dependent: :destroy, inverse_of: :account
 | |
|   end
 | |
| end
 |