From f68482f85020cba6b5e5281b404f0fa4749f29fa Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 21 Feb 2021 11:12:26 +0100 Subject: [PATCH] Simplification --- app/models/screenshot.rb | 10 ++-------- app/views/packages/_admin_buttons.slim | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/models/screenshot.rb b/app/models/screenshot.rb index bf4cdd7..c2423ee 100644 --- a/app/models/screenshot.rb +++ b/app/models/screenshot.rb @@ -18,14 +18,8 @@ class Screenshot < ApplicationRecord # Calculate how many days ago this screenshot has been uploaded - def age_days - if self.created_at - seconds = Time.now - self.created_at - else - seconds = 0 - end - days = (seconds/86400).to_i - days ? "#{days} days ago" : 'today' + def age + time_ago_in_words(self.created_at) end # Return caption for full-screen screenshots. diff --git a/app/views/packages/_admin_buttons.slim b/app/views/packages/_admin_buttons.slim index c9dcde0..da64279 100644 --- a/app/views/packages/_admin_buttons.slim +++ b/app/views/packages/_admin_buttons.slim @@ -33,7 +33,7 @@ p Status: #{screenshot.adminstatus} p Uploader IP=#{screenshot.uploaderip} p Uploader Token=#{session[:token]} - p Uploaded #{screenshot.age_days} (#{screenshot.created_at}) + p Uploaded #{screenshot.age} ago (#{screenshot.created_at}) / TODO: Move reporting screenshots to an extra page with a form and captcha / - else