Fix typo on /api/accounts/:id/statuses, fix potential case-sensitivity issue
when registering incoming status mentions, add Travis CI file
This commit is contained in:
@ -15,7 +15,7 @@ class Api::AccountsController < ApiController
|
||||
end
|
||||
|
||||
def statuses
|
||||
@statuses = @account.statuses.with_includes.with_counts.order('created_at desc')
|
||||
@statuses = @account.statuses.with_includes.with_counters.order('created_at desc')
|
||||
end
|
||||
|
||||
def follow
|
||||
|
@ -104,6 +104,12 @@ class Account < ActiveRecord::Base
|
||||
self.where(table[:username].matches(username)).where(domain: nil).take!
|
||||
end
|
||||
|
||||
def self.find_local(username)
|
||||
self.find_local!(username)
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
nil
|
||||
end
|
||||
|
||||
before_create do
|
||||
if local?
|
||||
keypair = OpenSSL::PKey::RSA.new(Rails.env.test? ? 1024 : 2048)
|
||||
|
@ -45,7 +45,7 @@ class ProcessFeedService < BaseService
|
||||
href = Addressable::URI.parse(mention_link.attribute('href').value)
|
||||
|
||||
if href.host == Rails.configuration.x.local_domain
|
||||
mentioned_account = Account.find_by(username: href.path.gsub('/users/', ''), domain: nil)
|
||||
mentioned_account = Account.find_local(href.path.gsub('/users/', ''))
|
||||
|
||||
unless mentioned_account.nil?
|
||||
mentioned_account.mentions.first_or_create(status: status)
|
||||
|
Reference in New Issue
Block a user