Browse Source

Small fixes

closed-social-glitch-2
Eugen Rochko 7 years ago
parent
commit
d74da1a89a
2 changed files with 5 additions and 2 deletions
  1. +1
    -2
      app/services/process_feed_service.rb
  2. +4
    -0
      config/application.rb

+ 1
- 2
app/services/process_feed_service.rb View File

@ -153,9 +153,8 @@ class ProcessFeedService < BaseService
status = Status.new(account: account, uri: target_id(xml), text: target_content(xml), url: target_url(xml), created_at: published(xml), updated_at: updated(xml))
status.thread = find_original_status(xml, thread_id(xml))
status.save
if status.saved? && status.thread.nil? && !thread_href(xml).nil?
if status.save && status.thread.nil? && !thread_href(xml).nil?
ThreadResolveWorker.perform_async(status.id, thread_href(xml))
end

+ 4
- 0
config/application.rb View File

@ -31,5 +31,9 @@ module Mastodon
config.middleware.use Rack::Deflater
config.browserify_rails.commandline_options = "--transform [ babelify --presets [ es2015 react ] ] --extension=\".jsx\""
config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'auth'
end
end
end

Loading…
Cancel
Save