CloudToys/REI-Fixed
1
0
Fork 0
Code

fix/admin filter+replies_count

Browse Source
This commit is contained in:
whippyshou 2023-11-10 04:05:04 +09:00
parent 4f196f2ffc
commit 0929cc092e
7 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/styles/bird-ui/layout-multiple-columns.scss
View File

@ -225,7 +225,9 @@ body.theme-bird-ui-light.layout-multiple-columns {
--color-dark: #f7f9f9;
--color-thread-line: #e1e8ed;
--color-gainsboro: #8899a6;
--color-light-purple: #9588a6;
--color-light-purple: #df98a2;
--color-dark-electric-blue: #9088a6;
--color-bg-75: #ffffffbf;
--color-accent: var(--color-accent-dark);
@ -1386,6 +1388,9 @@ body.embed .detailed-status,
background-color: var(--color-light-shade);
}
.layout-multiple-columns .column-link:focus-visible {
border-color:var(--color-accent-dark)
}
// /* Toot hover effect */
// .layout-multiple-columns article:focus,

8
app/javascript/styles/bird-ui/layout-single-column.scss
View File

@ -247,7 +247,9 @@ body.theme-bird-ui-light.layout-single-column {
--color-dark: #f7f9f9;
--color-thread-line: #e1e8ed;
--color-topaz: #8899a6;
--color-light-purple: #9588a6;
--color-light-purple: #df98a2;
--color-dark-electric-blue: #9088a6;
--color-bg-75: #ffffffbf;
--color-accent: var(--color-accent-dark);
@ -418,6 +420,10 @@ body.layout-single-column {
// display: none;
// }
.layout-single-column .column-link:focus-visible {
border-color:var(--color-accent-dark)
}
/* Things that should have the default font-size */
.layout-single-column .notification__message,
.layout-single-column .status__content,

2
app/javascript/styles/theme-ui/layout-multiple-columns.scss
View File

@ -240,7 +240,7 @@ body.theme-theme-ui-light.layout-multiple-columns {
--color-dark: #f7f9f9;
--color-thread-line: #e1e8ed;
--color-gainsboro: #8899a6;
--color-light-purple: #9588a6;
--color-light-purple: #df98a2;
--color-dark-electric-blue: #9088a6;
--color-bg-75: #ffffffbf;
--color-accent: var(--color-accent-dark);

14
app/javascript/styles/theme-ui/layout-single-column.scss
View File

@ -36,9 +36,9 @@
--color-fg: #fff;
--color-border: #38384d;
--color-dim: var(--color-brand-mastodon-dim);
--color-accent: #81c5cf;
--color-accent-dark: #27a4b8;
--color-accent-dark-50: #27a4b880;
--color-green: #00ba7c;
@ -57,7 +57,9 @@
--color-dark: var(--color-brand-mastodon-dark);
--color-thread-line: var(--color-brand-mastodon-threaded-line);
--color-topaz: #dadaf3;
--color-light-purple: #9baec8;
--color-light-purple: #df98a2;
--color-lighter-purple: #a5b8d3;
--color-dark-electric-blue: #576078;
--color-button-text: #f7f9f9;
@ -259,7 +261,9 @@ body.theme-theme-ui-light.layout-single-column {
--color-dark: #f7f9f9;
--color-thread-line: #e1e8ed;
--color-topaz: #8899a6;
--color-light-purple: #9588a6;
--color-light-purple: #df98a2;
--color-dark-electric-blue: #9088a6;
--color-bg-75: #ffffffbf;
--color-accent: var(--color-accent-dark);
@ -892,6 +896,10 @@ body.layout-single-column {
}
}
.layout-single-column .column-link:focus-visible {
border-color:var(--color-accent-dark)
}
.layout-single-column .emoji-mart-anchor-bar,
.layout-single-column .column-link.column-link--logo svg {
display: none;

4
app/models/admin/status_filter.rb
View File

@ -16,8 +16,8 @@ class Admin::StatusFilter
end
def results
scope = @account.statuses.where(visibility: [:public, :unlisted])
scope = @account.statuses
params.each do |key, value|
next if IGNORED_PARAMS.include?(key.to_s)

8
app/models/status.rb
View File

@ -469,19 +469,17 @@ class Status < ApplicationRecord
end
def increment_counter_caches
return if direct_visibility?
account&.increment_count!(:statuses_count)
reblog&.increment_count!(:reblogs_count) if reblog?
thread&.increment_count!(:replies_count) if in_reply_to_id.present? && distributable?
thread&.increment_count!(:replies_count) if in_reply_to_id.present?
end
def decrement_counter_caches
return if direct_visibility? || new_record?
return if new_record?
account&.decrement_count!(:statuses_count)
reblog&.decrement_count!(:reblogs_count) if reblog?
thread&.decrement_count!(:replies_count) if in_reply_to_id.present? && distributable?
thread&.decrement_count!(:replies_count) if in_reply_to_id.present?
end
def trigger_create_webhooks

3
app/services/post_status_service.rb
View File

@ -66,13 +66,14 @@ class PostStatusService < BaseService
@text = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
@visibility = @options[:visibility] || @account.user&.setting_default_privacy
@visibility = :unlisted if @visibility&.to_sym == :public && @account.silenced?
@visibility = :unlisted if @visibility&.to_sym == :public
@scheduled_at = @options[:scheduled_at]&.to_datetime
@scheduled_at = nil if scheduled_in_the_past?
rescue ArgumentError
raise ActiveRecord::RecordInvalid
end
def process_status!
def process_status!
@status = @account.statuses.new(status_attributes)
process_mentions_service.call(@status, save_records: false)
safeguard_mentions!(@status)