diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 08:41:00 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 08:44:30 +0100 |
| commit | 46cbb9c551b53e0255a382757744b2b1ae815b71 (patch) | |
| tree | 772df535dde6d12f07e1f1aa40337cd88a2fb683 | |
| parent | 253ab265207c4e556470e4aa45fc502a5c9480ad (diff) | |
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)
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 2 | ||||
| -rw-r--r-- | app/views/accounts/_grid_card.html.haml | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 8bb2b9016..bcfecc8f3 100644 --- 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 87a83e892..3d94f1049 100644 --- 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 454272d8c..d7751a323 100644 --- 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) |