about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-12-23 23:51:43 -0600
committermultiple creatures <dev@multiple-creature.party>2019-12-23 23:51:43 -0600
commitf12d9d27fc38e14bd8afd5b1286f274a3ae091d2 (patch)
tree1a2fe643446fecb408df16ebf18c104e96b27212 /app/lib
parentb50fd9613194e3aa8d9c99ceb1ab32ae9b8bc1b8 (diff)
fix `queued:boosts` & `queued:posts` breaking if populated
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/bangtags.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb
index 04c0f8c4e..a3874c128 100644
--- a/app/lib/bangtags.rb
+++ b/app/lib/bangtags.rb
@@ -897,7 +897,9 @@ class Bangtags
           when 'boosts', 'repeats'
             output = ["# Queued boosts\n"]
             @account.queued_boosts.find_each do |q|
-              output << "\\- [#{q.status_id}](#{TagManager.instance.url_for(q.status_id)})"
+              s = Status.find_by(id: q.status_id)
+              next if s.nil?
+              output << "\\- [#{q.status_id}](#{TagManager.instance.url_for(s)})"
             end
             if Redis.current.exists("queued_boost:#{@account.id}")
               output << "\nNext boost in #{Redis.current.ttl("queued_boost:#{@account.id}") / 60} minutes."
@@ -909,11 +911,15 @@ class Bangtags
           when 'posts', 'statuses', 'roars'
             output = ["<h1>Queued roars</h1><br>"]
             @account.scheduled_statuses.find_each do |s|
-              preview = s.params['spoiler_text'] || s.params['text']
+              s = Status.find_by(id: s.status_id)
+              next if s.nil?
+
+              preview = s.spoiler_text || s.text
               preview = '[no body text]' if preview.blank?
               preview = preview[0..50]
               preview = html_entities.encode(preview)
-              output << "- <a href=\"#{TagManager.instance.url_for(s.status_id)}\">#{preview}</a>"
+
+              output << "- <a href=\"#{TagManager.instance.url_for(s)}\">#{preview}</a>"
             end
             service_dm('announcements', @account, output.join("<br>"), content_type: 'text/html', footer: '#!queued:posts')
           end