Fix #43
This commit is contained in:
		
							parent
							
								
									bf4ee145f9
								
							
						
					
					
						commit
						adffc7a495
					
				
					 4 changed files with 12 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue