Remove certain platforms

getkirby · Jan 27, 2025 · cc599d6 · cc599d6
1 parent 69dba4a
commit cc599d6
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 115 deletions.
diff --git a/content/docs/1_guide/11_users/2_roles/guide.txt b/content/docs/1_guide/11_users/2_roles/guide.txt
@@ -54,7 +54,7 @@ tabs:
 
   info:
     label: Additional info
-    icon: instagram
+    icon: mastodon
     sections:
       info:
         type: fields
@@ -63,10 +63,10 @@ tabs:
             label: Website
             type: url
             width: 1/2
-          instagram:
-            label: Instagram
+          mastodon:
+            label: Mastodon
             type: text
-            icon: instagram
+            icon: mastodon
             width: 1/2
           bio:
             label: Bio

diff --git a/content/docs/2_reference/3_panel/8_samples/0_user/reference-article.txt b/content/docs/2_reference/3_panel/8_samples/0_user/reference-article.txt
@@ -39,15 +39,15 @@ columns:
       website:
         label: Website
         type: url
-      fediverse:
-        label: Fediverse URL
+      mastodon:
+        label: Mastodon
         type: url
         icon: mastodon
         placeholder: https://example.com/@username
-      instagram:
-        label: Instagram
+      bluesky:
+        label: Bluesky
         type: text
