mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
34 lines
899 B
Ruby
34 lines
899 B
Ruby
# frozen_string_literal: true
|
|
# == Schema Information
|
|
#
|
|
# Table name: mutes
|
|
#
|
|
# id :bigint(8) not null, primary key
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# hide_notifications :boolean default(TRUE), not null
|
|
# account_id :bigint(8) not null
|
|
# target_account_id :bigint(8) not null
|
|
# hide_notifications :boolean default(TRUE), not null
|
|
# expires_at :datetime
|
|
#
|
|
|
|
class Mute < ApplicationRecord
|
|
include Paginable
|
|
include RelationshipCacheable
|
|
include Expireable
|
|
|
|
belongs_to :account
|
|
belongs_to :target_account, class_name: 'Account'
|
|
|
|
validates :account_id, uniqueness: { scope: :target_account_id }
|
|
|
|
after_commit :remove_blocking_cache
|
|
|
|
private
|
|
|
|
def remove_blocking_cache
|
|
Rails.cache.delete("exclude_account_ids_for:#{account_id}")
|
|
end
|
|
end
|