about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-01-15 16:42:43 -0600
committermultiple creatures <dev@multiple-creature.party>2020-01-15 16:42:43 -0600
commitd8b87ec487463f548363cc861d0000b2016dd899 (patch)
treee1fccffa7616147836db57477b4a9e52c5fe42d1 /app/services
parentf49ff8fccc26cd8a157f50c2c30a1a30e33f30ee (diff)
handle passing `0` to `lifespan` & `defed_in` bangtags to unset the auto-destruct/auto-defederate flag for a post
Diffstat (limited to 'app/services')
-rw-r--r--app/services/post_status_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index baf45eda6..2a065f58b 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -279,6 +279,7 @@ class PostStatusService < BaseService
   end
 
   def set_expirations
+    return if @status.no_clobber_expirations?
     @status.delete_after = @delete_after if @delete_after && @status.delete_after.nil?
     @status.defederate_after = @defederate_after if @defederate_after && @status.defederate_after.nil?
   end