-        icon: instagram
+        icon: bluesky
         placeholder: username
 ```
 
@@ -72,10 +72,10 @@ sections:
         icon: mastodon
         placeholder: https://example.com/@username
         width: 1/3
-      instagram:
-        label: Instagram
+      bluesky:
+        label: Bluesky
         type: text
-        icon: instagram
+        icon: bluesky
         placeholder: username
         width: 1/3
   documents:

diff --git a/content/docs/2_reference/7_plugins/1_extensions/0_panel-areas/reference-extension.txt b/content/docs/2_reference/7_plugins/1_extensions/0_panel-areas/reference-extension.txt
@@ -307,7 +307,7 @@ The `k-users-view` component uses the `k-inside` component as a basic wrapper. T
 
 In this example, the list of users is just a basic unordered list, but of course, this could be anything. A big table, custom cards, or whatever you need to show your users appropriately.
 
-The backend part of your overwritten view is now sending exactly what your component needs. If you find out that you want to send your users in alphabetical groups or every user object should also contain the Instagram follower count, go for it.
+The backend part of your overwritten view is now sending exactly what your component needs. If you find out that you want to send your users in alphabetical groups or every user object should also contain the Mastodon follower count, go for it.
 
 ```php
 Kirby::plugin('custom/users', [

diff --git a/...nt/docs/3_cookbook/0_development-deployment/0_programmable-blueprints/cookbook-recipe.txt b/...nt/docs/3_cookbook/0_development-deployment/0_programmable-blueprints/cookbook-recipe.txt
@@ -588,8 +588,8 @@ $basicBlueprint = Data::read(__DIR__ . '/seo-basic.yml', 'yaml');
 $basicBlueprint['label'] = 'SEO';
 $fields = $basicBlueprint['sections']['basicMeta']['fields'];
 $basicBlueprint['sections']['basicMeta']['fields'] = array_merge($fields, [
-    'twitterHandle' => [
-        'label' => 'Twitter handle',
+    'mastodonHandle' => [
+        'label' => 'Mastodon handle',
         'type' => 'text',
     ]
 ]);
@@ -599,7 +599,7 @@ return $basicBlueprint;
 
 First, we read the file we want to extend into an array with `Data::read()`.
 
-Then we change the tab label and add a new field in the `basicMeta` section by merging the original fields array with the new `twitterHandle` field.
+Then we change the tab label and add a new field in the `basicMeta` section by merging the original fields array with the new `mastodonHandle` field.
 
 We can now add this tab in our page blueprints:
 

diff --git a/content/docs/3_cookbook/0_integrations/0_indieauth/cookbook-recipe.txt b/content/docs/3_cookbook/0_integrations/0_indieauth/cookbook-recipe.txt
@@ -66,8 +66,8 @@ Let's add some to our `/site/snippets/header.php` snippet:
   <title><?= $site->title() ?> | <?= $page->title() ?></title>
 
   <link rel="me" href="https://mastodon.social/@example">
+  <link rel="me" href="https://bsky.app/profile/example.com">
   <link rel="me" href="https://github.com/example">
-  <link rel="me" href="https://facebook.com/example">
 </head>
 ```
 

diff --git a/content/docs/4_quicktips/0_redirects/quicktip.txt b/content/docs/4_quicktips/0_redirects/quicktip.txt
@@ -94,7 +94,7 @@ This template doesn't display anything to the visitor but redirects directly to
 
 Now whenever someone visits `https://yourclientsdomain.com/blog`, they will be redirected to `https://ourawesomeproduct.tumblr.com`. And whenever someone visits `https://yourclientsdomain.com/support`, they will be redirected to `https://zendesk.com/ourawesomeproduct`. The menu is 100% editable from the Panel and you don't need to hack anything. Another side effect is that your client now has those nice branded URLs for their external support platform and blog.
 
-Once you've installed the `link.php` template, you can also use it to create more custom shortened links for your client. By adding invisible folders to the main content folder, you could also create redirects like `http://yourclientsdomain.com/facebook` or `http://yourclientsdomain.com/someothershortenedlink`
+Once you've installed the `link.php` template, you can also use it to create more custom shortened links for your client. By adding invisible folders to the main content folder, you could also create redirects like `http://yourclientsdomain.com/mastodon` or `http://yourclientsdomain.com/someothershortenedlink`
 
 
 ## Route instead of template

diff --git a/content/docs/4_quicktips/0_share-buttons/quicktip.txt b/content/docs/4_quicktips/0_share-buttons/quicktip.txt
diff --git a/content/home/1_company/home-story.txt b/content/home/1_company/home-story.txt
@@ -32,7 +32,7 @@ Mastodon: @[email protected]
 
 &minus;---
 
-Instagram: @h-and-c
+Bluesky: @h-and-c.com
 
 ----
 
@@ -57,7 +57,7 @@ Api:
 ```json
 {
   "site": {
-    "title": "H&C", "mastodon": "@[email protected]", "instagram": "@h-and-c"
+    "title": "H&C", "mastodon": "@[email protected]", "bluesky": "@h-and-c.com"
   },
   "projects": [
     { "title": "Creatious Labs.", "url": "/projects/creatious-labs" },

diff --git a/content/releases/3-8/release.txt b/content/releases/3-8/release.txt
@@ -231,7 +231,7 @@ options:
   type: query
   query: site.contactoptions.toStructure
   text: "{< item.nameWithHtml >}"
-  value: "{{ item.twitter }}"
+  value: "{{ item.mastodon }}"
 ```
 
 **Core**

diff --git a/content/voices/0_andy-bell/voice.txt b/content/voices/0_andy-bell/voice.txt
@@ -10,8 +10,4 @@ Text: Blimey, Kirby has come on a lot since I last used it. A fantastic CMS.
 
 ----
 
-Link: https://twitter.com/piccalilli_/status/1191815150178897924
-
-----
-
 Bio: Developer & author
diff --git a/content/voices/0_cameron-moll/voice.txt b/content/voices/0_cameron-moll/voice.txt
@@ -10,8 +10,4 @@ Text: I've been kicking the tires on Kirby as I revamp my site and it's been...
 
 ----
 
-Link: https://twitter.com/cameronmoll/status/1222951871763054593
-
-----
-
 Bio: VP design/research
diff --git a/content/voices/0_colly/voice.txt b/content/voices/0_colly/voice.txt
@@ -2,8 +2,6 @@ Title: Simon Collison
 ----
 Username: colly
 ----
-Link: https://twitter.com/colly/status/1214864770035322880
-----
 Text: Switching my sites to Kirby has transformed how I feel about them. I've rediscovered the ”designers who hack” spirit … I feel like I can build anything.
 ----
 Website: https://colly.com

diff --git a/content/voices/0_edenspiekermann/voice.txt b/content/voices/0_edenspiekermann/voice.txt
@@ -6,9 +6,6 @@ Username: edenspiekermann
 
 ----
 
-Link: https://twitter.com/edenspiekermann/status/504655558629392385
-
-----
 
 Website: https://www.edenspiekermann.com/
 

diff --git a/content/voices/0_geri-coady/voice.txt b/content/voices/0_geri-coady/voice.txt
@@ -2,10 +2,6 @@ Title: Geri Coady
 
 ----
 
-Link: https://twitter.com/hellogeri/status/1323753534656053251
-
-----
-
 Website: https://www.geridrawsjapan.com/
 
 ----

diff --git a/content/voices/0_julie-ng/voice.txt b/content/voices/0_julie-ng/voice.txt
@@ -1,7 +1,5 @@
 Title: Julie Ng
 ----
-Link: https://twitter.com/jng5/status/199608333215342595
-----
 Text: Really loving how flexible Kirby is. The documentation is also really thorough and fab.
 ----
 Bio: Developer at Microsoft

diff --git a/content/voices/0_matthias-ott/voice.txt b/content/voices/0_matthias-ott/voice.txt
@@ -10,8 +10,4 @@ Text: Working with Kirby is such a joy!
 
 ----
 
-Link: https://twitter.com/m_ott/status/1235134616023031808
-
-----
-
 Bio: UX designer, UI engineer, teacher, speaker
diff --git a/content/voices/0_nigel-ewan/voice.txt b/content/voices/0_nigel-ewan/voice.txt
@@ -10,8 +10,4 @@ Text: Kirby is the best CMS I’ve ever worked with in 15-ish years of building
 
 ----
 
-Link: https://twitter.com/nigel/status/1215731478996377600
-
-----
-
 Bio: Interdisciplinary designer
diff --git a/content/voices/0_rene-stalder/voice.txt b/content/voices/0_rene-stalder/voice.txt
@@ -10,8 +10,4 @@ Website: https://renestalder.me/en/
 
 ----
 
-Link: https://twitter.com/renestalder/status/1362077174581391364
-
-----
-
 Bio: Front-end-developer & accessibility consultant
diff --git a/content/voices/0_warchamp7/voice.txt b/content/voices/0_warchamp7/voice.txt
@@ -10,8 +10,5 @@ Text: Kirby is such a pleasure to work with
 
 ----
 
-Link: https://twitter.com/Warchamp7/status/1182713390881525761
-
-----
 
 Bio: Developer at @OBSProject
diff --git a/site/plugins/meta/src/PageMeta.php b/site/plugins/meta/src/PageMeta.php
@@ -71,7 +71,8 @@ public function jsonld(): string
 					'logo'   => url('/assets/images/kirby-signet.svg'),
 					'sameAs' => [
 						'https://mastodon.social/@getkirby',
-						'https://instagram.com/getkirby',
+						'https://bsky.app/profile/getkirby.com',
+						'https://www.linkedin.com/company/getkirby'
 					],
 				],
 				[
@@ -140,12 +141,9 @@ public function social(): string
 		$og['og:type']      = 'website';
 		$og['og:title']     = $this->get('ogtitle')->or($this->page->title());
 
-		// other platforms than Twitter also rely on this to display
-		// large preview images, e.g. Discord
-		$meta['twitter:card'] = 'summary_large_image';
-
 		// Meta and OpenGraph description
 		$description = $this->get('description', true);
+
 		if ($description->isNotEmpty()) {
 			$og['og:description'] = $description->excerpt(200);
 			$meta['description']  = $description->excerpt(160);
@@ -158,8 +156,6 @@ public function social(): string
 			if ($thumbnail->alt()->isNotEmpty()) {
 				$og['og:image:alt'] = $thumbnail->alt()->value();
 			}
-		} else if ($meta['twitter:card'] === 'summary_large_image') {
-			$meta['twitter:card'] = 'summary';
 		}
 
 		return Tpl::load(

diff --git a/site/snippets/layouts/footer.php b/site/snippets/layouts/footer.php
@@ -21,9 +21,6 @@
 					<a title="LinkedIn" rel="me" href="https://linkedin.com/company/getkirby">
 						<?= icon('linkedin') ?>
 					</a>
-					<a title="Instagram" rel="me" href="https://instagram.com/getkirby">
-						<?= icon('instagram') ?>
-					</a>
 					<a title="Youtube" rel="me" href="https://videos.getkirby.com">
 						<?= icon('youtube') ?>
 					</a>
@@ -96,7 +93,6 @@
 									'Community map' => 'https://community.getkirby.com',
 									'Mastodon'      => 'https://mastodon.social/@getkirby',
 									'LinkedIn'      => 'https://www.linkedin.com/company/getkirby',
-									'Instagram'     => 'https://instagram.com/getkirby',
 								]
 							]) ?>
 						</ul>

diff --git a/site/snippets/layouts/menu.php b/site/snippets/layouts/menu.php
@@ -66,7 +66,6 @@
 							'-',
 							'Mastodon' => 'https://mastodon.social/@getkirby',
 							'LinkedIn' => 'https://www.linkedin.com/company/getkirby',
-							'Instagram' => 'https://instagram.com/getkirby',
 						]
 					]) ?>
 				</ul>

diff --git a/site/snippets/templates/home/updates.php b/site/snippets/templates/home/updates.php
@@ -2,7 +2,7 @@
 	<div class="columns" style="--columns-sm: 1; --columns-md: 2; --columns-lg: 1; --column-gap: var(--spacing-12)">
 		<?php snippet('hgroup', [
 			'title' => $title ?? 'Join the Kirby community!',
-			'subtitle' => 'Subscribe to our <a class="link" href="/kosmos">monthly newsletter</a>. Enter our <a class="link" href="https://chat.getkirby.com">Discord chat</a>. Watch the <a class="link" href="https://videos.getkirby.com">screencasts</a>. Follow us in the <a class="link" href="https://mastodon.social/@getkirby">fediverse</a> and on <a class="link" href="https://instagram.com/getkirby">Instagram</a> for the latest updates.',
+			'subtitle' => 'Subscribe to our <a class="link" href="/kosmos">monthly newsletter</a>. Enter our <a class="link" href="https://chat.getkirby.com">Discord chat</a>. Watch the <a class="link" href="https://videos.getkirby.com">screencasts</a>. Follow us on <a class="link" href="https://mastodon.social/@getkirby">Mastodon</a> or <a class="link" href="https://bsky.app/profile/getkirby.com">Bluesky</a> for the latest updates.',
 			'mb' => 3
 		]) ?>
 
@@ -13,6 +13,12 @@
 					Mastodon
 				</a>
 			</li>
+			<li>
+				<a class="flex items-center" href="https://bsky.app/profile/getkirby.com" style="--icon: var(--color-blue-300)">
+					<figure class="mr-3 iconbox color-white bg-black rounded" style="--size: 3rem"><?= icon('bluesky') ?></figure>
+					Bluesky
+				</a>
+			</li>
 			<li>
 				<a class="flex items-center" href="https://videos.getkirby.com">
 					<figure class="mr-3 iconbox color-white bg-black rounded" style="--size: 3rem"><?= icon('youtube') ?></figure>
@@ -25,12 +31,6 @@
 					Discord
 				</a>
 			</li>
-			<li>
-				<a class="flex items-center" href="https://instagram.com/getkirby" style="--icon: var(--color-blue-300)">
-					<figure class="mr-3 iconbox color-white bg-black rounded" style="--size: 3rem"><?= icon('instagram') ?></figure>
-					Instagram
-				</a>
-			</li>
 		</ul>
 	</div>
 

diff --git a/site/snippets/templates/release-37/stats.php b/site/snippets/templates/release-37/stats.php
@@ -55,7 +55,7 @@
 		<div class="release-text-box" style="grid-area: box1">
 			<h3>Easy as 1-2-3</h3>
 			<div class="prose">
-				Show beautiful stats for your site or shop. Revenues, transactions, Instagram likes, page views… it’s totally up to you. Add as many reports to a <a href="/docs/reference/panel/sections/stats">stats section</a> as you need. Customize reports using our query syntax, and easily integrate into page models or site methods.
+				Show beautiful stats for your site or shop. Revenues, transactions, Social media engagement, page views… it’s totally up to you. Add as many reports to a <a href="/docs/reference/panel/sections/stats">stats section</a> as you need. Customize reports using our query syntax, and easily integrate into page models or site methods.
 			</div>
 		</div>
 

diff --git a/site/snippets/voice.php b/site/snippets/voice.php
@@ -3,7 +3,7 @@
 		<?= $voice->text()->widont() ?>
 	</p>
 	<footer>
-		<a href="<?= $voice->website()->or($voice->tweet()) ?>">
+		<a href="<?= $voice->website() ?>">
 			<figure class="flex items-center">
 				<?php if($image = $voice->image()): ?>
 				<div class="flex-shrink-0 mr-3" style="width: var(--spacing-12); --aspect-ratio: 1/1">

diff --git a/site/templates/2021.php b/site/templates/2021.php
@@ -87,10 +87,10 @@
 			</a>
 		</li>
 		<li class="bg-dark p-6">
-			<a class="block" href="https://twitter.com/getkirby">
+			<div class="block">
 				<span class="block text-2xl" style="color: var(--color-blue-400)">5,827</span>
 				<span class="font-mono text-xs"> Twitter followers</span>
-			</a>
+			</div>
 		</li>
 		<li class="bg-dark p-6">
 			<a class="block" href="https://videos.getkirby.com">
-Original file line number
+Diff line change
@@ Expand Up @@
     ----
-    Link: https://twitter.com/piccalilli_/status/1191815150178897924
-    ----
     Bio: Developer & author