Change own direct-visibility statuses to be in the home feed again (#14711)
And remove highlighting in web UI Full circle from #8940
This commit is contained in:
		@@ -980,14 +980,6 @@
 | 
			
		||||
    outline: 0;
 | 
			
		||||
    background: lighten($ui-base-color, 4%);
 | 
			
		||||
 | 
			
		||||
    .status.status-direct {
 | 
			
		||||
      background: lighten($ui-base-color, 12%);
 | 
			
		||||
 | 
			
		||||
      &.muted {
 | 
			
		||||
        background: transparent;
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .detailed-status,
 | 
			
		||||
    .detailed-status__action-bar {
 | 
			
		||||
      background: lighten($ui-base-color, 8%);
 | 
			
		||||
@@ -1022,11 +1014,6 @@
 | 
			
		||||
    margin-top: 8px;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  &.status-direct:not(.read) {
 | 
			
		||||
    background: lighten($ui-base-color, 8%);
 | 
			
		||||
    border-bottom-color: lighten($ui-base-color, 12%);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  &.light {
 | 
			
		||||
    .status__relative-time,
 | 
			
		||||
    .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__visibility-icon,
 | 
			
		||||
.notification__relative_time {
 | 
			
		||||
 
 | 
			
		||||
@@ -144,7 +144,7 @@ class FeedManager
 | 
			
		||||
    aggregate    = account.user&.aggregates_reblogs?
 | 
			
		||||
    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)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -6,12 +6,13 @@ class FanOutOnWriteService < BaseService
 | 
			
		||||
  def call(status)
 | 
			
		||||
    raise Mastodon::RaceConditionError if status.visibility.nil?
 | 
			
		||||
 | 
			
		||||
    deliver_to_self(status) if status.account.local?
 | 
			
		||||
 | 
			
		||||
    if status.direct_visibility?
 | 
			
		||||
      deliver_to_own_conversation(status)
 | 
			
		||||
    elsif status.limited_visibility?
 | 
			
		||||
      deliver_to_mentioned_followers(status)
 | 
			
		||||
    else
 | 
			
		||||
      deliver_to_self(status) if status.account.local?
 | 
			
		||||
      deliver_to_followers(status)
 | 
			
		||||
      deliver_to_lists(status)
 | 
			
		||||
    end
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user