Add support for categories and custom post types to the social meta plugin
https://bugs.webkit.org/show_bug.cgi?id=206327
Reviewed by Devin Rousso.
* wp-content/plugins/social-meta.php:
* wp-content/plugins/web-inspector-pages.php:
* wp-content/themes/webkit/archive-web_inspector_page.php:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254709 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/webkit.org/ChangeLog b/Websites/webkit.org/ChangeLog
index 044f27a..1854bc6 100644
--- a/Websites/webkit.org/ChangeLog
+++ b/Websites/webkit.org/ChangeLog
@@ -1,3 +1,14 @@
+2020-01-16 Jon Davis <jond@apple.com>
+
+ Add support for categories and custom post types to the social meta plugin
+ https://bugs.webkit.org/show_bug.cgi?id=206327
+
+ Reviewed by Devin Rousso.
+
+ * wp-content/plugins/social-meta.php:
+ * wp-content/plugins/web-inspector-pages.php:
+ * wp-content/themes/webkit/archive-web_inspector_page.php:
+
2020-01-15 Jon Davis <jond@apple.com>
Add Web Inspector Reference notice to Web Inspector blog posts
diff --git a/Websites/webkit.org/wp-content/plugins/social-meta.php b/Websites/webkit.org/wp-content/plugins/social-meta.php
index afc5bcd..1dd728c 100644
--- a/Websites/webkit.org/wp-content/plugins/social-meta.php
+++ b/Websites/webkit.org/wp-content/plugins/social-meta.php
@@ -12,37 +12,59 @@
$title = the_title_attribute('echo=0');
$description = get_the_excerpt();
$type = 'article';
-
+ $url = get_the_permalink();
$categories = array();
$tags = array();
- $image_url = get_stylesheet_directory_uri() . '/images/ogimage.png';
$twitter_handle = '';
$published_time = '';
$modified_time = '';
$fb_admins = array(
- 'Jon Davis' => '1085088865',
- 'Tim Hatcher' => '854565306'
+ 'Jon Davis' => '1085088865'
);
- if (is_front_page() || is_home()) {
+ if (is_front_page()) { // Landing page
$title = get_bloginfo('name');
$description = get_bloginfo('description');
$type = 'website';
- }
-
- if (is_single()) {
-
- $post = get_post();
-
- if ( has_post_thumbnail() ) {
- $image_src = wp_get_attachment_image_src( get_post_thumbnail_id($post_id), 'large' );
- $image_url = $image_src[0];
- } else {
- preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', $post->post_content, $matches);
- if ($matches[1][0]) $image_url = $matches[1][0];
+ } elseif (is_home()) { // Blog "page"
+ $title = get_bloginfo('name');
+ $description = "A collection of all " . get_bloginfo('name') . " blog posts.";
+ $type = 'website';
+ $url = get_home_url(null, '/blog/');
+ } elseif (is_post_type_archive()) { // custom post type archive "page"
+ $post_type = get_post_type();
+ $post_type_archive_url = get_post_type_archive_link($post_type);
+ $type = 'website';
+ $title = post_type_archive_title('', false);
+ $post_type_obj = get_post_type_object($post_type);
+ if (isset($post_type_obj->description))
+ $description = $post_type_obj->description;
+ if (!empty($post_type_archive_url))
+ $url = $post_type_archive_url;
+ } elseif (is_archive()) { // archives and category "pages"
+ $type = 'website';
+ $title = get_bloginfo('name')." Blog ".get_the_archive_title();
+ $description = "A collection of " . get_bloginfo('name') . " blog posts.";
+ if (is_category()) {
+ $category_objects = get_the_category();
+ if (isset($category_objects[0]->term_id))
+ $url = get_category_link($category_objects[0]->term_id);
}
-
+ } elseif (is_single() || is_page()) { // Posts and Pages
+ $post = get_post();
+ $social_image_url = get_post_meta(get_the_ID(), 'og-image-url', true);
+ if (!empty($social_image_url)) {
+ $image_url = $social_image_url;
+ } elseif (has_post_thumbnail()) {
+ $image_src = wp_get_attachment_image_src(get_post_thumbnail_id($post_id), 'large');
+ if (isset($image_src[0]))
+ $image_url = $image_src[0];
+ } elseif (is_single()) {
+ preg_match_all('/<img.+src(set)?=[\'"]([^\s\'"]+).*[\'"].*>/i', $post->post_content, $matches);
+ if (isset($matches[2][0]))
+ $image_url = $matches[2][0];
+ }
$categories = wp_get_object_terms(get_the_ID(), 'category', array('fields' => 'names'));
$tags = wp_get_object_terms(get_the_ID(), 'post_tag', array('fields' => 'names'));
@@ -51,7 +73,6 @@
$published_time = get_the_time('c');
$modified_time = get_the_modified_date('c');
}
-
?>
<!-- Schema.org markup -->
@@ -64,7 +85,10 @@
<?php endif; ?>
<!-- Twitter Card data -->
+<?php if ($image_url): // Twitter summary card with large image must be at least 280x150px ?>
<meta name="twitter:card" content="summary_large_image">
+ <meta name="twitter:image:src" content="<?php echo esc_url($image_url); ?>">
+<?php endif; ?>
<meta name="twitter:site" content="@webkit">
<meta name="twitter:title" content="<?php echo esc_attr($title); ?>">
<?php if ($description): ?>
@@ -73,14 +97,11 @@
<?php if ($twitter_handle): ?>
<meta name="twitter:creator" content="@<?php echo esc_attr($twitter_handle); ?>">
<?php endif; ?>
-<?php if ($image_url): // Twitter summary card with large image must be at least 280x150px ?>
- <meta name="twitter:image:src" content="<?php echo esc_url($image_url); ?>">
-<?php endif; ?>
<!-- Open Graph data -->
<meta property="og:title" content="<?php echo esc_attr($title); ?>">
<meta property="og:type" content="<?php echo esc_attr($type); ?>">
- <meta property="og:url" content="<?php the_permalink(); ?>">
+ <meta property="og:url" content="<?php echo esc_url($url); ?>">
<?php if ($image_url): ?>
<meta property="og:image" content="<?php echo esc_url($image_url); ?>">
<?php endif; ?>
diff --git a/Websites/webkit.org/wp-content/plugins/web-inspector-pages.php b/Websites/webkit.org/wp-content/plugins/web-inspector-pages.php
index cb46b77..cc73731 100644
--- a/Websites/webkit.org/wp-content/plugins/web-inspector-pages.php
+++ b/Websites/webkit.org/wp-content/plugins/web-inspector-pages.php
@@ -18,7 +18,7 @@
'delete_web_inspector_page' => true,
'delete_web_inspector_pages' => true,
'publish_web_inspector_pages' => true,
-
+
// Standard Editor Capabilities
'delete_others_pages' => true,
'delete_others_posts' => true,
@@ -68,10 +68,10 @@
add_action('init', function () {
register_post_type('web_inspector_page', array(
'label' => 'Web Inspector Page',
- 'description' => 'Reference pages for Web Inspector',
+ 'description' => 'Reference documentation for Web Inspector.',
'menu_icon' => 'dashicons-media-document',
'labels' => array(
- 'name' => 'Web Inspector Pages',
+ 'name' => 'Web Inspector Reference',
'singular_name' => 'Web Inspector Page',
'menu_name' => 'Web Inspector Pages',
'name_admin_bar' => 'Web Inspector Page',
@@ -131,7 +131,7 @@
'map_meta_cap' => true,
'show_in_rest' => true
));
-
+
register_taxonomy('web_inspector_topics', array('web_inspector_page'), array(
'labels' => array(
'name' => _x('Web Inspector Topics', 'Taxonomy General Name'),
