From 6a1f08d29a1059e7bc101cac5a626b3eeab6e1a8 Mon Sep 17 00:00:00 2001
From: Jeong Arm <kjwonmail@gmail.com>
Date: Sun, 28 Jul 2019 20:46:04 +0900
Subject: [PATCH] Prevent archiving when user set "noindex" (#11421)
---
app/views/accounts/show.html.haml | 2 +-
app/views/statuses/show.html.haml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 0dc984dcc..6846abeb6 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -5,7 +5,7 @@
%meta{ name: 'description', content: account_description(@account) }/
- if @account.user&.setting_noindex
- %meta{ name: 'robots', content: 'noindex' }/
+ %meta{ name: 'robots', content: 'noindex, noarchive' }/
%link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
%link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index 704e37a3d..0f22d106b 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -3,7 +3,7 @@
- content_for :header_tags do
- if @account.user&.setting_noindex
- %meta{ name: 'robots', content: 'noindex' }/
+ %meta{ name: 'robots', content: 'noindex, noarchive' }/
%link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: short_account_status_url(@account, @status), format: 'json') }/
%link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@status) }/