diff options
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 3 | ||||
| -rw-r--r-- | app/lib/bangtags.rb | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 4e7f922e9..1839a649e 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -92,7 +92,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end def find_imported_status - status = Status.find_by(origin: @origin_hash) + status = Status.joins(:imported_status).select('statuses.*').find_by(origin: @origin_hash) end def obfuscate_origin(key) @@ -138,7 +138,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity if @options[:imported] @params.except!(:uri, :url) @params[:content_type] = 'text/html' - @params[:imported] = true @params[:origin] = @origin_hash unless @origin_hash.nil? end diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb index 5d8389892..a1963aa6c 100644 --- a/app/lib/bangtags.rb +++ b/app/lib/bangtags.rb @@ -303,7 +303,6 @@ class Bangtags roars.each do |roar| if roar.sharekey.present? roar.sharekey = nil - roar.save Rails.cache.delete("statuses/#{roar.id}") end end @@ -315,15 +314,13 @@ class Bangtags if cmd[2] == 'new' || earliest_roar.sharekey.blank? sharekey = SecureRandom.urlsafe_base64(32) earliest_roar.sharekey = sharekey - earliest_roar.save Rails.cache.delete("statuses/#{earliest_roar.id}") else - sharekey = earliest_roar.sharekey + sharekey = earliest_roar.sharekey.key end roars.each do |roar| - if roar.sharekey != sharekey + if roar.sharekey.nil? || roar.sharekey.key != sharekey roar.sharekey = sharekey - roar.save Rails.cache.delete("statuses/#{roar.id}") end end |