From 9a7485d03407b8177a51d900ac9aabbca893a2c1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 18 Mar 2016 23:23:19 +0100
Subject: Fix typo on /api/accounts/:id/statuses, fix potential
case-sensitivity issue when registering incoming status mentions, add Travis
CI file
---
app/controllers/api/accounts_controller.rb | 2 +-
app/models/account.rb | 6 ++++++
app/services/process_feed_service.rb | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
(limited to 'app')
diff --git a/app/controllers/api/accounts_controller.rb b/app/controllers/api/accounts_controller.rb
index 782cc8102..f543ea98d 100644
--- a/app/controllers/api/accounts_controller.rb
+++ b/app/controllers/api/accounts_controller.rb
@@ -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
diff --git a/app/models/account.rb b/app/models/account.rb
index e4295d735..06f858c7c 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -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)
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 8962603cf..8fd0b3e68 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -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)
--
cgit