ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
rebase/4.0.0rc2
Eugen Rochko 2016-03-21 08:41:00 +01:00
parent 253ab26520
commit 46cbb9c551
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -3,8 +3,9 @@ cache: bundler
env: env:
global: global:
- LOCAL_DOMAIN=example.com - LOCAL_DOMAIN=cb6e6126.ngrok.io
- LOCAL_HTTPS=false - LOCAL_HTTPS=true
- RAILS_ENV=test
addons: addons:
postgresql: 9.4 postgresql: 9.4

2
app/services/fan_out_on_write_service.rb
View File

@ -11,7 +11,7 @@ class FanOutOnWriteService < BaseService
# Deliver to local followers # Deliver to local followers
status.account.followers.each do |follower| 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) push(:home, follower.id, status)
end end

2
app/views/accounts/_grid_card.html.haml
View File

@ -5,4 +5,4 @@
= link_to url_for_target(account) do = link_to url_for_target(account) do
%span.display_name= display_name(account) %span.display_name= display_name(account)
%span.username= "@#{account.acct}" %span.username= "@#{account.acct}"
%p.note= truncate(account.note, length: 124) %p.note= truncate(account.note, length: 150)