gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-19 13:09:14 +09:00
commit 1f388900a8
14 changed files with 341 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/custom_emoji.rb
View file

@ -33,7 +33,7 @@ class CustomEmoji < ApplicationRecord
SCAN_RE = /:(#{SHORTCODE_RE_FRAGMENT}):/x
SHORTCODE_ONLY_RE = /\A#{SHORTCODE_RE_FRAGMENT}\z/
IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze
IMAGE_MIME_TYPES = %w(image/png image/gif image/webp image/jpeg).freeze
belongs_to :category, class_name: 'CustomEmojiCategory', optional: true
has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode

2
app/models/emoji_reaction.rb
View file

@ -18,7 +18,7 @@ class EmojiReaction < ApplicationRecord
include Paginable
EMOJI_REACTION_LIMIT = 32767
EMOJI_REACTION_PER_ACCOUNT_LIMIT = 5
EMOJI_REACTION_PER_ACCOUNT_LIMIT = 3
update_index('statuses', :status)