tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Change own direct-visibility statuses to be in the home feed again (#14711)

Browse Source 
And remove highlighting in web UI

Full circle from #8940
This commit is contained in:
Eugen Rochko 2020-09-01 13:30:42 +02:00 committed by GitHub
parent 6d98b039a5
commit 1c308af84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/javascript/styles/mastodon/components.scss
View File

@ -980,14 +980,6 @@
outline: 0; outline: 0;
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
.status.status-direct {
background: lighten($ui-base-color, 12%);
&.muted {
background: transparent;
}
}
.detailed-status, .detailed-status,
.detailed-status__action-bar { .detailed-status__action-bar {
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
@ -1022,11 +1014,6 @@
margin-top: 8px; margin-top: 8px;
} }
&.status-direct:not(.read) {
background: lighten($ui-base-color, 8%);
border-bottom-color: lighten($ui-base-color, 12%);
}
&.light { &.light {
.status__relative-time, .status__relative-time,
.status__visibility-icon { .status__visibility-icon {
@ -1064,16 +1051,6 @@
} }
} }
.notification-favourite {
.status.status-direct {
background: transparent;
.icon-button.disabled {
color: lighten($action-button-color, 13%);
}
}
}
.status__relative-time, .status__relative-time,
.status__visibility-icon, .status__visibility-icon,
.notification__relative_time { .notification__relative_time {

2
app/lib/feed_manager.rb
View File

@ -144,7 +144,7 @@ class FeedManager
aggregate = account.user&.aggregates_reblogs? aggregate = account.user&.aggregates_reblogs?
timeline_key = key(:home, account.id) timeline_key = key(:home, account.id)
account.statuses.where.not(visibility: :direct).limit(limit).each do |status| account.statuses.limit(limit).each do |status|
add_to_feed(:home, account.id, status, aggregate) add_to_feed(:home, account.id, status, aggregate)
end end

3
app/services/fan_out_on_write_service.rb
View File

@ -6,12 +6,13 @@ class FanOutOnWriteService < BaseService
def call(status) def call(status)
raise Mastodon::RaceConditionError if status.visibility.nil? raise Mastodon::RaceConditionError if status.visibility.nil?
deliver_to_self(status) if status.account.local?
if status.direct_visibility? if status.direct_visibility?
deliver_to_own_conversation(status) deliver_to_own_conversation(status)
elsif status.limited_visibility? elsif status.limited_visibility?
deliver_to_mentioned_followers(status) deliver_to_mentioned_followers(status)
else else
deliver_to_self(status) if status.account.local?
deliver_to_followers(status) deliver_to_followers(status)
deliver_to_lists(status) deliver_to_lists(status)
end end