Merge branch 'master' of https://github.com/cantino/huginn

Rachel Brindle 10 anni fa
parent
commit
829975577c
1 ha cambiato i file con 5 aggiunte e 7 eliminazioni
  1. 5 7
      app/models/agents/website_agent.rb

+ 5 - 7
app/models/agents/website_agent.rb

@@ -245,14 +245,12 @@ module Agents
245 245
       case interpolated['mode'].presence
246 246
       when 'on_change'
247 247
         result_json = result.to_json
248
-        old_events.each do |old_event|
249
-          if old_event.payload.to_json == result_json
250
-            old_event.expires_at = new_event_expiration_date
251
-            old_event.save!
252
-            return false
253
-          end
248
+        if found = old_events.find { |event| event.payload.to_json == result_json }
249
+          found.update!(expires_at: new_event_expiration_date)
250
+          false
251
+        else
252
+          true
254 253
         end
255
-        true
256 254
       when 'all', 'merge', ''
257 255
         true
258 256
       else