diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts index 2372b94ee5..5c886293f2 100644 --- a/app/javascript/mastodon/api_types/accounts.ts +++ b/app/javascript/mastodon/api_types/accounts.ts @@ -14,7 +14,6 @@ export interface ApiAccountRoleJSON { export interface ApiAccountOtherSettingsJSON { noindex: boolean; - noai: boolean; hide_network: boolean; hide_statuses_count: boolean; hide_following_count: boolean; diff --git a/app/javascript/mastodon/models/account.ts b/app/javascript/mastodon/models/account.ts index d65a2794b9..d9338d0d80 100644 --- a/app/javascript/mastodon/models/account.ts +++ b/app/javascript/mastodon/models/account.ts @@ -50,7 +50,6 @@ export type AccountOtherSettings = RecordOf; const AccountOtherSettingsFactory = ImmutableRecord({ noindex: false, - noai: true, hide_network: false, hide_followers_count: false, hide_following_count: false, diff --git a/app/models/concerns/account/other_settings.rb b/app/models/concerns/account/other_settings.rb index c98ba1dc02..a62bc4195d 100644 --- a/app/models/concerns/account/other_settings.rb +++ b/app/models/concerns/account/other_settings.rb @@ -8,13 +8,6 @@ module Account::OtherSettings user_prefers_noindex? || (settings.present? && settings['noindex']) || false end - def noai? - return user.setting_noai if local? && user.present? - return settings['noai'] if settings.present? && settings.key?('noai') - - false - end - def translatable_private? return user.setting_translatable_private if local? && user.present? return settings['translatable_private'] if settings.present? && settings.key?('translatable_private') @@ -97,7 +90,6 @@ module Account::OtherSettings # Please update `app/javascript/mastodon/api_types/accounts.ts` when making changes to the attributes { 'noindex' => noindex?, - 'noai' => noai?, 'hide_network' => hide_collections, 'hide_statuses_count' => hide_statuses_count?, 'hide_following_count' => hide_following_count?, diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb index 5c5a84f516..c85a550c50 100644 --- a/app/models/concerns/user/has_settings.rb +++ b/app/models/concerns/user/has_settings.rb @@ -131,10 +131,6 @@ module User::HasSettings settings['noindex'] end - def setting_noai - settings['noai'] - end - def setting_translatable_private settings['translatable_private'] end diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb index df3b696340..0b9093cf9a 100644 --- a/app/models/user_settings.rb +++ b/app/models/user_settings.rb @@ -11,7 +11,6 @@ class UserSettings setting :aggregate_reblogs, default: true setting :theme, default: -> { ::Setting.theme } setting :noindex, default: -> { ::Setting.noindex } - setting :noai, default: true setting :translatable_private, default: false setting :link_preview, default: true setting :bio_markdown, default: false diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index b8bc063779..6c76748585 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -5,7 +5,7 @@ - if @account.noindex? %meta{ name: 'robots', content: 'noindex, noarchive, noai, noimageai' }/ %meta{ name: 'CCBot', content: 'nofollow' }/ - - elsif @account.noai? + - else %meta{ name: 'robots', content: 'noai, noimageai' }/ %meta{ name: 'CCBot', content: 'nofollow' }/ diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml index 9656ada005..c255e48ebb 100644 --- a/app/views/settings/privacy/show.html.haml +++ b/app/views/settings/privacy/show.html.haml @@ -21,9 +21,6 @@ .fields-group = ff.input :discoverable_local, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.discoverable_local'), hint: I18n.t('simple_form.hints.defaults.discoverable_local') - .fields-group - = ff.input :noai, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_noai'), hint: I18n.t('simple_form.hints.defaults.setting_noai') - .fields-group = f.input :unlocked, as: :boolean, wrapper: :with_label diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml index 23fb535c1d..f9dc1712cf 100644 --- a/app/views/statuses/show.html.haml +++ b/app/views/statuses/show.html.haml @@ -5,7 +5,7 @@ - if @account.noindex? %meta{ name: 'robots', content: 'noindex, noarchive, noai, noimageai' }/ %meta{ name: 'CCBot', content: 'nofollow' }/ - - elsif @account.noai? + - else %meta{ name: 'robots', content: 'noai, noimageai' }/ %meta{ name: 'CCBot', content: 'nofollow' }/ diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 0356cc9d89..8bfa340492 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -277,7 +277,6 @@ en: setting_hide_statuses_count: Hide statuses count setting_link_preview: Generate post link preview card setting_lock_follow_from_bot: Request approval about bot follow - setting_noai: Set noai meta tags setting_public_post_to_unlisted: Convert public post to public unlisted if not using Web app setting_reduce_motion: Reduce motion in animations setting_reject_public_unlisted_subscription: Reject sending public unlisted visibility/non-public searchability posts to Misskey, Calckey diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index c5ff387be5..fec46e5ab0 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -80,7 +80,6 @@ ja: setting_enable_emoji_reaction: この機能を無効にしても、他の人はあなたの投稿にスタンプをつけられます setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします setting_link_preview: プレビュー生成を停止することは、センシティブなサイトへのリンクを頻繁に投稿する人にも有効かもしれません - setting_noai: AI学習への利用を禁止するメタタグをプロフィールページに追加します。ただし実効性があるとは限りません setting_public_post_to_unlisted: 未対応のサードパーティアプリからもローカル公開で投稿できますが、公開投稿はWeb以外できなくなります setting_reject_unlisted_subscription: Misskeyやそのフォークは、フォローしていないアカウントの「非収載」投稿を **購読・検索** することができます。これはkmyblueの挙動と異なります。そのようなサーバーに、指定した公開範囲の投稿を「フォロワーのみ」として配送します。ただし構造上、完璧な対応は困難でたまに非収載として配信されること、ご理解ください setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります @@ -290,7 +289,6 @@ ja: setting_show_quote_in_home: ホーム・リスト・アンテナなどで引用を表示する setting_show_quote_in_public: 公開タイムライン(ローカル・連合)で引用を表示する setting_stay_privacy: 投稿時に公開範囲を保存する - setting_noai: 自分のコンテンツのAI学習利用に対して不快感を表明する setting_public_post_to_unlisted: サードパーティから公開範囲「公開」で投稿した場合、「ローカル公開」に変更する setting_reduce_motion: アニメーションの動きを減らす setting_reject_public_unlisted_subscription: Misskey系サーバーに「ローカル公開」かつ検索許可「誰でも以外」の投稿を「フォロワーのみ」に変換して配送する