mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 21:59:04 +09:00
Code

Linting fixes

Browse Source
This commit is contained in:
Essem 2023-12-18 18:27:02 -06:00
parent 71fba86454
commit 3ee5e3352c
No known key found for this signature in database
GPG Key ID: 7D497397CC3A2A8C
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/components/status_reactions.jsx
View File

@ -96,11 +96,11 @@ class Reaction extends ImmutablePureComponent {
} else { } else {
addReaction(statusId, reaction.get('name')); addReaction(statusId, reaction.get('name'));
} }
} };
handleMouseEnter = () => this.setState({ hovered: true }) handleMouseEnter = () => this.setState({ hovered: true });
handleMouseLeave = () => this.setState({ hovered: false }) handleMouseLeave = () => this.setState({ hovered: false });
render() { render() {
const { reaction } = this.props; const { reaction } = this.props;

2
app/models/status.rb
View File

@ -288,7 +288,9 @@ class Status < ApplicationRecord
if account.nil? if account.nil?
scope.select('name, custom_emoji_id, count(*) as count, false as me') scope.select('name, custom_emoji_id, count(*) as count, false as me')
else else
# rubocop:disable Layout/LineLength
scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from status_reactions r where r.account_id = #{account.id} and r.status_id = status_reactions.status_id and r.name = status_reactions.name and (r.custom_emoji_id = status_reactions.custom_emoji_id or r.custom_emoji_id is null and status_reactions.custom_emoji_id is null)) as me") scope.select("name, custom_emoji_id, count(*) as count, exists(select 1 from status_reactions r where r.account_id = #{account.id} and r.status_id = status_reactions.status_id and r.name = status_reactions.name and (r.custom_emoji_id = status_reactions.custom_emoji_id or r.custom_emoji_id is null and status_reactions.custom_emoji_id is null)) as me")
# rubocop:enable Layout/LineLength
end end
end end

2
app/views/settings/preferences/appearance/show.html.haml
View File

@ -52,7 +52,7 @@
= ff.input :'web.use_system_emoji_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_emoji_font'), glitch_only: true = ff.input :'web.use_system_emoji_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_emoji_font'), glitch_only: true
.fields-group.fields-row__column.fields-row__column-6 .fields-group.fields-row__column.fields-row__column-6
= ff.input :'visible_reactions', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_visible_reactions'), input_html: { type: 'number', min: '0', data: { default: '6' } }, hint: false = ff.input :visible_reactions, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_visible_reactions'), input_html: { type: 'number', min: '0', data: { default: '6' } }, hint: false
%h4= t 'appearance.discovery' %h4= t 'appearance.discovery'