Commit 46cbb9c5 authored by Eugen Rochko's avatar Eugen Rochko
Browse files

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)
parent 253ab265
......@@ -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
......
......@@ -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
......
......@@ -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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment