X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FManifest.php;h=e98c83a6136b79147d2e772479ee7ae5382fdfd1;hb=be8251ef0ca39376745dd0ab298208fb41395cce;hp=754e08c3ca5ab4cd0725d0ac8df446fc9d4e26fb;hpb=c546b8b760a8e3728d65f89013935458bfbdce52;p=friendica.git

diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php
index 754e08c3ca..e98c83a613 100644
--- a/src/Module/Manifest.php
+++ b/src/Module/Manifest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,35 +27,21 @@ use Friendica\DI;
 
 class Manifest extends BaseModule
 {
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
 		$config = DI::config();
 
-		$touch_icon = $config->get('system', 'touch_icon') ?: 'images/friendica-192.png';
-
 		$theme = DI::config()->get('system', 'theme');
 
 		$manifest = [
 			'name'          => $config->get('config', 'sitename', 'Friendica'),
-			'start_url'     => DI::baseUrl()->get(),
+			'start_url'     => DI::baseUrl(),
 			'display'       => 'standalone',
 			'description'   => $config->get('config', 'info', DI::l10n()->t('A Decentralized Social Network')),
 			'short_name'    => 'Friendica',
 			'lang'          => $config->get('system', 'language'),
 			'dir'           => 'auto',
 			'categories'    => ['social network', 'internet'],
-			'icons'         => [
-				[
-					'src'   => DI::baseUrl()->get() . '/' . $touch_icon,
-					'sizes' => '192x192',
-					'type'  => 'image/png',
-				],
-				[
-					'src'   => DI::baseUrl()->get() . '/' . $touch_icon,
-					'sizes' => '512x512',
-					'type'  => 'image/png',
-				],
-			],
 			'shortcuts'     => [
 				[
 					'name'  => 'Latest posts',
@@ -74,12 +60,71 @@ class Manifest extends BaseModule
 					'url'   => '/contact'
 				],
 				[
-					'name'  => 'Events',
-					'url'   => '/events'
+					'name'  => 'Calendar',
+					'url'   => '/calendar'
 				]
 			]
 		];
 
+		/// @TODO If the admin provides their own touch icon, the manifest will regress
+		/// to a smaller set of icons that do not follow the web app manifest spec.
+		/// There should be a mechanism to allow the admin to provide all of the 6
+		/// different images that are required for a fully valid web app manifest.
+		$touch_icon = $config->get('system', 'touch_icon');
+		if($touch_icon){
+			$manifest['icons'] = [
+				[
+					'src'   => DI::baseUrl() . '/' . $touch_icon,
+					'sizes' => '192x192',
+					'type'  => 'image/png',
+				],
+				[
+					'src'   => DI::baseUrl() . '/' . $touch_icon,
+					'sizes' => '512x512',
+					'type'  => 'image/png',
+				],
+			];
+		} else {
+			$manifest['icons'] = [
+				[
+					'src'   => DI::baseUrl() . '/images/friendica.svg',
+					'sizes' => 'any',
+					'type'  => 'image/svg+xml',
+					'purpose' => 'any',
+				],
+				[
+					'src'   => DI::baseUrl() . '/images/friendica-192.png',
+					'sizes' => '192x192',
+					'type'  => 'image/png',
+					'purpose' => 'any',
+				],
+				[
+					'src'   => DI::baseUrl() . '/images/friendica-512.png',
+					'sizes' => '512x512',
+					'type'  => 'image/png',
+					'purpose' => 'any',
+				],
+				[
+					'src'   => DI::baseUrl() . '/images/friendica-maskable.svg',
+					'sizes' => 'any',
+					'type'  => 'image/svg+xml',
+					'purpose' => 'maskable',
+				],
+				[
+					'src'   => DI::baseUrl() . '/images/friendica-maskable-192.png',
+					'sizes' => '192x192',
+					'type'  => 'image/png',
+					'purpose' => 'maskable',
+				],
+				[
+					'src'   => DI::baseUrl() . '/images/friendica-maskable-512.png',
+					'sizes' => '512x512',
+					'type'  => 'image/png',
+					'purpose' => 'maskable',
+				],
+			];
+		}
+
 		if ($background_color = Core\Theme::getBackgroundColor($theme)) {
 			$manifest['background_color'] = $background_color;
 		}