This commit is contained in:
KMY 2025-06-12 10:37:20 +09:00
parent f3c3ea42c2
commit 91e252259d
5 changed files with 11 additions and 9 deletions

View file

@ -63,11 +63,13 @@ export const MoreLink: React.FC = () => {
const emojiReactionMenu = useMemo(() => { const emojiReactionMenu = useMemo(() => {
if (!enableEmojiReaction) return []; if (!enableEmojiReaction) return [];
return [{ return [
text: intl.formatMessage(messages.emoji_reactions), {
to: '/emoji_reactions', text: intl.formatMessage(messages.emoji_reactions),
}]; to: '/emoji_reactions',
}, [enableEmojiReaction, intl]); },
];
}, [intl]);
const menu = useMemo(() => { const menu = useMemo(() => {
const arr: MenuItem[] = [ const arr: MenuItem[] = [

View file

@ -29,7 +29,7 @@ class ActivityPub::Parser::CustomEmojiParser
nil nil
end end
def is_sensitive # rubocop:disable Naming/PredicateName def is_sensitive # rubocop:disable Naming/PredicatePrefix
@json['isSensitive'].presence || false @json['isSensitive'].presence || false
end end

View file

@ -53,7 +53,7 @@ class REST::CustomEmojiSlimSerializer < ActiveModel::Serializer
object.is_sensitive object.is_sensitive
end end
def is_sensitive # rubocop:disable Naming/PredicateName def is_sensitive # rubocop:disable Naming/PredicatePrefix
sensitive sensitive
end end
end end

View file

@ -6,7 +6,7 @@ RSpec.describe SoftwareUpdateCheckService do
subject { described_class.new } subject { described_class.new }
shared_examples 'when the feature is enabled' do shared_examples 'when the feature is enabled' do
let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{Mastodon::Version.dev? ? '-dev' : ''}" } let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{'-dev' if Mastodon::Version.dev?}" }
let(:devops_role) { Fabricate(:user_role, name: 'DevOps', permissions: UserRole::FLAGS[:view_devops]) } let(:devops_role) { Fabricate(:user_role, name: 'DevOps', permissions: UserRole::FLAGS[:view_devops]) }
let(:owner_user) { Fabricate(:owner_user) } let(:owner_user) { Fabricate(:owner_user) }

View file

@ -13,7 +13,7 @@ RSpec.describe 'NewStatuses', :inline_jobs, :js, :streaming do
before do before do
as_a_logged_in_user as_a_logged_in_user
page.driver.browser.manage.window.resize_to(1600, 1050) page.set_viewport_size(width: 1600, height: 1050)
end end
it 'can be posted' do it 'can be posted' do