Add API data to show/index views

app/models/application_record.rb

@@ -280,6 +280,10 @@ class ApplicationRecord < ActiveRecord::Base
       self.class.api_attributes
     end
 
+    def html_data_attributes
+      []
+    end
+
     def serializable_hash(options = {})
       options ||= {}
       options[:only] ||= []

app/models/artist.rb

@@ -517,6 +517,12 @@ class Artist < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id, [:wiki_page, :id]]
+    end
+  end
+
   include UrlMethods
   include NameMethods
   include VersionMethods
@@ -525,6 +531,7 @@ class Artist < ApplicationRecord
   include TagMethods
   include BanMethods
   extend SearchMethods
+  include ApiMethods
 
   def status
     if is_banned? && is_active?

app/models/artist_commentary.rb

@@ -139,6 +139,13 @@ class ArtistCommentary < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:post_id]
+    end
+  end
+
   extend SearchMethods
   include VersionMethods
+  include ApiMethods
 end

app/models/artist_commentary_version.rb

@@ -7,4 +7,12 @@ class ArtistCommentaryVersion < ApplicationRecord
     q = q.search_attributes(params, :post, :updater, :original_title, :original_description, :translated_title, :translated_description)
     q.apply_default_order(params)
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :updater_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/artist_version.rb

@@ -23,7 +23,14 @@ class ArtistVersion < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:artist_id, :updater_id]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def previous
     ArtistVersion.where("artist_id = ? and created_at < ?", artist_id, created_at).order("created_at desc").first

app/models/ban.rb

@@ -44,6 +44,14 @@ class Ban < ApplicationRecord
     q
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:user_id, :banner_id, :expired?]
+    end
+  end
+
+  include ApiMethods
+
   def self.prune!
     expired.includes(:user).find_each do |ban|
       ban.user.unban! if ban.user.ban_expired?

app/models/bulk_update_request.rb

@@ -135,9 +135,16 @@ class BulkUpdateRequest < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:user_id, :approver_id, :forum_topic_id, :forum_post_id]
+    end
+  end
+
   extend SearchMethods
   include ApprovalMethods
   include ValidationMethods
+  include ApiMethods
 
   concerning :EmbeddedText do
     class_methods do

app/models/comment_vote.rb

@@ -51,4 +51,12 @@ class CommentVote < ApplicationRecord
   def initialize_user
     self.user_id = CurrentUser.user.id
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:comment_id, :user_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/dmail.rb

@@ -146,9 +146,16 @@ class Dmail < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:owner_id, :from_id, :to_id]
+    end
+  end
+
   include AddressMethods
   include FactoryMethods
   extend SearchMethods
+  include ApiMethods
 
   def validate_sender_is_not_banned
     if from.try(:is_banned?)

app/models/favorite_group.rb

@@ -70,7 +70,14 @@ class FavoriteGroup < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def self.name_to_id(name)
     if name =~ /^\d+$/

app/models/forum_post.rb

@@ -73,7 +73,14 @@ class ForumPost < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:topic_id, :creator_id, :updater_id, :is_deleted?, [:topic, :is_deleted?]]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def self.new_reply(params)
     if params[:topic_id]

app/models/forum_post_vote.rb

@@ -53,4 +53,12 @@ class ForumPostVote < ApplicationRecord
       raise
     end
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:forum_post_id, :creator_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/forum_topic.rb

@@ -131,10 +131,17 @@ class ForumTopic < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id, :updater_id, :category_id]
+    end
+  end
+
   extend SearchMethods
   include CategoryMethods
   include VisitMethods
   include SubscriptionMethods
+  include ApiMethods
 
   def editable_by?(user)
     (creator_id == user.id || user.is_moderator?) && visible?(user)

app/models/ip_address.rb

@@ -42,4 +42,12 @@ class IpAddress < ApplicationRecord
   def readonly?
     true
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:user_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/ip_ban.rb

@@ -42,4 +42,12 @@ class IpBan < ApplicationRecord
     str += "/" + ip_addr.prefix.to_s if has_subnet?
     str
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/mod_action.rb

@@ -83,4 +83,12 @@ class ModAction < ApplicationRecord
   def initialize_creator
     self.creator_id = CurrentUser.id
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:category_id, :creator_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/news_update.rb

@@ -2,4 +2,12 @@ class NewsUpdate < ApplicationRecord
   belongs_to_creator
   belongs_to_updater
   scope :recent, -> {where("created_at >= ?", 2.weeks.ago).order("created_at desc").limit(5)}
+
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id, :updater_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/note.rb

@@ -157,4 +157,12 @@ class Note < ApplicationRecord
       end
     end
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :creator_id, :version]
+    end
+  end
+
+  include ApiMethods
 end

app/models/note_version.rb

@@ -15,4 +15,12 @@ class NoteVersion < ApplicationRecord
   def previous
     NoteVersion.where("note_id = ? and updated_at < ?", note_id, updated_at).order("updated_at desc").first
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:note_id, :post_id, :updater_id, :version]
+    end
+  end
+
+  include ApiMethods
 end

app/models/pool.rb

@@ -95,7 +95,14 @@ class Pool < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def self.name_to_id(name)
     if name =~ /^\d+$/

app/models/pool_archive.rb

