Eugen Rochko 7 роки тому
джерело
коміт
adffc7a495
4 змінених файлів з 12 додано та 7 видалено
  1. +1
    -1
      app/controllers/api/accounts_controller.rb
  2. +4
    -4
      app/controllers/api/statuses_controller.rb
  3. +2
    -1
      app/services/process_feed_service.rb
  4. +5
    -1
      spec/services/process_feed_service_spec.rb

+ 1
- 1
app/controllers/api/accounts_controller.rb Переглянути файл

@@ -15,7 +15,7 @@ class Api::AccountsController < ApiController
end

def statuses
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil)
@statuses = @account.statuses.with_includes.with_counters.paginate_by_max_id(20, params[:max_id] || nil).to_a
end

def follow


+ 4
- 4
app/controllers/api/statuses_controller.rb Переглянути файл

@@ -8,8 +8,8 @@ class Api::StatusesController < ApiController

def context
@status = Status.find(params[:id])
@ancestors = @status.ancestors.with_includes.with_counters
@descendants = @status.descendants.with_includes.with_counters
@ancestors = @status.ancestors.with_includes.with_counters.to_a
@descendants = @status.descendants.with_includes.with_counters.to_a
end

def create
@@ -28,10 +28,10 @@ class Api::StatusesController < ApiController
end

def home
@statuses = Feed.new(:home, current_user.account).get(20, params[:max_id])
@statuses = Feed.new(:home, current_user.account).get(20, params[:max_id]).to_a
end

def mentions
@statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id])
@statuses = Feed.new(:mentions, current_user.account).get(20, params[:max_id]).to_a
end
end

+ 2
- 1
app/services/process_feed_service.rb Переглянути файл

@@ -129,7 +129,8 @@ class ProcessFeedService < BaseService
account = follow_remote_account_service.("#{username}@#{domain}", false)
end

Status.new(account: account, uri: target_id(xml), text: target_content(xml), url: target_url(xml))
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))
rescue Goldfinger::Error, HTTP::Error
nil
end


+ 5
- 1
spec/services/process_feed_service_spec.rb Переглянути файл

@@ -4,5 +4,9 @@ RSpec.describe ProcessFeedService do
subject { ProcessFeedService.new }

it 'updates remote user\'s account information'
it 'creates local copies of all notes and comments'
it 'creates posts'
it 'creates reblogs'
it 'creates replies'
it 'creates reblogged replies'
it 'deletes removed posts'
end

Завантаження…
Відмінити
Зберегти