luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Small fixes

Browse source
This commit is contained in:
Eugen Rochko 2016-10-02 23:46:25 +02:00
parent f06f295890
commit d74da1a89a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
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
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