@@ -33,7 +33,14 @@ class PoolArchive < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:pool_id, :updater_id, :version]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def self.sqs_service
     SqsService.new(Danbooru.config.aws_sqs_archives_url)

app/models/post.rb

@@ -1481,6 +1481,10 @@ class Post < ApplicationRecord
       hash
     end
 
+    def html_data_attributes
+      [:uploader_id, :approver_id]
+    end
+
     def status
       if is_pending?
         "pending"

app/models/post_appeal.rb

@@ -36,7 +36,14 @@ class PostAppeal < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :creator_id]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def resolved?
     post.present? && !post.is_deleted? && !post.is_flagged?

app/models/post_approval.rb

@@ -37,4 +37,12 @@ class PostApproval < ApplicationRecord
     q = q.search_attributes(params, :user, :post)
     q.apply_default_order(params)
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :user_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/post_archive.rb

@@ -75,8 +75,15 @@ class PostArchive < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :updater_id, :version]
+    end
+  end
+
   extend SearchMethods
   include ArchiveServiceMethods
+  include ApiMethods
 
   def tag_array
     tags.split

app/models/post_disapproval.rb

@@ -67,4 +67,12 @@ class PostDisapproval < ApplicationRecord
       end
     end
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :user_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/post_flag.rb

@@ -94,13 +94,24 @@ class PostFlag < ApplicationRecord
     end
   end
 
-  def api_attributes
-    attributes = super + [:category]
-    attributes -= [:creator_id] unless CurrentUser.can_view_flagger_on_post?(self)
-    attributes
+  module ApiMethods
+    def api_attributes
+      attributes = super + [:category]
+      attributes -= [:creator_id] unless CurrentUser.can_view_flagger_on_post?(self)
+      attributes
+    end
+
+    def html_data_attributes
+      attributes = [:post_id]
+      if CurrentUser.can_view_flagger_on_post?(self)
+        attributes += [:creator_id]
+      end
+      attributes
+    end
   end
 
   extend SearchMethods
+  include ApiMethods
 
   def category
     case reason

app/models/post_replacement.rb

@@ -28,6 +28,14 @@ class PostReplacement < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :creator_id]
+    end
+  end
+
+  include ApiMethods
+
   def suggested_tags_for_removal
     tags = post.tag_array.select { |tag| Danbooru.config.remove_tag_after_replacement?(tag) }
     tags = tags.map { |tag| "-#{tag}" }

app/models/post_vote.rb

@@ -68,4 +68,12 @@ class PostVote < ApplicationRecord
       1
     end
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :user_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/saved_search.rb

@@ -171,4 +171,12 @@ class SavedSearch < ApplicationRecord
   def disable_labels=(value)
     CurrentUser.update(disable_categorized_saved_searches: true) if value.to_s.truthy?
   end
+
+  module ApiMethods
+    def html_data_attributes
+      [:user_id]
+    end
+  end
+
+  include ApiMethods
 end

app/models/tag.rb

@@ -69,6 +69,10 @@ class Tag < ApplicationRecord
         "ambiguous" => false
       }.to_json
     end
+
+    def html_data_attributes
+      [:category]
+    end
   end
 
   class CategoryMapping

app/models/tag_relationship.rb

@@ -197,6 +197,12 @@ class TagRelationship < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:creator_id, :approver_id, :forum_topic_id, :forum_post_id]
+    end
+  end
+
   concerning :EmbeddedText do
     class_methods do
       def embedded_pattern
@@ -234,4 +240,5 @@ class TagRelationship < ApplicationRecord
 
   extend SearchMethods
   include MessageMethods
+  include ApiMethods
 end

app/models/upload.rb

@@ -228,12 +228,19 @@ class Upload < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:post_id, :uploader_id]
+    end
+  end
+
   include FileMethods
   include StatusMethods
   include UploaderMethods
   include VideoMethods
   extend SearchMethods
   include SourceMethods
+  include ApiMethods
 
   def uploader_is_not_limited
     if !uploader.can_upload?

app/models/user.rb

@@ -614,6 +614,10 @@ class User < ApplicationRecord
       }.to_json
     end
 
+    def html_data_attributes
+      [:inviter_id]
+    end
+
     def api_token
       api_key.try(:key)
     end

app/models/user_feedback.rb

@@ -40,7 +40,14 @@ class UserFeedback < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:user_id, :creator_id]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def user_name=(name)
     self.user = User.find_by_name(name)

app/models/user_name_change_request.rb

@@ -18,6 +18,14 @@ class UserNameChangeRequest < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:user_id]
+    end
+  end
+
+  include ApiMethods
+
   def update_name!
     user.update!(name: desired_name)
   end

app/models/wiki_page.rb

@@ -115,7 +115,14 @@ class WikiPage < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:category_name, [:artist, :id]]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def validate_not_locked
     if is_locked? && !CurrentUser.is_builder?

app/models/wiki_page_version.rb

@@ -17,7 +17,14 @@ class WikiPageVersion < ApplicationRecord
     end
   end
 
+  module ApiMethods
+    def html_data_attributes
+      [:wiki_page_id, :updater_id]
+    end
+  end
+
   extend SearchMethods
+  include ApiMethods
 
   def pretty_title
     title.tr("_", " ")