Fix typo on /api/accounts/:id/statuses, fix potential case-sensitivity issue

when registering incoming status mentions, add Travis CI file

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..e15efa9
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - 2.2.4
+
+bundler_args: --without development --retry=3 --jobs=3
+
+script: bundle exec rspec

diff --git a/README.md b/README.md
index 633aba040ee08e9852b3da649855c6b6482b0fab..e45e81c27aa1f6c1f9e291b2b578fbff3ea18c18 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 Mastodon
 ========
 
+[![Build Status](https://travis-ci.org/Gargron/mastodon.svg?branch=master)](https://travis-ci.org/Gargron/mastodon)
+
 Mastodon is a federated microblogging engine. An alternative implementation of the GNU Social project. Based on ActivityStreams, Webfinger, PubsubHubbub and Salmon.
 
 **Current status of the project is early development. Documentation &co will be added later**
@@ -18,12 +20,6 @@ Mastodon is a federated microblogging engine. An alternative implementation of t
 - Upload header image for profile page
 - Deleting statuses, deletion propagation
 
-Missing:
-
-- Media attachments (photos, videos)
-- Streaming API
-- Blocking users, blocking remote instances
-
 ## Configuration
 
 - `LOCAL_DOMAIN` should be the domain/hostname of your instance. This is **absolutely required** as it is used for generating unique IDs for everything federation-related

diff --git a/app/controllers/api/accounts_controller.rb b/app/controllers/api/accounts_controller.rb
index 782cc8102d9e84c7983e8d951caf56f921f481ba..f543ea98d927daa642a89bb42fe038253aed597a 100644 (file)
--- 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 e4295d735cff4bb2c8fde9f475ab4d2637fb1a5f..06f858c7c223705bda42d7e97783cd988517a5fa 100644 (file)
--- 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 8962603cf71cd326dc331a3fca998652c4327203..8fd0b3e6821cf491e7e1b0dcf0789b777457420c 100644 (file)
--- 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)