Don't forget to lycansubscribe

added "pending" scope helper

Changed files
+6 -7
app
models
lib
tasks
+2
app/models/searchable.rb
··· 30 30 ) 31 31 } 32 32 33 + scope :pending, -> { where(post: nil) } 34 + 33 35 def cursor 34 36 "#{self.time.to_f}:#{self.id}" 35 37 end
+4 -7
lib/tasks/import.rake
··· 15 15 16 16 case ENV['COLLECTION'] 17 17 when 'likes' 18 - queue = ItemQueue.new(user.likes.where(post: nil).to_a) 18 + queue = ItemQueue.new(user.likes.pending.to_a) 19 19 importer = LikesImporter.new(ENV['USER']) 20 20 when 'reposts' 21 - queue = ItemQueue.new(user.reposts.where(post: nil).to_a) 21 + queue = ItemQueue.new(user.reposts.pending.to_a) 22 22 importer = RepostsImporter.new(ENV['USER']) 23 23 when 'posts' 24 - queue = ItemQueue.new(user.quotes.where(post: nil).to_a + user.pins.where(post: nil).to_a) 24 + queue = ItemQueue.new(user.quotes.pending.to_a + user.pins.pending.to_a) 25 25 importer = PostsImporter.new(ENV['USER']) 26 26 when nil 27 27 raise "Required COLLECTION parameter missing" ··· 54 54 55 55 task :process_posts do 56 56 queue = ItemQueue.new( 57 - Like.where(post: nil).to_a + 58 - Repost.where(post: nil).to_a + 59 - Quote.where(post: nil).to_a + 60 - Pin.where(post: nil).to_a 57 + [Like, Repost, Quote, Pin].map { |x| x.pending.to_a }.reduce(&:+) 61 58 ) 62 59 63 60 report = ImportReport.new