Merge remote-tracking branch 'origin/main' into #92

backend/app/models/nico_tag_relation.rb

@@ -6,6 +6,7 @@ class NicoTagRelation < ApplicationRecord
   validates :tag_id, presence: true
 
   validate :nico_tag_must_be_nico
+  validate :tag_mustnt_be_nico
 
   private
 

backend/app/models/post.rb

@@ -1,11 +1,13 @@
-require 'mini_magick'
-
-
 class Post < ApplicationRecord
+  require 'mini_magick'
+
   belongs_to :parent, class_name: 'Post', optional: true, foreign_key: 'parent_id'
   belongs_to :uploaded_user, class_name: 'User', optional: true
-  has_many :post_tags, dependent: :destroy
-  has_many :tags, through: :post_tags
+
+  has_many :post_tags, dependent: :destroy, inverse_of: :post
+  has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :post
+  has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
+  has_many :tags, through: :active_post_tags
   has_many :user_post_views, dependent: :destroy
   has_many :post_similarities_as_post,
            class_name: 'PostSimilarity',
@@ -15,6 +17,8 @@ class Post < ApplicationRecord
            foreign_key: :target_post_id
   has_one_attached :thumbnail
 
+  validate :validate_original_created_range
+
   def as_json options = { }
     super(options).merge({ thumbnail: thumbnail.attached? ?
                                       Rails.application.routes.url_helpers.rails_blob_url(
@@ -49,4 +53,20 @@ class Post < ApplicationRecord
                      filename:      'resized_thumbnail.jpg',
                      content_type:  'image/jpeg')
   end
+
+  private
+
+  def validate_original_created_range
+    f = original_created_from
+    b = original_created_before
+    return if f.blank? || b.blank?
+
+    f = Time.zone.parse(f) if String === f
+    b = Time.zone.parse(b) if String === b
+    return if !(f) || !(b)
+
+    if f >= b
+      errors.add :original_created_before, 'オリジナルの作成日時の順番がをかしぃです．'
+    end
+  end
 end

backend/app/models/post_tag.rb

@@ -1,7 +1,25 @@
 class PostTag < ApplicationRecord
+  include Discard::Model
+
   belongs_to :post
   belongs_to :tag, counter_cache: :post_count
+  belongs_to :created_user, class_name: 'User', optional: true
+  belongs_to :deleted_user, class_name: 'User', optional: true
 
   validates :post_id, presence: true
   validates :tag_id, presence: true
+  validates :post_id, uniqueness: {
+      scope: :tag_id,
+      conditions: -> { where(discarded_at: nil) } }
+
+  def discard_by! deleted_user
+    return self if discarded?
+
+    transaction do
+      update!(discarded_at: Time.current, deleted_user:)
+      Tag.where(id: tag_id).update_all('post_count = GREATEST(post_count - 1, 0)')
+    end
+
+    self
+  end
 end

backend/app/models/tag.rb

@@ -1,6 +1,8 @@
 class Tag < ApplicationRecord
-  has_many :post_tags, dependent: :destroy
-  has_many :posts, through: :post_tags
+  has_many :post_tags, dependent: :delete_all, inverse_of: :tag
+  has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
+  has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
+  has_many :posts, through: :active_post_tags
   has_many :tag_aliases, dependent: :destroy
 
   has_many :nico_tag_relations, foreign_key: :nico_tag_id, dependent: :destroy
@@ -11,6 +13,14 @@ class Tag < ApplicationRecord
                                          dependent: :destroy
   has_many :linked_nico_tags, through: :reversed_nico_tag_relations, source: :nico_tag
 
+  has_many :tag_implications, foreign_key: :parent_tag_id, dependent: :destroy
+  has_many :children, through: :tag_implications, source: :tag
+
+  has_many :reversed_tag_implications, class_name: 'TagImplication',
+                                       foreign_key: :tag_id,
+                                       dependent: :destroy
+  has_many :parents, through: :reversed_tag_implications, source: :parent_tag
+
   enum :category, { deerjikist:  'deerjikist',
                     meme:        'meme',
                     character:   'character',
@@ -35,13 +45,13 @@ class Tag < ApplicationRecord
       'meta:' => 'meta' }.freeze
 
   def self.tagme
-    @tagme ||= Tag.find_or_initialize_by(name: 'タグ希望') do |tag|
+    @tagme ||= Tag.find_or_create_by!(name: 'タグ希望') do |tag|
       tag.category = 'meta'
     end
   end
 
   def self.bot
-    @bot ||= Tag.find_or_initialize_by(name: 'bot操作') do |tag|
+    @bot ||= Tag.find_or_create_by!(name: 'bot操作') do |tag|
       tag.category = 'meta'
     end
   end
@@ -57,10 +67,33 @@ class Tag < ApplicationRecord
         end
       end
     end
-    tags << Tag.tagme if with_tagme && tags.size < 20 && tags.none?(Tag.tagme)
+    tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
     tags.uniq
   end
 
+  def self.expand_parent_tags tags
+    return [] if tags.blank?
+
+    seen = Set.new
+    result = []
+    stack = tags.compact.dup
+
+    until stack.empty?
+      tag = stack.pop
+      next unless tag
+
+      tag.parents.each do |parent|
+        next if seen.include?(parent.id)
+
+        seen << parent.id
+        result << parent
+        stack << parent
+      end
+    end
+
+    (result + tags).uniq { |t| t.id }
+  end
+
   private
 
   def nico_tag_name_must_start_with_nico

backend/app/models/tag_implication.rb

@@ -0,0 +1,17 @@
+class TagImplication < ApplicationRecord
+  belongs_to :tag, class_name: 'Tag'
+  belongs_to :parent_tag, class_name: 'Tag'
+
+  validates :tag_id, presence: true, uniqueness: { scope: :parent_tag_id }
+  validates :parent_tag_id, presence: true
+
+  validate :parent_tag_mustnt_be_itself
+
+  private
+
+  def parent_tag_mustnt_be_itself
+    if parent_tag == tag
+      errors.add :parent_tag_id, '親タグは子タグと同一であってはなりません．'
+    end
+  end
+end

backend/app/models/user.rb

@@ -8,7 +8,6 @@ class User < ApplicationRecord
 
   has_many :posts
   has_many :settings
-  has_many :ip_addresses
   has_many :user_ips, dependent: :destroy
   has_many :ip_addresses, through: :user_ips
   has_many :user_post_views, dependent: :destroy