mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 04:07:45 +00:00
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)
This commit is contained in:
parent
253ab26520
commit
46cbb9c551
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue