about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-06-06 19:29:42 +0200
committerGitHub <noreply@github.com>2017-06-06 19:29:42 +0200
commit722d152082a20c96ca6f1db92c172f9d3772d737 (patch)
treee725bfc2f9688117782bec78bbaa8321a8344877
parent7623766241862d2ede47558639c357d57b769e3b (diff)
Fix #3063 - Add dynamic app manifest (#3563)
* Fix #3063 - Add dynamic app manifest

* Added short_name

* Add background_color
-rw-r--r--app/controllers/manifests_controller.rb11
-rw-r--r--app/views/manifests/show.json.rabl11
-rw-r--r--config/routes.rb1
-rw-r--r--public/manifest.json14
4 files changed, 23 insertions, 14 deletions
diff --git a/app/controllers/manifests_controller.rb b/app/controllers/manifests_controller.rb
new file mode 100644
index 000000000..832e1eb6f
--- /dev/null
+++ b/app/controllers/manifests_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ManifestsController < ApplicationController
+  before_action :set_instance_presenter
+
+  def show; end
+
+  def set_instance_presenter
+    @instance_presenter = InstancePresenter.new
+  end
+end
diff --git a/app/views/manifests/show.json.rabl b/app/views/manifests/show.json.rabl
new file mode 100644
index 000000000..0aa1728e7
--- /dev/null
+++ b/app/views/manifests/show.json.rabl
@@ -0,0 +1,11 @@
+object false
+
+node(:name)             { Setting.site_title }
+node(:short_name)       { Setting.site_title }
+node(:description)      { strip_tags(Setting.site_description.presence || I18n.t('about.about_mastodon')) }
+node(:icons)            { [{ src: '/android-chrome-192x192.png', sizes: '192x192', type: 'image/png' }] }
+node(:theme_color)      { '#282c37' }
+node(:background_color) { '#d9e1e8' }
+node(:display)          { 'standalone' }
+node(:start_url)        { '/web/timelines/home' }
+node(:scope)            { root_url }
diff --git a/config/routes.rb b/config/routes.rb
index 7a2286f92..c71c5603c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,6 +17,7 @@ Rails.application.routes.draw do
 
   get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
   get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
+  get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
 
   devise_for :users, path: 'auth', controllers: {
     sessions:           'auth/sessions',
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index 26e169ad2..000000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"name": "Mastodon",
-	"description": "Mastodon is a free, open-source social network server.",
-	"icons": [
-		{
-			"src": "\/android-chrome-192x192.png",
-			"sizes": "192x192",
-			"type": "image\/png"
-		}
-	],
-	"theme_color": "#282c37",
-	"display": "standalone",
-	"start_url": "/web/timelines/home"
-}