From 3db72441096b681939b873524091fbccc5b93848 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 2 Mar 2017 16:47:40 -0600 Subject: [PATCH] post_archive.rb: readd associations. --- app/models/post_archive.rb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/models/post_archive.rb b/app/models/post_archive.rb index 64b2d97e9..736fcc5dc 100644 --- a/app/models/post_archive.rb +++ b/app/models/post_archive.rb @@ -1,6 +1,9 @@ class PostArchive < ActiveRecord::Base extend Memoist + belongs_to :post + belongs_to :updater, class_name: "User" + def self.enabled? Danbooru.config.aws_sqs_archives_url.present? end @@ -92,18 +95,10 @@ class PostArchive < ActiveRecord::Base super end - def post - Post.where(id: post_id).first - end - def previous PostArchive.where("post_id = ? and version < ?", post_id, version).order("version desc").first end - def updater - User.find(updater_id) - end - def diff(version = nil) if post.nil? latest_tags = tag_array @@ -237,13 +232,9 @@ class PostArchive < ActiveRecord::Base post.save! end - def updater - User.find_by_id(updater_id) - end - def method_attributes super + [:obsolete_added_tags, :obsolete_removed_tags, :unchanged_tags, :updater_name] end - memoize :previous, :post, :tag_array, :changes, :added_tags_with_fields, :removed_tags_with_fields, :obsolete_removed_tags, :obsolete_added_tags, :unchanged_tags + memoize :previous, :tag_array, :changes, :added_tags_with_fields, :removed_tags_with_fields, :obsolete_removed_tags, :obsolete_added_tags, :unchanged_tags end