From: ThibG <thib@sitedethib.com>
Date: Sun, 30 Jun 2019 14:11:21 +0000 (+0200)
Subject: Fix expiration date of filters being set to “Never” when editing them (#11204)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=082b3b282f7863e4b10e9cb34624b4b167b75588;p=mastodon.git

Fix expiration date of filters being set to “Never” when editing them (#11204)

When editing a custom filter, select the shortest preset duration that
still covers the remaining time of that filter.

Fixes #9506
---

diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb
index 342207a55..382562fb8 100644
--- a/app/models/custom_filter.rb
+++ b/app/models/custom_filter.rb
@@ -35,6 +35,13 @@ class CustomFilter < ApplicationRecord
   before_validation :clean_up_contexts
   after_commit :remove_cache
 
+  def expires_in
+    return @expires_in if defined?(@expires_in)
+    return nil if expires_at.nil?
+
+    [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].find { |expires_in| expires_in.from_now >= expires_at }
+  end
+
   private
 
   def clean_up_contexts