Skip to content

Commit 08d22e7

Browse files
Gargronimrasalghul
authored andcommitted
Change own direct-visibility statuses to be in the home feed again (mastodon#14711)
And remove highlighting in web UI Full circle from mastodon#8940
1 parent bf04092 commit 08d22e7

3 files changed

Lines changed: 3 additions & 25 deletions

File tree

app/javascript/styles/mastodon/components.scss

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -980,14 +980,6 @@
980980
outline: 0;
981981
background: lighten($ui-base-color, 4%);
982982

983-
.status.status-direct {
984-
background: lighten($ui-base-color, 12%);
985-
986-
&.muted {
987-
background: transparent;
988-
}
989-
}
990-
991983
.detailed-status,
992984
.detailed-status__action-bar {
993985
background: lighten($ui-base-color, 8%);
@@ -1022,11 +1014,6 @@
10221014
margin-top: 8px;
10231015
}
10241016

1025-
&.status-direct:not(.read) {
1026-
background: lighten($ui-base-color, 8%);
1027-
border-bottom-color: lighten($ui-base-color, 12%);
1028-
}
1029-
10301017
&.light {
10311018
.status__relative-time,
10321019
.status__visibility-icon {
@@ -1064,16 +1051,6 @@
10641051
}
10651052
}
10661053

1067-
.notification-favourite {
1068-
.status.status-direct {
1069-
background: transparent;
1070-
1071-
.icon-button.disabled {
1072-
color: lighten($action-button-color, 13%);
1073-
}
1074-
}
1075-
}
1076-
10771054
.status__relative-time,
10781055
.status__visibility-icon,
10791056
.notification__relative_time {

app/lib/feed_manager.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def populate_feed(account)
144144
aggregate = account.user&.aggregates_reblogs?
145145
timeline_key = key(:home, account.id)
146146

147-
account.statuses.where.not(visibility: :direct).limit(limit).each do |status|
147+
account.statuses.limit(limit).each do |status|
148148
add_to_feed(:home, account.id, status, aggregate)
149149
end
150150

app/services/fan_out_on_write_service.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ class FanOutOnWriteService < BaseService
66
def call(status)
77
raise Mastodon::RaceConditionError if status.visibility.nil?
88

9+
deliver_to_self(status) if status.account.local?
10+
911
if status.direct_visibility?
1012
deliver_to_own_conversation(status)
1113
elsif status.limited_visibility?
1214
deliver_to_mentioned_followers(status)
1315
else
14-
deliver_to_self(status) if status.account.local?
1516
deliver_to_followers(status)
1617
deliver_to_lists(status)
1718
end

0 commit comments

Comments
 (0)