Increase note truncation length on account grids, improve FanOutOnWrite a bit,

fix tests (the recorded Salmon fixture expects LOCAL_DOMAIN to be something
specific unfortunately)

diff --git a/.travis.yml b/.travis.yml
index 8bb2b90168c21953bfade396ce32d2fbcb0db441..bcfecc8f357e529a492ff390be7df950c6057362 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ cache: bundler
 
 env:
   global:
-    - LOCAL_DOMAIN=example.com
-    - LOCAL_HTTPS=false
+    - LOCAL_DOMAIN=cb6e6126.ngrok.io
+    - LOCAL_HTTPS=true
+    - RAILS_ENV=test
 
 addons:
   postgresql: 9.4

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 87a83e892bf5c50a5df1263f54811a9e268227db..3d94f10491f57b102c984377d41ade206ea0873e 100644 (file)
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -11,7 +11,7 @@ class FanOutOnWriteService < BaseService
 
     # Deliver to local followers
     status.account.followers.each do |follower|
-      next if (status.reply? && !follower.following?(replied_to_user)) || !follower.local?
+      next if (status.reply? && !(follower.id = replied_to_user.id || follower.following?(replied_to_user))) || !follower.local?
       push(:home, follower.id, status)
     end
 

diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml
index 454272d8cf7b0e9ea2a27c3312185d02bcd3deca..d7751a323cb8ebbe79c543db01949598ee6166bd 100644 (file)
--- a/app/views/accounts/_grid_card.html.haml
+++ b/app/views/accounts/_grid_card.html.haml
@@ -5,4 +5,4 @@
       = link_to url_for_target(account) do
         %span.display_name= display_name(account)
         %span.username= "@#{account.acct}"
-  %p.note= truncate(account.note, length: 124)
+  %p.note= truncate(account.note, length: 150)