From d2528b26b6da34f34b5d7a392e263428d3c09d69 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 5 Oct 2022 03:47:56 +0200
Subject: Add server banner to web app, add `GET /api/v2/instance` to REST API
 (#19294)

---
 app/views/about/more.html.haml           | 8 ++++----
 app/views/about/show.html.haml           | 6 +++---
 app/views/application/_sidebar.html.haml | 4 ++--
 app/views/privacy/show.html.haml         | 2 +-
 app/views/shared/_og.html.haml           | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'app/views')

diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index 3b48afc0c..a5a10b620 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -9,7 +9,7 @@
   .column-0
     .public-account-header.public-account-header--no-bar
       .public-account-header__image
-        = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.site_title, class: 'parallax'
+        = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title, class: 'parallax'
 
   .column-1
     .landing-page__call-to-action{ dir: 'ltr' }
@@ -31,14 +31,14 @@
     .contact-widget
       %h4= t 'about.administered_by'
 
-      = account_link_to(@instance_presenter.contact_account)
+      = account_link_to(@instance_presenter.contact.account)
 
-      - if @instance_presenter.site_contact_email.present?
+      - if @instance_presenter.contact.email.present?
         %h4
           = succeed ':' do
             = t 'about.contact'
 
-        = mail_to @instance_presenter.site_contact_email, nil, title: @instance_presenter.site_contact_email
+        = mail_to @instance_presenter.contact.email, nil, title: @instance_presenter.contact.email
 
   .column-3
     = render 'application/flashes'
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index d61b3cd51..75124d5e2 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -40,11 +40,11 @@
 
       .hero-widget
         .hero-widget__img
-          = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.site_title
+          = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title
 
         .hero-widget__text
           %p
-            = @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')
+            = @instance_presenter.description.html_safe.presence || t('about.about_mastodon_html')
             = link_to about_more_path do
               = t('about.learn_more')
               = fa_icon 'angle-double-right'
@@ -53,7 +53,7 @@
           .hero-widget__footer__column
             %h4= t 'about.administered_by'
 
-            = account_link_to @instance_presenter.contact_account
+            = account_link_to @instance_presenter.contact.account
 
           .hero-widget__footer__column
             %h4= t 'about.server_stats'
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml
index cc157bf47..eb2813dd0 100644
--- a/app/views/application/_sidebar.html.haml
+++ b/app/views/application/_sidebar.html.haml
@@ -1,9 +1,9 @@
 .hero-widget
   .hero-widget__img
-    = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.site_title
+    = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title
 
   .hero-widget__text
-    %p= @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')
+    %p= @instance_presenter.description.html_safe.presence || t('about.about_mastodon_html')
 
 - if Setting.trends && !(user_signed_in? && !current_user.setting_trends)
   - trends = Trends.tags.query.allowed.limit(3)
diff --git a/app/views/privacy/show.html.haml b/app/views/privacy/show.html.haml
index 9d076a91b..cdd38a595 100644
--- a/app/views/privacy/show.html.haml
+++ b/app/views/privacy/show.html.haml
@@ -4,6 +4,6 @@
 .grid
   .column-0
     .box-widget
-      .rich-formatting= @instance_presenter.site_terms.html_safe.presence || t('terms.body_html')
+      .rich-formatting= @instance_presenter.privacy_policy.html_safe.presence || t('terms.body_html')
   .column-1
     = render 'application/sidebar'
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index 7feae1b8b..b54ab2429 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -1,12 +1,12 @@
 - thumbnail     = @instance_presenter.thumbnail
-- description ||= strip_tags(@instance_presenter.site_short_description.presence || t('about.about_mastodon_html'))
+- description ||= strip_tags(@instance_presenter.description.presence || t('about.about_mastodon_html'))
 
 %meta{ name: 'description', content: description }/
 
 = opengraph 'og:site_name', t('about.hosted_on', domain: site_hostname)
 = opengraph 'og:url', url_for(only_path: false)
 = opengraph 'og:type', 'website'
-= opengraph 'og:title', @instance_presenter.site_title
+= opengraph 'og:title', @instance_presenter.title
 = opengraph 'og:description', description
 = opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('media/images/preview.png', protocol: :request))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
-- 
cgit