Changeset 3738687

indieweb-post-kinds/tags/4.0.0/.gitattributes

-              r2491232
+              r3738687
 /tests export-ignore
 /bin export-ignore
 /node-modules export-ignore
+/node_modules export-ignore
 /sass export-ignore
 …
 /readme.md export-ignore
 /phpcs.xml export-ignore
+/phpcs-templates.xml export-ignore
 /phpunit.xml export-ignore
+/Gruntfile.js export-ignore
+/gruntlint.js export-ignore
+/eslint.config.js export-ignore

indieweb-post-kinds/tags/4.0.0/css/kind.admin.min.css

r2572705	r3738687
1		.svg-icon svg{fill:currentColor;padding:2px;vertical-align:middle;top:-0.0625em}#kind-all svg{width:1rem;height:1rem;color:gray}#kind-menu svg,#kind-posts svg,#tempus-onthisday svg,#tempus-thisweek svg,.kind-titles svg{width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}.response svg{width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}#replybox-meta.is-loading .loading{visibility:visible}#replybox-meta label{display:block}#replybox-meta .field-row{overflow:auto;height:100%}#replybox-meta .half{float:left;width:46%;margin:0 1%}#replybox-meta .half:first-of-type{margin-left:0;width:48%}#replybox-meta .half:last-of-type{margin-right:0;width:49%}#replybox-meta .quarter{float:left;margin-left:2%;width:12%}#replybox-meta .eighth{float:left;margin-left:2%;margin-right:1%;width:6%}#replybox-meta input[type=number]{width:100%}#replybox-meta .three-quarters{float:left;width:85%}#replybox-meta .is-loading .loading{visibility:visible}#replybox-meta .loading{visibility:hidden;position:absolute;top:0;bottom:0;left:0;right:0;z-index:10;background-color:#000;background-color:rgba(0,0,0,.4)}#replybox-meta .loading-spinner{margin:0 auto;display:block;position:relative;top:2em}/# sourceMappingURL=kind.admin.min.css.map /
	1	:where(.svg-icon){display:inline-block;width:1em;height:1em;margin-right:.5rem;vertical-align:middle}:where(.svg-icon>span,.svg-icon svg){display:block;width:100%;height:100%}:where(.svg-icon svg){fill:currentColor}:where(#kind-all .svg-icon){width:1rem;height:1rem;color:gray}:where(#kind-menu,#kind-posts,#tempus-onthisday,#tempus-thisweek,.kind-titles) :where(.svg-icon){width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}:where(.response) :where(.svg-icon){width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}#replybox-meta.is-loading .loading{visibility:visible}#replybox-meta label{display:block}#replybox-meta .field-row{overflow:auto;height:100%}#replybox-meta .half{float:left;width:46%;margin:0 1%}#replybox-meta .half:first-of-type{margin-left:0;width:48%}#replybox-meta .half:last-of-type{margin-right:0;width:49%}#replybox-meta .quarter{float:left;margin-left:2%;width:12%}#replybox-meta .eighth{float:left;margin-left:2%;margin-right:1%;width:6%}#replybox-meta input[type=number]{width:100%}#replybox-meta .three-quarters{float:left;width:85%}#replybox-meta .is-loading .loading{visibility:visible}#replybox-meta .loading{visibility:hidden;position:absolute;top:0;bottom:0;left:0;right:0;z-index:10;background-color:#000;background-color:rgba(0,0,0,.4)}#replybox-meta .loading-spinner{margin:0 auto;display:block;position:relative;top:2em}/# sourceMappingURL=kind.admin.min.css.map /

indieweb-post-kinds/tags/4.0.0/css/kind.admin.min.css.map

r2572705	r3738687
1		{"version":3,"sourceRoot":"","sources":["../sass/_kinds.scss","../sass/_meta-box.scss"],"names":[],"mappings":"AAAA,cACC,kBACA,YACA,sBACA,cAIA,cACC,WACA,YACA,WAKD,2FACC,aACA,cACA,WACA,0BAED,sFACC,qBAKM,cACQ,WACA,YACd,WACc,0BAEf,iBACC,YCnCF,mCACC,mBAIA,qBACC,cAED,0BACC,cACA,YAED,qBACC,WACA,UACA,YAED,mCACC,cACA,UAED,kCACC,eACA,UAED,wBACC,WACA,eACA,UAED,uBACC,WACA,eACA,gBACA,SAED,kCACC,WAED,+BACC,WACA,UAED,oCACC,mBAED,wBACC,kBACA,kBACA,MACA,SACA,OACA,QACA,WACA,sBACA,gCAED,gCACC,cACA,cACA,kBACA","file":"kind.admin.min.css"}
	1	{"version":3,"sourceRoot":"..\/","sources":["sass\/_kinds.scss","sass\/_meta-box.scss"],"names":[],"mappings":"AAGA,kBACC,qBACA,UACA,WACA,mBACA,sBAGD,qCACC,cACA,WACA,YAGD,sBACC,kBAGD,4BACC,WACA,YACA,WAGD,iGACC,aACA,cACA,WACA,0BAIA,sFACC,qBAIF,oCACC,WACA,YACA,WACA,0BAIA,iBACC,YCjDF,mCACC,mBAIA,qBACC,cAED,0BACC,cACA,YAED,qBACC,WACA,UACA,YAED,mCACC,cACA,UAED,kCACC,eACA,UAED,wBACC,WACA,eACA,UAED,uBACC,WACA,eACA,gBACA,SAED,kCACC,WAED,+BACC,WACA,UAED,oCACC,mBAED,wBACC,kBACA,kBACA,MACA,SACA,OACA,QACA,WACA,sBACA,gCAED,gCACC,cACA,cACA,kBACA","file":"kind.admin.min.css"}

indieweb-post-kinds/tags/4.0.0/css/kind.min.css

r2588189	r3738687
1		.svg-icon svg{fill:currentColor;padding:2px;vertical-align:middle;top:-0.0625em}#kind-all svg{width:1rem;height:1rem;color:gray}#kind-menu svg,#kind-posts svg,#tempus-onthisday svg,#tempus-thisweek svg,.kind-titles svg{width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}.response svg{width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}.response{margin-bottom:10px;margin-top:10px;margin-left:20px;padding:5px;font-size:16px;border-bottom:inset #d6d6d6}.response .kind-icon{margin-right:3px}.response blockquote{margin-left:25px}.response a:link{text-decoration:none}.response a:hover{text-decoration:none}.response img{padding:0;margin:2px}ul.cites{list-style:none;display:inline}.kind-embeds{text-align:center;position:relative;width:100%;margin-top:5px}.kind-photo-thumbnail{margin-bottom:5px}/# sourceMappingURL=kind.min.css.map /
	1	:where(.svg-icon){display:inline-block;width:1em;height:1em;margin-right:.5rem;vertical-align:middle}:where(.svg-icon>span,.svg-icon svg){display:block;width:100%;height:100%}:where(.svg-icon svg){fill:currentColor}:where(#kind-all .svg-icon){width:1rem;height:1rem;color:gray}:where(#kind-menu,#kind-posts,#tempus-onthisday,#tempus-thisweek,.kind-titles) :where(.svg-icon){width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}:where(.response) :where(.svg-icon){width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}.response{margin-bottom:10px;margin-top:10px;margin-left:20px;padding:5px;font-size:16px;border-bottom:inset #d6d6d6}.response .kind-icon{margin-right:3px}.response blockquote{margin-left:25px}.response a:link{text-decoration:none}.response a:hover{text-decoration:none}.response img{padding:0;margin:2px}ul.cites{list-style:none;display:inline}.kind-embeds{text-align:center;position:relative;width:100%;margin-top:5px}.kind-photo-thumbnail{margin-bottom:5px}/# sourceMappingURL=kind.min.css.map /

indieweb-post-kinds/tags/4.0.0/css/kind.min.css.map

r2588189	r3738687
1		{"version":3,"sourceRoot":"","sources":["../sass/_kinds.scss","../sass/_frontend.scss"],"names":[],"mappings":"AAAA,cACC,kBACA,YACA,sBACA,cAIA,cACC,WACA,YACA,WAKD,2FACC,aACA,cACA,WACA,0BAED,sFACC,qBAKM,cACQ,WACA,YACd,WACc,0BAEf,iBACC,YCnCF,UACI,mBACA,gBACA,iBACA,YACA,eACA,4BACF,qBACC,iBAED,qBACC,iBAGF,iBACC,qBAGD,kBACC,qBAGD,cACE,UACA,WAIH,SACI,gBACA,eAGJ,aACI,kBACA,kBACA,WACA,eAGJ,sBACI","file":"kind.min.css"}
	1	{"version":3,"sourceRoot":"..\/","sources":["sass\/_kinds.scss","sass\/_frontend.scss"],"names":[],"mappings":"AAGA,kBACC,qBACA,UACA,WACA,mBACA,sBAGD,qCACC,cACA,WACA,YAGD,sBACC,kBAGD,4BACC,WACA,YACA,WAGD,iGACC,aACA,cACA,WACA,0BAIA,sFACC,qBAIF,oCACC,WACA,YACA,WACA,0BAIA,iBACC,YCjDF,UACI,mBACA,gBACA,iBACA,YACA,eACA,4BACF,qBACC,iBAED,qBACC,iBAGF,iBACC,qBAGD,kBACC,qBAGD,cACE,UACA,WAIH,SACI,gBACA,eAGJ,aACI,kBACA,kBACA,WACA,eAGJ,sBACI","file":"kind.min.css"}

indieweb-post-kinds/tags/4.0.0/develop.txt

-              r1787314
+              r3738687
+== Functions ==
+Developer notes for Post Kinds 4.0.0. Every function, method and hook listed here has a docblock in the code with its full parameters and return values.
+`get_post_kind_slug($id)` - Return the kind slug for a given post. If `$id` is not specified, use current post.
+`get_post_kind($id)` - Return the kind string for a given post. If `$id` is not specified, use current post.
+== Template functions ==
+`has_post_kind($kind, $post)` - Returns true/false if kind is in post. If post is empty, then use current post
+These global functions are loaded on `plugins_loaded`, from `includes/kind-functions.php`.
+`get_kind_context_class( $class, $classtype )` - Returns the CSS class to be applied to the response/context if the kind is one for which there is context. Classtype defaults to u, other option is usually p. Sets the class to the kind slug and for specially specified slugs, sets appropriate mf2 classes as well. $class specifies any additional classes to be added.
+`get_post_kind_slug( $post = null )` - Returns the kind slug of a post, or false if it has no kind. Defaults to the current post.
+`get_post_kind( $post = null )` - Returns the translated kind name of a post, or false if it has no kind. Defaults to the current post.
+`has_post_kind( $kinds = array(), $post = null )` - Returns whether a post has any of the given kinds, or any kind at all if `$kinds` is empty.
+`set_post_kind( $post, $kind )` - Gives a post a kind. Returns a WP_Error if the post or the kind is not valid.
+`get_post_kind_slugs()` - Returns the slugs of every registered kind.
+`get_post_kind_string( $slug )` - Returns the translated name of a kind, or an empty string if it is not registered.
+`get_post_kind_link( $kind )` - Returns the URL of a kind's archive.
+`kind_display( $post_id = null )` - Prints the response markup for a post. Use it with the `kind_content_display` filter to place the markup in the theme.
+`get_kind_view_part( $slug, $name = null, $args = null )` - Returns a rendered view. See Kind_View::get_view_part().
+`kind_get_the_title( $post = null, $args = array() )` - Returns a post's title, or a generated one (the kind's icon or name and a cited name or excerpt) for a post without one.
+`kind_get_the_link( $post = null, $cls = null, $date_cls = null )` - Returns a link to a post, using kind_get_the_title(), followed by its date.
+`kind_flatten_array( $a )` - Removes empty values from an array and unwraps single-item lists, recursively.
+`kind_src_url_in_content( $content )` - Returns every src attribute value in some markup, or 0 if there are none.
+== Registering kinds ==
+`register_post_kind( $slug, $args )` - Registers a kind. Call it on `init`. `includes/register-kinds.php` registers the built-in kinds the same way, and Kind_Taxonomy::register_post_kind() documents every argument.
+`set_post_kind_visibility( $slug, $show = true )` - Shows or hides a kind in Settings, including the kinds reserved for future use.
 ==  Filters ==
+== Time functions ==
+`get_the_kind` - Filter get_the_kinds
+Also global, from `includes/time-functions.php`.
+`the_kinds` - Filter get_the_kinds_list
+`kind_safe_datetime( $value, $timezone = null, $immutable = true )` - Since 4.0.0. Creates a date from a value, returning false instead of throwing on invalid input.
+`kind_safe_interval( $value )` - Since 4.0.0. Creates a DateInterval from an ISO 8601 duration such as `PT3M30S`, returning false instead of throwing on invalid input.
+`calculate_duration( $start_string, $end_string )` - Returns the DateInterval between two dates, or false.
+`date_interval_to_iso8601( $interval )` - Converts a DateInterval to an ISO 8601 duration string.
+`build_iso8601_time( $date, $time, $offset )` - Joins a date, time and offset into an ISO 8601 string.
+`build_iso8601_duration( $values )` - Builds an ISO 8601 duration from its pieces (Y, M, D, H, I, S).
+`get_gmt_offsets()` - Returns the UTC offsets in use by any time zone, sorted.
+`get_default_offset()` - Returns the site's UTC offset, such as `-05:00`.
+`tz_seconds_to_offset( $seconds )`, `tz_offset_to_seconds( $offset )` - Convert between a UTC offset in seconds and an offset string.
+`tz_seconds_to_timezone( $seconds )`, `tz_timezone_to_seconds( $timezone )` - Convert between a UTC offset in seconds and a DateTimeZone.
+`kind_classes` - Filter get_kind_class
+== Classes ==
 `kind_verb` - Filter get_kind_verbs
+`Kind_Post` reads and writes a post's response data. Create one with a post ID or WP_Post. Its main methods:
+`kind-response-display` - Filters the output being added to the_content or to custom location in theme
+* `get_kind()`, `get_cite( $key = null )`, `get_author()`, `get_photo()`, `get_audio()`, `get_video()`, `get_duration()`, `get_datetime_property( $property )` and `get( $key )` read data.
+* `set( $key, $value )`, `set_duration( $value )`, `set_datetime_property( $key, $value )` and `delete( $key )` write it. Response data is stored as post meta prefixed `mf2_`.
+* `get_cite_type()` - Since 4.0.0. Returns the jf2 type of the post's citation: `card` for a checkin, `food` for eat and drink, and `cite` for every other kind.
+* `Kind_Post::get_attachment_id( $url )` - Since 4.0.0. Static. A cached wrapper for attachment_url_to_postid().
+`Kind_Time` - Since 4.0.0. Static helpers for the editor's date, time and duration fields: `display_formatted_datetime()`, `divide_datetime()`, `build_datetime()`, `get_datetime_offset()`, `divide_interval()` and `build_interval()`.
+`Kind_View` builds the response markup. `Kind_View::get_display( $post_id = null )` returns it for a post, `Kind_View::get_view_part( $slug, $name, $args = null )` renders one view, and `Kind_View::get_hcard( $author, $args = null )` returns an author's h-card. Since 4.0.0, its helpers return escaped markup; the 4.0.0 changelog lists the ones that changed.
+`Kind_Media_Metadata::has_media( $post )` - Since 4.0.0. Returns whether a post may show audio or video. The media fragment script loads only for these posts.
+`Kind_Upgrade` - Since 4.0.0. Upgrades stored post data in the background, in batches, after the plugin is updated. It gives published posts without a kind one, moves citations out of older storage locations, repairs citations that earlier versions damaged, and records the media in each post.
+== WP-CLI ==
+`wp post-kinds upgrade` - Since 4.0.0. Runs the upgrade now instead of in the background. It is safe to run more than once.
+* `--dry-run` - Report what would change without saving.
+* `--post=<id>` - Upgrade only this post.
+== REST API ==
+* The `kind` field on posts reads and sets a post's kind slug.
+* `GET /wp-json/post-kinds/1.0/fields?kind={slug}` returns a kind's registration, including its field schema. An unknown kind returns a 404. It requires the `edit_posts` capability.
+* The editor fetches details for a cited URL from the bundled Parse This library's `parse-this/1.0/parse` route.
+== Filters ==
+Display:
+`kind_content_display` - Whether to add response markup to post content, excerpts and feeds automatically. Return false to place it with kind_display() instead. Default true.
+`kind_response_display` - The response markup for a post. Receives the markup and the post ID.
+`kind_view_paths` - The folders searched for views before the plugin's `views` folder. Default the theme's `kind_views` folder.
+`kind_icon_display` - Whether to show the kind's icon or name before the response. Return false to hide it and remove the option from Settings.
+`post_kinds_icon_attributes` - The HTML attributes on the span that wraps a kind icon. Output as-is, so it must be escaped. Default empty since 4.0.0; before that, an inline style.
+`kind_get_the_title_content` - The text of a generated title. Receives escaped text and the post.
+`kind_get_the_title_before` - The markup before a generated title, the kind's icon or name by default. Output as-is, so it must be escaped.
+`get_hcard_data` - The author data before it becomes an h-card.
+`get_hcard` - The h-card markup for an author. Return non-empty, escaped markup to replace the plugin's own.
+`post_kind_embed_approvelist` - The domains whose cited URLs are embedded with oEmbed.
+`kind_post_type_string` - The phrase for what a known site's URL points to, such as "a video" for YouTube.
+Kinds and archives:
+`kind_include` - The kinds offered in the editor and listed by the Kind Menu widget. Default the kinds selected in Settings, plus note, reply and article.
+`kind_base_slug` - Since 4.0.0. The start of kind archive URLs, as in `/kind/like/`. Default the Kind base on Settings > Permalinks, or `kind`.
+`kind_rewrite_taxonomies` - The taxonomies that get `/kind/{kind}/{taxonomy}/{term}/` archives. Default post_tag, category and series.
+`kind_exclude_slug` - The slug for archives that exclude kinds, as in `/exclude/kind/note,like/`. Default `exclude`.
+`kind_photos_slug` - The slug for the archive of posts with photos. Default `photos`.
+`kind_firehose_slug` - The slug for the feed that includes every kind. Default `firehose`.
+After changing a slug or the rewrite taxonomies, flush rewrite rules: visit Settings > Permalinks and save.
+Upgrade:
+`kind_upgrade_batch_size` - Since 4.0.0. The number of posts the background upgrade processes per batch. Default 50.
+Micropub (these run only when the Micropub plugin is active):
+`post_kinds_micropub_enrich` - Since 4.0.0. Whether to fill in citation URLs from Micropub requests with data parsed from the cited page. Return false to store citations exactly as the client sent them. Default true.
+`post_kinds_micropub_parse_timeout` - Since 4.0.0. The timeout, in seconds, for parsing a citation while the client waits. Citations that time out are retried in the background. Default 5.
+`post_kinds_micropub_unavailable_retry_delay` - Since 4.0.0. How long to wait before retrying, once, a citation whose page returned 404, 401 or 403. Default 6 hours.
+`post_kinds_micropub_post_types` - Since 4.0.0. The post types advertised to Micropub clients in `q=config`.
+== Actions ==
+`change_kind` - Fires when a post's kind changes. Receives the post ID and the old and new kind slugs; either slug can be an empty string.
+`post_kinds_citation_enrichment` - Since 4.0.0. Fires after each attempt to parse a Micropub citation. Receives the log entry and the post ID.
+== Deprecated ==
+These still work, but report a deprecation notice when WP_DEBUG is on.
+* Since 4.0.0, the global functions `display_formatted_datetime()`, `divide_datetime()`, `build_datetime()`, `get_datetime_offset()`, `divide_interval()` and `build_interval()`. Use the Kind_Time methods of the same names. They will be removed in 5.0.0.
+* Since 4.0.0, the `MF2_Post` class. Use Kind_Post. It will be removed in a future major version.
+== Styling icons ==
+Kind icons are `<span class="svg-icon svg-{kind}">` elements wrapping an SVG. The plugin's stylesheet sizes the span, and the SVG fills it. Its rules use `:where()`, so they have no specificity and any theme rule wins. For example, `.svg-icon { width: 1rem; height: 1rem; }` resizes every icon, and `#kind-menu .svg-icon` only those in the Kind Menu widget. Icons take their colour from the `color` property.
+== Overriding views ==
+The markup added to each post comes from a view file in the plugin's `views` folder: `kind-{slug}.php` for a kind (for example `kind-like.php`), or `kind.php` for a kind without its own view.
+To change a view, copy it into a `kind_views` folder in your theme and edit the copy. If a child theme has a `kind_views` folder, it is used instead of the parent theme's; the two aren't combined. For each post, the plugin looks for `kind-{slug}.php` in your theme and then in the plugin, and only then for `kind.php` in the same order. So a theme `kind.php` replaces only the kinds that have no view of their own. The `kind_view_paths` filter changes which folders are searched before the plugin's.
+Copies don't receive updates. After upgrading, compare them with the plugin's views. Since 4.0.0, views escape everything they print, and the `Kind_View` helpers return escaped markup.
+Each view is rendered by `Kind_View::get_view_part()` with these variables in scope:
+* `$kind_post` (Kind_Post) - the post being displayed.
+* `$kind` (string) - the kind's slug, such as `like`.
+* `$type` (string) - the kind's microformats property, such as `like-of`.
+* `$cite` (array) - the citation, normalized by `Kind_Post::normalize_cite()`, so every key is present. `name` falls back to the URL.
+* `$url` (string) - the cited URL.
+* `$author` (string|false) - the cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none. `$cite['authors']` lists each author as a card with `name`, `url` and `photo`.
+* `$embed` (string) - embed markup for the cited URL, or an empty string.
+* `$photos` (int[]|false) - attachment IDs of the post's photos, from `Kind_Post::get_photo()`.
+* `$args` (array) - the arguments passed to `Kind_View::get_view_part()`; `post_id` is the post's ID.

indieweb-post-kinds/tags/4.0.0/includes/class-kind-config.php

-              r2973430
+              r3738687
 <?php
 /**
  * Post Kind Configuration Class
+ * Kind_Config class.
+ *
  * @package Post Kinds
  * Sets Up Configuration Options for the Plugin.
+ * @package Post_Kinds
+ * @since   2.0.2
  */
+defined( 'ABSPATH' ) || exit;
 /**
  * Static Class to Configure Admin Options.
+ * Registers the plugin settings and builds the settings page.
+ *
  * @package Post Kinds
+ * @since 2.0.2
  */
 class Kind_Config {
 …
         /**
          * Function to Initialize the Configuration.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 add_action( 'admin_init', array( static::class, 'admin_init' ) );
                 add_action( 'admin_menu', array( static::class, 'admin_menu' ), 11 );
                 // Add post help tab
+                // Add post help tab.
                 add_action( 'load-post.php', array( static::class, 'add_post_help_tab' ), 20 );
+                $args = array(
+                        'type'         => 'array',
+                        'description'  => 'Kinds Enabled on This Site',
+                        'show_in_rest' => false,
+                        'default'      => array( 'article', 'reply', 'bookmark' ),
+                add_action( 'load-options-permalink.php', array( static::class, 'save_kind_base' ) );
+                $args = array(
+                        'type'              => 'array',
+                        'description'       => 'Kinds Enabled on This Site',
+                        'show_in_rest'      => false,
+                        'default'           => array( 'article', 'reply', 'bookmark' ),
+                        'sanitize_callback' => array( static::class, 'sanitize_kind_list' ),
                 );
                 register_setting( 'iwt_options', 'kind_termslist', $args );
                 $args = array(
+                        'type'         => 'string',
+                        'description'  => 'Default Kind',
+                        'show_in_rest' => false,
+                        'default'      => 'note',
+                        'type'              => 'string',
+                        'description'       => 'Default Kind',
+                        'show_in_rest'      => false,
+                        'default'           => 'note',
+                        'sanitize_callback' => array( static::class, 'sanitize_default_kind' ),
                 );
                 register_setting( 'iwt_options', 'kind_default', $args );
                 $args = array(
+                        'type'         => 'boolean',
+                        'description'  => 'Rich Embed Support for Whitelisted Sites',
+                        'show_in_rest' => false,
+                        'default'      => 1,
+                        'type'              => 'boolean',
+                        'description'       => 'Rich Embed Support for Whitelisted Sites',
+                        'show_in_rest'      => false,
+                        'default'           => 1,
+                        'sanitize_callback' => array( static::class, 'sanitize_checkbox' ),
                 );
                 register_setting( 'iwt_options', 'kind_embeds', $args );
                 $args = array(
+                        'type'         => 'array',
+                        'description'  => 'Kinds Showing in Main Archive',
+                        'show_in_rest' => false,
+                        'default'      => array(),
+                        'type'              => 'array',
+                        'description'       => 'Kinds Showing in Main Archive',
+                        'show_in_rest'      => false,
+                        'default'           => array(),
+                        'sanitize_callback' => array( static::class, 'sanitize_kind_list' ),
                 );
                 register_setting( 'iwt_options', 'kind_firehose', $args );
                 $args = array(
+                        'type'         => 'boolean',
+                        'description'  => 'Response Information Should Be After Content',
+                        'show_in_rest' => false,
+                        'default'      => 0,
+                        'type'              => 'boolean',
+                        'description'       => 'Response Information Should Be After Content',
+                        'show_in_rest'      => false,
+                        'default'           => 0,
+                        'sanitize_callback' => array( static::class, 'sanitize_checkbox' ),
                 );
                 register_setting( 'iwt_options', 'kind_bottom', $args );
                 $args = array(
+                        'type'         => 'string',
+                        'description'  => 'Display Preferences for Before Kind',
+                        'show_in_rest' => false,
+                        'default'      => 'icon',
+                        'type'              => 'string',
+                        'description'       => 'Display Preferences for Before Kind',
+                        'show_in_rest'      => false,
+                        'default'           => 'icon',
+                        'sanitize_callback' => array( static::class, 'sanitize_display' ),
                 );
                 register_setting( 'iwt_options', 'kind_display', $args );
                 $args = array(
+                        'type'         => 'string',
+                        'description'  => 'KSES Content Protection on Responses',
+                        'show_in_rest' => false,
+                        'default'      => str_replace( '},"', "},\r\n\"", wp_json_encode( wp_kses_allowed_html( 'post' ), 128 ) ),
+                        'type'              => 'string',
+                        'description'       => 'KSES Content Protection on Responses',
+                        'show_in_rest'      => false,
+                        'default'           => str_replace( '},"', "},\r\n\"", wp_json_encode( wp_kses_allowed_html( 'post' ), 128 ) ),
+                        'sanitize_callback' => array( static::class, 'sanitize_kses' ),
                 );
                 register_setting( 'iwt_options', 'kind_kses', $args );
                 $args = array(
+                        'type'         => 'boolean',
+                        'description'  => 'Automatically add the Kind to the Title',
+                        'show_in_rest' => false,
+                        'default'      => 0,
+                        'type'              => 'boolean',
+                        'description'       => 'Automatically add the Kind to the Title',
+                        'show_in_rest'      => false,
+                        'default'           => 0,
+                        'sanitize_callback' => array( static::class, 'sanitize_checkbox' ),
                 );
                 register_setting( 'iwt_options', 'kind_title', $args );
+                $args = array(
+                        'type'              => 'string',
+                        'description'       => 'Kind Base',
+                        'show_in_rest'      => false,
+                        'default'           => '',
+                        'sanitize_callback' => array( static::class, 'sanitize_kind_base' ),
+                );
+                register_setting( 'permalink', 'kind_base', $args );
+        }
+        /**
+         * Sanitizes the kind_base setting.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string The base, such as 'type' or 'blog/type', or an empty string for the default.
+         */
+        public static function sanitize_kind_base( $value ) {
+                if ( ! is_string( $value ) ) {
+                        return '';
+                }
+                $segments = array_filter( array_map( 'sanitize_title', explode( '/', $value ) ) );
+                $base     = implode( '/', $segments );
+                return 'kind' === $base ? '' : $base;
+        }
+        /**
+         * Saves the Kind base field on Settings > Permalinks.
+         *
+         * Core's permalink page doesn't save fields that plugins add, so this runs
+         * before it, with its nonce. Core flushes the rewrite rules when the page
+         * reloads.
+         *
+         * @since 4.0.0
+         */
+        public static function save_kind_base() {
+                if ( ! isset( $_POST['kind_base'] ) || ! is_string( $_POST['kind_base'] ) || ! current_user_can( 'manage_options' ) ) {
+                        return;
+                }
+                check_admin_referer( 'update-permalink' );
+                // Sanitized by sanitize_kind_base(), the setting's sanitize callback.
+                update_option( 'kind_base', wp_unslash( $_POST['kind_base'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+        }
+        /**
+         * Outputs the Kind base field on Settings > Permalinks.
+         *
+         * @since 4.0.0
+         */
+        public static function kind_base_callback() {
+                printf(
+                        '<input name="kind_base" id="kind_base" type="text" value="%1$s" class="regular-text code" placeholder="kind" />',
+                        esc_attr( get_option( 'kind_base', '' ) )
+                );
+        }
+        /**
+         * Sanitizes a list of kinds: the kind_termslist and kind_firehose settings.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string[] Registered kind slugs.
+         */
+        public static function sanitize_kind_list( $value ) {
+                if ( ! is_array( $value ) ) {
+                        return array();
+                }
+                $value = array_map( 'sanitize_key', array_filter( $value, 'is_string' ) );
+                return array_values( array_unique( array_intersect( $value, Kind_Taxonomy::get_kind_list() ) ) );
+        }
+        /**
+         * Sanitizes the default kind setting.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string A registered kind slug, or note.
+         */
+        public static function sanitize_default_kind( $value ) {
+                $value = is_string( $value ) ? sanitize_key( $value ) : '';
+                return in_array( $value, Kind_Taxonomy::get_kind_list(), true ) ? $value : 'note';
+        }
+        /**
+         * Sanitizes the display setting for the text before a kind.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string icon, text, both or hide. Defaults to icon.
+         */
+        public static function sanitize_display( $value ) {
+                return in_array( $value, array( 'icon', 'text', 'both', 'hide' ), true ) ? $value : 'icon';
+        }
+        /**
+         * Sanitizes a checkbox setting.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return int 1 if checked, otherwise 0.
+         */
+        public static function sanitize_checkbox( $value ) {
+                return empty( $value ) ? 0 : 1;
+        }
+        /**
+         * Sanitizes the allowed HTML setting, a JSON object as wp_kses() expects.
+         *
+         * Invalid JSON is rejected and the previous value kept.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string JSON-encoded allowed HTML.
+         */
+        public static function sanitize_kses( $value ) {
+                $decoded = is_string( $value ) ? json_decode( $value, true ) : null;
+                if ( is_array( $decoded ) ) {
+                        return $value;
+                }
+                // The settings error API is only loaded in the admin.
+                if ( function_exists( 'add_settings_error' ) ) {
+                        add_settings_error( 'kind_kses', 'kind_kses_invalid', __( 'The allowed HTML must be a valid JSON object. The previous value has been kept.', 'indieweb-post-kinds' ) );
+                }
+                $previous = get_option( 'kind_kses' );
+                return is_string( $previous ) ? $previous : '';
+        }
+        /**
+         * Returns the kinds enabled in settings (the kind_termslist option).
+         *
+         * Always returns an array of registered kind slugs, whatever is stored: the
+         * option can be missing, false or hold kinds that are no longer registered.
+         * Note, which is always available, is not included unless it was saved.
+         *
+         * @since 4.0.0
+         *
+         * @return string[] Kind slugs.
+         */
+        public static function get_termslist() {
+                $termslist = get_option( 'kind_termslist' );
+                if ( ! is_array( $termslist ) ) {
+                        return array();
+                }
+                return array_values( array_intersect( $termslist, Kind_Taxonomy::get_kind_list() ) );
+        }
         /**
          * Function to Set up Settings.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 add_action( 'admin_bar_menu', array( static::class, 'dashbar_links' ), 20 );
                 add_action( 'admin_bar_menu', array( static::class, 'remove_dashbar_post' ), 200 );
+                add_settings_field(
+                        'kind_base',
+                        __( 'Kind base', 'indieweb-post-kinds' ),
+                        array( static::class, 'kind_base_callback' ),
+                        'permalink',
+                        'optional',
+                        array( 'label_for' => 'kind_base' )
+                );
                 add_settings_section(
                         'iwt-content',
 …
+                        )
                 );
                 // Add Query Var to Admin
+                // Add Query Var to Admin.
                 add_filter( 'query_vars', array( static::class, 'query_var' ) );
+        }
 …
         /**
          * Function to add our kindurl query var.
+         *
+         * @since 2.3.3
+         *
          * @access public
 …
          * Function to remove "post" from the "New" admin bar section.
+         *
+         * @access public
+         *
+         * @param WP_Admin_Bar $wp_admin_bar
+         * @since 3.0.7
+         *
+         * @access public
+         *
+         * @param WP_Admin_Bar $wp_admin_bar The admin bar.
          */
         public static function remove_dashbar_post( $wp_admin_bar ) {
 …
          * Function to add our Post Kind post links to the "New" admin bar section.
+         *
+         * @access public
+         * @param WP_Admin_Bar $wp_admin_bar
+         * @since 3.0.7
+         *
+         * @access public
+         *
+         * @param WP_Admin_Bar $wp_admin_bar The admin bar.
          */
         public static function dashbar_links( $wp_admin_bar ) {
                 $termslist = get_option( 'kind_termslist' );
                 // Note can never be removed
+                $termslist = self::get_termslist();
+                // Note can never be removed.
                 array_unshift( $termslist, 'note' );
                 foreach ( $termslist as $term ) {
+                foreach ( array_unique( $termslist ) as $term ) {
                         $wp_admin_bar->add_menu(
                                 array(
 …
          * Adds Options Page for Plugin Options.
+         *
+         * @since 2.0.2
+         *
          * @access public
          */
 …
                         add_submenu_page(
                                 'indieweb',
                                 __( 'Post Kinds', 'indieweb-post-kinds' ), // page title
                                 __( 'Post Kinds', 'indieweb-post-kinds' ), // menu title
                                 'manage_options', // access capability
+                                __( 'Post Kinds', 'indieweb-post-kinds' ), // page title.
+                                __( 'Post Kinds', 'indieweb-post-kinds' ), // menu title.
+                                'manage_options', // access capability.
                                 'kind_options',
                                 array( static::class, 'options_form' )
 …
          * Callback for Options on Options Page.
+         *
+         * @since 2.0.2
+         *
          * @access public
          */
 …
         /**
          * Generate a Checkbox.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 $option  = get_option( $args['name'] );
                 $checked = intval( $option ?? 0 );
                 printf( '<input name="%1$s" type="hidden" value="0" />', esc_attr( $args['name'] ) ); // phpcs:ignore
                 printf( '<input name="%1$s" type="checkbox" value="1" %2$s />', esc_attr( $args['name'] ), checked( 1, $checked, false) ); // phpcs:ignore
+                printf( '<input name="%1$s" type="hidden" value="0" />', esc_attr( $args['name'] ) );
+                printf( '<input name="%1$s" type="checkbox" value="1" %2$s />', esc_attr( $args['name'] ), checked( 1, $checked, false ) );
+        }
         /**
          * Generate a Textbox.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 $option = get_option( $args['name'] );
                 if ( is_array( $option ) ) {
                         $option = print_r( $option, true );
+                }
                 echo "<textarea rows='10' cols='50' class='large-text code' name='" . esc_attr( $args['name'] ) . "'>" . $option . '</textarea> '; // phpcs:ignore
+                        $option = wp_json_encode( $option, JSON_PRETTY_PRINT );
+                }
+                echo "<textarea rows='10' cols='50' class='large-text code' name='" . esc_attr( $args['name'] ) . "'>" . esc_textarea( (string) $option ) . '</textarea> ';
+        }
         /**
          * Generate a Term List.
+         *
+         * @since 2.5.0
+         *
          * @access public
 …
                 $terms = Kind_Taxonomy::get_kind_list();
                 // Hide these terms until ready for use for now.
                 $termslist = get_option( 'kind_termslist' );
+                $termslist = self::get_termslist();
                 echo '<div id="kind-all">';
                 foreach ( $terms as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         if ( $value->show ) {
                                 printf( '<input name="kind_termslist[]" type="checkbox" value="%1$s" %2$s />', esc_attr( $term ), checked( in_array( $term, $termslist, true ), true, false ) ); // phpcs:ignore
                                 printf( '%1$s<strong>%2$s</strong> - %3$s<br />', Kind_Taxonomy::get_icon( $term ), sanitize_text_field( $value->singular_name ), sanitize_text_field( $value->description ) );  // phpcs:ignore
+                                printf( '<input name="kind_termslist[]" type="checkbox" value="%1$s" %2$s />', esc_attr( $term ), checked( in_array( $term, $termslist, true ), true, false ) );
+                                printf( '%1$s<strong>%2$s</strong> - %3$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ), esc_html( $value->description ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
+                        }
+                }
 …
         /**
+         * Generate a Term List.
+         *
+         * @access public
+         * Outputs a multiple select of kinds for a setting.
+         *
+         * @since 3.6.0
+         *
+         * @access public
+         *
+         * @param array $args Field arguments. 'name' is the option name.
          */
         public static function kindmultiselect_callback( array $args ) {
                 $terms   = get_option( 'kind_termslist' );
+                $terms   = self::get_termslist();
                 $terms[] = 'note';
+                $terms   = array_unique( $terms );
                 $kindlist = get_option( $args['name'] );
 …
                 foreach ( $terms as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         printf( '<option value="%1$s" %2$s />%3$s</option>', esc_attr($term), selected( in_array( $term, $kindlist ), true, false ), sanitize_text_field( $value->singular_name ) );  // phpcs:ignore
+                        printf( '<option value="%1$s" %2$s>%3$s</option>', esc_attr( $term ), selected( in_array( $term, $kindlist, true ), true, false ), esc_html( $value->singular_name ) );
+                }
                 echo '</select>';
 …
          * Generate a Kind Select List.
+         *
+         * @since 2.3.3
+         *
          * @access public
          */
         public static function defaultkind_callback() {
                 $terms   = get_option( 'kind_termslist' );
+                $terms   = self::get_termslist();
                 $terms[] = 'note';
+                $terms   = array_unique( $terms );
                 sort( $terms, SORT_STRING );
 …
                 foreach ( $terms as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         printf( '<option value="%1$s" %2$s />%3$s</option>', esc_attr($term), selected( $term, $defaultkind, false ), sanitize_text_field( $value->singular_name ) );  // phpcs:ignore
+                        printf( '<option value="%1$s" %2$s>%3$s</option>', esc_attr( $term ), selected( $term, $defaultkind, false ), esc_html( $value->singular_name ) );
+                }
                 echo '</select>';
 …
         /**
          * Generate Radio Options.
+         *
+         * @since 2.6.6
+         *
          * @access public
 …
                 $display = get_option( 'kind_display' );
                 foreach ( $args['options'] as $key => $value ) {
                         printf( '<input id="%1$s" name="%1$s" type="radio" value="%2$s" class="%3$s" %4$s />%5$s<br />', esc_attr( $args['name'] ), esc_attr( $key ), esc_attr( $args['class'] ), checked( $key, $display, false ), sanitize_text_field( $value ) ); // phpcs:ignore
+                        printf( '<input id="%1$s" name="%1$s" type="radio" value="%2$s" class="%3$s" %4$s />%5$s<br />', esc_attr( $args['name'] ), esc_attr( $key ), esc_attr( $args['class'] ), checked( $key, $display, false ), esc_html( $value ) );
+                }
+        }
 …
         /**
          * Generate Options Form.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
         /**
          * Function to generate a help tab in the WordPress admin help tab.
+         *
+         * @since 2.3.0
+         *
          * @access public

indieweb-post-kinds/tags/4.0.0/includes/class-kind-fields.php

-              r2973430
+              r3738687
 <?php
 /**
  * Kind Fields Class
+ * Kind_Fields class.
+ *
+ * @package Post Kind
+ * Used to Generate Form Fields for a Post UI
+ * @package Post_Kinds
+ * @since   3.3.4
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Generates form fields for the posting UI from a kind's property schema.
+ *
  * Fields currently supported and their options{
         * datetime
         * duration
+        * author - is a representation of an author and consists of name, url, and photo by default
+        * select
+                * options - associative array of values for the select. Key being the value and the value being the description
+        * url
         * text
+        * list
+        * textarea
+        * number
+        * cite - is a representation of an h-cite object
+* }
+ * Supported field types and their options:
+ * - datetime
+ * - duration
+ * - author: a name, URL and photo by default.
+ * - select: `options` is an associative array of value => label.
+ * - url
+ * - text
+ * - list
+ * - textarea
+ * - number
+ * - cite: an h-cite object.
+ *
+ * @since 3.3.4
  */
 class Kind_Fields {
+        /**
+         * Returns a list of time zones with translated labels.
+         *
+         * @since 3.3.4
+         *
+         * @return string[] Labels, keyed by time zone identifier.
+         */
         public static function timezone_list() {
                 return array(
 …
+        }
+        /**
+         * Returns the UTC offsets in use by any time zone, sorted.
+         *
+         * @since 3.3.4
+         *
+         * @return string[] Offsets such as '-05:00'.
+         */
         public static function get_offset_list() {
                 $o = wp_cache_get( 'kind_offset_list' );
 …
                 foreach ( $t_zones as $a ) {
                         $datetime = new DateTime( 'now', new DateTimeZone( $a ) );
                         $o[]      = get_datetime_offset( $datetime );
+                        $o[]      = Kind_Time::get_datetime_offset( $datetime );
+                }
                 $o = array_unique( $o );
 …
         /**
+         * Function to render date/time field inputs.
+         *
+         * @access public
+         *
+         * @param string|DateTime $time   Date/time value.
+         * @param string $name Property name
+         * @param array $args
+         * @param string|array $class  Class to use for fields.
+         * @return string
+         * Renders date, time and offset inputs.
+         *
+         * @since 3.3.4
+         *
+         * @param array                 $args     Field arguments, as returned by validate(): 'name', 'label' and 'class'.
+         * @param DateTime|string|false $datetime Date, or a date string. Default now.
+         * @return string The inputs.
          */
         public static function field_datetime( $args, $datetime ) {
 …
+                }
                 $return   = array();
                 $time     = divide_datetime( $datetime );
+                $time     = Kind_Time::divide_datetime( $datetime );
                 $return[] = sprintf( '<label for="mf2_%1$s" class="%2$s">%3$s', $args['name'], $args['class'], $args['label'] );
                 $return[] = sprintf( '<input type="date" name="mf2_%1$s_date" id="mf2_%1$s_date" value="%2$s"/>', $args['name'], ( $time['date'] ?? '' ) );
 …
         /**
+         * Function to render dateinterval field inputs.
+         *
+         * @access public
+         *
+         * @param string|Kind_DateTime $time   Date/time value.
+         * @param string $name Property name
+         * @param array $args
+         * @param string|array $class  Class to use for fields.
+         * @return string
+         * Renders duration inputs.
+         *
+         * @since 3.3.4
+         *
+         * @param array               $args     Field arguments, as returned by validate(), including 'pieces'.
+         * @param DateInterval|string $interval Duration, or an ISO 8601 duration. Default 0.
+         * @return string The inputs.
          */
         public static function field_duration( $args, $interval ) {
 …
+                }
                 $return   = array();
                 $duration = divide_interval( $interval );
+                $duration = Kind_Time::divide_interval( $interval );
                 $max      = array(
                         'Y' => 1000,
 …
         /**
+         * Function to render author inputs.
+         *
+         * @access public
+         *
+         * @param string $prefix Field prefix.
+         * @param string|array $author Defautl values. If string, considered to be the name property below. {
+                 * @param string $name Author Name
+                 * @param string $url Author URL
+                 * @param string $photo Author Photo
+         * }
+         * @return string
+         * Renders author name, URL and photo inputs.
+         *
+         * @since 3.3.4
+         *
+         * @param array       $args   Field arguments, as returned by validate().
+         * @param array|false $author Values, with 'name', 'url' and 'photo' keys.
+         * @return string The inputs.
          */
         public static function field_author( $args, $author ) {
 …
                         ),
                 );
                 // Ensure all props are set for values
+                // Ensure all props are set for values.
                 foreach ( array_keys( $props ) as $prop ) {
                         if ( ! array_key_exists( $prop, $author ) ) {
 …
         /**
          * Function to render a select.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $selected Selected field type.
          * @return string
+         * Renders a select. The options are in $args['options'].
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args     Field arguments, as returned by validate().
+         * @param string $selected Value of the selected option.
+         * @return string The input.
          */
         public static function field_select( $args, $selected ) {
 …
         /**
          * Function to render a url.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $url
          * @return string
+         * Renders a URL input.
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args Field arguments, as returned by validate().
+         * @param string $url  Value.
+         * @return string The input.
          */
         public static function field_url( $args, $url ) {
 …
         /**
          * Function to render a number.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $value
          * @return string
+         * Renders a number input. The step is in $args['step'].
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args  Field arguments, as returned by validate().
+         * @param string $value Value.
+         * @return string The input.
          */
         public static function field_number( $args, $value ) {
 …
         /**
          * Function to render a text.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $value
          * @return string
+         * Renders a text input.
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args  Field arguments, as returned by validate().
+         * @param string $value Value.
+         * @return string The input.
          */
         public static function field_text( $args, $value ) {
 …
         /**
          * Function to render a textarea.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $value
          * @return string
+         * Renders a textarea.
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args  Field arguments, as returned by validate().
+         * @param string $value Value.
+         * @return string The input.
          */
         public static function field_textarea( $args, $value ) {
 …
+        }
+        /**
+         * Renders a textarea for a list, with items separated by semicolons.
+         *
+         * @since 3.3.4
+         *
+         * @param array        $args  Field arguments, as returned by validate().
+         * @param string|array $value Value, or a list of values.
+         * @return string The input.
+         */
         public static function field_list( $args, $value ) {
                 if ( is_array( $value ) ) {
 …
+        }
+        /**
+         * Renders the inputs for a venue's properties.
+         *
+         * @since 3.3.4
+         *
+         * @param array $args  Field arguments, as returned by validate(), including 'properties'.
+         * @param array $value Values, keyed by property.
+         * @return string The inputs.
+         */
         public static function field_venue( $args, $value ) {
                 return self::render( $args['properties'], $value );
+        }
+        /**
+         * Renders the inputs for a citation's properties.
+         *
+         * @since 3.3.4
+         *
+         * @param array $args  Field arguments, as returned by validate(), including 'properties'.
+         * @param array $value Values, keyed by property.
+         * @return string The inputs.
+         */
         public static function field_cite( $args, $value ) {
                 return self::render( $args['properties'], $value );
+        }
+        /**
+         * Checks whether a string starts with a prefix.
+         *
+         * @since 3.3.4
+         *
+         * @param string $source The source string.
+         * @param string $prefix The prefix to look for.
+         * @return bool True if the source starts with the prefix.
+         */
         public static function str_prefix( $source, $prefix ) {
                 return strncmp( $source, $prefix, strlen( $prefix ) ) === 0;
+        }
+        /**
+         * Returns a value from an array.
+         *
+         * @since 3.3.4
+         *
+         * @param string $key   Key.
+         * @param array  $array The array.
+         * @return mixed The value, or false if it is not set.
+         */
         private static function get( $key, $array ) {
                 if ( ! is_array( $array ) ) {
 …
+        }
+        /**
+         * Checks a field definition and fills in defaults.
+         *
+         * @since 3.3.4
+         *
+         * @param array $element Field definition.
+         * @return array|false The field definition, or false if it is not valid.
+         */
         private static function validate( $element ) {
                 // Everything must have a type
+                // Everything must have a type.
                 if ( ! self::get( 'type', $element ) ) {
                         return false;
+                }
                 // Everything must have a label
+                // Everything must have a label.
                 if ( ! self::get( 'label', $element ) ) {
                         return false;
+                }
                 // If no name property then the label property copies over
+                // If no name property then the label property copies over.
                 if ( ! self::get( 'name', $element ) ) {
                         $element['name'] = sanitize_title( $element['label'] );
+                }
                 // If no label property then the name property copies over
+                // If no label property then the name property copies over.
                 if ( ! self::get( 'label', $element ) ) {
                         $element['label'] = $element['name'];
+                }
                 // If no class property then the class property is set to empty
+                // If no class property then the class property is set to empty.
                 if ( ! self::get( 'class', $element ) ) {
                         $element['class'] = '';
+                }
                 // Class can be an array
+                // Class can be an array.
                 if ( is_array( $element['class'] ) ) {
                         $element['class'] = implode( ' ', $element['class'] );
+                }
                 $type = self::get( 'type', $element );
                 // Any non supported type should be considered to be text
+                // Any non supported type should be considered to be text.
                 if ( ! self::supported_type( $type ) ) {
                         $type = 'text';
+                }
                 // Type Specific Conditions
+                // Type Specific Conditions.
                 switch ( $type ) {
                         case 'cite':
 …
                         case 'number':
                                 if ( ! array_key_exists( 'step', $element ) ) {
                                         $element['step'] = 1; // Defaults to Even Numbers
+                                        $element['step'] = 1; // Defaults to Even Numbers.
+                                }
                                 break;
                         case 'select':
                                 if ( ! array_key_exists( 'options', $elements ) ) {
+                                if ( ! array_key_exists( 'options', $element ) ) {
                                         return false;
+                                }
                                 break;
                         case 'duration':
                                 if ( array_key_exists( 'pieces', $elements ) ) {
                                         // Ensure only valid options
                                         $element['pieces'] = array_intersect( array( 'Y', 'M', 'D', 'H', 'I', 'S' ), $elements['pieces'] );
+                                if ( array_key_exists( 'pieces', $element ) ) {
+                                        // Ensure only valid options.
+                                        $element['pieces'] = array_intersect( array( 'Y', 'M', 'D', 'H', 'I', 'S' ), $element['pieces'] );
                                 } else {
                                         // By default only show hours, minutes, seconds
+                                        // By default only show hours, minutes, seconds.
                                         $element['pieces'] = array( 'H', 'I', 'S' );
+                                }
 …
                 return $element;
+        }
+        /**
+         * Whether a field type is supported.
+         *
+         * @since 3.3.4
+         *
+         * @param string $type Field type.
+         * @return bool
+         */
         public static function supported_type( $type ) {
                 return in_array( $type, array( 'cite', 'venue', 'coordinate', 'author', 'datetime', 'duration', 'text', 'url', 'textarea', 'list', 'section' ), true );
 …
         /**
+         * Sets an array with only the mf2 prefixed meta.
+         *
+         * Returns the properties stored in mf2_ prefixed post meta, without the prefix.
+         *
+         * Reads the current post; the $post argument is not used.
+         *
+         * @since 3.3.4
+         *
+         * @param int|WP_Post $post Not used.
+         * @return array|false The properties, or false if there is no current post.
          */
         private function get_mf2meta( $post ) {
 …
                                 unset( $meta[ $key ] );
                                 $key = str_replace( 'mf2_', '', $key );
                                 // Do not save microput prefixed instructions
+                                // Do not save microput prefixed instructions.
                                 if ( self::str_prefix( $key, 'mp-' ) ) {
                                         continue;
 …
         /**
          * Function to render a form from a schema array
+         *
          * @access public
+         *
          * @param array $schema
+         *
          * @return string Form
+         * Renders a form from a field schema.
+         *
+         * @since 3.3.4
+         *
+         * @param array $schema Field definitions, keyed by property.
+         * @param array $values Optional. Values, keyed by property. Default empty array.
+         * @return string The form.
          */
         public static function render( $schema, $values = array() ) {
 …
+        }
+        /* Extracts microformats elements from post data.
+         * Microformats elements are prefixed by mf2_
+         * After that, underscore would indicate properties that need to be reconstituted
+        */
+        /**
+         * Extracts microformats properties from submitted form data.
+         *
+         * Properties are prefixed by mf2_. After that, an underscore marks the
+         * pieces of a property that need to be put back together.
+         *
+         * @since 3.3.4
+         *
+         * @param array $data Form data, such as $_POST.
+         * @return array The properties.
+         */
         public static function rebuild_data( $data ) {
                 $raw = array();
 …
                                 $raw[ $pieces[0] ] = $pieces[1];
                                 unset( $raw[ $key ] );
                                 // If this has the elements of a duration
+                                // If this has the elements of a duration.
                                 if ( ! empty( array_intersect( array( 'Y', 'M', 'D', 'H', 'I', 'S' ), $raw[ $pieces[0] ] ) ) ) {
                                         $interval          = build_interval( $raw[ $pieces[0] ] );
+                                        $interval          = Kind_Time::build_interval( $raw[ $pieces[0] ] );
                                         $raw[ $pieces[0] ] = date_interval_to_iso8601( $interval );
+                                }
                                 // If this has the elements of a datetime
+                                // If this has the elements of a datetime.
                                 if ( ! empty( array_intersect( array( 'date', 'time', 'offset' ), $raw[ $pieces[0] ] ) ) ) {
                                         $datetime          = build_datetime( $raw[ $pieces[0] ] );
+                                        $datetime          = Kind_Time::build_datetime( $raw[ $pieces[0] ] );
                                         $raw[ $pieces[0] ] = $datetime->format( DATE_W3C );
+                                }

indieweb-post-kinds/tags/4.0.0/includes/class-kind-media-metadata.php

-              r3001401
+              r3738687
 <?php
 /**
+ * Kind_Media_Metadata class.
+ *
+ * Enhances Metadata for Media
+ * @package Post_Kinds
+ * @since   3.1.0
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Enhances the metadata stored for media attachments, and records the media a post uses.
+ *
+ * @since 3.1.0
  */
 class Kind_Media_Metadata {
 …
          * Function to Initialize the Configuration.
+         *
+         * @since 3.1.0
+         *
          * @access public
          */
         public static function init() {
-                $wp_version = get_bloginfo( 'version' );
                 add_filter( 'wp_generate_attachment_metadata', array( static::class, 'wp_generate_attachment_metadata' ), 33, 2 );
+                if ( version_compare( $wp_version, '5.3', '>' ) ) {
+                        add_filter( 'wp_update_attachment_metadata', array( static::class, 'wp_sanitize_media_metadata' ), 9, 2 );
+                }
+                add_filter( 'wp_update_attachment_metadata', array( static::class, 'wp_sanitize_media_metadata' ), 9, 2 );
                 add_action( 'wp_enqueue_scripts', array( static::class, 'enqueue' ) );
+                add_action( 'save_post', array( static::class, 'save_post' ), 20 );
+                // Kinds apply to posts only; revisions and autosaves have their own post type.
+                add_action( 'save_post_post', array( static::class, 'save_post' ), 20 );
+                // The photo property can change outside a save, for example from Micropub.
+                foreach ( array( 'added_post_meta', 'updated_post_meta', 'deleted_post_meta' ) as $hook ) {
+                        add_action( $hook, array( static::class, 'photo_meta_changed' ), 10, 3 );
+                }
                 add_filter( 'attachment_fields_to_edit', array( static::class, 'attachment_fields_to_edit' ), 10, 2 );
 …
+        }
+        /**
+         * Whether the request is for an AMP page, according to the AMP plugin.
+         *
+         * @since 3.5.1
+         *
+         * @return bool
+         */
         public static function is_amp_endpoint() {
                 if ( function_exists( 'is_amp_endpoint' ) ) {
 …
+        }
+        /**
+         * Enqueues the media fragment script on single posts that have media.
+         *
+         * @since 3.3.0
+         */
         public static function enqueue() {
+                if ( ! is_front_page() && is_singular() && ! self::is_amp_endpoint() ) {
+                        wp_enqueue_script(
+                                'media-fragment',
+                                plugins_url( 'js/clone-media-fragment.js', __DIR__ ),
+                                array(),
+                                '1.0',
+                                true
+                        );
+                }
+                if ( is_front_page() || ! is_singular() || self::is_amp_endpoint() || ! self::has_media( get_queried_object() ) ) {
+                        return;
+                }
+                wp_enqueue_script(
+                        'media-fragment',
+                        plugins_url( 'js/clone-media-fragment.js', __DIR__ ),
+                        array(),
+                        '1.0',
+                        // WordPress 6.2 reads the array as a true $in_footer; 6.3 and later also defer it.
+                        array(
+                                'in_footer' => true,
+                                'strategy'  => 'defer',
+                        )
+                );
+        }
+        /**
+         * Returns whether a post may show audio or video, which the media
+         * fragment script links to.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $post Post object, usually the queried object.
+         * @return bool True if the post has an audio or video kind or property, or
+         *              audio or video in its content.
+         */
+        public static function has_media( $post ) {
+                if ( ! $post instanceof WP_Post ) {
+                        return false;
+                }
+                if ( 'post' === $post->post_type ) {
+                        if ( has_post_kind( array( 'audio', 'video', 'listen', 'watch', 'jam' ), $post ) ) {
+                                return true;
+                        }
+                        if ( get_post_meta( $post->ID, 'mf2_audio', true ) || get_post_meta( $post->ID, 'mf2_video', true ) ) {
+                                return true;
+                        }
+                }
+                return (bool) preg_match( '/<(audio|video)[\s>]|\[(audio|video|playlist)[\s\]]/i', $post->post_content );
+        }
 …
         /**
          * Displays the Media Creator Description on the Attachment Page.
+         *
+         * @since 3.4.0
+         *
          * @param array   $form_fields See attachment_fields_to_edit filter in WordPress.
 …
                 $author = get_post_meta( $post->ID, 'mf2_author', true );
                 if ( Parse_This_MF2_Utils::is_microformat( $author ) ) {
                         $author = mf2_to_jf2( $author );
+                if ( \ParseThis\MF2_Utils::is_microformat( $author ) ) {
+                        $author = \ParseThis\mf2_to_jf2( $author );
                 } else {
                         $author = array();
 …
          * Saves Extra Fields.
+         *
+         * @param array $post Attachment post data.
+         * @param array   $attachment data.
+         * @since 3.4.0
+         *
+         * @param array $post       Attachment post data.
+         * @param array $attachment Attachment fields submitted.
          */
         public static function attachment_fields_to_save( $post, $attachment ) {
+                // Core checks this before saving; check again as the filter can be applied elsewhere.
+                if ( empty( $post['ID'] ) || ! current_user_can( 'edit_post', $post['ID'] ) ) {
+                        return $post;
+                }
+                // Core passes the request data slashed.
                 $author = array();
                 if ( isset( $attachment['author_name'] ) && ! empty( $attachment['author_name'] ) ) {
                         $author['name'] = $attachment['author_name'];
+                }
                 if ( isset( $attachment['author_url'] ) && ! empty( $attachment['author_url'] ) ) {
                         $author['url'] = $attachment['author_url'];
+                if ( isset( $attachment['author_name'] ) && is_string( $attachment['author_name'] ) ) {
+                        $author['name'] = sanitize_text_field( wp_unslash( $attachment['author_name'] ) );
+                }
+                if ( isset( $attachment['author_url'] ) && is_string( $attachment['author_url'] ) ) {
+                        $author['url'] = sanitize_url( trim( wp_unslash( $attachment['author_url'] ) ), array( 'http', 'https' ) );
+                }
                 $author = array_filter( $author );
 …
                 } else {
                         $author['type'] = 'card';
+                        update_post_meta( $post['ID'], 'mf2_author', jf2_to_mf2( $author ) );
+                        // The metadata API unslashes, so slash the sanitized values.
+                        update_post_meta( $post['ID'], 'mf2_author', wp_slash( \ParseThis\jf2_to_mf2( $author ) ) );
+                }
                 return $post;
+        }
+        /*
+        /**
+         * Finds the media library attachments used in a content block.
+         *
+         * The content is parsed once for images, audio and video. An image's ID
+         * is taken from its wp-image-{id} class when it has one; otherwise, and
+         * for audio and video sources, the URL is looked up.
+         *
+         * @since 4.0.0
+         *
+         * @param string $content Content.
+         * @return array {
+         *     Attachment IDs found, each list without duplicates or zeros.
+         *
+         *     @type int[] $img   Image attachment IDs.
+         *     @type int[] $audio Audio attachment IDs.
+         *     @type int[] $video Video attachment IDs.
+         * }
+         */
+        private static function get_media_from_content( $content ) {
+                $return = array(
+                        'img'   => array(),
+                        'audio' => array(),
+                        'video' => array(),
+                );
+                $content = wp_unslash( (string) $content );
+                // Most content has no media; skip parsing it.
+                if ( false === stripos( $content, '<img' ) && false === stripos( $content, '<audio' ) && false === stripos( $content, '<video' ) ) {
+                        return $return;
+                }
+                $doc = \ParseThis\pt_load_domdocument( $content );
+                foreach ( $doc->getElementsByTagName( 'img' ) as $image ) {
+                        $id = 0;
+                        foreach ( explode( ' ', $image->getAttribute( 'class' ) ) as $class ) {
+                                if ( 0 === strpos( $class, 'wp-image-' ) ) {
+                                        $id = (int) substr( $class, strlen( 'wp-image-' ) );
+                                        break;
+                                }
+                        }
+                        if ( ! $id ) {
+                                $id = attachment_url_to_postid( $image->getAttribute( 'src' ) );
+                        }
+                        $return['img'][] = $id;
+                }
+                foreach ( array( 'audio', 'video' ) as $tag ) {
+                        foreach ( $doc->getElementsByTagName( $tag ) as $media ) {
+                                foreach ( $media->getElementsByTagName( 'source' ) as $source ) {
+                                        $return[ $tag ][] = attachment_url_to_postid( remove_query_arg( '_', $source->getAttribute( 'src' ) ) );
+                                }
+                        }
+                }
+                foreach ( $return as $type => $ids ) {
+                        $return[ $type ] = array_values( array_unique( array_filter( array_map( 'intval', $ids ) ) ) );
+                }
+                return $return;
+        }
+        /**
          * Determine Attached Images from a Content Block.
+         *
+         * @since 3.4.0
+         *
          * @param string $content Content.
          * @return array Array of Attachment IDs.
         */
+         */
         public static function get_img_from_content( $content ) {
+                $content = wp_unslash( $content );
+                $return  = array();
+                $doc     = pt_load_domdocument( $content );
+                $images  = $doc->getElementsByTagName( 'img' );
+                foreach ( $images as $image ) {
+                        $classes = $image->getAttribute( 'class' );
+                        $classes = explode( ' ', $classes );
+                        foreach ( $classes as $class ) {
+                                if ( 0 === strpos( $class, 'wp-image-' ) ) {
+                                        $id = (int) str_replace( 'wp-image-', '', $class );
+                                        if ( 0 !== $id ) {
+                                                $return[] = $id;
+                                        }
+                                        break;
+                                }
+                        }
+                        $url = $image->getAttribute( 'src' );
+                        $id  = attachment_url_to_postid( $url );
+                        if ( 0 !== $id ) {
+                                $return[] = $id;
+                        }
+                }
+                return array_unique( $return );
+        }
+        /*
+                return self::get_media_from_content( $content )['img'];
+        }
+        /**
          * Determine Attached Audio from a Content Block.
+         *
+         * @since 3.4.0
+         *
          * @param string $content Content.
          * @return array Array of Attachment IDs.
         */
+         */
         public static function get_audio_from_content( $content ) {
+                $content = wp_unslash( $content );
+                $return  = array();
+                $doc     = pt_load_domdocument( $content );
+                $audios  = $doc->getElementsByTagName( 'audio' );
+                foreach ( $audios as $audio ) {
+                        $sources = $audio->getElementsByTagName( 'source' );
+                        foreach ( $sources as $source ) {
+                                $url      = remove_query_arg( '_', $source->getAttribute( 'src' ) );
+                                $id       = attachment_url_to_postid( $url );
+                                $return[] = $id;
+                        }
+                }
+                return array_unique( $return );
+        }
+        /*
+                return self::get_media_from_content( $content )['audio'];
+        }
+        /**
          * Determine Attached Videos from a Content Block.
+         *
+         * @since 3.4.0
+         *
          * @param string $content Content.
          * @return array Array of Attachment IDs.
         */
+         */
         public static function get_video_from_content( $content ) {
+                $content = wp_unslash( $content );
+                $return  = array();
+                $doc     = pt_load_domdocument( $content );
+                $videos  = $doc->getElementsByTagName( 'video' );
+                foreach ( $videos as $video ) {
+                        $sources = $video->getElementsByTagName( 'source' );
+                        foreach ( $sources as $source ) {
+                                $url      = remove_query_arg( '_', $source->getAttribute( 'src' ) );
+                                $id       = attachment_url_to_postid( $url );
+                                $return[] = $id;
+                        }
+                }
+                return array_unique( $return );
+        }
+        private function media_sideload_image( $url, $post_id, $description = null ) {
+                // To prevent sideloading the same URL multiple times check for the original URL which will now be stored
+                $ids = get_posts(
+                        array(
+                                'post_type'        => 'attachment',
+                                'suppress_filters' => false,
+                                'nopaging'         => true,
+                                'meta_key'         => '_source_url',
+                                'meta_value'       => $url,
+                                'fields'           => 'ids',
+                        )
+                );
+                if ( ! empty( $ids ) ) {
+                        return $ids[0];
+                }
+                $id = media_sideload_image( $url, $post_id, $description, 'id' );
+                // Version 5.4 adds this automatically.
+                if ( $id && version_compare( $wp_version, '5.3', '>' ) ) {
+                        update_post_meta( $id, '_source_url', $url );
+                }
+                return $id;
+        }
+        /**
+         * Every time the post is saved check for media embedded in content and save a list of attachment IDs.
+        */
+                return self::get_media_from_content( $content )['video'];
+        }
+        /**
+         * Every time a post is saved, stores the attachment IDs of the media in its content.
+         *
+         * The lists are kept in the _content_img_ids, _content_audio_ids and
+         * _content_video_ids meta; a key is deleted when there is no media of that
+         * type, so the photos archive can select posts by whether the key exists.
+         *
+         * @since 3.4.0
+         *
+         * @param int $post_id Post ID.
+         */
         public static function save_post( $post_id ) {
+                $post    = get_post( $post_id );
+                $content = do_shortcode( $post->post_content );
+                $gallery_ids = array();
+                $gallery     = get_post_gallery( $post_id, false );
+                if ( is_array( $gallery ) ) {
+                        if ( array_key_exists( 'ids', $gallery ) ) {
+                                $gallery_ids = explode( ',', $gallery['ids'] );
+                        }
+                }
+                $ids = self::get_img_from_content( $content );
+                if ( is_array( $ids ) && is_array( $gallery_ids ) ) {
+                        $ids = array_merge( $ids, $gallery_ids );
+                }
+                if ( ! $ids ) {
+                        delete_post_meta( $post_id, '_content_img_ids' );
+                // The classic editor's draft autosave; the next save will record the media.
+                if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+                        return;
+                }
+                $post = get_post( $post_id );
+                if ( ! $post ) {
+                        return;
+                }
+                $content = $post->post_content;
+                // Shortcodes such as [gallery], [audio] and [video] produce the media markup.
+                if ( false !== strpos( $content, '[' ) ) {
+                        $content = do_shortcode( $content );
+                }
+                $media = self::get_media_from_content( $content );
+                $gallery = get_post_gallery( $post_id, false );
+                if ( is_array( $gallery ) && ! empty( $gallery['ids'] ) ) {
+                        $media['img'] = array_values( array_unique( array_merge( $media['img'], array_filter( array_map( 'intval', explode( ',', $gallery['ids'] ) ) ) ) ) );
+                }
+                foreach ( $media as $type => $ids ) {
+                        $key = '_content_' . $type . '_ids';
+                        if ( empty( $ids ) ) {
+                                delete_post_meta( $post_id, $key );
+                        } else {
+                                update_post_meta( $post_id, $key, $ids );
+                        }
+                }
+                self::update_photo_flag( $post_id );
+        }
+        /**
+         * Updates the photo flag when a post's photo property changes.
+         *
+         * @since 4.0.0
+         *
+         * @param int|int[] $meta_id   Meta ID, or IDs when deleting.
+         * @param int       $object_id Post ID.
+         * @param string    $meta_key  Meta key.
+         */
+        public static function photo_meta_changed( $meta_id, $object_id, $meta_key ) {
+                if ( 'mf2_photo' === $meta_key && 'post' === get_post_type( $object_id ) ) {
+                        self::update_photo_flag( $object_id );
+                }
+        }
+        /**
+         * Records whether a post has photos, for the photos archive.
+         *
+         * A post has photos when it has images in its content or a photo
+         * property. The _kind_has_photo meta exists only for those posts, so the
+         * archive can select them with one indexed meta key.
+         *
+         * @since 4.0.0
+         *
+         * @param int $post_id Post ID.
+         */
+        public static function update_photo_flag( $post_id ) {
+                if ( get_post_meta( $post_id, '_content_img_ids', true ) || get_post_meta( $post_id, 'mf2_photo', true ) ) {
+                        update_post_meta( $post_id, '_kind_has_photo', 1 );
                 } else {
+                        update_post_meta( $post_id, '_content_img_ids', $ids );
+                }
+                $ids = self::get_video_from_content( $content );
+                if ( ! $ids ) {
+                        delete_post_meta( $post_id, '_content_video_ids' );
+                } else {
+                        update_post_meta( $post_id, '_content_video_ids', $ids );
+                }
+                $ids = self::get_audio_from_content( $content );
+                if ( ! $ids ) {
+                        delete_post_meta( $post_id, '_content_audio_ids' );
+                } else {
+                        update_post_meta( $post_id, '_content_audio_ids', $ids );
+                        delete_post_meta( $post_id, '_kind_has_photo' );
+                }
+        }
 …
          * bad character encodings from causing database calls and API endpoints to fail.
+         *
+         * @param array $metadata An existing array with data
+         * @since 3.3.0
+         *
+         * @param array $metadata An existing array with data.
+         *
          * @return array Returns array of sanitized metadata.
 …
+        }
+        /**
+         * Stores an attachment's author, album and duration from its file metadata.
+         *
+         * The image credit, or the artist of audio or video, becomes the author;
+         * the album becomes the publication.
+         *
+         * @since 3.3.4
+         *
+         * @param array|mixed $data          Attachment metadata.
+         * @param int         $attachment_id Attachment ID.
+         * @return array|mixed The metadata, with empty values removed.
+         */
         public static function wp_generate_attachment_metadata( $data, $attachment_id ) {
                 if ( ! is_array( $data ) ) {
                         return $data;
+                }
+                $data       = array_filter( $data );
+                $attachment = get_post( $attachment_id, ARRAY_A );
+                $data = array_filter( $data );
                 if ( isset( $data['image_meta'] ) ) {
                         $meta = $data['image_meta'];
 …
                                         $attachment_id,
                                         'mf2_author',
                                         jf2_to_mf2(
+                                        \ParseThis\jf2_to_mf2(
                                                 array(
                                                         'name' => $meta['credit'],
 …
                                 $attachment_id,
                                 'mf2_author',
                                 jf2_to_mf2(
+                                \ParseThis\jf2_to_mf2(
                                         array(
                                                 'name' => $data['artist'],
 …
+                }
                 if ( isset( $data['length'] ) ) {
                         update_post_meta( $attachment_id, 'mf2_duration', array( seconds_to_iso8601( $data['length'] ) ) );
+                        update_post_meta( $attachment_id, 'mf2_duration', array( \ParseThis\seconds_to_iso8601( $data['length'] ) ) );
+                }
                 return $data;

indieweb-post-kinds/tags/4.0.0/includes/class-kind-media-view.php

-              r2973430
+              r3738687
 <?php
 /**
  * Kind Media View Class
+ * Kind_Media_View class.
+ *
  * @package Post Kind
  * Used to Display Media
+ * @package Post_Kinds
+ * @since   3.3.0
  */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Builds the markup for images, audio and video in kind views.
+ *
+ * @since 3.3.0
+ */
 class Kind_Media_View {
+        /**
+         * Attachment IDs or media URLs.
+         *
+         * @since 3.3.0
+         * @var int[]|string[]|int|string
+         */
         private $ids;
+        /**
+         * Media type: 'photo', 'audio' or 'video'.
+         *
+         * @since 3.3.0
+         * @var string
+         */
         private $type;
+        /**
+         * Sets up the media to display.
+         *
+         * @since 3.3.0
+         *
+         * @param int[]|string[]|int|string $ids  Attachment IDs or media URLs.
+         * @param string                    $type Media type: 'photo', 'audio' or 'video'.
+         */
         public function __construct( $ids, $type ) {
                 $this->ids  = $ids;
 …
+        }
+        /**
+         * Returns the markup for the media.
+         *
+         * @since 3.3.0
+         *
+         * @return string The markup, or an empty string if the type is not supported.
+         */
         public function get() {
                 switch ( $this->type ) {
 …
+        }
+        /**
+         * Returns a one-column gallery of photos.
+         *
+         * @since 3.3.0
+         *
+         * @param int[] $photos Attachment IDs.
+         * @return string The gallery markup.
+         */
         private function photo( $photos ) {
                 return gallery_shortcode(
 …
          * Return a media view for the audio post kind.
+         *
+         * @since 3.3.0
+         *
          * @access private
+         * @param int|string   $id   Audio attachment ID or audio URL
+         * @param mixed $args Arguments for the audio media view.
+         *
+         * @param int|string|array $id   Audio attachment ID or audio URL, or a list of them.
+         * @param array|null       $args Arguments for the audio media view.
+         *
          * @return array|string|void
 …
                 $return = '';
                 if ( $args['src'] ) {
+                        $args   = wp_parse_args( $args, $default );
                         $return = wp_audio_shortcode( $args );
+                }
 …
          * Return a media view for the video post kind.
+         *
+         * @since 3.3.0
+         *
          * @access private
+         * @param int|string   $id   Video attachment ID or URL.
+         * @param mixed $args Arguments for the video media view.
+         *
+         * @param int|string|array $id   Video attachment ID or URL, or a list of them.
+         * @param array|null       $args Arguments for the video media view.
+         *
          * @return array|string|void
 …
                 } elseif ( wp_http_validate_url( $id ) ) {
                         $args['src'] = $id;
                 } if ( 0 === $id ) {
+                } elseif ( 0 === $id ) {
                         return '';
                 } else {

indieweb-post-kinds/tags/4.0.0/includes/class-kind-menu-widget.php

-              r3067251
+              r3738687
 <?php
+/**
+ * Kind_Menu_Widget class.
+ *
+ * @package Post_Kinds
+ * @since   3.1.3
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Widget that lists links to the archive of each kind.
+ *
+ * @since 3.1.3
+ */
 class Kind_Menu_Widget extends WP_Widget {
         /**
          * Register widget with WordPress.
+         *
+         * @since 3.1.3
          */
         public function __construct() {
                 parent::__construct(
                         'Kind_Menu_Widget',                // Base ID
                         __( 'Kind Menu Widget', 'indieweb-post-kinds' ),        // Name
+                        'Kind_Menu_Widget',                // Base ID.
+                        __( 'Kind Menu Widget', 'indieweb-post-kinds' ),        // Name.
                         array(
                                 'classname'             => 'kind_menu_widget',
 …
         /**
          * Front-end display of widget.
+         *
+         * @since 3.1.3
+         *
          * @see WP_Widget::widget()
 …
+                }
                 $include = array_merge( $include, array( 'note', 'reply', 'article' ) );
+                // Filter Kinds
+                /**
+                 * This filter is documented in includes/class-kind-taxonomy.php
+                 */
                 $include = array_unique( apply_filters( 'kind_include', $include ) );
                 // Note cannot be removed or disabled without hacking the code
+                // Note cannot be removed or disabled without hacking the code.
                 if ( ! in_array( 'note', $include, true ) ) {
                         $include[] = 'note';
+                }
+                // phpcs:ignore
+                echo $args['before_widget'];
+                echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
                 if ( $title ) {
                         echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore
+                        echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Wrapper markup is the theme's; the title is escaped by core's widget_title filter.
+                }
                 ?>
 …
                 <ul>
                 <?php
                 $feed = is_front_page() ? 'rel="feed"' : '';
+                $feed = is_front_page() ? ' rel="feed"' : '';
                 foreach ( $include as $i ) {
                         $count = Kind_Taxonomy::get_post_kind_count( $i );
 …
                         $name = ( 1 === $count ) ? Kind_Taxonomy::get_kind_info( $i, 'singular_name' ) : Kind_Taxonomy::get_kind_info( $i, 'name' );
                         /* translators: 1. Blog Title 2. Kind Singular Name */
                         $title = sprintf( __( 'title="%1$s %2$s Feed"', 'indieweb-post-kinds' ), esc_attr( get_bloginfo( 'name' ) ), esc_attR( Kind_Taxonomy::get_kind_info( $i, 'singular_name' ) ) );
                         if ( 1 === (int) $instance['count'] ) {
                                 $count = sprintf( '%1$s (%2$s)', $name, $count );
+                        $feed_title = sprintf( __( '%1$s %2$s Feed', 'indieweb-post-kinds' ), get_bloginfo( 'name' ), Kind_Taxonomy::get_kind_info( $i, 'singular_name' ) );
+                        if ( 1 === (int) ( $instance['count'] ?? 0 ) ) {
+                                $label = sprintf( '%1$s (%2$s)', $name, number_format_i18n( $count ) );
                         } else {
                                 $count = $name;
+                                $label = $name;
+                        }
                         printf(
                                 '<li><a %4$s %5$s type="text/html" href="%2$s">%1$s%3$s</a></li>',
                                 Kind_Taxonomy::get_icon( $i ), // phpcs:ignore
+                                '<li><a%4$s title="%5$s" type="text/html" href="%2$s">%1$s%3$s</a></li>',
+                                Kind_Taxonomy::get_icon( $i ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
                                 esc_url( Kind_Taxonomy::get_post_kind_link( $i ) ),
                                 $count, // phpcs:ignore
                                 $feed, // phpcs:ignore
                                 $title  // phpcs:ignore
                         ); // phpcs:ignore
+                                esc_html( $label ),
+                                $feed, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- A fixed attribute string.
+                                esc_attr( $feed_title )
+                        );
+                }
                 if ( 1 === (int) $instance['all'] ) {
                         printf( '<li><a type="text/html" href="%2$s">%1$s%3$s</a></li>', Kind_Taxonomy::get_icon( 'firehose' ), esc_url( get_post_type_archive_link( 'post' ) ), esc_html__( 'All Posts', 'indieweb-post-kinds' ) ); // phpcs:ignore
+                if ( 1 === (int) ( $instance['all'] ?? 0 ) ) {
+                        printf( '<li><a type="text/html" href="%2$s">%1$s%3$s</a></li>', Kind_Taxonomy::get_icon( 'firehose' ), esc_url( get_post_type_archive_link( 'post' ) ), esc_html__( 'All Posts', 'indieweb-post-kinds' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
+                }
                 ?>
 …
                 <?php
+                // phpcs:ignore
+                echo $args['after_widget'];
+                echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
+        }
 …
         /**
          * Sanitize widget form values as they are saved.
+         *
+         * @since 3.1.3
+         *
          * @see WP_Widget::update()
 …
          */
         public function update( $new_instance, $old_instance ) {
+                array_walk_recursive( $new_instance, 'sanitize_text_field' );
+                return $new_instance;
+                $termslist = isset( $new_instance['termslist'] ) && is_array( $new_instance['termslist'] ) ? array_filter( $new_instance['termslist'], 'is_string' ) : array();
+                $termslist = array_values( array_unique( array_intersect( array_map( 'sanitize_key', $termslist ), Kind_Taxonomy::get_kind_list() ) ) );
+                return array(
+                        'title'     => isset( $new_instance['title'] ) && is_string( $new_instance['title'] ) ? sanitize_text_field( $new_instance['title'] ) : '',
+                        'termslist' => $termslist,
+                        'count'     => empty( $new_instance['count'] ) ? 0 : 1,
+                        'all'       => empty( $new_instance['all'] ) ? 0 : 1,
+                );
+        }
 …
         /**
          * Create the form for the Widget admin
+         *
+         * @since 3.1.3
+         *
          * @see WP_Widget::form()
 …
                 $termslist = (array) $instance['termslist'];
                 ?>
+                                <p><label for="title"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
+                                <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?> id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" value="
+                <?php echo esc_html( ( $instance['title'] ?? '' ) ); ?>" /></p>
+                                <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
+                                <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" value="<?php echo esc_attr( $instance['title'] ?? '' ); ?>" /></p>
                 <div id="kind-all">
                 <?php
                 foreach ( get_option( 'kind_termslist', Kind_Taxonomy::get_kind_list() ) as $term ) {
+                foreach ( Kind_Config::get_termslist() as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         if ( $value->show ) {
 …
                                         checked( in_array( $term, $termslist, true ), true, false )
                                 );
                                 printf( '%1$s %2$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ) ); //phpcs:ignore
+                                printf( '%1$s %2$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
+                        }
+                }

indieweb-post-kinds/tags/4.0.0/includes/class-kind-metabox.php

-              r3001401
+              r3738687
 <?php
 /**
  * Post Kind Post MetaBox Class
+ * Kind_Metabox class.
+ *
+ * Sets Up Tabbed Metabox in the Posting UI for Kind data.
+ * @package Post_Kinds
+ * @since   2.2.0
  */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Adds the tabbed Post Kinds metabox to the Classic Editor and saves its fields.
+ *
+ * @since 2.2.0
+ */
 class Kind_Metabox {
         /**
+         * Plugin version, used to version enqueued assets.
+         *
          * @var string $version
          */
 …
         /**
          * Function to initiate our metabox.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
                 self::$version = Post_Kinds_Plugin::$version;
                 add_action( 'edit_form_after_title', array( static::class, 'after_title_metabox' ) );
                 // Add meta box to new post/post pages only
+                // Add meta box to new post/post pages only.
                 add_action( 'load-post.php', array( static::class, 'kindbox_setup' ) );
                 add_action( 'load-post-new.php', array( static::class, 'kindbox_setup' ) );
 …
          * Function to change our post kind.
+         *
+         * @since 3.1.0
+         *
          * @access public
+         *
 …
         /**
+         * Function to change if a new post should be considered empty.
+         * Filters whether a post should be considered empty.
+         *
+         * Many kinds (likes, bookmarks, reposts, and so on) legitimately have no
+         * content, title or excerpt, which core would otherwise reject as empty.
+         *
+         * @since 3.0.0
+         *
          * @access public
+         *
          * @param bool  $maybe_empty Whether or not the post should be considered empty.
          * @param array $postarr     Data for the post to be inserted.
+         * @param array $postarr     Data for the post to be inserted or updated.
+         *
          * @return bool
          */
         public static function wp_insert_post_empty_content( $maybe_empty, $postarr ) {
                 // Always let updates to trash posts through
                 if ( 'trash' === $postarr['post_status'] ) {
+                // Always let updates to trash posts through.
+                if ( isset( $postarr['post_status'] ) && 'trash' === $postarr['post_status'] ) {
                         return false;
+                }
                 // Let All Micropub Posts through
                 if ( isset( $postarr['meta_input'] ) && isset( $postarr['meta_input']['micropub_auth_response'] ) ) {
+                // Let all Micropub creates through.
+                if ( isset( $postarr['meta_input']['micropub_auth_response'] ) ) {
                         return false;
+                }
+                if ( ! isset( $postarr['tax_input'] ) && ! isset( $postarr['tax_input']['kind'] ) ) {
+                        return $maybe_empty;
+                }
+                $kind = get_term_by( 'id', $postarr['tax_input']['kind'][0], 'kind' );
+                $kind = ( $kind instanceof WP_Term ) ? $kind->slug : '';
+                // Use traditional rules for articles
+                $kind = self::kind_from_postarr( $postarr );
+                // Use traditional rules for articles, and for posts without a kind.
                 if ( 'article' === $kind || ! $kind ) {
                         return $maybe_empty;
+                }
+                $keys = array( 'cite_url', 'cite_name', 'cite_summary' );
+                $keys = array_flip( $keys );
+                $diff = array_filter( array_intersect_key( $_POST, $keys ) );
+                if ( ! empty( $diff ) ) {
+                // An existing post of a kind other than article may have no content,
+                // for example when Micropub updates a like.
+                if ( ! empty( $postarr['ID'] ) ) {
                         return false;
+                }
+                // A new post from the metabox needs something to respond to.
+                foreach ( array( 'cite_url', 'cite_name', 'cite_summary' ) as $key ) {
+                        // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Only checks whether a field was filled in; save_post() verifies the nonce before saving.
+                        if ( isset( $_POST[ $key ] ) && is_string( $_POST[ $key ] ) && '' !== sanitize_text_field( wp_unslash( $_POST[ $key ] ) ) ) {
+                                return false;
+                        }
+                }
                 return $maybe_empty;
+        }
         /**
+         * Returns the kind slug for post data being inserted or updated.
+         *
+         * The kind comes from tax_input, which the kind metabox submits as a slug and
+         * other callers may pass as term IDs, or failing that from the existing post.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param array $postarr Data for the post to be inserted or updated.
+         * @return string Kind slug, or an empty string if none.
+         */
+        public static function kind_from_postarr( $postarr ) {
+                if ( isset( $postarr['tax_input']['kind'] ) ) {
+                        $kind = $postarr['tax_input']['kind'];
+                        if ( is_array( $kind ) ) {
+                                $kind = reset( $kind );
+                        }
+                        $term = is_numeric( $kind ) ? get_term_by( 'id', (int) $kind, 'kind' ) : get_term_by( 'slug', (string) $kind, 'kind' );
+                        return ( $term instanceof WP_Term ) ? $term->slug : '';
+                }
+                if ( ! empty( $postarr['ID'] ) ) {
+                        $kind = get_post_kind_slug( $postarr['ID'] );
+                        return $kind ? $kind : '';
+                }
+                return '';
+        }
+        /**
          * Execute metaboxes for the current screen, after the post title.
+         *
+         * @since 3.0.0
+         *
          * @access public
          * @param WP_Post $post Post object for the current screen.
 …
         /**
          * Metabox setup.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
                 /* Add meta boxes on the 'add_meta_boxes' hook. */
                 add_action( 'add_meta_boxes', array( $cls, 'add_meta_boxes' ) );
+                add_filter( 'hidden_meta_boxes', array( $cls, 'hidden_meta_boxes' ), 10, 2 );
                 add_action( 'admin_enqueue_scripts', array( $cls, 'enqueue_admin_scripts' ) );
+        }
 …
         /**
          * Enqueue our needed assets.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
                         // Provide a global object to our JS file containing our REST API endpoint, and API nonce
                         // Nonce must be 'wp_rest'
+                        // Nonce must be 'wp_rest'.
                         wp_localize_script(
                                 'kindmeta',
 …
                                         'success_message' => __( 'Your URL has been successfully retrieved and parsed', 'indieweb-post-kinds' ),
                                         'clear_message'   => __( 'Are you sure you want to clear post properties?', 'indieweb-post-kinds' ),
+                                        'error_message'   => __( 'Error: Unable to Retrieve', 'indieweb-post-kinds' ),
+                                        'invalid_url'     => __( 'Invalid URL', 'indieweb-post-kinds' ),
+                                        'media_title'     => __( 'Attach', 'indieweb-post-kinds' ),
+                                        'media_button'    => __( 'Use this media', 'indieweb-post-kinds' ),
+                                )
                         );
 …
         /**
          * Utility function to concatenate a list of post kinds.
+         *
+         * @since 2.7.5
+         *
          * @access public
 …
          * Utility function to separate out a list of post kinds.
+         *
+         * @since 2.7.5
+         *
          * @access public
+         *
 …
         /**
          * Function to render date/time field inputs.
+         *
+         * @since 2.5.0
+         *
          * @access public
 …
                 $tz_seconds = get_option( 'gmt_offset' ) * 3600;
                 $offset     = tz_seconds_to_offset( $tz_seconds );
                 $time       = divide_datetime( $datetime );
+                $time       = Kind_Time::divide_datetime( $datetime );
                 if ( ! is_array( $time ) ) {
                         $time = array();
 …
                         $offset = $time['offset'];
+                }
+                $string  = '<label class="half ' . $class . '" for="' . $prefix . '">' . $label . '<br/>';
+                $string .= '<input class="date" type="date" name="' . $prefix . '_date" id="' . $prefix . '_date" value="' . ( $time['date'] ?? '' ) . '"/>';
+                $string .= '<input class="time" type="time" name="' . $prefix . '_time" id="' . $prefix . '_time" step="1" value="' . ( $time['time'] ?? '' ) . '"/>';
+                $prefix  = esc_attr( $prefix );
+                $string  = '<label class="half ' . esc_attr( $class ) . '" for="' . $prefix . '">' . esc_html( $label ) . '<br/>';
+                $string .= '<input class="date" type="date" name="' . $prefix . '_date" id="' . $prefix . '_date" value="' . esc_attr( $time['date'] ?? '' ) . '"/>';
+                $string .= '<input class="time" type="time" name="' . $prefix . '_time" id="' . $prefix . '_time" step="1" value="' . esc_attr( $time['time'] ?? '' ) . '"/>';
                 $string .= self::select_offset( $prefix, $offset );
                 $string .= '</label>';
 …
          * Function to render our timezone choices.
+         *
+         * @since 2.5.0
+         *
          * @access public
+         *
 …
          */
         public static function select_offset( $prefix, $select ) {
                 $string  = '<select name="' . $prefix . '_offset" id="' . $prefix . '_offset">';
+                $string  = '<select name="' . esc_attr( $prefix ) . '_offset" id="' . esc_attr( $prefix ) . '_offset">';
                 $string .= self::timezone_offset_choice( $select );
                 $string .= '</select>';
 …
          * Function to render options for a chosen timezone select field.
+         *
+         * @since 3.0.0
+         *
          * @access public
+         *
 …
                 $tzlist = get_gmt_offsets();
                 $string = '';
                 foreach ( $tzlist as $key => $value ) {
                         $string .= '<option value="' . $value . '"';
+                foreach ( $tzlist as $value ) {
+                        $string .= '<option value="' . esc_attr( $value ) . '"';
                         if ( $select === $value ) {
                                 $string .= ' selected';
+                        }
                         $string .= '>GMT' . $value . '</option>';
+                        $string .= '>GMT' . esc_html( $value ) . '</option>';
+                }
                 return $string;
 …
          * Render the options for the rating select field.
+         *
+         * @access public
+         *
+         * @param string $selected Selected Rating choice
+         * @since 3.7.0
+         *
+         * @access public
+         *
+         * @param string $selected Selected Rating choice.
          * @return string
          */
 …
                 $ret      = '';
                 foreach ( $ratings as $key => $value ) {
                         $ret .= '<option value="' . $key . '"';
+                        $ret .= '<option value="' . esc_attr( $key ) . '"';
                         if ( $selected === $key ) {
                                 $ret .= ' selected';
+                        }
                         $ret .= '>' . $value . '</option>';
+                        $ret .= '>' . esc_html( (string) $value ) . '</option>';
+                }
                 return $ret;
 …
          * Render the options for the RSVP select field.
+         *
+         * @access public
+         *
+         * @param string $selected Selected RSVP choice
+         * @since 3.0.0
+         *
+         * @access public
+         *
+         * @param string $selected Selected RSVP choice.
          * @return string
          */
 …
                 $string = '';
                 foreach ( $rsvps as $key => $value ) {
                         $string .= '<option value="' . $key . '"';
+                        $string .= '<option value="' . esc_attr( $key ) . '"';
                         if ( $selected === $key ) {
                                 $string .= ' selected';
+                        }
                         $string .= '>' . $value . '</option>';
+                        $string .= '>' . esc_html( (string) $value ) . '</option>';
+                }
                 return $string;
 …
         /**
          * Render our RSVP select input.
+         *
+         * @since 2.5.0
+         *
          * @access public
 …
          */
         public static function rsvp_select( $selected ) {
                 $string  = '<label for="mf2_rsvp">' . __( 'RSVP', 'indieweb-post-kinds' ) . '</label><br/>';
+                $string  = '<label for="mf2_rsvp">' . esc_html__( 'RSVP', 'indieweb-post-kinds' ) . '</label><br/>';
                 $string .= '<select name="mf2_rsvp" id="mf2_rsvp">';
                 $string .= self::rsvp_choice( $selected );
 …
          * Render our rating select input.
+         *
+         * @since 3.7.0
+         *
          * @access public
+         *
 …
          */
         public static function rating_select( $selected ) {
                 $string  = '<label for="mf2_rating">' . __( 'Rating', 'indieweb-post-kinds' ) . '</label><br/>';
+                $string  = '<label for="mf2_rating">' . esc_html__( 'Rating', 'indieweb-post-kinds' ) . '</label><br/>';
                 $string .= '<select name="mf2_rating" id="mf2_rating">';
                 $string .= self::rating_choice( $selected );
 …
         /**
+         * Keeps the Response Properties box from being saved as hidden.
+         *
+         * The editor script hides the box for kinds without a response, such as
+         * note. WordPress saves every hidden box as unticked in Screen Options
+         * whenever any box is collapsed or any Screen Options box is toggled, so
+         * the box would stay hidden for every kind afterwards. The script shows
+         * and hides it by kind instead.
+         *
+         * @since 4.0.0
+         *
+         * @param string[]  $hidden IDs of the hidden meta boxes.
+         * @param WP_Screen $screen The current screen.
+         * @return string[] IDs of the hidden meta boxes.
+         */
+        public static function hidden_meta_boxes( $hidden, $screen ) {
+                if ( ! is_array( $hidden ) || ! $screen instanceof WP_Screen || 'post' !== $screen->id ) {
+                        return $hidden;
+                }
+                return array_values( array_diff( $hidden, array( 'replybox-meta' ) ) );
+        }
+        /**
          * Create one or more meta boxes to be displayed on the post editor screen.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
         public static function add_meta_boxes() {
                 add_meta_box(
                         'replybox-meta', // Unique ID
                         esc_html__( 'Response Properties', 'indieweb-post-kinds' ), // Title
                         array( static::class, 'reply_metabox' ), // Callback function
+                        'replybox-meta', // Unique ID.
+                        esc_html__( 'Response Properties', 'indieweb-post-kinds' ), // Title.
+                        array( static::class, 'reply_metabox' ), // Callback function.
                         'post',
                         'kind_after_title', // Context
                         'default', // Priority
+                        'kind_after_title', // Context.
+                        'default', // Priority.
                         array(
                                 '__block_editor_compatible_meta_box' => false,
 …
          * Render our reply meta box.
+         *
+         * @since 3.0.0
+         *
          * @access public
+         *
 …
          * Process and save meta box data.
+         *
+         * @access public
+         *
+         * @param int    $post_id Saved post ID.
+         * @param WP_Pos $post    Saved post object.
+         * @since 2.2.0
+         *
+         * @access public
+         *
+         * @param int     $post_id Saved post ID.
+         * @param WP_Post $post    Saved post object.
          */
         public static function save_post( $post_id, $post ) {
 …
                 // Verify that the nonce is valid.
                 if ( ! wp_verify_nonce( $_POST['replykind_metabox_nonce'], 'replykind_metabox' ) ) {
+                if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['replykind_metabox_nonce'] ) ), 'replykind_metabox' ) ) {
                         return;
+                }
 …
                 // Check the user's permissions.
                 if ( isset( $_POST['post_type'] ) && 'page' === $_POST['post_type'] ) {
+                if ( 'page' === self::posted_text( 'post_type' ) ) {
                         if ( ! current_user_can( 'edit_page', $post_id ) ) {
                                 return;
 …
                 if ( isset( $_POST['mf2_start_date'] ) || isset( $_POST['mf2_start_time'] ) ) {
                         $start = build_iso8601_time( sanitize_text_field( $_POST['mf2_start_date'] ), sanitize_text_field( $_POST['mf2_start_time'] ), sanitize_text_field( $_POST['mf2_start_offset'] ) );
+                        $start = build_iso8601_time( self::posted_text( 'mf2_start_date' ), self::posted_text( 'mf2_start_time' ), self::posted_text( 'mf2_start_offset' ) );
                         if ( ! $start ) {
                                 $kind_post->delete( 'start' );
 …
+                }
                 if ( isset( $_POST['mf2_end_date'] ) || isset( $_POST['mf2_end_time'] ) ) {
                         $end = build_iso8601_time( sanitize_text_field( $_POST['mf2_end_date'] ), sanitize_text_field( $_POST['mf2_end_time'] ), sanitize_text_field( $_POST['mf2_end_offset'] ) );
+                        $end = build_iso8601_time( self::posted_text( 'mf2_end_date' ), self::posted_text( 'mf2_end_time' ), self::posted_text( 'mf2_end_offset' ) );
                         if ( ! $end ) {
                                 $kind_post->delete( 'end' );
 …
                 $durations = array(
                         'Y' => intval( $_POST['duration_years'] ?? '' ),
                         'M' => intval( $_POST['duration_months'] ?? '' ),
                         'D' => intval( $_POST['duration_days'] ?? '' ),
                         'H' => intval( $_POST['duration_hours'] ?? '' ),
                         'I' => intval( $_POST['duration_minutes'] ?? '' ),
                         'S' => intval( $_POST['duration_seconds'] ?? '' ),
+                        'Y' => absint( self::posted_text( 'duration_years' ) ),
+                        'M' => absint( self::posted_text( 'duration_months' ) ),
+                        'D' => absint( self::posted_text( 'duration_days' ) ),
+                        'H' => absint( self::posted_text( 'duration_hours' ) ),
+                        'I' => absint( self::posted_text( 'duration_minutes' ) ),
+                        'S' => absint( self::posted_text( 'duration_seconds' ) ),
                 );
                 $duration  = build_iso8601_duration( $durations );
 …
                         if ( $duration instanceof DateInterval ) {
                                 $duration = date_interval_to_iso8601( $duration );
-                                error_log( wp_json_encode( $duration ) );
+                        }
+                }
 …
+                }
+                $kind_post->set( 'rsvp', $_POST['mf2_rsvp'] );
+                if ( array_key_exists( 'mf2_rating', $_POST ) && is_numeric( $_POST['mf2_rating'] ) ) {
+                        $kind_post->set( 'rating', intval( $_POST['mf2_rating'] ) );
+                }
+                if ( isset( $_POST['cite_published_date'] ) || isset( $_POST['published_time'] ) ) {
+                        $cite['published'] = build_iso8601_time( sanitize_text_field( $_POST['cite_published_date'] ), sanitize_text_field( $_POST['cite_published_time'] ), sanitize_text_field( $_POST['cite_published_offset'] ) );
+                if ( isset( $_POST['mf2_rsvp'] ) ) {
+                        $rsvp = self::posted_text( 'mf2_rsvp' );
+                        if ( in_array( $rsvp, array( 'yes', 'no', 'maybe', 'interested', 'remote' ), true ) ) {
+                                $kind_post->set( 'rsvp', $rsvp );
+                        } else {
+                                $kind_post->delete( 'rsvp' );
+                        }
+                }
+                $rating = self::posted_text( 'mf2_rating' );
+                if ( is_numeric( $rating ) ) {
+                        $kind_post->set( 'rating', intval( $rating ) );
+                }
+                if ( isset( $_POST['cite_published_date'] ) || isset( $_POST['cite_published_time'] ) ) {
+                        $cite['published'] = build_iso8601_time( self::posted_text( 'cite_published_date' ), self::posted_text( 'cite_published_time' ), self::posted_text( 'cite_published_offset' ) );
+                }
                 if ( isset( $_POST['cite_updated_date'] ) || isset( $_POST['cite_updated_time'] ) ) {
+                        $cite['updated'] = build_iso8601_time( sanitize_text_field( $_POST['cite_updated_date'] ), sanitize_text_field( $_POST['cite_updated_time'] ), sanitize_text_field( $_POST['cite_updated_offset'] ) );
+                }
+                $cite['summary'] = wp_kses_post( $_POST['cite_summary'] ?? '' );
+                $cite['name']    = sanitize_text_field( $_POST['cite_name'] ?? '' );
+                $cite['url']     = esc_url( $_POST['cite_url'] ?? '' );
+                        $cite['updated'] = build_iso8601_time( self::posted_text( 'cite_updated_date' ), self::posted_text( 'cite_updated_time' ), self::posted_text( 'cite_updated_offset' ) );
+                }
+                // Summaries are plain text; line breaks are kept.
+                $cite['summary'] = isset( $_POST['cite_summary'] ) && is_string( $_POST['cite_summary'] ) ? sanitize_textarea_field( wp_unslash( $_POST['cite_summary'] ) ) : '';
+                $cite['name']    = self::posted_text( 'cite_name' );
+                $cite['url']     = self::posted_urls( 'cite_url' );
                 if ( isset( $_POST['cite_tags'] ) ) {
+                        $cite['category'] = array_filter( explode( ';', sanitize_text_field( $_POST['cite_tags'] ) ) );
+                }
+                $cite['publication'] = sanitize_text_field( $_POST['cite_publication'] ?? '' );
+                $cite['featured']    = esc_url( $_POST['cite_featured'] ?? '' );
+                $author         = array();
+                $author['name'] = self::explode( sanitize_text_field( $_POST['cite_author_name'] ?? '' ) );
+                $author['url']  = self::explode( $_POST['cite_author_url'] ?? '' );
+                if ( is_array( $author['url'] ) ) {
+                        $author['url'] = array_map( 'esc_url', $author['url'] );
+                        $cite['category'] = array_values( array_filter( array_map( 'trim', explode( ';', self::posted_text( 'cite_tags' ) ) ) ) );
+                }
+                $cite['publication'] = self::posted_text( 'cite_publication' );
+                $cite['featured']    = self::posted_urls( 'cite_featured' );
+                // One h-card per author. Like the other fields, an empty value clears what was stored.
+                $authors = array_map( '\ParseThis\jf2_to_mf2', self::posted_authors() );
+                if ( empty( $authors ) ) {
+                        $cite['author'] = '';
                 } else {
+                        $author['url'] = esc_url( $author['url'] );
+                }
+                $author['photo'] = self::explode( $_POST['cite_author_photo'] ?? '' );
+                if ( is_array( $author['photo'] ) ) {
+                        $author['photo'] = array_map( 'esc_url', $author['photo'] );
+                } else {
+                        $author['photo'] = esc_url( $author['photo'] );
+                }
+                $author = array_filter( $author );
+                if ( ! empty( $author ) ) {
+                        $author['type'] = 'card';
+                        $cite['author'] = jf2_to_mf2( $author );
+                }
+                        $cite['author'] = 1 === count( $authors ) ? $authors[0] : $authors;
+                }
                 $kind = $kind_post->get_kind();
                 $type = Kind_Taxonomy::get_kind_info( $kind, 'property' );
+                // Make sure there is no overwrite of properties that might not be handled by the plugin
+                $fetch = $kind_post->get_cite();
+                if ( ! $fetch ) {
+                        $fetch = array();
+                } else {
+                        $fetch = array_filter( $fetch );
+                }
+                // Make sure there is no overwrite of properties that might not be handled by the plugin.
+                $fetch = self::stored_cite_properties( $kind_post->get_cite() );
                 if ( empty( $_POST['cite_media'] ) ) {
                         $cite = array_merge( $fetch, $cite );
 …
+                                }
                                 $cite = array( 'properties' => $build );
                                 // Temporary code which assumes everything except a checkin is a citation
+                                // Temporary code which assumes everything except a checkin is a citation.
                                 if ( 'checkin' === $kind ) {
                                         $cite['type'] = array( 'h-card' );
 …
+                        }
+                }
+                $kind_post->set( $type, $cite );
+                // Values are unslashed for sanitizing; the metadata API expects them slashed.
+                $kind_post->set( $type, wp_slash( $cite ) );
+        }
+        /**
+         * Returns a posted metabox field as sanitized text.
+         *
+         * Only called from save_post(), after the nonce is verified.
+         *
+         * @since 4.0.0
+         *
+         * @param string $key Field name.
+         * @return string The unslashed, sanitized value, or an empty string if it is missing.
+         */
+        private static function posted_text( $key ) {
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Verified in save_post().
+                if ( ! isset( $_POST[ $key ] ) || ! is_string( $_POST[ $key ] ) ) {
+                        return '';
+                }
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Verified in save_post().
+                return sanitize_text_field( wp_unslash( $_POST[ $key ] ) );
+        }
+        /**
+         * Returns the properties of a stored citation, keyed by property name.
+         *
+         * Saving merges these with the posted fields, so properties the metabox
+         * does not edit are kept. A citation stored as a plain URL has none.
+         * Before 4.0.0, saving merged the whole stored microformat instead, nesting
+         * it inside its own properties one level deeper on each save; those levels
+         * are flattened here, newer values winning.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $cite Citation as returned by Kind_Post::get_cite().
+         * @return array Property values, each a list.
+         */
+        private static function stored_cite_properties( $cite ) {
+                if ( wp_is_numeric_array( $cite ) && 1 === count( $cite ) ) {
+                        $cite = $cite[0];
+                }
+                if ( ! is_array( $cite ) || empty( $cite['properties'] ) || ! is_array( $cite['properties'] ) ) {
+                        return array();
+                }
+                return array_filter( Kind_Upgrade::flatten_properties( $cite['properties'] ) );
+        }
+        /**
+         * Returns a posted metabox URL field, sanitized.
+         *
+         * Only called from save_post(), after the nonce is verified.
+         *
+         * @since 4.0.0
+         *
+         * @param string $key Field name.
+         * @return string The URL, or an empty string if it is not valid.
+         */
+        private static function posted_urls( $key ) {
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Verified in save_post().
+                if ( ! isset( $_POST[ $key ] ) || ! is_string( $_POST[ $key ] ) ) {
+                        return '';
+                }
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Verified in save_post(); sanitized with sanitize_url() (sanitize_text_field() would alter %-encoding).
+                return sanitize_url( trim( wp_unslash( $_POST[ $key ] ) ) );
+        }
+        /**
+         * Returns the authors posted in the metabox's Author tab, as jf2 h-cards.
+         *
+         * Each field holds one value per author, separated by semicolons, so the
+         * first name goes with the first URL and the first photo, and so on. An
+         * author without a URL leaves that position empty, as in "Ann; Bob" and
+         * "; https://example.com/bob".
+         *
+         * Only called from save_post(), after the nonce is verified.
+         *
+         * @since 4.0.0
+         *
+         * @return array[] The authors, each with type 'card' and any of name, url and photo.
+         */
+        private static function posted_authors() {
+                $fields = array();
+                foreach ( array(
+                        'name'  => 'cite_author_name',
+                        'url'   => 'cite_author_url',
+                        'photo' => 'cite_author_photo',
+                ) as $property => $key ) {
+                        // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Verified in save_post(); each value is sanitized below.
+                        $value  = isset( $_POST[ $key ] ) && is_string( $_POST[ $key ] ) ? wp_unslash( $_POST[ $key ] ) : '';
+                        $values = array_map( 'trim', explode( ';', $value ) );
+                        $fields[ $property ] = array_map( 'name' === $property ? 'sanitize_text_field' : 'sanitize_url', $values );
+                }
+                $authors = array();
+                $count   = max( array_map( 'count', $fields ) );
+                for ( $i = 0; $i < $count; $i++ ) {
+                        $author = array();
+                        foreach ( $fields as $property => $values ) {
+                                if ( isset( $values[ $i ] ) && '' !== $values[ $i ] ) {
+                                        $author[ $property ] = $values[ $i ];
+                                }
+                        }
+                        if ( $author ) {
+                                $authors[] = array_merge( array( 'type' => 'card' ), $author );
+                        }
+                }
+                return $authors;
+        }
         /**
          * Function to handle saving our kind data upon post status transition.
+         *
+         * @since 2.2.0
+         *
          * @access public

indieweb-post-kinds/tags/4.0.0/includes/class-kind-plugins.php

-              r2973430
+              r3738687
 <?php
 /**
  * Post Kind Plugins Class
+ * Kind_Plugins class.
+ *
+ * Custom Functions for Specific Other Pugins
+ * @package Post_Kinds
+ * @since   2.5.2
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Integrations with other plugins, such as Micropub and ActivityPub.
+ *
  * @package Post Kinds
+ * @since 2.5.2
  */
 class Kind_Plugins {
         /**
+         * WP-Cron hook that retries parsing a Micropub citation in the background.
+         *
+         * @var string
+         */
+        const ENRICH_EVENT = 'post_kinds_enrich_citation';
+        /**
+         * How many times a citation is parsed after temporary failures, counting the
+         * attempt during the request.
+         *
+         * @var int
+         */
+        const ENRICH_ATTEMPTS = 3;
+        /**
+         * Post meta holding the log of citation parsing outcomes for a post.
+         *
+         * @var string
+         */
+        const LOG_META = '_kind_citation_log';
+        /**
+         * Post meta holding the post's citation status: retrying or failed. It is
+         * removed when no citation is retrying or failed.
+         *
+         * @var string
+         */
+        const STATUS_META = '_kind_citation_status';
+        /**
+         * How many log entries are kept per post.
+         *
+         * @var int
+         */
+        const LOG_LIMIT = 20;
+        /**
+         * Citation URLs from the current Micropub request that could not be parsed,
+         * as arrays of property, URL and WP_Error, waiting for the post ID.
+         *
+         * @var array[]
+         */
+        private static $pending = array();
+        /**
          * Initialize our plugin integrations.
+         *
+         * @since 2.5.2
+         *
          * @access public
          */
         public static function init() {
+                // Set Post Kind for Micropub Inputs.
+                // Set the post kind for Micropub posts before they are inserted (Micropub 2.1.0
+                // and later), with after_micropub as a fallback.
+                add_filter( 'micropub_tax_input', array( static::class, 'micropub_tax_input' ), 10, 2 );
                 add_action( 'after_micropub', array( static::class, 'micropub_set_kind' ), 9, 2 );
                 add_action( 'after_micropub', array( static::class, 'post_formats' ), 11, 2 );
                 add_filter( 'before_micropub', array( static::class, 'micropub_parse' ), 11 );
+                add_action( 'after_micropub', array( static::class, 'schedule_enrichment' ), 20, 2 );
+                add_action( self::ENRICH_EVENT, array( static::class, 'enrich_citation' ), 10, 4 );
+                // Advertise the enabled kinds to Micropub clients (Micropub 1.4 and later).
+                add_filter( 'micropub_query', array( static::class, 'micropub_query' ), 10, 2 );
                 add_filter( 'tempus_widget_post_title', array( static::class, 'tempus_widget_post_title' ), 10, 2 );
                 // Override Post Type in Semantic Linkbacks.
                 add_filter( 'semantic_linkbacks_post_type', array( static::class, 'semantic_post_type' ), 11, 2 );
+                // Remove the Automatic Post Generation that the Micropub Plugin Offers
+                if ( class_exists( 'Micropub_Render' ) ) {
+                        if ( has_filter( 'micropub_post_content', array( 'Micropub_Render', 'generate_post_content' ) ) ) {
+                                remove_filter( 'micropub_post_content', array( 'Micropub_Render', 'generate_post_content' ), 1, 2 );
+                        }
+                } elseif ( class_exists( 'Micropub_Plugin' ) ) {
+                        if ( has_filter( 'micropub_post_content', array( 'Micropub_Plugin', 'generate_post_content' ) ) ) {
+                                remove_filter( 'micropub_post_content', array( 'Micropub_Plugin', 'generate_post_content' ), 1, 2 );
+                        }
+                }
+                // Hum Compatibility Filters
+                // Post Kinds displays the response itself, so turn off Micropub's dynamic
+                // rendering of Micropub posts (Micropub 2.4.0 and later).
+                add_filter( 'micropub_dynamic_render', '__return_false' );
+                // Hum Compatibility Filters.
                 add_action( 'hum_local_types', array( static::class, 'hum_local_types' ), 11 );
                 add_action( 'hum_type_prefix', array( static::class, 'hum_type_prefix' ), 11, 2 );
                 // ActivityPub Filters
+                // ActivityPub Filters.
                 add_filter( 'activitypub_post', array( static::class, 'activitypub_post' ), 12 );
+        }
 …
          * Construct a title for the Tempus Widget link.
+         *
+         * @since 3.5.4
+         *
          * @access public
+         *
          * @param string $title The Original Title.
          * @param WP_Post $post Post object.
+         * @param string  $title The Original Title.
+         * @param WP_Post $post  Post object.
          * @return string
          */
 …
         /**
+         *
+         * @param array $post_array
+         * Sets the ActivityPub object type based on the post kind.
+         *
+         * @since 3.6.2
+         *
+         * @param array $post_array ActivityPub object array.
+         *
          * @return array
 …
+        }
+        /**
+         * Adds the kinds' shortlink type codes to the Hum plugin.
+         *
+         * @since 3.4.0
+         *
+         * @param string[] $types Local type codes.
+         * @return string[] Local type codes.
+         */
         public static function hum_local_types( $types ) {
                 // http://tantek.pbworks.com/w/page/21743973/Whistle#design - Some of the uses are modified based on design considerations noted.
                 $types[] = 'f'; // Favorited, Likes, etc
                 $types[] = 'e'; // Events
                 $types[] = 'g'; // Geo Checkin
                 $types[] = 'h'; // Link
                 $types[] = 'm'; // Metric
                 $types[] = 'q'; // Question
                 $types[] = 'r'; // Review
                 $types[] = 'x'; // Experience
                 $types[] = 'u'; // Status Update
+                $types[] = 'f'; // Favorited, Likes, etc.
+                $types[] = 'e'; // Events.
+                $types[] = 'g'; // Geo Checkin.
+                $types[] = 'h'; // Link.
+                $types[] = 'm'; // Metric.
+                $types[] = 'q'; // Question.
+                $types[] = 'r'; // Review.
+                $types[] = 'x'; // Experience.
+                $types[] = 'u'; // Status Update.
                 return $types;
+        }
+        /**
+         * Uses the kind's shortlink code as a post's Hum type prefix.
+         *
+         * @since 3.4.0
+         *
+         * @param string $prefix  Type prefix.
+         * @param int    $post_id Post ID.
+         * @return string The kind's shortlink code, or the prefix if it has none.
+         */
         public static function hum_type_prefix( $prefix, $post_id ) {
                 $post_type = get_post_type( $post_id );
 …
          * Replaces need for replacing the entire excerpt.
+         *
+         * @since 2.5.2
+         *
          * @access public
+         *
 …
         /**
+         * Take mf2 properties and set a post kind.
+         * Implements Post Type Discovery https://www.w3.org/TR/post-type-discovery/
+         *
+         * @param array $input   Micropub Request in JSON.
+         * @param array $wp_args Arguments passed to insert or update posts.
+         * Returns the post kind for an mf2 object, using Post Type Discovery.
+         * Implements https://www.w3.org/TR/post-type-discovery/ via Parse This.
+         *
+         * @since 4.0.0
+         *
+         * @param array $mf2 mf2 object, such as a Micropub request.
+         * @return string Registered kind slug, or an empty string if none applies.
+         */
+        public static function discover_kind( $mf2 ) {
+                if ( ! is_array( $mf2 ) || empty( $mf2['properties'] ) || ! function_exists( '\\ParseThis\\post_type_discovery' ) ) {
+                        return '';
+                }
+                $type = \ParseThis\post_type_discovery( \ParseThis\mf2_to_jf2( $mf2 ) );
+                return ( $type && Kind_Taxonomy::get_post_kind_info( $type ) ) ? $type : '';
+        }
+        /**
+         * Sets the kind of a Micropub post in the taxonomy input, so the post is
+         * inserted with its kind rather than the default term. Everything that runs
+         * during the insert, such as the publish transition, post formats and other
+         * plugins' publish hooks, then sees the right kind.
+         *
+         * Hooked to Micropub's micropub_tax_input filter (Micropub 2.1.0 and later),
+         * which is applied when a post is created.
+         *
+         * @since 4.0.0
+         *
+         * @param array|null $tax_input Taxonomy input for the new post.
+         * @param array      $input     Micropub request.
+         * @return array|null Taxonomy input, with the kind added.
+         */
+        public static function micropub_tax_input( $tax_input, $input ) {
+                $kind = self::discover_kind( $input );
+                if ( ! $kind ) {
+                        return $tax_input;
+                }
+                if ( ! is_array( $tax_input ) ) {
+                        $tax_input = array();
+                }
+                if ( empty( $tax_input['kind'] ) ) {
+                        $tax_input['kind'] = array( $kind );
+                }
+                return $tax_input;
+        }
+        /**
+         * Sets the kind of a Micropub post after it is created, if it does not
+         * already have it.
+         *
+         * The kind is normally set before the insert (see micropub_tax_input()). This
+         * covers Micropub versions before 2.1.0, and users who cannot assign kind
+         * terms, for whom WordPress ignores the taxonomy input.
+         *
+         * @since 2.5.2
+         *
+         * @param array      $input   Micropub request.
+         * @param array|null $wp_args Arguments of the created or updated post; null for queries.
          */
         public static function micropub_set_kind( $input, $wp_args ) {
+                // Only continue if create or update
+                if ( ! $wp_args ) {
+                if ( empty( $wp_args['ID'] ) ) {
                         return;
+                }
+                $type = post_type_discovery( mf2_to_jf2( $input ) );
+                if ( ! empty( $type ) ) {
+                        set_post_kind( $wp_args['ID'], $type );
+                }
+        }
+        /**
+         * Set our post formats.
+                $post_id = (int) $wp_args['ID'];
+                if ( isset( $input['action'] ) && 'update' === $input['action'] ) {
+                        // Only recalculate when the update changed a property that decides the
+                        // kind, so a kind chosen in the editor survives unrelated updates.
+                        if ( ! self::update_changes_kind( $input ) ) {
+                                return;
+                        }
+                        $kind = self::discover_kind( self::stored_mf2( $post_id ) );
+                } else {
+                        $kind = self::discover_kind( $input );
+                }
+                if ( $kind && get_post_kind_slug( $post_id ) !== $kind ) {
+                        self::set_kind_without_moving_properties( $post_id, $kind );
+                }
+        }
+        /**
+         * Returns the properties that decide a post's kind: each registered kind's
+         * property, plus rsvp, which Post Type Discovery checks first.
+         *
+         * @since 4.0.0
+         *
+         * @return string[] Property names.
+         */
+        public static function kind_properties() {
+                $properties = array( 'rsvp' );
+                foreach ( Kind_Taxonomy::get_kind_list() as $kind ) {
+                        $property = Kind_Taxonomy::get_kind_info( $kind, 'property' );
+                        if ( $property ) {
+                                $properties[] = $property;
+                        }
+                }
+                return array_values( array_unique( $properties ) );
+        }
+        /**
+         * Whether a Micropub update request replaces, adds or deletes a property
+         * that decides the kind.
+         *
+         * @since 4.0.0
+         *
+         * @param array $input Micropub update request.
+         * @return bool
+         */
+        public static function update_changes_kind( $input ) {
+                $changed = array();
+                foreach ( array( 'replace', 'add' ) as $operation ) {
+                        if ( isset( $input[ $operation ] ) && is_array( $input[ $operation ] ) ) {
+                                $changed = array_merge( $changed, array_keys( $input[ $operation ] ) );
+                        }
+                }
+                if ( isset( $input['delete'] ) && is_array( $input['delete'] ) ) {
+                        // Either a list of property names, or an object of property => values.
+                        $changed = array_merge( $changed, wp_is_numeric_array( $input['delete'] ) ? $input['delete'] : array_keys( $input['delete'] ) );
+                }
+                return (bool) array_intersect( $changed, self::kind_properties() );
+        }
+        /**
+         * Builds the mf2 for a post from what is stored: the mf2_ post meta, plus the
+         * title and content, which Post Type Discovery uses to tell articles from notes.
+         *
+         * @since 4.0.0
+         *
+         * @param int $post_id Post ID.
+         * @return array mf2 object.
+         */
+        public static function stored_mf2( $post_id ) {
+                $properties = array();
+                foreach ( get_post_meta( $post_id ) as $key => $values ) {
+                        if ( 0 !== strpos( $key, 'mf2_' ) || 'mf2_type' === $key ) {
+                                continue;
+                        }
+                        $value = maybe_unserialize( $values[0] );
+                        if ( '' === $value || array() === $value ) {
+                                continue;
+                        }
+                        $properties[ substr( $key, 4 ) ] = is_array( $value ) ? $value : array( $value );
+                }
+                $post = get_post( $post_id );
+                if ( $post && '' !== $post->post_title ) {
+                        $properties['name'] = array( $post->post_title );
+                }
+                if ( $post && '' !== $post->post_content ) {
+                        $properties['content'] = array( $post->post_content );
+                }
+                return array(
+                        'type'       => array( 'h-entry' ),
+                        'properties' => $properties,
+                );
+        }
+        /**
+         * Sets a post's kind without moving property values between properties.
+         *
+         * When the kind changes in the editor, Kind_Metabox::change_kind() moves the
+         * old kind's property to the new one (a like-of becomes an in-reply-to, for
+         * example). After a Micropub update the properties are already where the
+         * client put them, so that is suspended here.
+         *
+         * @since 4.0.0
+         *
+         * @param int    $post_id Post ID.
+         * @param string $kind    Kind slug.
+         */
+        private static function set_kind_without_moving_properties( $post_id, $kind ) {
+                $moving = has_action( 'change_kind', array( 'Kind_Metabox', 'change_kind' ) );
+                if ( false !== $moving ) {
+                        remove_action( 'change_kind', array( 'Kind_Metabox', 'change_kind' ), $moving );
+                }
+                set_post_kind( $post_id, $kind );
+                if ( false !== $moving ) {
+                        add_action( 'change_kind', array( 'Kind_Metabox', 'change_kind' ), $moving, 3 );
+                }
+        }
+        /**
+         * Sets the post format of a post created or updated by Micropub to match its kind.
+         *
+         * @since 2.5.2
+         *
          * @access public
+         *
          * @param $input
          * @param $wp_args
+         * @param array $input   The Micropub request.
+         * @param array $wp_args Arguments passed to wp_insert_post() or wp_update_post().
          */
         public static function post_formats( $input, $wp_args ) {
 …
         /**
+         * Parse our micropub values.
+         * Returns the Micropub properties whose URL values are enriched into citations.
+         *
+         * @since 4.0.0
+         *
+         * @return string[] Property names.
+         */
+        public static function citation_properties() {
+                return array( 'bookmark-of', 'like-of', 'favorite-of', 'in-reply-to', 'read-of', 'listen-of', 'watch-of' );
+        }
+        /**
+         * Enriches the URLs in citation properties of a Micropub create request, or
+         * of the replace part of an update request, into h-cite objects parsed from
+         * the cited page.
+         *
+         * Follows the Micropub spec: property values are arrays, so a property whose
+         * value is not an array is left for Micropub to handle, and only string URLs
+         * inside the array are enriched. Values the client already sent as objects,
+         * such as an h-cite, are kept as sent.
+         *
+         * @since 2.7.5
+         *
          * @access public
+         *
          * @param array $input Array of inputs to parse.
          * @return mixed
+         * @param array $input Micropub request, in mf2 JSON.
+         * @return array The request, with citation URLs enriched where possible.
          */
         public static function micropub_parse( $input ) {
+                if ( ! $input ) {
+                self::$pending = array();
+                // Queries (q) are left as is.
+                if ( ! is_array( $input ) || isset( $input['q'] ) ) {
                         return $input;
+                }
+                // q indicates a get query
+                if ( isset( $input['q'] ) ) {
+                if ( ! class_exists( '\\ParseThis\\Parser' ) || ! self::enrichment_enabled( $input ) ) {
                         return $input;
+                }
+                if ( ! isset( $input['properties'] ) ) {
+                        return $input;
+                }
+                $parsed = array( 'bookmark-of', 'like-of', 'favorite-of', 'in-reply-to', 'read-of', 'listen-of', 'watch-of' );
+                foreach ( $input['properties'] as $property => $value ) {
+                        if ( in_array( $property, $parsed, true ) ) {
+                                if ( wp_is_numeric_array( $value ) ) {
+                                        foreach ( $value as $i => $v ) {
+                                                if ( wp_http_validate_url( $v ) ) {
+                                                        $parse = new Parse_This( $v );
+                                                        $fetch = $parse->fetch();
+                                                        if ( ! is_wp_error( $fetch ) ) {
+                                                                $parse->parse();
+                                                                $jf2 = $parse->get();
+                                                                // Entries become citations
+                                                                if ( 'entry' === $jf2['type'] ) {
+                                                                        $jf2['type'] = 'cite';
+                                                                }
+                                                                $mf2                                    = jf2_to_mf2( $jf2 );
+                                                                $input['properties'][ $property ][ $i ] = $mf2;
+                                                        } else {
+                                                                error_log( wp_json_encode( $fetch ) ); // phpcs:ignore
+                                                        }
+                                                }
+                                        }
+                                } elseif ( isset( $value['url'] ) && wp_http_validate_url( $value['url'] ) ) {
+                                        $parse = new Parse_This( $value['url'] );
+                                        $fetch = $parse - fetch();
+                                        if ( ! is_wp_error( $fetch ) ) {
+                                                $parse->parse();
+                                                $input['properties'][ $property ] = array_merge( $value, jf2_to_mf2( $parse->get() ) );
+                // Create requests carry properties. Update requests can replace citation
+                // properties; Micropub only allows adding categories, syndication and media.
+                if ( isset( $input['properties'] ) && is_array( $input['properties'] ) ) {
+                        $input['properties'] = self::enrich_properties( $input['properties'] );
+                }
+                if ( isset( $input['action'] ) && 'update' === $input['action'] && isset( $input['replace'] ) && is_array( $input['replace'] ) ) {
+                        $input['replace'] = self::enrich_properties( $input['replace'] );
+                }
+                return $input;
+        }
+        /**
+         * Enriches the citation URLs in a set of Micropub properties.
+         *
+         * @since 4.0.0
+         *
+         * @param array $properties Properties, keyed by name, each an array of values.
+         * @return array The properties, with citation URLs enriched where possible.
+         */
+        private static function enrich_properties( $properties ) {
+                foreach ( self::citation_properties() as $property ) {
+                        if ( empty( $properties[ $property ] ) || ! wp_is_numeric_array( $properties[ $property ] ) ) {
+                                continue;
+                        }
+                        foreach ( $properties[ $property ] as $i => $value ) {
+                                if ( ! is_string( $value ) || ! wp_http_validate_url( $value ) ) {
+                                        continue;
+                                }
+                                // Keep the client waiting only briefly: a short timeout and no follow-up
+                                // requests. Failures are logged, and retried in the background where
+                                // worthwhile, once the post exists (see schedule_enrichment()).
+                                $cite = self::parse_citation( $value, self::request_parse_args() );
+                                if ( is_wp_error( $cite ) ) {
+                                        self::report_failure( $value, $cite );
+                                        self::$pending[] = array( $property, $value, $cite );
+                                        continue;
+                                }
+                                $properties[ $property ][ $i ] = $cite;
+                        }
+                }
+                return $properties;
+        }
+        /**
+         * Fetches and parses a URL into an mf2 citation.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param string $url  URL of the cited page.
+         * @param array  $args {
+         *     Optional. Limits for this parse.
+         *
+         *     @type int $timeout      HTTP timeout in seconds. Default: Parse This's own (15).
+         *     @type int $max_requests Follow-up requests allowed. Default: Parse This's own (10).
+         * }
+         * @return array|WP_Error mf2 citation, or WP_Error if the page could not be fetched or parsed.
+         */
+        public static function parse_citation( $url, $args = array() ) {
+                $timeout       = isset( $args['timeout'] ) ? (int) $args['timeout'] : 0;
+                $max_requests  = isset( $args['max_requests'] ) ? (int) $args['max_requests'] : null;
+                $limit_timeout = static function ( $request ) use ( $timeout ) {
+                        $request['timeout'] = isset( $request['timeout'] ) ? min( (float) $request['timeout'], $timeout ) : $timeout;
+                        return $request;
+                };
+                $limit_budget  = static function () use ( $max_requests ) {
+                        return $max_requests;
+                };
+                if ( $timeout > 0 ) {
+                        add_filter( 'http_request_args', $limit_timeout, 99 );
+                }
+                if ( null !== $max_requests ) {
+                        add_filter( 'parse_this_max_requests', $limit_budget, 99 );
+                }
+                try {
+                        $parse = new \ParseThis\Parser( $url );
+                        $fetch = $parse->fetch();
+                        if ( is_wp_error( $fetch ) ) {
+                                return $fetch;
+                        }
+                        // Keep nested objects in place rather than moving them to refs.
+                        $parse->parse( array( 'references' => false ) );
+                        $jf2 = $parse->get();
+                } finally {
+                        remove_filter( 'http_request_args', $limit_timeout, 99 );
+                        remove_filter( 'parse_this_max_requests', $limit_budget, 99 );
+                }
+                if ( ! is_array( $jf2 ) || empty( $jf2 ) ) {
+                        return new WP_Error( 'empty', __( 'Nothing could be parsed from the URL.', 'indieweb-post-kinds' ) );
+                }
+                // Content Parse This did not recognize is returned whole under raw.
+                unset( $jf2['raw'] );
+                $type = isset( $jf2['type'] ) ? $jf2['type'] : '';
+                // A page that parses as a feed (a home page, for example) is cited as the
+                // page itself, not its entries.
+                if ( 'feed' === $type ) {
+                        $jf2 = array_intersect_key( $jf2, array_flip( array( 'name', 'url', 'author', 'summary', 'photo' ) ) );
+                }
+                $jf2 = self::clean_citation( $jf2 );
+                // Entries and feeds become citations. Other types, such as an h-event for
+                // an RSVP, are kept.
+                $jf2['type'] = in_array( $type, array( '', 'entry', 'feed' ), true ) ? 'cite' : $type;
+                return \ParseThis\jf2_to_mf2( $jf2 );
+        }
+        /**
+         * Whether to enrich citation URLs in Micropub requests.
+         *
+         * @since 4.0.0
+         *
+         * @param array|null $input Micropub request, or null outside a request.
+         * @return bool
+         */
+        public static function enrichment_enabled( $input = null ) {
+                /**
+                 * Filters whether Post Kinds enriches citation URLs in Micropub requests
+                 * (in-reply-to, like-of, and so on) with data parsed from the cited page.
+                 *
+                 * Return false to store citations exactly as the client sent them.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param bool       $enabled Whether to enrich citations. Default true.
+                 * @param array|null $input   Micropub request, or null when a background retry runs.
+                 */
+                return (bool) apply_filters( 'post_kinds_micropub_enrich', true, $input );
+        }
+        /**
+         * Returns the limits for parsing citations during a Micropub request.
+         *
+         * @since 4.0.0
+         *
+         * @return array Arguments for parse_citation().
+         */
+        public static function request_parse_args() {
+                /**
+                 * Filters the HTTP timeout, in seconds, for parsing a citation while a
+                 * Micropub client waits. Citations that time out are retried in the
+                 * background.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param int $timeout Timeout in seconds. Default 5.
+                 */
+                $timeout = (int) apply_filters( 'post_kinds_micropub_parse_timeout', 5 );
+                return array(
+                        'timeout'      => max( 1, $timeout ),
+                        'max_requests' => 0,
+                );
+        }
+        /**
+         * Classifies a parse failure to decide whether to retry it.
+         *
+         * @since 4.0.0
+         *
+         * @param WP_Error $error Parse failure.
+         * @return string One of:
+         *                'temporary'   A connection problem or timeout, a server error or rate limiting.
+         *                'unavailable' The page was missing or refused (HTTP 404, 401 or 403), which
+         *                              may be an outage or a configuration problem on the cited site.
+         *                'permanent'   Anything else, such as content that cannot be parsed.
+         */
+        public static function failure_type( $error ) {
+                if ( 'http_request_failed' === $error->get_error_code() ) {
+                        return 'temporary';
+                }
+                $code = self::failure_response_code( $error );
+                if ( 429 === $code || $code >= 500 ) {
+                        return 'temporary';
+                }
+                if ( in_array( $code, array( 401, 403, 404 ), true ) ) {
+                        return 'unavailable';
+                }
+                return 'permanent';
+        }
+        /**
+         * Returns the HTTP status code of a parse failure, if there was one.
+         *
+         * @since 4.0.0
+         *
+         * @param WP_Error $error Parse failure.
+         * @return int HTTP status code, or 0.
+         */
+        private static function failure_response_code( $error ) {
+                $data = $error->get_error_data();
+                return is_array( $data ) && isset( $data['response_code'] ) ? (int) $data['response_code'] : 0;
+        }
+        /**
+         * Returns how long to wait before retrying a failed citation, if at all.
+         *
+         * Temporary failures are retried after a minute, then after 15 minutes, up
+         * to ENRICH_ATTEMPTS attempts in all. A missing or refused page is retried
+         * once, after some hours, in case the cited site was down or misconfigured.
+         * Other failures are not retried.
+         *
+         * @since 4.0.0
+         *
+         * @param int      $post_id Post ID.
+         * @param string   $url     Cited URL.
+         * @param WP_Error $error   The failure.
+         * @param int      $attempt Which attempt failed.
+         * @return int Seconds to wait, or 0 for no retry.
+         */
+        public static function retry_delay( $post_id, $url, $error, $attempt ) {
+                switch ( self::failure_type( $error ) ) {
+                        case 'temporary':
+                                if ( $attempt >= self::ENRICH_ATTEMPTS ) {
+                                        return 0;
+                                }
+                                return 1 === $attempt ? MINUTE_IN_SECONDS : 15 * MINUTE_IN_SECONDS;
+                        case 'unavailable':
+                                // Only once per citation.
+                                foreach ( self::get_citation_log( $post_id ) as $entry ) {
+                                        if ( $url === $entry['url'] && 'unavailable' === $entry['type'] ) {
+                                                return 0;
+                                        }
+                                }
+                        }
+                }
+                return $input;
+                                /**
+                                 * Filters how long to wait before retrying, once, a citation whose page
+                                 * was missing or refused (HTTP 404, 401 or 403).
+                                 *
+                                 * @since 4.0.0
+                                 *
+                                 * @param int      $delay Delay in seconds. Default 6 hours.
+                                 * @param string   $url   Cited URL.
+                                 * @param WP_Error $error The failure.
+                                 */
+                                return max( 0, (int) apply_filters( 'post_kinds_micropub_unavailable_retry_delay', 6 * HOUR_IN_SECONDS, $url, $error ) );
+                        default:
+                                return 0;
+                }
+        }
+        /**
+         * Reports a citation that could not be parsed. Only shown when WP_DEBUG is on.
+         *
+         * @since 4.0.0
+         *
+         * @param string   $url   Cited URL.
+         * @param WP_Error $error Parse failure.
+         */
+        public static function report_failure( $url, $error ) {
+                wp_trigger_error(
+                        __METHOD__,
+                        sprintf( 'Could not parse %1$s for a Micropub citation: %2$s', esc_url( $url ), esc_html( $error->get_error_message() ) )
+                );
+        }
+        /**
+         * Logs and, where worthwhile, schedules a retry for citations that could not
+         * be parsed during a Micropub create or update request, once the post ID is known.
+         *
+         * @since 4.0.0
+         *
+         * @param array      $input   Micropub request.
+         * @param array|null $wp_args Arguments of the created or updated post.
+         */
+        public static function schedule_enrichment( $input, $wp_args ) {
+                $pending       = self::$pending;
+                self::$pending = array();
+                if ( empty( $pending ) || empty( $wp_args['ID'] ) ) {
+                        return;
+                }
+                foreach ( $pending as $citation ) {
+                        self::handle_failure( (int) $wp_args['ID'], $citation[0], $citation[1], 1, $citation[2] );
+                }
+        }
+        /**
+         * Logs a failed attempt and schedules a retry if one is worthwhile.
+         *
+         * @since 4.0.0
+         *
+         * @param int      $post_id  Post ID.
+         * @param string   $property Micropub property, such as in-reply-to.
+         * @param string   $url      Cited URL.
+         * @param int      $attempt  Which attempt failed.
+         * @param WP_Error $error    The failure.
+         */
+        private static function handle_failure( $post_id, $property, $url, $attempt, $error ) {
+                // Work out the delay before logging, so the log holds only earlier failures.
+                $delay    = self::retry_delay( $post_id, $url, $error, $attempt );
+                $retry_at = $delay ? time() + $delay : 0;
+                self::log_outcome( $post_id, $property, $url, $attempt, $error, $retry_at );
+                if ( $retry_at ) {
+                        $args = array( $post_id, $property, $url, $attempt + 1 );
+                        if ( ! wp_next_scheduled( self::ENRICH_EVENT, $args ) ) {
+                                wp_schedule_single_event( $retry_at, self::ENRICH_EVENT, $args );
+                        }
+                }
+        }
+        /**
+         * Parses a Micropub citation in the background and stores the result.
+         *
+         * The citation is only replaced if the post still holds the URL as it was
+         * stored, so later edits are not overwritten.
+         *
+         * @since 4.0.0
+         *
+         * @param int    $post_id  Post ID.
+         * @param string $property Micropub property, such as in-reply-to.
+         * @param string $url      Cited URL.
+         * @param int    $attempt  Which attempt this is.
+         */
+        public static function enrich_citation( $post_id, $property, $url, $attempt ) {
+                if ( ! get_post( $post_id ) || ! class_exists( '\\ParseThis\\Parser' ) || ! self::enrichment_enabled() ) {
+                        return;
+                }
+                $key    = 'mf2_' . $property;
+                $values = get_post_meta( $post_id, $key, true );
+                $index  = is_array( $values ) ? array_search( $url, $values, true ) : false;
+                if ( false === $index ) {
+                        self::log_outcome( $post_id, $property, $url, $attempt, 'skipped', 0 );
+                        return;
+                }
+                $cite = self::parse_citation( $url );
+                if ( is_wp_error( $cite ) ) {
+                        self::report_failure( $url, $cite );
+                        self::handle_failure( $post_id, $property, $url, $attempt, $cite );
+                        return;
+                }
+                $values[ $index ] = $cite;
+                update_post_meta( $post_id, $key, $values );
+                self::log_outcome( $post_id, $property, $url, $attempt, 'enriched', 0 );
+        }
+        /**
+         * Returns the log of citation parsing outcomes for a post, oldest first.
+         *
+         * Each entry is an array with these keys:
+         * - time          Unix timestamp of the attempt.
+         * - property      Micropub property, such as in-reply-to.
+         * - url           Cited URL.
+         * - attempt       Attempt number; 1 is the attempt during the Micropub request.
+         * - result        'enriched', 'failed', or 'skipped' (the citation was edited since).
+         * - type          For failures: 'temporary', 'unavailable' or 'permanent'. Otherwise empty.
+         * - code          For failures: the WP_Error code. Otherwise empty.
+         * - response_code For failures: the HTTP status code, or 0.
+         * - message       For failures: the error message. Otherwise empty.
+         * - retry         Unix timestamp of the scheduled retry, or 0 if none.
+         *
+         * @since 4.0.0
+         *
+         * @param int $post_id Post ID.
+         * @return array[] Log entries.
+         */
+        public static function get_citation_log( $post_id ) {
+                $log = get_post_meta( $post_id, self::LOG_META, true );
+                return is_array( $log ) ? $log : array();
+        }
+        /**
+         * Adds an outcome to a post's citation log and updates its citation status.
+         *
+         * @since 4.0.0
+         *
+         * @param int             $post_id  Post ID.
+         * @param string          $property Micropub property.
+         * @param string          $url      Cited URL.
+         * @param int             $attempt  Attempt number.
+         * @param WP_Error|string $result   The failure, or 'enriched' or 'skipped'.
+         * @param int             $retry_at Timestamp of the scheduled retry, or 0.
+         */
+        private static function log_outcome( $post_id, $property, $url, $attempt, $result, $retry_at ) {
+                $failed = is_wp_error( $result );
+                $entry  = array(
+                        'time'          => time(),
+                        'property'      => $property,
+                        'url'           => $url,
+                        'attempt'       => (int) $attempt,
+                        'result'        => $failed ? 'failed' : $result,
+                        'type'          => $failed ? self::failure_type( $result ) : '',
+                        'code'          => $failed ? $result->get_error_code() : '',
+                        'response_code' => $failed ? self::failure_response_code( $result ) : 0,
+                        'message'       => $failed ? $result->get_error_message() : '',
+                        'retry'         => (int) $retry_at,
+                );
+                $log    = self::get_citation_log( $post_id );
+                $log[]  = $entry;
+                $log    = array_slice( $log, -self::LOG_LIMIT );
+                update_post_meta( $post_id, self::LOG_META, $log );
+                // The status reflects the latest outcome for each cited URL.
+                $latest = array();
+                foreach ( $log as $item ) {
+                        $latest[ $item['url'] ] = $item;
+                }
+                $status = '';
+                foreach ( $latest as $item ) {
+                        if ( 'failed' !== $item['result'] ) {
+                                continue;
+                        }
+                        if ( ! $item['retry'] ) {
+                                $status = 'failed';
+                                break;
+                        }
+                        $status = 'retrying';
+                }
+                if ( $status ) {
+                        update_post_meta( $post_id, self::STATUS_META, $status );
+                } else {
+                        delete_post_meta( $post_id, self::STATUS_META );
+                }
+                /**
+                 * Fires after each attempt to parse a Micropub citation.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param array $entry   The log entry. See Kind_Plugins::get_citation_log().
+                 * @param int   $post_id Post ID.
+                 */
+                do_action( 'post_kinds_citation_enrichment', $entry, $post_id );
+        }
+        /**
+         * Removes Parse This bookkeeping from parsed jf2, recursively.
+         *
+         * Keys starting with an underscore (_code, _links, _alternate,
+         * _source_format, ...), post-type and refs are not microformats properties,
+         * and would otherwise be stored in post meta and returned by Micropub's
+         * q=source.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param mixed $jf2 Parsed jf2, or any value within it.
+         * @return mixed The value without bookkeeping keys.
+         */
+        public static function clean_citation( $jf2 ) {
+                if ( ! is_array( $jf2 ) ) {
+                        return $jf2;
+                }
+                foreach ( array_keys( $jf2 ) as $key ) {
+                        if ( is_string( $key ) && ( 0 === strpos( $key, '_' ) || in_array( $key, array( 'post-type', 'refs' ), true ) ) ) {
+                                unset( $jf2[ $key ] );
+                        } elseif ( is_array( $jf2[ $key ] ) ) {
+                                $jf2[ $key ] = self::clean_citation( $jf2[ $key ] );
+                        }
+                }
+                return $jf2;
+        }
+        /**
+         * Adds the enabled kinds to Micropub's configuration query, using the
+         * post-types extension (Query for Supported Vocabulary), so clients only
+         * offer the kinds this site uses.
+         *
+         * @since 4.0.0
+         *
+         * @see https://indieweb.org/Micropub-extensions#Query_for_Supported_Vocabulary
+         *
+         * @param array|mixed $response Micropub query response.
+         * @param array       $input    Micropub query.
+         * @return array|mixed The response, with post-types added for q=config.
+         */
+        public static function micropub_query( $response, $input ) {
+                if ( ! is_array( $response ) || ! isset( $input['q'] ) || 'config' !== $input['q'] ) {
+                        return $response;
+                }
+                $types = isset( $response['post-types'] ) && is_array( $response['post-types'] ) ? $response['post-types'] : array();
+                $known = wp_list_pluck( $types, 'type' );
+                foreach ( self::micropub_post_types() as $type ) {
+                        if ( ! in_array( $type['type'], $known, true ) ) {
+                                $types[] = $type;
+                        }
+                }
+                $response['post-types'] = $types;
+                return $response;
+        }
+        /**
+         * Returns the enabled kinds as Micropub post types.
+         *
+         * @since 4.0.0
+         *
+         * @return array[] Arrays with the keys type (the kind slug, which is its Post
+         *                 Type Discovery type) and name (the kind's singular name).
+         */
+        public static function micropub_post_types() {
+                // The kinds offered in the editor: those enabled in settings, plus note,
+                // which is always available.
+                $kinds = Kind_Config::get_termslist();
+                array_unshift( $kinds, 'note' );
+                $types = array();
+                foreach ( array_unique( $kinds ) as $kind ) {
+                        $name = Kind_Taxonomy::get_kind_info( $kind, 'singular_name' );
+                        if ( $name ) {
+                                $types[] = array(
+                                        'type' => $kind,
+                                        'name' => $name,
+                                );
+                        }
+                }
+                /**
+                 * Filters the post types advertised to Micropub clients in q=config.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param array[] $types Arrays with the keys type and name.
+                 */
+                return apply_filters( 'post_kinds_micropub_post_types', $types );
+        }
 } // End Class Kind_Plugins

indieweb-post-kinds/tags/4.0.0/includes/class-kind-post-widget.php

-              r3001401
+              r3738687
 <?php
+/**
+ * Kind_Post_Widget class.
+ *
+ * @package Post_Kinds
+ * @since   3.1.5
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Widget that lists recent posts of selected kinds.
+ *
+ * @since 3.1.5
+ */
 class Kind_Post_Widget extends WP_Widget {
         /**
          * Register widget with WordPress.
+         *
+         * @since 3.1.5
          */
         public function __construct() {
                 parent::__construct(
                         'Kind_Post_Widget',                // Base ID
                         __( 'Kind Post Widget', 'indieweb-post-kinds' ),        // Name
+                        'Kind_Post_Widget',                // Base ID.
+                        __( 'Kind Post Widget', 'indieweb-post-kinds' ),        // Name.
                         array(
                                 'classname'             => 'kind_post_widget',
 …
          * Front-end display of widget.
+         *
+         * @since 3.1.5
+         *
          * @see WP_Widget::widget()
+         *
 …
          */
         public function widget( $args, $instance ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+                $kind = $instance['kind'] ?? 'note';
+                // phpcs:ignore
+                echo $args['before_widget'];
+                if ( ! empty( $instance['title'] ) ) {
+                        echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore
+                }
+                $transient = get_transient( 'kind_post_widget' );
+                if ( false === $transient ) {
+                                $query = array(
+                                        'tax_query'   => array(
+                                                array(
+                                                        'taxonomy' => 'kind',
+                                                        'field'    => 'slug',
+                                                        'terms'    => $kind,
+                                                ),
+                $kind   = $instance['kind'] ?? 'note';
+                $number = absint( $instance['number'] ?? 5 );
+                $posts  = get_posts(
+                        array(
+                                // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query -- Kinds are a taxonomy; this is the indexed way to select them.
+                                'tax_query'           => array(
+                                        array(
+                                                'taxonomy' => 'kind',
+                                                'field'    => 'slug',
+                                                'terms'    => $kind,
                                         ),
+                                        'numberposts' => $instance['number'] ?? 5,
+                                );
+                                $posts = get_posts( $query );
+                                ),
+                                'numberposts'         => $number ? $number : 5,
+                                'no_found_rows'       => true,
+                                'ignore_sticky_posts' => true,
+                        )
+                );
+                // Like core's Recent Posts widget, show nothing when there are no posts.
+                // WP_Query caches the result in the object cache, so no transient is needed.
+                if ( empty( $posts ) ) {
+                        return;
+                }
+                if ( 0 === count( $posts ) ) {
+                        return;
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title = apply_filters( 'widget_title', $instance['title'] ?? '', $instance, $this->id_base );
+                echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
+                if ( $title ) {
+                        echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Wrapper markup is the theme's; the title is escaped by core's widget_title filter.
+                }
+                echo '<div id="kind-posts">';
+                if ( 0 !== count( $posts ) ) {
+                        echo '<ul>';
+                        foreach ( $posts as $post ) {
+                                printf( '<li>%1$s</li>', kind_get_the_link( $post ) ); // phpcs:ignore
+                        }
+                        echo '</ul>';
+                } else {
+                        esc_html_e( 'No Posts Found', 'indieweb-post-kinds' );
+                echo '<div id="kind-posts"><ul>';
+                foreach ( $posts as $post ) {
+                        printf( '<li>%1$s</li>', kind_get_the_link( $post ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- kind_get_the_link() escapes its parts.
+                }
                 echo '</div>';
                 echo $args['after_widget']; // phpcs:ignore
+                echo '</ul></div>';
+                echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
+        }
         /**
          * Sanitize widget form values as they are saved.
+         *
+         * @since 3.1.5
+         *
          * @see WP_Widget::update()
 …
          */
         public function update( $new_instance, $old_instance ) {
+                array_walk_recursive( $new_instance, 'sanitize_text_field' );
+                return $new_instance;
+                $kind   = isset( $new_instance['kind'] ) && is_string( $new_instance['kind'] ) ? sanitize_key( $new_instance['kind'] ) : '';
+                $number = isset( $new_instance['number'] ) ? absint( $new_instance['number'] ) : 0;
+                return array(
+                        'title'  => isset( $new_instance['title'] ) && is_string( $new_instance['title'] ) ? sanitize_text_field( $new_instance['title'] ) : '',
+                        'kind'   => in_array( $kind, Kind_Taxonomy::get_kind_list(), true ) ? $kind : 'note',
+                        'number' => $number > 0 ? $number : 5,
+                );
+        }
 …
         /**
          * Create the form for the Widget admin
+         *
+         * @since 3.1.5
+         *
          * @see WP_Widget::form()
 …
                 $instance['kind'] = ( $instance['kind'] ?? 'note' );
                 ?>
                                 <p><label for="title"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
                                 <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?> id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"
                                 value="<?php echo esc_html( $instance['title'] ?? '' ); ?>" /></p>
+                                <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
+                                <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"
+                                value="<?php echo esc_attr( $instance['title'] ?? '' ); ?>" /></p>
                 <select name="<?php echo esc_attr( $this->get_field_name( 'kind' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'kind' ) ); ?>">
                 <?php
                 $list   = get_option( 'kind_termslist', Kind_Taxonomy::get_kind_list() );
+                $list   = Kind_Config::get_termslist();
                 $list[] = 'note';
+                $list   = array_unique( $list );
                 foreach ( $list as $term ) {
-                        $value = Kind_Taxonomy::get_post_kind_info( $term );
                         printf(
                                 '<option value="%1$s" %3$s>%2$s</option>',
                                 esc_attr( $term ),
                                 Kind_Taxonomy::get_kind_info( $term, 'singular_name' ), // phpcs:ignore
                                 selected( $instance['kind'], $term )
+                                esc_html( Kind_Taxonomy::get_kind_info( $term, 'singular_name' ) ),
+                                selected( $instance['kind'], $term, false )
                         );
-                                printf( '%1$s %2$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ) ); //phpcs:ignore
+                }
                 ?>

indieweb-post-kinds/tags/4.0.0/includes/class-kind-post.php

-              r2973430
+              r3738687
 <?php
 /**
  * Kind Post Class
+ * Kind_Post class.
+ *
+ * @package Post Kinds
+ * Assists in retrieving/saving properties from a Post. Replaces MF2_Post by only looking for Items on Demand instead of Parsing Them initially.
+ * @package Post_Kinds
+ * @since   3.4.0
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Reads and writes the kind properties of a post.
+ *
+ * Replaces MF2_Post by looking up each property on demand instead of parsing
+ * all of them up front.
+ *
+ * @since 3.4.0
  */
 class Kind_Post {
+        /**
+         * Post ID.
+         *
+         * @since 3.4.0
+         * @var int
+         */
         public $id;
+        /**
+         * Sets up the post to read and write.
+         *
+         * @since 3.4.0
+         *
+         * @param int|WP_Post|string $post Post ID, post object, or the URL of a post or attachment.
+         */
         public function __construct( $post ) {
                 if ( is_numeric( $post ) ) {
 …
                                 $post     = $id;
                         } else {
                                 $id       = attachment_url_to_postid( $post );
+                                $id       = self::get_attachment_id( $post );
                                 $this->id = $id;
                                 $post     = $id;
 …
+        }
+        /*
+         * Check is post is attachment.
+         *
+         * @param WP_Post $post Post Object.
+         * @return boolean True if attachment.
+        /**
+         * Checks whether a post is an attachment.
+         *
+         * @since 3.4.10
+         *
+         * @param int|WP_Post $post Post ID or post object.
+         * @return bool True if the post is an attachment.
          */
         private function is_attachment( $post ) {
 …
+        /*
+         * Returns WP_Post Object
+         *
+         * @return WP_Post Post Object.
+         *
+        /**
+         * Returns the post object.
+         *
+         * @since 3.4.0
+         *
+         * @return WP_Post|null The post, or null if it does not exist.
          */
         public function get_post() {
 …
+        }
+        /*
+         * Returns the Post Kind. For Attachments will return the media type.
+         *
+         * @return string Post Kind.
+         *
+        /**
+         * Returns the post kind. For an attachment, returns its media type instead.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false|null The kind slug ('photo', 'video' or 'audio' for an attachment),
+         *                           false if a post has no kind, or null for an attachment of another type.
          */
         public function get_kind() {
 …
+        }
+        /*
+         * Get Name.
+         *
+         * @return string Return name.
+        /**
+         * Returns the post's name (title).
+         *
+         * A title that is just the post ID, or an attachment title that is just its
+         * file name, does not count as a name.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false The name, or false if there is none.
          */
         public function get_name() {
 …
+        }
+        /*
+         * Get Content.
+         *
+         * @return array with HTML and Plaintext Version of Content or Summary
+        /**
+         * Returns the post's content or summary (excerpt).
+         *
+         * @since 3.4.0
+         *
+         * @param string $property Either 'content' or 'summary'.
+         * @return array|false Array with the HTML ('html') and plain text ('value') versions,
+         *                     or false if the property is empty or not supported.
          */
         public function get_html( $property ) {
 …
+        }
+        /*
+         * Get Permalink URL
+         *
+         * @return string $url
+        /**
+         * Returns the post's permalink, or the file URL for an attachment.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false The URL, or false if there is none.
          */
         public function get_url() {
 …
+        }
+        /*
+         * Get Featured Image Permalink
+         *
+         * @return string $url
+        /**
+         * Returns the URL of the post's featured image.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false The URL, or false if the post has no featured image.
          */
         public function get_featured() {
 …
+        /*
+         * Return datetime property as a DateTime Object.
+         *
+         * @param string $property Property You Wish to Return.
+         * @return DateTimeImmutable Published Time in Local Timezone.
+         *
+        /**
+         * Returns a date property as a date object.
+         *
+         * For posts other than attachments, 'published' and 'updated' come from the
+         * post's own dates. Everything else comes from post meta.
+         *
+         * @since 3.4.0
+         *
+         * @param string $property Property to return, such as 'published' or 'start'.
+         * @return DateTimeImmutable|false The date, or false if it is missing or not a valid date.
          */
         public function get_datetime_property( $property ) {
 …
                         $datetime = $datetime[0];
+                }
+                return new DateTimeImmutable( $datetime );
+        }
+        /*
+         * Returns Publication.
+         *
+         * @return string
+         *
+                return kind_safe_datetime( $datetime );
+        }
+        /**
+         * Returns the publication the post appeared in.
+         *
+         * For posts other than attachments, this is the site title.
+         *
+         * @since 3.4.0
+         *
+         * @return string|null The publication, or null if an attachment has none.
          */
         public function get_publication() {
 …
+        }
+        /**
+         * Returns the post's stored duration.
+         *
+         * @since 3.4.0
+         *
+         * @return DateInterval|false The duration, or false if it is missing or not valid.
+         */
         public function get_duration() {
                 $duration = get_post_meta( $this->id, 'mf2_duration', true );
 …
                         $duration = $duration[0];
+                }
                 if ( $duration ) {
                         return new DateInterval( $duration );
+                }
                 return false;
+        }
         /*
          * Return Categories which are a combination of Tags and Categories.
+         *
          * @return array Array of the names of Categories and Tag names.
+         *
+                return kind_safe_interval( $duration );
+        }
+        /**
+         * Returns the names of the post's categories and tags, combined.
+         *
+         * 'Uncategorized' is left out.
+         *
+         * @since 3.4.0
+         *
+         * @return string[] Category and tag names.
          */
         public function get_categories() {
                 $category = array();
                 // Get a list of categories and extract their names
+                // Get a list of categories and extract their names.
                 $post_categories = get_the_terms( $this->id, 'category' );
                 if ( ! empty( $post_categories ) && ! is_wp_error( $post_categories ) ) {
 …
+                }
                 // Get a list of tags and extract their names
+                // Get a list of tags and extract their names.
                 $post_tags = get_the_terms( $this->id, 'post_tag' );
                 if ( ! empty( $post_tags ) && ! is_wp_error( $post_tags ) ) {
                         $category = array_merge( $this->category, wp_list_pluck( $post_tags, 'name' ) );
+                        $category = array_merge( $category, wp_list_pluck( $post_tags, 'name' ) );
+                }
                 if ( in_array( 'Uncategorized', $category, true ) ) {
 …
         /**
+         * Is prefix in string.
+         *
+         * @param  string $source The source string.
+         * @param  string $prefix The prefix you wish to check for in source.
+         * @return boolean The result.
+         * Checks whether a string starts with a prefix.
+         *
+         * @since 3.4.0
+         *
+         * @param string $source The source string.
+         * @param string $prefix The prefix to look for.
+         * @return bool True if the source starts with the prefix.
          */
         protected static function str_prefix( $source, $prefix ) {
 …
         /**
+         * Returns True if Array is Multidimensional.
+         *
+         * @param array $arr array.
+         *
+         * @return boolean result
+         * Checks whether an array is multidimensional.
+         *
+         * @since 3.4.0
+         *
+         * @param array $arr The array to check.
+         * @return bool True if any element is an array.
          */
         protected static function is_multi_array( $arr ) {
 …
+        }
+        /**
+         * Unwraps single-item arrays, recursively.
+         *
+         * @since 3.4.0
+         *
+         * @param mixed $value   The value to unwrap.
+         * @param bool  $discard Optional. Whether to keep only the first item of a list
+         *                       with more than one item. Default false.
+         * @return mixed The value, with single-item arrays replaced by their item.
+         */
         protected function single_array( $value, $discard = false ) {
                 if ( ! is_array( $value ) ) {
 …
         /**
+         * Retrieve author
+         *
+         * @return boolean|array The result or false if does not exist.
+         * Returns the post's author as an h-card.
+         *
+         * For an attachment, or a post with no WordPress author, this is the author
+         * stored in post meta.
+         *
+         * @since 3.4.0
+         *
+         * @return array|string|false The author as mf2, the stored value, or false if there is none.
          */
         public function get_author() {
 …
                         return ( $author ?? false );
+                }
                 // Attachments may have been uploaded by a user but may have metadata for original author
+                // Attachments may have been uploaded by a user but may have metadata for original author.
                 if ( 'attachment' === get_post_type( $this->id ) ) {
                         $author = get_post_meta( $post->ID, 'mf2_author', true );
 …
                                 'name'  => array( get_the_author_meta( 'display_name', $post->post_author ) ),
                                 'url'   => array( get_the_author_meta( 'user_url', $post->post_author ) ? get_the_author_meta( 'user_url', $post->post_author ) : get_author_posts_url( $post->post_author ) ),
                                 'photo' => array( get_avatar_url( $this->post_author ) ),
+                                'photo' => array( get_avatar_url( $post->post_author ) ),
                         ),
                 );
+        }
+        /*
+         * Return Attached Media IDs.
+         *
+         * @param string $type audio, video, or photo.
+         * @return array Array of Media IDs.
+         *
+        /**
+         * Returns the IDs of media attached to the post.
+         *
+         * @since 3.4.0
+         *
+         * @param string $type 'audio', 'video' or 'photo'.
+         * @return int[]|false Attachment IDs, or false if the type is not supported.
          */
         public function get_attached_media( $type ) {
 …
+        }
+        /*
+         * Return Attached Photos.
+         *
+         * Looks in both attached media and the photo property.
+         *
+         * @param boolean $content If true then return empty if there are any images in content.
+         * @return array Array of Media IDs.
+         *
+        /**
+         * Returns the post's photos.
+         *
+         * Looks in attached media, the photo property and images in the content.
+         * Returns an empty array if the post has a featured image.
+         *
+         * @since 3.4.0
+         *
+         * @param bool $content Optional. Whether to return an empty array if the content
+         *                      has any images. Default true.
+         * @return int[]|false Attachment IDs, or false if there are none.
          */
         public function get_photo( $content = true ) {
+                if ( ! $this->get_post() ) {
+                        return false;
+                }
                 // Check if the post itself is an image attachment.
                 if ( wp_attachment_is( 'image', $this->id ) ) {
 …
+                }
+                // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                 $content_ids = get_post_meta( $this->id, '_content_img_ids', true );
-                if ( false === $content_ids ) {
-                        // Check for a gallery first.
-                        $gallery = get_post_gallery( $this->id, false );
-                        if ( $gallery & array_key_exists( 'ids', $gallery ) ) {
-                                $content_ids = explode( ',', $gallery['ids'] );
+                        }
-                        $content_ids = array();
-                        $post        = $this->get_post();
-                        $shortcode   = false;
-                        $shortcodes  = apply_filter( 'kind_photo_shortcode_exclude', array( 'vr', '360' ) );
-                        if ( $post->post_content ) {
-                                foreach ( $shortcodes as $code ) {
-                                        if ( has_shortcode( $post->post_content, $code ) ) {
-                                                $shortcode = true;
+                                        }
+                                }
-                                if ( $shortcode ) {
-                                        $content_ids = array();
-                                } else {
-                                        $content_ids = array_merge( $content_ids, Kind_Media_Metadata::get_img_from_content( $post->post_content ) );
+                                }
-                                update_post_meta( $this->id, '_content_img_ids', $content_ids );
+                        }
+                }
                 // If there are photos in the content then end here if this is true.
 …
+        }
+        /*
+         * Return Attached Audio.
+         *
+         * Looks in both attached media and the audio property.
+         *
+         * @param boolean $content If true then return empty if there are any audio files in content.
+         * @return array Array of Media IDs or URLs.
+         *
+        /**
+         * Returns the post's audio.
+         *
+         * Looks in attached media, the audio property and audio in the content.
+         *
+         * @since 3.4.0
+         *
+         * @param bool $content Optional. Whether to return an empty array if the content
+         *                      has any audio. Default true.
+         * @return array|false Attachment IDs, external URLs if no attachments were found,
+         *                     or false if there is no audio.
          */
         public function get_audio( $content = true ) {
 …
+                }
+                // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                 $content_ids = get_post_meta( $this->id, '_content_audio_ids', true );
-                if ( false === $content_ids ) {
-                        $post = get_post();
-                        if ( $post->post_content ) {
-                                $content_ids = Kind_Media_Metadata::get_audio_from_content( $post->post_content );
-                                update_post_meta( $this->id, '_content_audio_ids', $content_ids );
+                        }
+                }
                 // If there are ids in the content then end here if this is true.
 …
                 $audio_ids = is_array( $audios ) ? $this->get_attachments_from_urls( $audios ) : array();
                 // If there are ids found return them
+                // If there are ids found return them.
                 if ( ! empty( $audio_ids ) || ! empty( $att_ids ) || ! empty( $content_ids ) ) {
                         return array_unique( array_merge( $att_ids, $this->get_attachments_from_urls( $audios ), $content_ids ) );
+                        return array_unique( array_merge( $att_ids, $audio_ids, $content_ids ) );
+                }
 …
+        }
+        /*
+         * Return Attached Video.
+         *
+         * Looks in both attached media and the audio property.
+         *
+         * @param boolean $content If true then return empty if there are any video files in content.
+         * @return array Array of Media IDs.
+         *
+        /**
+         * Returns the post's videos.
+         *
+         * Looks in attached media, the video property and videos in the content.
+         *
+         * @since 3.4.0
+         *
+         * @param bool $content Optional. Whether to return an empty array if the content
+         *                      has any videos. Default true.
+         * @return int[]|false Attachment IDs, or false if there are none.
          */
         public function get_video( $content = true ) {
 …
                         return array( $this->id );
+                }
+                // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                 $content_ids = get_post_meta( $this->id, '_content_video_ids', true );
-                if ( false === $content_ids ) {
-                        $post = get_post();
-                        if ( $post->post_content ) {
-                                $content_ids = Kind_Media_Metadata::get_video_from_content( $post->post_content );
-                                update_post_meta( $this->id, '_content_video_ids', $content_ids );
+                        }
+                }
                 // If there are ids in the content then end here if this is true.
 …
+        }
+        /**
+         * Look up the attachment ID for a URL, with caching.
+         *
+         * Wraps attachment_url_to_postid(), which runs an uncached query, in the
+         * object cache. The key includes the posts last_changed value, so adding,
+         * changing or deleting any post or attachment invalidates it. Without a
+         * persistent object cache this still avoids repeat lookups in a request.
+         *
+         * @since 4.0.0
+         *
+         * @param string $url Media URL.
+         * @return int Attachment ID, or 0 if there is none.
+         */
+        public static function get_attachment_id( $url ) {
+                if ( ! is_string( $url ) || '' === $url ) {
+                        return 0;
+                }
+                $key = 'attachment_id:' . md5( $url ) . ':' . wp_cache_get_last_changed( 'posts' );
+                $id  = wp_cache_get( $key, 'post-kinds' );
+                if ( false === $id ) {
+                        $id = attachment_url_to_postid( $url );
+                        wp_cache_set( $key, $id, 'post-kinds' );
+                }
+                return (int) $id;
+        }
+        /**
+         * Looks up the attachment IDs for media URLs.
+         *
+         * @since 3.4.0
+         *
+         * @param string|array $urls A URL, or a list of URLs, attachment IDs or arrays with a 'url' key.
+         * @return int[] Attachment IDs found. URLs with no attachment are left out.
+         */
         public function get_attachments_from_urls( $urls ) {
                 if ( is_string( $urls ) ) {
                         $attachment = attachment_url_to_postid( $urls );
+                        $attachment = self::get_attachment_id( $urls );
                         if ( $attachment ) {
                                 return array( $attachment );
 …
                                 if ( is_array( $url ) ) {
                                         if ( isset( $url['url'] ) ) {
                                                 $att_ids[] = attachment_url_to_postid( $url['url'] );
+                                                $att_ids[] = self::get_attachment_id( $url['url'] );
+                                        }
                                 } elseif ( is_numeric( $url ) ) {
                                         $att_ids[] = $url;
                                 } else {
                                         $att_ids[] = attachment_url_to_postid( $url );
+                                        $att_ids[] = self::get_attachment_id( $url );
+                                }
+                        }
 …
         /**
+         * Retrieve value
+         *
+         * @param  string $key The key to retrieve.
+         * @param  boolean $single Whether to return a a single value or array if there is only one value.
+         * @return mixed The result or false if does not exist.
+         * Returns a property of the post.
+         *
+         * @since 3.4.0
+         *
+         * @param string $key    The property to return.
+         * @param bool   $single Optional. Whether to unwrap a single value from its array. Default true.
+         * @return mixed The value, or false if the key is empty.
          */
         public function get( $key, $single = true ) {
 …
+        }
+        /**
+         * Returns the post's citation, or one property of it.
+         *
+         * For an attachment, the citation is built from the attachment itself.
+         * Citations stored as jf2 are returned as mf2.
+         *
+         * @since 3.4.0
+         *
+         * @param string|null $key Optional. Citation property to return. Default null, for the whole citation.
+         * @return mixed The citation as mf2 or a string, the property, or false if there is none.
+         */
         public function get_cite( $key = null ) {
                 if ( 'attachment' === get_post_type( $this->id ) ) {
 …
                                 $duration = date_interval_to_iso8601( $duration );
+                        }
                         $cite = jf2_to_mf2(
+                        $cite = \ParseThis\jf2_to_mf2(
                                 array_filter(
                                         array(
 …
                                         $cite = $cite[0];
+                                }
+                                $this->delete( 'cite' );
+                        }
+                }
+                // If this is formatted as JF2 try to convert it to MF2 and update.
+                if ( is_array( $cite ) && ! wp_is_numeric_array( $cite ) ) {
+                        $cite['type'] = 'cite';
+                        $cite         = jf2_to_mf2( $cite );
+                        $property     = Kind_Taxonomy::get_kind_info( $this->get_kind(), 'property' );
+                        $this->set( $property, $cite );
+                        }
+                        // Citations stored as jf2 are returned as mf2.
+                        if ( is_array( $cite ) && ! wp_is_numeric_array( $cite ) ) {
+                                if ( ! isset( $cite['properties'] ) ) {
+                                        if ( empty( $cite['type'] ) ) {
+                                                $cite['type'] = $this->get_cite_type();
+                                        }
+                                        $cite = \ParseThis\jf2_to_mf2( $cite );
+                                } elseif ( empty( $cite['type'] ) || ! is_array( $cite['type'] ) ) {
+                                        // Reads before 4.0.0 stored the type as 'cite'.
+                                        $cite['type'] = array( 'h-' . $this->get_cite_type() );
+                                }
+                        }
+                }
 …
+        }
+        /* Returns a normalized cite with all possible parameters present to reduce isset checks and to ensure everything is formatted correctly
+         * For Display and Metabox purposes only.
+        /**
+         * Returns the jf2 type of the post's citation, based on its kind.
+         *
+         * Matches the type Kind_Metabox::save_post() stores: a checkin cites a
+         * place (card), eat and drink cite food, and every other kind a citation.
+         *
+         * @since 4.0.0
+         *
+         * @return string The jf2 type: 'card', 'food' or 'cite'.
+         */
+        public function get_cite_type() {
+                $kind = $this->get_kind();
+                if ( 'checkin' === $kind ) {
+                        return 'card';
+                }
+                if ( in_array( $kind, array( 'drink', 'eat' ), true ) ) {
+                        return 'food';
+                }
+                return 'cite';
+        }
+        /**
+         * Returns a citation as jf2 with every key present and formatted for display.
+         *
+         * Missing keys are set to empty strings, which saves isset checks. For
+         * display and the metabox only.
+         *
+         * 'authors' lists every author as a card with name, url and photo. 'author'
+         * is the single author, or for several authors one card whose fields hold
+         * each author's value in turn, separated by semicolons, as the metabox
+         * shows them.
+         *
+         * @since 3.4.9
+         * @since 4.0.0 Added 'authors'. 'author' joins several authors' photos too.
+         *
+         * @param array|string|false $cite The citation, as mf2, jf2 or a URL or name.
+         * @return array The normalized citation.
          */
         public function normalize_cite( $cite ) {
                 // Ensures that an empty string is always present in the cite
+                // Ensures that an empty string is always present in the cite.
                 $author_defaults = array(
                         'type'  => 'card',
 …
                         'summary'     => '',
                         'author'      => $author_defaults,
+                        'authors'     => array(),
                         'category'    => '',
                 );
 …
                         $cite = $cite[0];
+                }
                 if ( Parse_This_MF2_Utils::is_microformat( $cite ) ) {
                         $cite = mf2_to_jf2( $cite );
+                if ( \ParseThis\MF2_Utils::is_microformat( $cite ) ) {
+                        $cite = \ParseThis\mf2_to_jf2( $cite );
+                }
 …
+                }
+                if ( wp_is_numeric_array( $cite['author'] ) ) {
+                        if ( 1 === count( $cite['author'] ) ) {
+                                $cite['author'] = array_pop( $cite['author'] );
+                        }
+                }
+                if ( is_string( $cite['author'] ) ) {
+                        $cite['author'] = wp_http_validate_url( $cite['author'] ) ? array( 'url' => $cite['author'] ) : array( 'name' => $cite['author'] );
+                }
+                $cite['author'] = wp_parse_args( $cite['author'], $author_defaults );
+                $cite['authors'] = self::normalize_authors( $cite['author'] );
+                if ( 1 === count( $cite['authors'] ) ) {
+                        $cite['author'] = $cite['authors'][0];
+                } else {
+                        $cite['author'] = $author_defaults;
+                        foreach ( array( 'name', 'url', 'photo' ) as $key ) {
+                                $values = wp_list_pluck( $cite['authors'], $key );
+                                if ( array_filter( $values ) ) {
+                                        $cite['author'][ $key ] = implode( '; ', $values );
+                                }
+                        }
+                }
                 if ( is_array( $cite['publication'] ) ) {
                         $cite['publication'] = $cite['publication']['name'];
+                }
-                if ( is_array( $cite['author']['name'] ) ) {
-                        $cite['author']['name'] = implode( ';', $cite['author']['name'] );
+                }
-                if ( is_array( $cite['author']['url'] ) ) {
-                        $cite['author']['url'] = implode( ';', $cite['author']['url'] );
+                }
 …
+        }
+        /**
+         * Returns a citation's authors as a list of cards.
+         *
+         * Accepts one author or a list, each as a jf2 or mf2 h-card, a URL or a
+         * name. Before 4.0.0 the metabox saved several authors as one card whose
+         * name, url and photo were lists; the values are paired up by position.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $author The author or authors.
+         * @return array[] Cards with string type, name, url and photo, leaving out empty ones.
+         */
+        public static function normalize_authors( $author ) {
+                if ( wp_is_numeric_array( $author ) ) {
+                        $authors = array();
+                        foreach ( $author as $item ) {
+                                $authors = array_merge( $authors, self::normalize_authors( $item ) );
+                        }
+                        return $authors;
+                }
+                if ( is_string( $author ) ) {
+                        $author = wp_http_validate_url( $author ) ? array( 'url' => $author ) : array( 'name' => $author );
+                }
+                if ( ! is_array( $author ) ) {
+                        return array();
+                }
+                if ( \ParseThis\MF2_Utils::is_microformat( $author ) ) {
+                        $author = \ParseThis\mf2_to_jf2( $author );
+                }
+                $fields = array();
+                foreach ( array( 'name', 'url', 'photo' ) as $key ) {
+                        $value = isset( $author[ $key ] ) ? $author[ $key ] : '';
+                        if ( is_array( $value ) && isset( $value['value'] ) ) {
+                                // A jf2 photo with alt text.
+                                $value = $value['value'];
+                        }
+                        $fields[ $key ] = array_values( array_filter( (array) $value, 'is_scalar' ) );
+                }
+                $authors = array();
+                $count   = max( array_map( 'count', $fields ) );
+                for ( $i = 0; $i < $count; $i++ ) {
+                        $card = array( 'type' => 'card' );
+                        foreach ( $fields as $key => $values ) {
+                                $card[ $key ] = isset( $values[ $i ] ) ? trim( (string) $values[ $i ] ) : '';
+                        }
+                        if ( '' !== $card['name'] . $card['url'] . $card['photo'] ) {
+                                $authors[] = $card;
+                        }
+                }
+                return $authors;
+        }
+        /**
+         * Stores a date property.
+         *
+         * For posts other than attachments, 'published' and 'updated' set the
+         * post's own dates. Everything else is stored in post meta.
+         *
+         * @since 3.4.0
+         *
+         * @param string $key   Property to set, such as 'published' or 'start'.
+         * @param mixed  $value A date, in any form kind_safe_datetime() accepts.
+         * @return int|bool|WP_Error The result of updating the post or its meta,
+         *                           or false if the value is not a valid date.
+         */
         public function set_datetime_property( $key, $value ) {
                 // In an attachment the post date properties reflect when the item was uploaded not when the piece was created.
+                if ( ! $value instanceof DateTime ) {
+                        $value = new DateTime( $value );
+                }
+                // A mutable copy, as the timezone is changed below.
+                $value = kind_safe_datetime( $value, null, false );
                 if ( ! $value ) {
                         return false;
 …
+        }
+        /**
+         * Stores the post's duration as an ISO 8601 duration.
+         *
+         * @since 3.4.0
+         *
+         * @param mixed $value A duration, in any form kind_safe_interval() accepts.
+         * @return int|bool The result of updating the meta, or false if the value is not a valid duration.
+         */
         public function set_duration( $value ) {
+                if ( ! $value instanceof DateInterval ) {
+                        $value = new DateInterval( $value );
+                }
+                $value = kind_safe_interval( $value );
                 if ( ! $value ) {
                         return false;
 …
         /**
+         * Set author
+         *
+         * @param array $value Author microformat.
+         * @return boolean|WP_Error
+         * Stores the author of an attachment.
+         *
+         * Other posts use their WordPress author, so nothing is stored for them.
+         *
+         * @since 3.4.0
+         *
+         * @param array $value Author, as mf2.
+         * @return int|bool|null The result of updating the meta, or null if the post is not an attachment.
          */
         public function set_author( $value ) {
                 // Attachments may have been uploaded by a user but may have metadata for original author
+                // Attachments may have been uploaded by a user but may have metadata for original author.
                 if ( 'attachment' === get_post_type( $this->id ) ) {
                         return update_post_meta( $this->id, 'mf2_author', $value );
 …
+        }
+        /**
+         * Stores a property, or several.
+         *
+         * @since 3.4.0
+         *
+         * @param string|array $key   Property to set, or an array of property => value pairs.
+         * @param mixed        $value Optional. The value. Default null.
+         * @return mixed The result of storing the value. True when setting an array,
+         *               and null if the key or value is empty.
+         */
         public function set( $key, $value = null ) {
                 if ( is_array( $key ) ) {
 …
                         case 'featured':
                                 if ( wp_http_validate_url( $value ) ) {
                                         $featured = attachment_url_to_postid( $value );
+                                        $featured = self::get_attachment_id( $value );
                                         if ( $featured ) {
                                                 $value = $featured;
 …
                                 return wp_update_post( $args, true );
                         case 'audio':
+                                /* All media is handled identically.
+                                */
+                                // All media is handled identically.
                         case 'video':
+                                /* All Media is handled identically.
+                                */
+                                // All media is handled identically.
                         case 'photo':
                                 if ( Parse_This_MF2::is_microformat( $value ) ) {
                                         $url = Parse_This_MF2::get_plaintext( $value, 'url' );
                                         $id  = attachment_url_to_postid( $url );
+                                if ( \ParseThis\MF2_Utils::is_microformat( $value ) ) {
+                                        $url = \ParseThis\MF2_Utils::get_plaintext( $value, 'url' );
+                                        $id  = self::get_attachment_id( $url );
                                         if ( $id ) {
                                                 $value = mf2_to_jf2( $value );
+                                                $value = \ParseThis\mf2_to_jf2( $value );
                                                 unset( $value['type'] );
                                                 $attachment = new Kind_Post( $id );
 …
                                         return update_post_meta( $this->id, 'mf2_' . $key, array( $url ) );
+                                }
+                                /* If it is not a microformat handle as default.
+                                */
+                                // If it is not a microformat handle as default.
                         default:
                                 return update_post_meta( $this->id, 'mf2_' . $key, $value );
 …
+        }
+        /**
+         * Deletes a property stored in post meta.
+         *
+         * @since 3.4.0
+         *
+         * @param string $key Property to delete.
+         * @return bool True on success, false on failure.
+         */
         public function delete( $key ) {
                 return delete_post_meta( $this->id, 'mf2_' . $key );

indieweb-post-kinds/tags/4.0.0/includes/class-kind-taxonomy.php

-              r3011061
+              r3738687
 <?php
 /**
  * Post Kind Taxonomy Class
+ * Kind_Taxonomy class.
+ *
+ * Registers the taxonomy and sets its behavior.
+ * @package Post_Kinds
+ * @since   2.0.2
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Registers the kind taxonomy and sets its behavior.
+ *
  * @package Post Kinds
+ * @since 2.0.2
  */
 final class Kind_Taxonomy {
+        private static $kinds = array(); // Store a Post_Kind class which is a definition of a specific kind
+        /**
+         * Registered kinds, keyed by slug.
+         *
+         * @since 3.1.0
+         * @var Post_Kind[]
+         */
+        private static $kinds = array();
+        /**
+         * Whether the built-in kinds have been registered.
+         *
+         * @since 4.0.0
+         * @var bool
+         */
+        private static $builtins_loaded = false;
+        /**
+         * Loads the built-in kinds and adds the taxonomy's hooks.
+         *
+         * @since 2.0.2
+         */
         public static function init() {
+                $wp_version = get_bloginfo( 'version' );
+                require_once plugin_dir_path( __FILE__ ) . '/register-kinds.php';
+                self::load_kinds();
                 // Add the Correct Archive Title to Kind Archives.
+                if ( version_compare( $wp_version, '5.5', '>' ) ) {
+                        add_filter( 'get_the_archive_title', array( self::class, 'kind_archive_title' ), 10 );
+                } else {
+                        add_filter( 'get_the_archive_title', array( self::class, 'kind_archive_title' ), 10, 3 );
+                }
+                add_filter( 'get_the_archive_title', array( self::class, 'kind_archive_title' ), 10 );
                 add_filter( 'get_the_archive_title_prefix', array( self::class, 'kind_archive_prefix' ), 10 );
 …
                 add_filter( 'document_title_parts', array( self::class, 'document_title_parts' ), 10 );
+                // Keep the taxonomy's default term in step with the Default Kind setting.
+                add_action( 'add_option_kind_default', array( self::class, 'sync_default_term' ) );
+                add_action( 'update_option_kind_default', array( self::class, 'sync_default_term' ) );
                 // Add Kind Permalinks.
                 add_filter( 'post_link', array( self::class, 'kind_permalink' ), 10, 3 );
                 add_filter( 'post_type_link', array( self::class, 'kind_permalink' ), 10, 3 );
                 // Query Variable to Exclude Kinds from Feed
+                // Query Variable to Exclude Kinds from Feed.
                 add_filter( 'query_vars', array( self::class, 'query_vars' ) );
                 add_action( 'pre_get_posts', array( self::class, 'kind_filter_query' ) );
 …
                 add_action( 'pre_get_posts', array( self::class, 'kind_firehose_query' ), 99 );
                 // Add Dropdown
+                // Add Dropdown.
                 add_action( 'restrict_manage_posts', array( self::class, 'kind_dropdown' ), 10, 2 );
 …
                 add_filter( 'webmention_links', array( self::class, 'webmention_links' ), 11, 2 );
                 // Add Links to Enclosures if Appropriate
+                // Add Links to Enclosures if Appropriate.
                 add_filter( 'enclosure_links', array( self::class, 'enclosure_links' ), 11, 2 );
 …
                 // Trigger Webmention on Change in Post Status.
                 add_filter( 'transition_post_status', array( self::class, 'transition' ), 10, 3 );
                 // On Post Save Set Post Format
+                // On Post Save Set Post Format.
                 add_action( 'save_post', array( self::class, 'post_formats' ), 99, 3 );
                 // Create hook triggered by change of kind
+                // Create hook triggered by change of kind.
                 add_action( 'set_object_terms', array( self::class, 'set_object_terms' ), 10, 6 );
 …
+        }
+        /** Template Redirect
+         *
+        /**
+         * Uses the kind photos template for photo archives, if the theme has one.
+         *
+         * @since 3.4.14
+         *
+         * @param string $template Path of the template to include.
+         * @return string Path of the template to include.
          */
         public static function template_include( $template ) {
                 global $wp_query;
                 // Only use this template for archive pages
+                // Only use this template for archive pages.
                 if ( is_singular() ) {
                         return $template;
 …
         /**
          * Register the Route.
+         *
+         * @since 3.3.4
          */
         public static function register_routes() {
 …
                                                 ),
                                         ),
+                                        // For editor tools: only users who can write posts need it.
                                         'permission_callback' => function () {
                                                 return current_user_can( 'read' );
+                                                return current_user_can( 'edit_posts' );
                                         },
                                 ),
 …
+        }
+        /**
+         * Returns a kind's registration info for the post-kinds/1.0/fields route.
+         *
+         * @since 3.3.4
+         *
+         * @param WP_REST_Request $request Request, with the kind slug (or all) in kind.
+         * @return Post_Kind|Post_Kind[]|WP_Error The kind, all kinds, or an error for an unknown kind.
+         */
         public static function read( $request ) {
                 $kind = $request->get_param( 'kind' );
+                return self::get_kind_info( $kind, 'all' );
+                $info = self::get_kind_info( $kind, 'all' );
+                if ( false === $info ) {
+                        return new WP_Error( 'rest_post_kind_not_found', __( 'Unknown post kind.', 'indieweb-post-kinds' ), array( 'status' => 404 ) );
+                }
+                return $info;
+        }
 …
         /**
          * Add our query variables to query_vars list.
+         *
+         * @since 3.2.4
+         *
          * @access public
 …
          * Filter the query for our post kinds.
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.4.14
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_photo_filter( $query ) {
                 // check if the user is requesting an admin page
+                // check if the user is requesting an admin page.
                 if ( is_admin() || ! $query->is_main_query() ) {
                         return $query;
+                }
                 $photos = get_query_var( 'kind_photos' );
                 // Return if  not set
+                // Return if  not set.
                 if ( $photos ) {
                         $query->set( 'posts_per_page', 30 );
 …
                         $query->is_comment_feed = false;
                         $query->is_home         = false;
+                        // Set for posts with images in their content or a photo property; see Kind_Media_Metadata::update_photo_flag().
                         $query->set(
                                 'meta_query',
                                 array(
-                                        'relation' => 'OR',
                                         array(
+                                                'key'     => '_content_img_ids',
+                                                'compare' => 'EXISTS',
+                                        ),
+                                        array(
+                                                'key'     => 'mf2_photo',
+                                                'key'     => '_kind_has_photo',
                                                 'compare' => 'EXISTS',
                                         ),
 …
          * Filter the query for our post kinds.
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.2.4
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_filter_query( $query ) {
                 // check if the user is requesting an admin page
+                // check if the user is requesting an admin page.
                 if ( is_admin() || ! $query->is_main_query() ) {
                         return $query;
+                }
                 $exclude = get_query_var( 'exclude' );
                 // Return if both are not set
+                // Return if both are not set.
                 if ( ! taxonomy_exists( $exclude ) ) {
                         return $query;
 …
          * Filter the main query for post kinds.
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.6.0
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_firehose_query( $query ) {
                 // check if the user is requesting an admin page
+                // check if the user is requesting an admin page.
                 if ( is_admin() || ! $query->is_main_query() ) {
                         return $query;
 …
+                }
+                $query->set(
+                        'tax_query',
+                $tax_query = array(
                         array(
+                                'relation' => 'OR',
+                                array(
+                                        'taxonomy' => 'kind',
+                                        'field'    => 'slug',
+                                        'terms'    => $firehose,
+                                        'operator' => 'IN',
+                                ),
+                                array(
+                                        'taxonomy' => 'kind',
+                                        'operator' => 'NOT EXISTS',
+                                ),
+                        )
+                );
+                                'taxonomy' => 'kind',
+                                'field'    => 'slug',
+                                'terms'    => $firehose,
+                                'operator' => 'IN',
+                        ),
+                );
+                // Posts without a kind are shown too. The upgrade routine gives them one,
+                // so the costly NOT EXISTS clause is only needed until it completes.
+                if ( Kind_Upgrade::is_pending() ) {
+                        $tax_query['relation'] = 'OR';
+                        $tax_query[]           = array(
+                                'taxonomy' => 'kind',
+                                'operator' => 'NOT EXISTS',
+                        );
+                }
+                $query->set( 'tax_query', $tax_query );
                 return $query;
+        }
 …
          * Allows for some pre-defined aliases
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.4.19
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_alias_filter( $query ) {
 …
         /**
          * Register our REST API endpoint for post kinds.
+         *
+         * @since 3.1.0
+         *
          * @access public
 …
                         'kind',
                         array(
                                 'get_callback'    => array( self::class, 'get_post_kind_slug' ),
+                                'get_callback'    => array( self::class, 'get_rest_post_kind' ),
                                 'update_callback' => array( self::class, 'set_rest_post_kind' ),
                                 'schema'          => array(
+                                        'kind' => __( 'Post Kind', 'indieweb-post-kinds' ),
+                                        'type' => 'string',
+                                        'description' => __( 'The post kind, or false if the post has none.', 'indieweb-post-kinds' ),
+                                        // False is only returned, never accepted: the enum allows kind slugs alone.
+                                        'type'        => array( 'string', 'boolean' ),
+                                        'enum'        => self::get_kind_list(),
+                                        'context'     => array( 'view', 'edit' ),
                                 ),
+                        )
 …
         /**
          * Filter template hierarchy to include our template files.
+         *
+         * @since 3.1.2
+         *
          * @access public
 …
          * Generate a sample permalink for a post.
+         *
+         * @since 3.2.2
+         *
          * @access public
+         *
 …
                 if ( is_numeric( $permalink[1] ) && $post_id === (int) $permalink[1] ) {
                         $excerpt = self::get_excerpt( $post );
                         $excerpt = sanitize_title( mb_strimwidth( wp_strip_all_tags( $excerpt ), 0, 40 ) ); // phpcs:ignore
+                        $excerpt = sanitize_title( mb_strimwidth( wp_strip_all_tags( $excerpt ), 0, 40 ) );
                         if ( ! empty( $excerpt ) ) {
                                 $permalink[1] = wp_unique_post_slug( $excerpt, $post_id, $post->post_status, $post->post_type, $post->post_parent );
 …
          * Generate a post title.
+         *
+         * @access public
+         *
+         * @param int!WP_Post    $post Post ID or Post Object.
+         * @return string
+         * @since 3.3.3
+         *
+         * @access public
+         *
+         * @param int|WP_Post $post   Post ID or post object.
+         * @param int         $length Optional. Maximum length of the title. Default 40.
+         * @return string|null The title, or null if the post does not exist.
          */
         public static function generate_title( $post, $length = 40 ) {
 …
                         $kind_post = new Kind_Post( $post );
                         $cite      = $kind_post->get_cite();
+                        if ( Parse_This_MF2::is_microformat( $cite ) ) {
+                        // Citations are stored as a list; use the first.
+                        if ( wp_is_numeric_array( $cite ) && 1 === count( $cite ) ) {
+                                $cite = $cite[0];
+                        }
+                        if ( class_exists( '\\ParseThis\\MF2_Utils' ) && \ParseThis\MF2_Utils::is_microformat( $cite ) ) {
                                 if ( array_key_exists( 'name', $cite['properties'] ) ) {
                                         $excerpt = $cite['properties']['name'];
 …
+                        }
+                }
                 return mb_strimwidth( $excerpt, 0, $length, '...' ); // phpcs:ignore
+                return mb_strimwidth( $excerpt, 0, $length, '...' );
+        }
 …
          * Filter the post title. Add a symbol at the end if generated title.
+         *
+         * @access public
+         *
+         * @param string $title   Current post title
+         * @param int    $post_id Post ID
+         * @since 3.0.9
+         *
+         * @access public
+         *
+         * @param string $title   Current post title.
+         * @param int    $post_id Post ID.
          * @return string
          */
 …
                                 $title = sprintf( '[%1$s] %2$s', $post_kind, self::generate_title( $post_id, 60 ) );
+                        }
+                } elseif ( empty( $title ) && is_comment_feed() ) {
+                        // Comment feed items read "Comment on <title> by <author>"; name untitled posts.
+                        $title = self::generate_title( $post_id, 60 );
+                }
                 return $title;
 …
          * Filter the single post title.
+         *
+         * @access public
+         *
+         * @param string $title   Current post title
+         * @param WP_Post    $post Post object
+         * @since 3.3.3
+         *
+         * @access public
+         *
+         * @param string  $title Current post title.
+         * @param WP_Post $post  Post object.
          * @return string
          */
 …
          * Filter the post excerpt.
+         *
+         * @since 3.2.0
+         *
          * @access public
+         *
 …
          * Set our post object terms.
+         *
+         * @since 3.0.8
+         *
          * @access public
+         *
 …
          * @param array  $terms      Array of object terms.
          * @param array  $tt_ids     Array of term taxonomy IDs.
          * @param string $taxonomy   Taxonomy slug
+         * @param string $taxonomy   Taxonomy slug.
          * @param bool   $append     If terms should be appended or overwrite.
          * @param array  $old_tt_ids Array of original trem taxonomy IDs.
 …
                         $new_term = $new_term instanceof WP_Term ? $new_term->slug : '';
                         if ( $old_term !== $new_term ) {
+                                // Trigger a hook on a changed kind identifying old and new so actions can be performed
+                                /**
+                                 * Fires when a post's kind changes.
+                                 *
+                                 * @since 3.0.8
+                                 *
+                                 * @param int    $object_id Post ID.
+                                 * @param string $old_term  Slug of the previous kind, or an empty string if there was none.
+                                 * @param string $new_term  Slug of the new kind, or an empty string if the kind was removed.
+                                 */
                                 do_action( 'change_kind', $object_id, $old_term, $new_term );
+                        }
 …
         /**
          * To Be Run on Plugin Activation.
+         */
+        /**
+         * Registers the built-in kinds, once.
+         *
+         * Called from init() and on activation. A plugin is activated after
+         * plugins_loaded and init have run for the request, so neither the kinds
+         * nor the register_post_kind() function (kind-functions.php) would
+         * otherwise be loaded when the kind terms are created.
+         *
+         * @since 4.0.0
+         */
+        public static function load_kinds() {
+                if ( self::$builtins_loaded ) {
+                        return;
+                }
+                self::$builtins_loaded = true;
+                if ( ! function_exists( 'register_post_kind' ) ) {
+                        require_once plugin_dir_path( __FILE__ ) . 'kind-functions.php';
+                }
+                require plugin_dir_path( __FILE__ ) . 'register-kinds.php';
+        }
+        /**
+         * Creates the kind terms on activation.
+         *
+         * Stops with an error if the IndieWeb Taxonomy plugin, which Post Kinds
+         * replaces, is active.
+         *
+         * @since 2.0.2
          */
         public static function activate_kinds() {
                 if ( function_exists( 'iwt_plugin_notice' ) ) {
+                        deactivate_plugins( plugin_basename( __FILE__ ) );
+                        wp_die( 'You have Indieweb Taxonomy activated. Post Kinds replaces this plugin. Please disable Taxonomy before activating' );
+                }
+                        deactivate_plugins( plugin_basename( dirname( __DIR__ ) . '/indieweb-post-kinds.php' ) );
+                        wp_die( esc_html__( 'Post Kinds replaces the IndieWeb Taxonomy plugin. Deactivate IndieWeb Taxonomy, then activate Post Kinds.', 'indieweb-post-kinds' ) );
+                }
+                self::load_kinds();
                 self::register();
                 self::kind_defaultterms();
 …
+        }
+        /**
+         * Returns the rewrite regex for the pagination part of a URL.
+         *
+         * @since 3.5.0
+         *
+         * @return string The regex, such as 'page/?([0-9]{1,})'.
+         */
         public static function get_pagination_regex() {
                 global $wp_rewrite;
 …
+        }
+        /**
+         * Returns the rewrite regex for the feed part of a URL.
+         *
+         * @since 3.5.0
+         *
+         * @param bool $with_base Optional. Whether to start with the feed base ('feed/'). Default true.
+         * @return string The regex, such as 'feed/(feed|rdf|rss|rss2|atom)'.
+         */
         public static function get_feed_regex( $with_base = true ) {
                 global $wp_rewrite;
                 // Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
+                // Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?.
                 $feedregex2 = '';
                 foreach ( (array) $wp_rewrite->feeds as $feed_name ) {
 …
+        }
+        /**
+         * Joins regex parts into a rewrite rule pattern.
+         *
+         * @since 3.5.0
+         *
+         * @param string[] $elements Parts of the pattern, in order.
+         * @return string The parts joined by slashes and ending in '?$', or an empty string if there are none.
+         */
         public static function generate_permastruct( $elements ) {
                 if ( empty( $elements ) || ! is_array( $elements ) ) {
 …
         /**
+         * Returns the start of kind archive URLs, as in /kind/like/.
+         *
+         * Set as the Kind base on Settings > Permalinks.
+         *
+         * @since 4.0.0
+         *
+         * @return string The base. Default 'kind'.
+         */
+        public static function get_kind_base() {
+                $base = get_option( 'kind_base', '' );
+                $base = is_string( $base ) && '' !== $base ? $base : 'kind';
+                /**
+                 * Filters the start of kind archive URLs, as in /kind/like/.
+                 *
+                 * The Kind base on Settings > Permalinks sets it. Flush rewrite rules after
+                 * changing this.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param string $base The base. Default the Kind base setting, or 'kind'.
+                 */
+                return (string) apply_filters( 'kind_base_slug', $base );
+        }
+        /**
          * Register the custom taxonomy for kinds.
+         *
+         * @since 2.0.2
          */
         public static function register() {
 …
                         'add_or_remove_items'        => _x( 'Add or remove kinds', 'add or remove items', 'indieweb-post-kinds' ),
                         'choose_from_most_used'      => _x( 'Choose from the most used kinds', 'choose most used', 'indieweb-post-kinds' ),
                         'not found'                  => _x( 'No kinds found', 'no kinds found', 'indieweb-post-kinds' ),
+                        'not_found'                  => _x( 'No kinds found', 'no kinds found', 'indieweb-post-kinds' ),
                         'no_terms'                   => _x( 'No kinds', 'no kinds', 'indieweb-post-kinds' ),
                         'back_to_items'              => __( 'Back to Kinds', 'indieweb-post-kinds' ),
 …
                         'item_link_description'      => __( 'A link to a kind', 'indieweb-post-kinds' ),
                 );
+                // The slug is used as the name too: core finds the default term by name, and a translated name would not match.
+                $default_kind = get_option( 'kind_default', 'note' );
                 $args = array(
 …
                         'show_admin_column'  => true,
                         'meta_box_cb'        => array( self::class, 'select_metabox' ),
                         'rewrite'            => true,
+                        'rewrite'            => array( 'slug' => self::get_kind_base() ),
                         'query_var'          => true,
                         'default_term'       => array(
                                 'name' => __( 'Article', 'indieweb-post-kinds' ),
                                 'slug' => 'article',
+                                'name' => $default_kind,
+                                'slug' => $default_kind,
                         ),
                 );
                 register_taxonomy( 'kind', array( 'post' ), $args );
+                add_permastruct( 'kind_date', 'kind/%kind%/%year%/%monthnum%/' );
+                add_permastruct( 'kind_date', self::get_kind_base() . '/%kind%/%year%/%monthnum%/' );
+                /**
+                 * Filters the taxonomies that get kind archive rewrite rules.
+                 *
+                 * Each taxonomy gets rules for /kind/{kind}/{taxonomy}/{term}/, where kind is the Kind base. Rewrite rules
+                 * are flushed when the plugin is activated or updated; flush them yourself
+                 * (Settings > Permalinks > Save) after changing this.
+                 *
+                 * @since 3.4.15
+                 *
+                 * @param string[] $taxonomies Taxonomy names. Default 'post_tag', 'category' and 'series'.
+                 */
                 $kind_rewrite_taxonomies = apply_filters( 'kind_rewrite_taxonomies', array( 'post_tag', 'category', 'series' ) );
                 // For each kind, support filtering by other taxonomies.
                 foreach ( $kind_rewrite_taxonomies as $taxonomy ) {
+                        add_permastruct( 'kind_' . $taxonomy, 'kind/%kind%/' . $taxonomy . '/%' . $taxonomy . '%' );
+                }
+                        add_permastruct( 'kind_' . $taxonomy, self::get_kind_base() . '/%kind%/' . $taxonomy . '/%' . $taxonomy . '%' );
+                }
+                /**
+                 * Filters the URL slug for archives that exclude kinds, as in /exclude/kind/{kinds}/.
+                 *
+                 * Flush rewrite rules after changing this.
+                 *
+                 * @since 3.4.15
+                 *
+                 * @param string $slug Slug. Default 'exclude'.
+                 */
                 $kind_exclude_slug = apply_filters( 'kind_exclude_slug', 'exclude' );
 …
                 add_permastruct( 'kind_excludes', $kind_exclude_slug . '/%kind_exclude%/%kind_exclude_terms%' );
+                /**
+                 * Filters the URL slug for the archive of posts with photos.
+                 *
+                 * Flush rewrite rules after changing this.
+                 *
+                 * @since 3.4.15
+                 *
+                 * @param string $slug Slug. Default 'photos'.
+                 */
                 $kind_photos_slug   = apply_filters( 'kind_photos_slug', 'photos' );
+                /**
+                 * Filters the URL slug for the firehose feed, which includes every kind.
+                 *
+                 * Flush rewrite rules after changing this.
+                 *
+                 * @since 3.6.0
+                 *
+                 * @param string $slug Slug. Default 'firehose'.
+                 */
                 $kind_firehose_slug = apply_filters( 'kind_firehose_slug', 'firehose' );
                 $year_regex       = '([0-9]{4})';
                 $month_regex      = '(0-9]{2})';
+                $month_regex      = '([0-9]{2})';
                 $day_regex        = '([0-9]{1,})';
                 $pagination_regex = self::get_pagination_regex();
                 $feed_regex       = self::get_feed_regex();
                 $feed_regex2      = self::get_feed_regex( false );
+                $tax_regex        = '([^/]*)';
+                $term_regex       = '([^/]*)';
+                // Year Archives for Photos
+                // Year Archives for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $year_regex, $pagination_regex ) ),
 …
                 );
                 // Year and Month Archive for Photos
+                // Year and Month Archive for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $year_regex, $month_regex, $pagination_regex ) ),
 …
                 );
                 // Year and Month And Day Archive for Photos
+                // Year and Month And Day Archive for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $year_regex, $month_regex, $day_regex, $pagination_regex ) ),
 …
                 );
                 // Month And Day Archive for Photos
+                // Month And Day Archive for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $month_regex, $day_regex, $pagination_regex ) ),
 …
         /**
+         * Points the kind taxonomy's default term at the Default Kind setting.
+         *
+         * Core sets the default term when the taxonomy is registered; this applies a
+         * change to the setting within the same request.
+         *
+         * @since 4.0.0
+         */
+        public static function sync_default_term() {
+                $term = get_term_by( 'slug', get_option( 'kind_default', 'note' ), 'kind' );
+                if ( $term ) {
+                        update_option( 'default_term_kind', $term->term_id );
+                }
+        }
+        /**
          * Sets up Default Terms for Kind Taxonomy.
+         *
+         * Creates a term for each registered kind that has none, and updates the
+         * name and description of terms that differ from the kind's, for example
+         * after a translation changes. Terms that already match are not written.
+         *
+         * @since 2.0.2
          */
         public static function kind_defaultterms() {
+                $terms = self::get_kind_list();
+                foreach ( $terms as $term ) {
+                        if ( ! get_term_by( 'slug', $term, 'kind' ) ) {
+                $existing = get_terms(
+                        array(
+                                'taxonomy'   => 'kind',
+                                'hide_empty' => false,
+                        )
+                );
+                $existing = is_wp_error( $existing ) ? array() : array_column( $existing, null, 'slug' );
+                foreach ( self::get_kind_list() as $term ) {
+                        if ( ! isset( $existing[ $term ] ) ) {
                                 self::create_post_kind( $term );
+                        } else {
+                                continue;
+                        }
+                        $kind = self::get_post_kind_info( $term );
+                        if ( $kind && ( $existing[ $term ]->name !== $kind->singular_name || $existing[ $term ]->description !== $kind->description ) ) {
                                 self::update_post_kind( $term );
+                        }
 …
          * Update our post kind if the term already exists.
+         *
+         * @since 3.1.0
+         *
          * @access private
+         *
          * @param $term
+         * @param string $term Post kind slug.
          */
         private static function update_post_kind( $term ) {
 …
          * Create our post kind term.
+         *
+         * @since 3.1.0
+         *
          * @access private
+         *
          * @param $term
+         * @param string $term Post kind slug.
          */
         private static function create_post_kind( $term ) {
                 $kind = self::get_post_kind_info( $term );
                 if ( $kind ) {
+                        // The first argument is the term name; wp_insert_term() has no 'name' argument.
                         wp_insert_term(
                                 $kind->slug,
+                                $kind->singular_name,
                                 'kind',
                                 array(
-                                        'name'        => $kind->singular_name,
                                         'description' => $kind->description,
                                         'slug'        => $term,
 …
          * Filter our post kind permalink.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
                         return $permalink; }
                 // Get post
+                // Get post.
                 $post = get_post( $post_id );
                 if ( ! $post ) {
                         return $permalink; }
                 // Get taxonomy terms
                 $terms = wp_get_object_terms( $post->ID, 'kind' );
                 if ( ! is_wp_error( $terms ) && ! empty( $terms ) && is_object( $terms[0] ) ) {
+                // Get taxonomy terms; get_the_terms() uses the term cache the main query primes.
+                $terms = get_the_terms( $post, 'kind' );
+                if ( is_array( $terms ) && ! empty( $terms ) && is_object( $terms[0] ) ) {
                         $taxonomy_slug = $terms[0]->slug;
                 } else {
 …
         /**
          * Fetch the current post kind terms from the current query.
+         *
+         * @since 3.0.3
+         *
          * @access public
 …
          * Prefix Introduced in WP5.5
+         *
+         * @since 3.5.0
+         *
          * @access public
+         *
 …
          * Original Title and Prefix introduced in WP5.5.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
          */
         public static function kind_archive_title( $title, $original_title = null, $prefix = null ) {
+                $return     = array();
+                $wp_version = get_bloginfo( 'version' );
+                $return = array();
+                /**
+                 * This filter is documented in wp-includes/general-template.php
+                 */
                 $prefix = apply_filters( 'get_the_archive_title_prefix', $prefix );
 …
         /**
          * Filters the post kind archive description.
+         *
+         * @since 2.5.2
+         *
          * @access public
 …
          * Sets Post Format for Post Kind.
+         *
+         * @param int     $post_id Post ID
+         * @param WP_Post $post Post Object
+         * @param boolean $update,
+         * @since 2.5.0
+         *
+         * @param int     $post_id Post ID.
+         * @param WP_Post $post    Post object.
+         * @param bool    $update  Whether this is an existing post being updated.
          */
         public static function post_formats( $post_id, $post, $update ) {
 …
          * Fiters the `<title>` tag parts for the post kind.
+         *
+         * @since 3.1.3
+         *
          * @access public
+         *
 …
         public static function document_title_parts( $parts ) {
                 if ( is_tax() || is_category() || is_tag() ) {
+                        $terms = self::get_terms_from_query();
+                        $terms  = self::get_terms_from_query();
+                        $return = array();
                         foreach ( $terms as $term ) {
                                 if ( 'kind' === $term->taxonomy ) {
 …
          * Callback for the taxonomy meta box for our post kinds taxonomy.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
          */
         public static function select_metabox( $post ) {
+                $include = get_option( 'kind_termslist' );
+                $include = array_merge( $include, array( 'note', 'reply', 'article' ) );
+                // If Simple Location is Enabled, include the check-in type
+                // Filter Kinds
+                $include = array_merge( Kind_Config::get_termslist(), array( 'note', 'reply', 'article' ) );
+                /**
+                 * Filters the kinds offered in the editor and listed by the Kind Menu widget.
+                 *
+                 * By default these are the kinds selected in the settings, plus note, reply and article.
+                 *
+                 * @since 2.0.2
+                 *
+                 * @param string[] $include Kind slugs.
+                 */
                 $include = array_unique( apply_filters( 'kind_include', $include ) );
                 // Note cannot be removed or disabled without hacking the code
+                // Note cannot be removed or disabled without hacking the code.
                 if ( ! in_array( 'note', $include, true ) ) {
                         $include[] = 'note';
+                }
+                if ( isset( $_GET['kind'] ) ) {
+                        $default = get_term_by( 'slug', $_GET['kind'], 'kind' );
+                // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Preselects the kind on the new post screen; nothing is saved.
+                $requested = ( isset( $_GET['kind'] ) && is_string( $_GET['kind'] ) ) ? sanitize_key( wp_unslash( $_GET['kind'] ) ) : '';
+                if ( '' !== $requested ) {
+                        $default = get_term_by( 'slug', $requested, 'kind' );
                 } elseif ( 'publish' === get_post_status( $post ) ) {
                         // On existing published posts without a kind fall back on article which most closely mimics the behavior of an unclassified post
+                        // On existing published posts without a kind fall back on article which most closely mimics the behavior of an unclassified post.
                         $default = get_term_by( 'slug', 'article', 'kind' );
                 } else {
 …
          * Register our post kinds.
+         *
+         * @since 3.1.0
+         *
          * @access public
+         *
          * @param string $slug Post kind slug.
+         * @param array  $args Post kind arguments {
+                 * @param string $singular_name  Name for one instance of the kind.
+                 * @param string $name   General name for the kind plural.
+                 * @param string $verb The string for the verb or action (liked this).
+                 * @param string $property Microformats 2 property, superseded by properties
+                 * @param array $properties Properties is an array outlining the fields for the particular kind. See Kind Fields class for more details
+                 * @param string $format Post Format that maps to this.
+                 * @param string $description Description of the Kind
+                 * @param url $description-url Link to more information
+                 * @param string $title Should this kind have an explicit title.
+                 * @param boolean $show Show in Settings.
+         * @param array  $args {
+         *     Post kind arguments. Arguments that are not listed are kept and can
+         *     be read as properties of the Post_Kind.
+         *
+         *     @type string $singular_name   Name for one instance of the kind. Default the slug.
+         *     @type string $name            General name for the kind, plural. Default the slug.
+         *     @type string $verb            The verb or action, such as 'Liked'. Default the slug.
+         *     @type string $property        Microformats 2 property, such as 'like-of'. Default empty.
+         *     @type array  $properties      The fields for the kind. See Kind_Fields.
+         *     @type string $format          Post format that maps to this kind. Default 'standard'.
+         *     @type string $icon            Icon name. Default the slug.
+         *     @type string $description     Description of the kind.
+         *     @type string $description_url Link to more information.
+         *     @type string $shortlink       Shortlink code for the kind.
+         *     @type bool   $title           Whether the kind should have an explicit title.
+         *     @type bool   $show            Whether to show the kind in Settings. Default false.
          * }
          * @return bool
+         * @return bool True if the kind was registered, false if it already exists.
          */
         public static function register_post_kind( $slug, $args ) {
                 $kind = new Post_Kind( $slug, $args );
                 // Do not allow reregistering existing kinds
+                // Do not allow reregistering existing kinds.
                 if ( isset( self::$kinds[ $slug ] ) ) {
                         return false;
 …
         /**
          * Retrieve info on a provided post kind.
+         *
+         * @since 3.1.0
+         *
          * @access public
 …
+        }
-        // Enable a hidden post kind
         /**
          * Enables a hidden post kind.
+         *
+         * @since 3.1.0
+         *
          * @access public
 …
          * Retrieve list of registered post kinds.
+         *
+         * @since 3.1.0
+         *
          * @access public
          * @return array
 …
          * Returns all translated strings.
+         *
+         * @since 2.5.2
+         *
          * @param string $kind     Post Kind to return.
          * @param string $property The individual property
+         * @param string $property The individual property.
          * @return string|array Return kind-property. If either is set to all, return all.
          */
 …
                         return $k;
+                }
                 if ( ! array_key_exists( $property, get_object_vars( $k ) ) ) {
+                if ( ! $k->has( $property ) ) {
                         return false;
+                }
 …
         /**
          * Add available webmention links.
+         *
+         * @since 2.3.5
+         *
          * @access public
 …
         /**
          * Add available enclosure links.
+         *
+         * @since 3.0.4
+         *
          * @access public
 …
          * Generate a dropdown of our post kinds for the post list table view.
+         *
+         * @since 2.5.2
+         *
          * @access public
          * @param string $post_type Current post type being listed.
 …
                 if ( 'post' === $post_type ) {
                         $taxonomy      = 'kind';
+                        $selected      = isset( $_GET[ $taxonomy ] ) ? $_GET[ $taxonomy ] : '';
+                        // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- A list-table filter; nothing is saved.
+                        $selected      = ( isset( $_GET[ $taxonomy ] ) && is_string( $_GET[ $taxonomy ] ) ) ? sanitize_key( wp_unslash( $_GET[ $taxonomy ] ) ) : '';
                         $kind_taxonomy = get_taxonomy( $taxonomy );
                         wp_dropdown_categories(
 …
          * Set our post kind terms upon publish transition status.
+         *
+         * @access public
+         * @param int          $post_id Current post ID
+         * @since 2.0.2
+         *
+         * @access public
+         *
+         * @param int          $post_id Current post ID.
          * @param WP_Post|null $post    Current post object.
          */
 …
                         return;
+                }
                 $count = wp_get_post_terms( $post_id, 'kind' );
                 if ( is_countable( $count ) && $count <= 0 ) {
+                $terms = wp_get_post_terms( $post_id, 'kind' );
+                if ( ! is_wp_error( $terms ) && empty( $terms ) ) {
                         set_post_kind( $post_id, get_option( 'kind_default' ) );
+                }
 …
         /**
          * Maybe set our post kind terms upon post status transition.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
          * Filter the classes on a post's markup.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
          * Returns a pretty, translated version of a post kind slug.
+         *
+         * @since 2.1.1
+         *
          * @param string $slug A post format slug.
          * @return string The translated post format name.
 …
         public static function get_post_kind_string( $slug ) {
                 $string = self::get_kind_info( $slug, 'singular_name' );
                 return $slug ? $slug : '';
+                return $string ? $string : '';
+        }
         /**
          * Returns a link to a post kind index.
+         *
+         * @since 2.1.1
+         *
          * @param string $kind The post kind slug.
 …
          * Retrieve a total count statistic for a given post kind.
+         *
+         * @since 3.1.3
+         *
          * @access public
+         *
 …
         /**
          * Returns the post kind slug for the current post.
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
          * Returns the post kind name for the current post.
+         *
+         * @access public
+         *
+         * @param WP_Post|int|null $post
+         * @return array|bool|string
+         * @since 2.1.1
+         *
+         * @access public
+         *
+         * @param WP_Post|int|null $post Optional. Post ID or post object. Default the current post.
+         * @return string|false The kind's translated name, or false if the post has no kind.
          */
         public static function get_post_kind( $post = null ) {
 …
          * Check if a post has any of the given kinds, or any kind.
+         *
+         * @since 2.1.1
+         *
          * @uses has_term()
+         *
 …
          * Assign a kind to a post.
+         *
+         * @since 2.1.1
+         *
          * @param int|WP_Post $post The post for which to assign a kind.
+         * @param string     $kind A kind to assign. Using an empty string or array will default to article.
+         * @return mixed WP_Error on error. Array of affected term IDs on success.
+         * @param string      $kind Optional. A registered kind's slug. Default 'article'.
+         * @return array|false|WP_Error Array of affected term IDs on success. WP_Error if the post
+         *                              or the kind is not valid, or false on failure.
          */
         public static function set_post_kind( $post, $kind = 'article' ) {
 …
         /**
+         * Update callback for REST API endpoint.
+         *
+         * @access public
+         *
+         * @param string $kind Post kind being processed.
+         * @param $post_array
+         */
+        public static function set_rest_post_kind( $kind, $post_array ) {
+                if ( isset( $post_array['id'] ) ) {
+                        self::set_post_kind( $post_array['id'], $kind );
+                }
+         * Update callback for the kind REST field.
+         *
+         * @since 3.1.0
+         *
+         * @access public
+         *
+         * @param string        $kind Post kind to set.
+         * @param WP_Post|array $post Post being updated.
+         * @return true|WP_Error True on success, WP_Error if the kind could not be set.
+         */
+        public static function set_rest_post_kind( $kind, $post ) {
+                // WordPress passes the post being updated as a WP_Post object.
+                $post_id = $post instanceof WP_Post ? $post->ID : ( is_array( $post ) && isset( $post['id'] ) ? (int) $post['id'] : 0 );
+                if ( ! $post_id ) {
+                        return new WP_Error( 'rest_invalid_post', __( 'Invalid post.', 'indieweb-post-kinds' ), array( 'status' => 400 ) );
+                }
+                if ( ! current_user_can( 'edit_post', $post_id ) ) {
+                        return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to set the kind of this post.', 'indieweb-post-kinds' ), array( 'status' => rest_authorization_required_code() ) );
+                }
+                $result = self::set_post_kind( $post_id, $kind );
+                if ( is_wp_error( $result ) ) {
+                        $result->add_data( array( 'status' => 400 ) );
+                        return $result;
+                }
+                return true;
+        }
+        /**
+         * Get callback for the kind REST field.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param array $post Prepared post data, as an array with an id key.
+         * @return string|false The post's kind slug, or false if it has none.
+         */
+        public static function get_rest_post_kind( $post ) {
+                // The prepared post is an array; passing it to get_post() would cast it to 1.
+                $post_id = is_array( $post ) && isset( $post['id'] ) ? (int) $post['id'] : 0;
+                return $post_id ? self::get_post_kind_slug( $post_id ) : false;
+        }
 …
          * Whether or not to display the before kind content.
+         *
+         * @since 2.6.6
+         *
          * @access public
          * @return mixed|void
          */
         public static function before_kind() {
+                /**
+                 * Filters whether to show the kind's icon or name before the response.
+                 *
+                 * Return false to hide it everywhere and remove the display option from the settings page.
+                 *
+                 * @since 2.6.6
+                 *
+                 * @param bool $display Whether to show it. Default true.
+                 */
                 return apply_filters( 'kind_icon_display', true );
+        }
 …
          * Display before Kind - either icon text or no display.
+         *
+         * @since 2.6.6
+         *
          * @param string $kind    The slug for the kind of the current post.
          * @param string $display Override display;
+         * @param string $display Override display.
          * @return string Marked up kind information.
          */
 …
                         $display = get_option( 'kind_display' );
+                }
                 $text = '<span class="kind-display-text">' . self::get_kind_info( $kind, 'verb' ) . '</span> ';
+                $text = '<span class="kind-display-text">' . esc_html( self::get_kind_info( $kind, 'verb' ) ) . '</span> ';
                 $icon = self::get_icon( $kind );
                 // Hide Icon in Feed View
+                // Hide Icon in Feed View.
                 if ( 'text' !== $display && is_feed() ) {
                         $icon = '';
 …
          * Retrieve the icon SVG for a provided post kind.
+         *
+         * @since 2.4.0
+         *
          * @access public
+         *
 …
          */
         public static function get_icon( $kind, $echo = false ) {
+                // Icons are shown per post, per widget item and per settings row; read each file once.
+                static $svgs = array();
+                $kind        = sanitize_key( $kind );
+                if ( ! isset( $svgs[ $kind ] ) ) {
+                        $svg           = sprintf( '%1$ssvgs/%2$s.svg', plugin_dir_path( __DIR__ ), $kind );
+                        $svgs[ $kind ] = file_exists( $svg ) ? (string) file_get_contents( $svg ) : '';
+                        // A default size for places without the plugin's stylesheet, such as feed readers. CSS overrides it.
+                        $svgs[ $kind ] = preg_replace( '/^<svg\b/', '<svg width="1em" height="1em"', $svgs[ $kind ] );
+                }
+                if ( '' === $svgs[ $kind ] ) {
+                        return '';
+                }
                 $name       = self::get_kind_info( $kind, 'singular_name' );
+                $svg        = sprintf( '%1$ssvgs/%2$s.svg', plugin_dir_path( __DIR__ ), $kind );
+                $attributes = apply_filters( 'post_kinds_icon_attributes', 'style="display: inline-block; max-height: 1rem; margin-right: 0.5rem"' );
+                if ( file_exists( $svg ) ) {
+                        $return = sprintf( '<span class="svg-icon svg-%1$s" aria-label="%2$s" title="%2$s" %3$s><span aria-hidden="true">%4$s</span></span>', esc_attr( $kind ), esc_attr( $name ), $attributes, file_get_contents( $svg ) );
+                } else {
+                        return '';
+                }
+                /**
+                 * Filters the HTML attributes added to the span that wraps a kind icon.
+                 *
+                 * The string is output as-is, so it must be safe, escaped markup.
+                 *
+                 * @since 3.5.8
+                 * @since 4.0.0 The default is empty; the stylesheet sizes the icon.
+                 *
+                 * @param string $attributes HTML attributes. Default empty.
+                 */
+                $attributes = (string) apply_filters( 'post_kinds_icon_attributes', '' );
+                $attributes = '' === $attributes ? '' : ' ' . $attributes;
+                $return     = sprintf( '<span class="svg-icon svg-%1$s" aria-label="%2$s" title="%2$s"%3$s><span aria-hidden="true">%4$s</span></span>', esc_attr( $kind ), esc_attr( $name ), $attributes, $svgs[ $kind ] );
                 if ( $echo ) {
                         echo $return; // phpcs:ignore
+                        echo $return; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon; the kind and name are escaped, and the attributes come from the post_kinds_icon_attributes filter.
+                }
                 return $return;

indieweb-post-kinds/tags/4.0.0/includes/class-kind-view.php

-              r3001401
+              r3738687
 <?php
 /**
  * Post Kind View Class
+ * Kind_View class.
+ *
+ * Includes Helper Functions to Set Up Display Behavior and Allows Calling of View Templates
+ * @package Post_Kinds
+ * @since   2.0.2
  */
+// The Kind_View class sets up the kind display behavior for kinds
+defined( 'ABSPATH' ) || exit;
+/**
+ * Sets up how kinds are displayed, and locates and renders the view templates.
+ *
+ * @since 2.0.2
+ */
 class Kind_View {
+        /**
+         * Adds the hooks that display kind markup.
+         *
+         * @since 2.0.2
+         */
         public static function init() {
+                /**
+                 * Filters whether to add response markup to post content, excerpts and feeds automatically.
+                 *
+                 * Return false to place it in the theme instead, for example with
+                 * Kind_View::get_display().
+                 *
+                 * @since 3.6.0
+                 *
+                 * @param bool $display Whether to add it. Default true.
+                 */
                 if ( apply_filters( 'kind_content_display', true ) ) {
                         add_filter( 'the_content', array( static::class, 'content_response' ), 9 );
 …
         /**
          * Filters the attachment image attributes for image post kinds.
+         *
+         * @since 2.6.1
+         *
          * @access public
 …
+        }
+        /*
+         * Function will locate the correct template and return it.
+         *
+         * @param string $slug Post Kind Slug.
+         * @param string $name Post Kind Term Name.
+         * @return string|null File if located or null if unable to find.
+        /**
+         * Finds the view file for a kind, in the theme or the plugin.
+         *
+         * @since 3.4.0
+         *
+         * @param string $slug View slug, such as 'kind'.
+         * @param string $name Kind slug, such as 'like'.
+         * @return string|null Path of the view file, an empty string if no kind is given,
+         *                     or null if no view file exists.
          */
         public static function locate_view( $slug, $name ) {
 …
                         return '';
+                }
+                $templates[] = "{$slug}-{$name}.php";
+                $templates[] = "{$slug}.php";
+                $templates   = array( "{$slug}-{$name}.php", "{$slug}.php" );
+                /**
+                 * Filters the folders searched for view files before the plugin's own views folder.
+                 *
+                 * @since 3.3.0
+                 *
+                 * @param string[] $paths Folder paths, each with a trailing slash. Default the theme's kind_views folder.
+                 */
                 $look        = apply_filters( 'kind_view_paths', array( get_theme_file_path( 'kind_views/' ) ) );
                 $look[]      = plugin_dir_path( __DIR__ ) . 'views/';
 …
          * Function will return the output.
+         *
+         * @since 2.4.0
+         *
          * @access public
+         *
          * @param string $slug Post kind slug.
          * @param string $name Post kind term name.
          * @param array $args Optional Arguments
+         * @param array  $args Optional. Arguments for the view. 'post_id' is the post's ID.
          * @return string
          */
 …
+                }
+                $author = self::get_hcard( $cite['author'] );
+                // Every author's h-card, as a list such as "Ann, Bob and Cat".
+                $author = array_filter( array_map( array( static::class, 'get_hcard' ), $cite['authors'] ) );
+                $author = empty( $author ) ? false : wp_sprintf( '%l', $author );
                 $url   = $cite['url'];
 …
          * Return the post kind display.
+         *
+         * @since 2.1.1
+         *
          * @access public
+         *
 …
                 if ( 'post' === get_post_type( $post_id ) ) {
                         $kind    = get_post_kind_slug( $post_id );
+                        $content = self::get_view_part( 'kind', $kind );
+                        $content = self::get_view_part( 'kind', $kind, array( 'post_id' => $post_id ) );
+                        /**
+                         * Filters the response markup for a post.
+                         *
+                         * @since 2.0.2
+                         *
+                         * @param string $content Rendered view markup.
+                         * @param int    $post_id Post ID.
+                         */
                         return apply_filters( 'kind_response_display', $content, $post_id );
+                }
 …
          * Echo the output of get_display.
+         *
+         * @since 2.1.1
+         *
          * @access public
          * @param int|null $post_id Post ID.
          */
         public static function display( $post_id = null ) {
                 echo self::get_display( $post_id ); // phpcs:ignore
+                echo self::get_display( $post_id ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The view escapes its output as it is built.
+        }
         /**
          * Output the post kind content to the post content.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
+                }
                 global $wp_current_filter;
                 // Don't allow to be added to the_content more than once (prevent infinite loops)
+                // Don't allow to be added to the_content more than once (prevent infinite loops).
                 $done = false;
                 foreach ( $wp_current_filter as $filter ) {
 …
          * Output the post kind content to the feed item content.
+         *
+         * @since 3.0.5
+         *
          * @access public
+         *
 …
          * Output the post kind content to the content if the `jsonfeed` plugin is active.
+         *
+         * @since 3.0.5
+         *
          * @access public
+         *
 …
                 $kind_post = new Kind_Post( $post );
+                $kind      = $kind_post->get_kind();
+                $type      = Kind_Taxonomy::get_kind_info( $kind, 'property' );
+                $cite      = mf2_to_jf2( $kind_post->get_cite() );
+                $cite      = \ParseThis\mf2_to_jf2( $kind_post->get_cite() );
                 if ( is_string( $cite ) ) {
 …
          * Append the post kind display to excerpts.
+         *
+         * @since 2.3.3
+         *
          * @access public
+         *
 …
          * This function will remove the www.prefix if it is part of the URL.
+         *
+         * @since 2.3.7
+         *
          * @access public
+         *
 …
          * Converts an array of attributes and output them as a string.
+         *
+         * @since 2.1.1
+         *
          * @access public
+         *
 …
         /**
          * Converts a URL into a complete `<a>` link with link text.
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
                                 $atr = self::get_attributes( $atr );
+                }
                 $return = '<a ' . $atr . ' href="' . $url . '">' . $name . '</a>';
+                $return = '<a ' . $atr . ' href="' . esc_url( $url ) . '">' . esc_html( $name ) . '</a>';
                 return $return;
+        }
 …
          * Create formatted HTML output for a field.
+         *
+         * @access public
+         *
+         * @param string $field Content to put in the markup
+         * @since 2.2.0
+         *
+         * @access public
+         *
+         * @param string $field Content to put in the markup.
          * @param string $attr  Attributes to add to the tag markup.
          * @param string $type  HTML tag type to create. Default span.
 …
         public static function get_formatted( $field, $attr, $type = 'span' ) {
                 if ( ! isset( $field ) ) {
+                        return $string;
+                }
+                        return '';
+                }
+                $type   = tag_escape( $type );
                 $string = '<' . $type . $attr . '>' . $field . '</' . $type . '>';
                 return $string;
 …
         /**
          * Return post kind-wrapped oEmbed content for a provided URL.
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
                         'dailymotion.com',
                         'flickr.com',
                         'imgur.com',
+                        'imgur.com', // phpcs:ignore PluginCheck.CodeAnalysis.Offloading.OffloadedContent -- A domain whose links are embedded with oEmbed, not a remote asset.
                         'issuu.com',
                         'kickstarter.com',
 …
                         'youtube.com',
                 );
+                /**
+                 * Filters the domains whose cited URLs are embedded with oEmbed.
+                 *
+                 * @since 3.3.6
+                 *
+                 * @param string[] $approvelist Domain names.
+                 */
                 $approvelist = apply_filters( 'post_kind_embed_approvelist', $approvelist );
                 if ( ! in_array( $host, $approvelist, true ) ) {
                         return '';
+                }
+                if ( isset( $GLOBALS['wp_embed'] ) ) {
+                        $embed = $GLOBALS['wp_embed']->autoembed( $url );
+                }
+                if ( ! isset( $GLOBALS['wp_embed'] ) ) {
+                        return '';
+                }
+                $embed = $GLOBALS['wp_embed']->autoembed( $url );
                 if ( 0 === strcmp( $embed, $url ) ) {
                         $embed = '';
                 } else {
+                        $embed = sprintf( '<div class="kind-embed">%1$s<a class="u-url" href="%2$s"></a></div>', $embed, $url );
+                        // The embed is the oEmbed markup WordPress generated.
+                        $embed = sprintf( '<div class="kind-embed">%1$s<a class="u-url" href="%2$s"></a></div>', $embed, esc_url( $url ) );
+                }
                         return $embed;
 …
         /**
          * Returns an array of domains with the post type terminologies
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
                 $domain  = self::extract_domain_name( $url );
                 if ( array_key_exists( $domain, $strings ) ) {
+                        /**
+                         * Filters the phrase for what a known site's URL points to, such as 'a video' for YouTube.
+                         *
+                         * It runs only for the sites listed above; other URLs get "a post".
+                         *
+                         * @since 2.0.2
+                         *
+                         * @param string $string Translated phrase.
+                         */
                         return apply_filters( 'kind_post_type_string', $strings[ $domain ] );
                 } else {
 …
         /**
          * Retrieve/Generate the h-card.
+         *
+         * @since 2.1.1
+         *
          * @param mixed $author The author to generate Accepts an array or optionally other info.
 …
                 /**
+                 * Filter for alternate retrieval types
+                 *
+                 * This could be using WordPress's gravatar system, retrieval by pure URL, etc.
+                 *
+                 * @param string|boolean $author Defaults to false, but may return string.
+                 * @param mixed  $author Data on the author, type optional. Defaults to array.
+                 * @param array  $args        Arguments passed to get_hcard.
+                 * Filters the author data before it is turned into an h-card.
+                 *
+                 * Use it to look up author details another way, for example from a URL
+                 * or Gravatar.
+                 *
+                 * @since 2.3.0
+                 *
+                 * @param mixed $author Author data, usually an array with name, url and photo.
+                 * @param array $args   Arguments passed to Kind_View::get_hcard().
                  */
                 $author = apply_filters( 'get_hcard_data', $author, $args );
 …
                 /**
+                 * Filter for alternate presentation
+                 *
+                 * @param string|boolean $card Defaults to false, but may return string.
+                 * @param mixed  $author Data on the author, type optional. Defaults to array.
+                 * @param array  $args        Arguments passed to get_hcard.
+                 * Filters the h-card markup for an author.
+                 *
+                 * Return non-empty markup to replace the plugin's own h-card. The markup is
+                 * output as-is, so it must be escaped.
+                 *
+                 * @since 2.3.0
+                 *
+                 * @param string $card   H-card markup. Default empty, which uses the plugin's markup.
+                 * @param array  $author Author data, with name, url and photo.
+                 * @param array  $args   Arguments passed to Kind_View::get_hcard().
                  */
                 $card = apply_filters( 'get_hcard', '', $author, $args );
 …
                         return $card;
+                }
                 // Temporarily drop multi-data on display
                 if ( ! empty( $author['url'] ) && is_array( $author['url'] ) ) {
                         $author['url'] = $author['url'][0];
+                }
+                if ( is_array( $author['name'] ) ) {
                                 $author['name'] = $author['name'][0];
+                }
                 if ( empty( $author['name'] ) && ! empty( $author['url'] ) ) {
+                // One card is one author: use the first of any list. Kind_Post::normalize_authors() splits lists into cards.
+                foreach ( array( 'name', 'url', 'photo' ) as $key ) {
+                        $value          = isset( $author[ $key ] ) ? $author[ $key ] : '';
+                        $author[ $key ] = is_array( $value ) ? (string) reset( $value ) : (string) $value;
+                }
+                // Escape everything here: author data often comes from other sites.
+                $author['url']   = esc_url( $author['url'] );
+                $author['photo'] = esc_url( $author['photo'] );
+                if ( '' === trim( wp_strip_all_tags( $author['name'] ) ) && ! empty( $author['url'] ) ) {
                         $author['name'] = __( 'an author', 'indieweb-post-kinds' );
+                }
+                $author['name']  = esc_html( wp_strip_all_tags( $author['name'] ) );
+                $args['width']   = absint( $args['width'] );
+                $args['height']  = absint( $args['height'] );
                 // If no filter generated the card, generate the card.
 …
+                                }
                                 if ( empty( $author['url'] ) ) {
                                         return sprintf( '<img src="%1s" class="h-card u-photo p-author" alt="%2s" width=%3s height=%4s />', $author['photo'], $author['name'], $args['width'], $args['height'] );
+                                        return sprintf( '<img src="%1$s" class="h-card u-photo p-author" alt="%2$s" width="%3$d" height="%4$d" />', $author['photo'], $author['name'], $args['width'], $args['height'] );
                                 } else {
                                         return sprintf( '<a class="h-card p-author" href="%1s"><img class="u-photo" src="%2s" alt="%3s" width=%4s height=%5s /></a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'] );
+                                        return sprintf( '<a class="h-card p-author" href="%1$s"><img class="u-photo" src="%2$s" alt="%3$s" width="%4$d" height="%5$d" /></a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'] );
+                                }
                                 break;
                         case 'name':
                                 return sprintf( '<span class="h-card p-author">%1s</span>', $author['name'] );
+                                return sprintf( '<span class="h-card p-author">%1$s</span>', $author['name'] );
                         case 'both':
                                 if ( ! empty( $author['photo'] ) ) {
                                         if ( empty( $author['url'] ) ) {
                                                 return sprintf( '<span class="h-card p-author"><img src="%1s" class="u-photo" alt="%2s" width=%3s height=%4s />%5s</span>', $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
+                                                return sprintf( '<span class="h-card p-author"><img src="%1$s" class="u-photo" alt="%2$s" width="%3$d" height="%4$d" />%5$s</span>', $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
                                         } else {
                                                 return sprintf( '<a href="%1s" class="h-card p-author"><img class="u-photo" src="%2s" alt="%3s" width=%4s height=%5s />%6s</a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
+                                                return sprintf( '<a href="%1$s" class="h-card p-author"><img class="u-photo" src="%2$s" alt="%3$s" width="%4$d" height="%5$d" />%6$s</a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
+                                        }
+                                } elseif ( ! empty( $author['url'] ) ) {
+                                        return sprintf( '<a href="%1$s" class="h-card p-author">%2$s</a>', $author['url'], $author['name'] );
                                 } else {
                                         return sprintf( '<span class="h-card p-author">%1s</span>', $author['name'] );
+                                        return sprintf( '<span class="h-card p-author">%1$s</span>', $author['name'] );
+                                }
                                 break;
 …
          * Retrieve a title for a given citation.
+         *
+         * @since 2.3.0
+         *
          * @access public
+         *
 …
                         return false;
+                }
+                if ( empty( $cite['url'] ) ) {
+                        if ( ! isset( $cite['name'] ) ) {
+                // FIXME: Temporary Fix for array functionality.
+                $url  = isset( $cite['url'] ) ? $cite['url'] : '';
+                $url  = esc_url( is_array( $url ) ? (string) reset( $url ) : (string) $url );
+                $name = isset( $cite['name'] ) ? $cite['name'] : null;
+                $name = is_array( $name ) ? (string) reset( $name ) : $name;
+                if ( empty( $url ) ) {
+                        if ( null === $name ) {
                                 return '';
+                        }
+                        return sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+                }
+                // FIXME: Temporary Fix for array functionality
+                if ( is_array( $cite['url'] ) ) {
+                        $cite['url'] = $cite['url'][0];
+                }
+                if ( ! array_key_exists( 'name', $cite ) ) {
+                        // $cite['name'] = self::get_post_type_string( $cite['url'] );
+                        $cite['name'] = $cite['url'];
+                }
+                return sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $cite['url'], $cite['name'] );
+                        return sprintf( '<span class="p-name">%1$s</span>', esc_html( wp_strip_all_tags( (string) $name ) ) );
+                }
+                if ( null === $name || '' === $name ) {
+                        $name = $url;
+                }
+                return sprintf( '<a href="%1$s" class="p-name u-url">%2$s</a>', $url, esc_html( wp_strip_all_tags( (string) $name ) ) );
+        }
         /**
          * Retrieve site name for given citation.
+         *
+         * @since 2.3.0
+         *
          * @access public
 …
                         return false;
+                }
+                return sprintf( '<span class="p-publication">%1s</span>', $cite['publication'] );
+        }
+        /**
+         * Returns a requested Rating item.
+         *
+         * The returned value will be a printf-ready translated string.
+         *
+         * @access
+         *
+         * @param int $rating Rating Value.
+         * @return mixed|string
+                $publication = is_array( $cite['publication'] ) ? (string) reset( $cite['publication'] ) : (string) $cite['publication'];
+                return sprintf( '<span class="p-publication">%1$s</span>', esc_html( wp_strip_all_tags( $publication ) ) );
+        }
+        /**
+         * Returns the citation's summary as escaped plain text.
+         *
+         * Summaries are plain text: tags are stripped, and the text is marked up as
+         * p-summary. Line breaks are kept.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param array $cite Normalized citation (see Kind_Post::normalize_cite()).
+         * @return string The summary markup, or an empty string if there is none.
+         */
+        public static function get_summary( $cite ) {
+                if ( ! is_array( $cite ) || empty( $cite['summary'] ) ) {
+                        return '';
+                }
+                $summary = $cite['summary'];
+                if ( is_array( $summary ) ) {
+                        foreach ( array( 'value', 'text', 'html' ) as $key ) {
+                                if ( isset( $summary[ $key ] ) ) {
+                                        $summary = $summary[ $key ];
+                                        break;
+                                }
+                        }
+                        $summary = is_array( $summary ) ? (string) reset( $summary ) : $summary;
+                }
+                $summary = trim( wp_strip_all_tags( (string) $summary ) );
+                if ( '' === $summary ) {
+                        return '';
+                }
+                return sprintf( '<blockquote class="p-summary">%1$s</blockquote>', nl2br( esc_html( $summary ) ) );
+        }
+        /**
+         * Returns a rating as a row of stars.
+         *
+         * @since 3.7.0
+         *
+         * @access public
+         *
+         * @param int|string $rating Rating value. Values above 10 show 10 stars.
+         * @return string Plain text: one star per point, or an empty string.
          */
         public static function rating_text( $rating ) {
+                if ( ! $rating || 0 === $rating ) {
+                        return '';
+                }
+                $ret = '';
+                for ( $i = $rating; $i > 0; $i-- ) {
+                        $ret .= '⭐';
+                }
+                return $ret;
+        }
+        /**
+         * Returns a requested RSVP option item.
+         *
+         * The returned value will be a printf-ready translated string.
+         *
+         * @access
+         *
+         * @param string $type RSVP type to return.
+         * @return mixed|string
+         */
+        public static function rsvp_text( $type ) {
+                if ( ! $type ) {
+                        return '';
+                }
+                $rating = is_numeric( $rating ) ? (int) $rating : 0;
+                if ( $rating <= 0 ) {
+                        return '';
+                }
+                return str_repeat( '⭐', min( $rating, 10 ) );
+        }
+        /**
+         * Returns the text for an RSVP.
+         *
+         * Called with only a type, it returns a printf-ready string whose
+         * %1$s and %2$s are the event URL and name, as before 4.0.0; the caller
+         * must escape both. With a URL or name, it returns the escaped sentence
+         * with the event linked.
+         *
+         * @since 2.6.1
+         *
+         * @access public
+         *
+         * @param string      $type RSVP value: yes, no, maybe, interested or remote.
+         * @param string|null $url  Optional. Event URL.
+         * @param string|null $name Optional. Event name. Defaults to the URL.
+         * @return string The RSVP text, or an empty string for an unknown type.
+         */
+        public static function rsvp_text( $type, $url = null, $name = null ) {
                 $rsvp = array(
                         /* translators: URL for link to event and name of event */
                         'yes'        => __( 'Attending <a href="%1$s" class="u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'maybe'      => __( 'Might be attending <a href="%1$s" class="u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'no'         => __( 'Unable to Attend <a href="%1$s" class="u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'interested' => __( 'Interested in Attending <a href="%1$s" class=u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'remote'     => __( 'Attending <a href="%1$s" class="u-in-reply-to">%2$s</a> remotely', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'yes'        => __( 'Attending %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'maybe'      => __( 'Might be attending %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'no'         => __( 'Unable to Attend %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'interested' => __( 'Interested in Attending %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'remote'     => __( 'Attending %s remotely', 'indieweb-post-kinds' ),
                 );
+                return $rsvp[ $type ];
+                if ( ! is_string( $type ) || ! array_key_exists( $type, $rsvp ) ) {
+                        return '';
+                }
+                if ( null === $url && null === $name ) {
+                        return sprintf( esc_html( $rsvp[ $type ] ), '<a href="%1$s" class="u-in-reply-to">%2$s</a>' );
+                }
+                $url  = esc_url( (string) $url );
+                $name = ( null === $name || '' === $name ) ? $url : $name;
+                $name = esc_html( wp_strip_all_tags( (string) $name ) );
+                if ( '' === $url ) {
+                        $link = sprintf( '<span class="p-in-reply-to">%1$s</span>', $name );
+                } else {
+                        $link = sprintf( '<a href="%1$s" class="u-in-reply-to">%2$s</a>', $url, $name );
+                }
+                return sprintf( esc_html( $rsvp[ $type ] ), $link );
+        }
         /**
          * Returns a requested read status option item.
+         *
+         * @since 3.0.7
+         *
          * @access public
 …
                         'finished' => __( 'Finished Reading: ', 'indieweb-post-kinds' ),
                 );
                 return $read[ $type ];
+                return ( is_string( $type ) && isset( $read[ $type ] ) ) ? $read[ $type ] : '';
+        }
 …
          * Return a string for a requested duration.
+         *
+         * @access public
+         *
+         * @param string|Dateinterval $interval Duration to display.
+         * @return string
+         * @throws Exception
+         * @since 2.6.1
+         * @since 4.0.0 Returns escaped markup.
+         *
+         * @access public
+         *
+         * @param string|DateInterval $interval Duration to display.
+         * @return string The duration as an escaped dt-duration time element, or an empty string if it is not a valid duration.
          */
         public static function display_duration( $interval ) {
+                if ( ! $interval instanceof DateInterval ) {
+                        $interval = new DateInterval( $interval );
+                }
+                $interval = kind_safe_interval( $interval );
                 if ( ! $interval ) {
                         return '';
 …
+                }
                 return sprintf( '<time class="dt-duration" datetime="%1$s">%2$s</time>', date_interval_to_iso8601( $interval ), implode( ' ', $duration ) );
+                return sprintf( '<time class="dt-duration" datetime="%1$s">%2$s</time>', esc_attr( date_interval_to_iso8601( $interval ) ), esc_html( implode( ' ', $duration ) ) );
+        }
 }  // End Class

indieweb-post-kinds/tags/4.0.0/includes/class-mf2-post.php

-              r2973430
+              r3738687
 <?php
+/**
+ * MF2_Post class.
+ *
+ * @package Post_Kinds
+ * @since   3.1.0
+ */
+defined( 'ABSPATH' ) || exit;
 /**
  * MF2 Post Class
+ *
+ * @package Post Kinds
+ * Assists in retrieving/saving microformats 2 properties from a post
+ * Assists in retrieving/saving microformats 2 properties from a post.
+ *
+ * @since 3.1.0
+ * @deprecated 4.0.0 Use Kind_Post. MF2_Post will be removed in a future major version.
  */
 class MF2_Post implements ArrayAccess {
+        /**
+         * Post ID.
+         *
+         * @since 3.1.0
+         * @var int
+         */
         public $uid;
+        /**
+         * ID of the post author.
+         *
+         * @since 3.1.0
+         * @var int|string
+         */
         public $post_author;
+        /**
+         * Post type.
+         *
+         * @since 3.3.0
+         * @var string
+         */
         public $post_type;
+        /**
+         * Author, as an h-card.
+         *
+         * @since 3.1.0
+         * @var array|string|false
+         */
         public $author;
+        /**
+         * Publication the post appeared in.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $publication;
+        /**
+         * Published date, in DATE_W3C format.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $published;
+        /**
+         * Updated date, in DATE_W3C format.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $updated;
+        /**
+         * Content, with 'html' and 'value' versions.
+         *
+         * @since 3.1.0
+         * @var array
+         */
         public $content;
+        /**
+         * Summary (excerpt).
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $summary;
+        /**
+         * ID of the parent post.
+         *
+         * @since 3.1.0
+         * @var int
+         */
         public $post_parent;
+        /**
+         * Post kind slug, or media type for an attachment.
+         *
+         * @since 3.1.0
+         * @var string|false|null
+         */
         public $kind;
+        /**
+         * Permalink, or file URL for an attachment.
+         *
+         * @since 3.1.0
+         * @var string|false
+         */
         public $url;
+        /**
+         * Post title.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $name;
+        /**
+         * Category and tag names.
+         *
+         * @since 3.1.0
+         * @var string[]
+         */
         public $category = array();
+        /**
+         * URL of the featured image.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $featured;
+        /**
+         * Properties stored in mf2_ prefixed post meta, without the prefix.
+         *
+         * @since 3.1.0
+         * @var array
+         */
         private $mf2 = array();
+        /**
+         * Reads a post's properties.
+         *
+         * @since 3.1.0
+         * @deprecated 4.0.0 Use Kind_Post.
+         *
+         * @param int|WP_Post|string $post Post ID, post object, or the URL of a post or attachment.
+         */
         public function __construct( $post ) {
+                _deprecated_function( __METHOD__, '4.0.0', 'Kind_Post' );
                 if ( is_numeric( $post ) ) {
                         $this->uid = (int) $post;
 …
+        }
+        /**
+         * Returns the published date.
+         *
+         * For an attachment, this is the date stored in post meta.
+         *
+         * @since 3.3.0
+         *
+         * @return string|false The date, or false if there is none.
+         */
         public function get_published() {
                 if ( 'attachment' === $this->post_type ) {
                         return $this->meta['published'] ?? '';
+                        return $this->get_single( $this->mf2['published'] ?? '' );
+                }
                 return get_the_date( DATE_W3C, $this->uid );
+        }
+        /**
+         * Returns the updated date.
+         *
+         * For an attachment, this is the date stored in post meta.
+         *
+         * @since 3.3.0
+         *
+         * @return string|false The date, or false if there is none.
+         */
         public function get_updated() {
                 if ( 'attachment' === $this->post_type ) {
                         return $this->meta['updated'] ?? '';
+                        return $this->get_single( $this->mf2['updated'] ?? '' );
+                }
                 return get_the_modified_date( DATE_W3C, $this->uid );
+        }
+        /**
+         * Returns the publication the post appeared in.
+         *
+         * For posts other than attachments, this is the site title.
+         *
+         * @since 3.3.0
+         *
+         * @return string The publication, or an empty string if an attachment has none.
+         */
         public function get_publication() {
                 if ( 'attachment' !== $this->post_type ) {
                         return get_bloginfo( 'title' );
+                }
+                return $this->meta['publication'] ?? '';
+        }
+                return $this->get_single( $this->mf2['publication'] ?? '' );
+        }
+        /**
+         * Whether a property exists, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         * @return bool
+         */
+        #[\ReturnTypeWillChange]
         public function offsetExists( $offset ) {
                 $vars = get_object_vars( $this );
 …
+        }
+        /**
+         * Returns a property, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         * @return mixed The value, or null if it does not exist.
+         */
+        #[\ReturnTypeWillChange]
         public function offsetGet( $offset ) {
                 $vars = get_object_vars( $this );
 …
+        }
+        /**
+         * Sets a property, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         * @param mixed  $value  The value.
+         */
+        #[\ReturnTypeWillChange]
         public function offsetSet( $offset, $value ) {
                 $this->set( $offset, $value );
+        }
+        /**
+         * Deletes a property stored in post meta, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         */
+        #[\ReturnTypeWillChange]
         public function offsetUnset( $offset ) {
                 $this->delete( $offset );
+        }
+        /**
+         * Returns the names of a post's categories and tags.
+         *
+         * 'Uncategorized' is left out.
+         *
+         * @since 3.2.0
+         *
+         * @param int $post_id Post ID.
+         * @return string[] Category and tag names.
+         */
         public function get_categories( $post_id ) {
                 $category = array();
                 // Get a list of categories and extract their names
+                // Get a list of categories and extract their names.
                 $post_categories = get_the_terms( $post_id, 'category' );
                 if ( ! empty( $post_categories ) && ! is_wp_error( $post_categories ) ) {
 …
+                }
                 // Get a list of tags and extract their names
+                // Get a list of tags and extract their names.
                 $post_tags = get_the_terms( $post_id, 'post_tag' );
                 if ( ! empty( $post_tags ) && ! is_wp_error( $post_tags ) ) {
 …
+        }
+        /**
+         * Returns the post kind, or the media type of an attachment.
+         *
+         * @since 3.1.0
+         *
+         * @return string|false|null The kind slug, or null for an attachment that is not image, video or audio.
+         */
         private function get_post_kind() {
                 if ( is_attachment( $this->uid ) ) {
 …
+        }
+        /**
+         * Returns the post object.
+         *
+         * @since 3.1.0
+         *
+         * @return WP_Post|null The post, or null if it does not exist.
+         */
         public function get_post() {
                 return get_post( $this->uid );
 …
         /**
          * Is prefix in string.
+         *
+         * @since 3.1.0
+         *
          * @param  string $source The source string.
 …
         /**
          * Returns True if Array is Multidimensional.
+         *
+         * @since 3.1.0
+         *
          * @param array $arr array.
 …
+        }
+        /**
+         * Sanitizes HTML with the allowed tags from the plugin settings.
+         *
+         * @since 3.1.0
+         *
+         * @param mixed $value The value. Anything but a string is returned unchanged.
+         * @return mixed The sanitized value.
+         */
         public static function sanitize_content( $value ) {
                 if ( ! is_string( $value ) ) {
 …
+        }
+        /**
+         * Sanitizes a URL or text, recursively.
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $value The value.
+         * @return string|array The sanitized value.
+         */
         public function sanitize_text( $value ) {
                 if ( is_array( $value ) ) {
 …
          * Retrieve author
+         *
+         * @since 3.1.0
+         *
          * @return boolean|array The result or false if does not exist.
          */
         public function get_author() {
                 if ( ! $this->post_author ) {
                         return $this->meta['author'] ?? false;
+                }
                 // Attachments may have been uploaded by a user but may have metadata for original author
+                        return $this->get_single( $this->mf2['author'] ?? false );
+                }
+                // Attachments may have been uploaded by a user but may have metadata for original author.
                 if ( 'attachment' === $this->post_type ) {
                         return $this->meta['author'] ?? '';
+                        return $this->get_single( $this->mf2['author'] ?? '' );
+                }
                 return array(
 …
         /**
+         * Sets an array with only the mf2 prefixed meta.
+         *
+         * Returns the properties stored in mf2_ prefixed post meta, without the prefix.
+         *
+         * @since 3.1.0
          */
         private function get_mf2meta() {
 …
                         return array();
+                }
+                if ( isset( $meta['response'] ) ) {
+                        $response = maybe_unserialize( $meta['response'] );
+                        // Retrieve from the old response array and store in new location.
+                        if ( ! empty( $response ) ) {
+                // Very old versions stored the citation in the response meta. Read it as
+                // mf2_cite when there is no newer citation; the upgrade routine moves it.
+                if ( isset( $meta['response'] ) && ! isset( $meta['mf2_cite'] ) ) {
+                        $response = maybe_unserialize( $meta['response'][0] );
+                        if ( is_array( $response ) ) {
                                 $new = array();
-                                // Convert to new format and update.
                                 if ( ! empty( $response['title'] ) ) {
                                         $new['name'] = $response['title'];
 …
+                                }
                                 if ( ! empty( $response['author'] ) ) {
+                                        $new['card']         = array();
+                                        $new['card']['name'] = $response['author'];
+                                        $new['card'] = array( 'name' => $response['author'] );
                                         if ( ! empty( $response['icon'] ) ) {
                                                 $new['card']['photo'] = $response['icon'];
+                                        }
+                                }
+                                $new         = array_unique( $new );
+                                $new['card'] = array_unique( $new['card'] );
+                                if ( isset( $new ) ) {
+                                        update_post_meta( $this->uid, 'mf2_cite', $new );
+                                        delete_post_meta( $this->uid, 'response' );
+                                        $meta['cite'] = $new;
+                                if ( $new ) {
+                                        $meta['mf2_cite'] = array( $new );
+                                }
+                        }
 …
                                 unset( $meta[ $key ] );
                                 $key = str_replace( 'mf2_', '', $key );
                                 // Do not save microput prefixed instructions
+                                // Do not save microput prefixed instructions.
                                 if ( self::str_prefix( $key, 'mp-' ) ) {
                                         continue;
 …
          * Map Properties Based on Post Type
+         *
+         * @since 3.3.0
          */
         private function get_post_type_properties() {
 …
          * Retrieve value
+         *
+         * @param  string $key The key to retrieve.
+         * @param  boolean $single Whether to return a a single value or array if there is only one value.
+         * @since 3.1.0
+         *
+         * @param string|null $key    Optional. The key to retrieve. Default null, for every property.
+         * @param bool        $single Optional. Whether to unwrap a single value from its array. Default true.
          * @return boolean|string|array The result or false if does not exist.
          */
 …
+        }
+        /**
+         * Whether the post has a property.
+         *
+         * @since 3.1.0
+         *
+         * @param string $key Property name.
+         * @return bool
+         */
         public function has_key( $key ) {
                 $keys = array_merge( get_object_vars( $this ), $this->mf2 );
 …
+        }
+        /**
+         * Unwraps single-item arrays, recursively.
+         *
+         * @since 3.1.0
+         *
+         * @param mixed $value   The value to unwrap.
+         * @param bool  $discard Optional. Whether to keep only the first item of a list
+         *                       with more than one item. Default false.
+         * @return mixed The value, with single-item arrays replaced by their item.
+         */
         private function single_array( $value, $discard = false ) {
                 if ( ! is_array( $value ) ) {
 …
+        }
+        /**
+         * Stores a property, or several.
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $key   Property name, an array of property => value pairs, or an mf2 item.
+         * @param mixed        $value Optional. The value. Default null.
+         * @return mixed The result of storing the value, or false or null if nothing was stored.
+         */
         public function set( $key, $value = null ) {
                 if ( ! $key ) {
 …
+        }
+        /**
+         * Deletes a property stored in post meta.
+         *
+         * @since 3.1.0
+         *
+         * @param string $key Property name.
+         * @return bool True on success, false on failure.
+         */
         public function delete( $key ) {
                 return delete_post_meta( $this->uid, 'mf2_' . $key );
+        }
+        /**
+         * Converts mf2 to jf2.
+         *
+         * @since 3.1.0
+         *
+         * @param array $cite The mf2 item.
+         * @return array The jf2 item.
+         */
         public function mf2_to_jf2( $cite ) {
                 return mf2_to_jf2( $cite );
+        }
+        /**
+         * Returns the first item of an array.
+         *
+         * @since 3.1.0
+         *
+         * @param mixed $value The value.
+         * @return mixed The first item, or the value if it is not an array.
+         */
         public function get_single( $value ) {
                 if ( is_array( $value ) ) {
 …
+        }
+        /**
+         * Converts jf2 to mf2.
+         *
+         * @since 3.1.0
+         *
+         * @param array  $item The jf2 item.
+         * @param string $type Optional. jf2 type to use if the item has none. Default 'cite'.
+         * @return array The mf2 item.
+         */
         public function jf2_to_mf2( $item, $type = 'cite' ) {
                 if ( is_array( $item ) && isset( $item['type'] ) && ! isset( $item['properties'] ) ) {
 …
+        }
+        // Retrieve the right property to use for the link preview based on the kind.
+        // It will return an array of properties or false if it cannot find what it needs.
+        // Also will update old posts with new settings
+        /**
+         * Returns a property for the link preview, as jf2.
+         *
+         * Updates a property stored in the format used before 2.7.0.
+         *
+         * @since 3.1.0
+         *
+         * @param string $property Property name.
+         * @return array|false The property, or false if there is none.
+         */
         public function fetch( $property ) {
                 // If the property is not set then exit
+                // If the property is not set then exit.
                 if ( ! $property || ! $this->has_key( $property ) ) {
                         return false;
 …
                         $return = array_shift( $return );
+                }
                 // If it is in fact a string it is the pre 2.7.0 format and should be updated
+                // If it is in fact a string it is the pre 2.7.0 format and should be updated.
                 if ( is_string( $return ) ) {
                         if ( $this->has_key( 'cite' ) ) {
 …
+        }
+        /**
+         * Returns the IDs of media attached to a post.
+         *
+         * @since 3.1.0
+         *
+         * @param string      $type MIME type, such as 'image'.
+         * @param int|WP_Post $post Post ID or post object.
+         * @return int[] Attachment IDs.
+         */
         public function get_attached_media( $type, $post ) {
                 $posts = get_attached_media( $type, $post );
 …
+        }
+        /**
+         * Returns the post's audio.
+         *
+         * @since 3.1.0
+         *
+         * @return int[]|false Attachment IDs, or false if there are none.
+         */
         public function get_audios() {
                 // Check if the post itself if an audio attachment.
 …
+        }
+        /**
+         * Returns the post's videos.
+         *
+         * @since 3.1.0
+         *
+         * @return int[]|false Attachment IDs, or false if there are none.
+         */
         public function get_videos() {
                 // Check if the post itself if an audio attachment.
 …
+        }
+        /**
+         * Returns the post's images.
+         *
+         * @since 3.1.0
+         *
+         * @param bool $content_allow Optional. Whether to return images in the content. Default false.
+         * @return int[]|false Attachment IDs, or false if there are none.
+         */
         public function get_images( $content_allow = false ) {
                 // Check if the post itself is an image attachment.
 …
                 $post_content = $this->content['html'] ?? '';
                 if ( $post_content ) {
+                        // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                         $att_ids = get_post_meta( $this->uid, '_content_img_ids', true );
-                        if ( false === $att_ids ) {
-                                $att_ids = Kind_Media_Metadata::get_img_from_content( $post->post_content );
-                                update_post_meta( $this->uid, '_content_img_ids', $att_ids );
+                        }
                         if ( $att_ids ) {
                                 return $content_allow ? $att_ids : array();
 …
+                        }
+                }
                 // If there is a featured image return only that. Otherwise return all images
+                // If there is a featured image return only that. Otherwise return all images.
                 $featured = get_post_thumbnail_id( $this->uid );
                 if ( $featured ) {
 …
                 $att_ids = $this->get_attached_media( 'image', $this->uid );
                 $photos  = $this->get( 'photo', false );
+                if ( is_array( $photos ) ) {
+                        if ( ! wp_is_numeric_array( $photos ) ) {
+                                $photos = array( $photos );
+                        }
+                        $photos = $this->sideload_images( $photos );
+                        $this->set( 'photo', $photos );
+                if ( is_array( $photos ) && ! wp_is_numeric_array( $photos ) ) {
+                        $photos = array( $photos );
+                }
                 $att_ids = array_merge( $att_ids, $this->get_attachments_from_urls( $photos ) );
 …
+        }
+        private function media_sideload_image( $url, $post_id, $description = null ) {
+                // To prevent sideloading the same image multiple times check for the original URL which will now be stored
+                $ids = get_posts(
+                        array(
+                                'post_type'        => 'attachment',
+                                'suppress_filters' => false,
+                                'nopaging'         => true,
+                                'meta_key'         => 'mf2_url',
+                                'meta_value'       => $url,
+                                'fields'           => 'ids',
+                        )
+                );
+                if ( ! empty( $ids ) ) {
+                        return $ids[0];
+                }
+                $id = media_sideload_image( $url, $post_id, $description, 'id' );
+                if ( $id ) {
+                        update_post_meta( $id, 'mf2_url', $url );
+                }
+                return $id;
+        }
+        private function sideload_images( $photos ) {
+                require_once ABSPATH . 'wp-admin/includes/media.php';
+                require_once ABSPATH . 'wp-admin/includes/file.php';
+                require_once ABSPATH . 'wp-admin/includes/image.php';
+                foreach ( $photos as $key => $value ) {
+                        if ( is_string( $value ) ) {
+                                if ( ! wp_http_validate_url( $value ) ) {
+                                        continue;
+                                } elseif ( ! attachment_url_to_postid( $value ) ) {
+                                        $id = self::media_sideload_image( $value, $this->uid );
+                                        if ( $id ) {
+                                                $photos[ $key ] = wp_get_attachment_url( $id );
+                                        }
+                                }
+                        }
+                        // Attempt to normalize old data
+                        if ( is_array( $value ) ) {
+                                $value = mf2_to_jf2( $value );
+                                $id    = attachment_url_to_postid( $value['url'] );
+                                if ( ! $id ) {
+                                        $id = self::media_sideload_image( $value['url'], $this->uid );
+                                        if ( $id ) {
+                                                $value['url'] = wp_get_attachment_url( $id );
+                                        }
+                                }
+                                $args = array(
+                                        'ID'           => $id,
+                                        'post_title'   => $value['name'] ?? '',
+                                        'post_excerpt' => $value['summary'] ?? '',
+                                );
+                                $args = array_filter( $args );
+                                wp_update_post( $args );
+                                unset( $value['name'] );
+                                unset( $value['summary'] );
+                                foreach ( $value as $k => $v ) {
+                                        update_post_meta( $id, 'mf2_' . $k, $v );
+                                }
+                                $photos[ $key ] = $value['url'];
+                        }
+                }
+                return $photos;
+        }
+        /**
+         * Looks up the attachment IDs for media URLs.
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $urls A URL, or a list of URLs or arrays with a 'url' key.
+         * @return int[] Attachment IDs found.
+         */
         public function get_attachments_from_urls( $urls ) {
                 if ( is_string( $urls ) ) {

indieweb-post-kinds/tags/4.0.0/includes/class-post-kind.php

-              r2973430
+              r3738687
 <?php
 /**
  * Post Kind Class
+ * Post_Kind class.
+ *
  * @package Post Kind
  * Used to define a Post Kind object
+ * @package Post_Kinds
+ * @since   3.1.0
  */
+final class Post_Kind {
+        public $id; // Term ID
+        public $slug; // Kind Slug
+        public $name; // Name of Kind - Plural
+        public $singular_name; // Name of Kind - Singular
+        public $verb; // The string for the verb or action (liked this)
+        public $format; // Post Format that Maps to This
+        public $icon; // Icon
+defined( 'ABSPATH' ) || exit;
+/**
+ * Defines a single post kind, as registered with register_post_kind().
+ *
+ * @since 3.1.0
+ */
+final class Post_Kind implements JsonSerializable {
+        /**
+         * Term ID.
+         *
+         * @since 3.1.0
+         * @var int
+         */
+        public $id;
+        /**
+         * Kind slug.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $slug;
+        /**
+         * General name for the kind, plural.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $name;
+        /**
+         * Name for one instance of the kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $singular_name;
+        /**
+         * The verb or action, such as 'Liked'.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $verb;
+        /**
+         * Post format that maps to this kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $format;
+        /**
+         * Icon name.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $icon;
+        /**
+         * Description of the kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $description;
+        /**
+         * Link to more information about the kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $description_url;
+        public $title; // Should this Kind Have an Explicit Title
+        public $show; // Show in Settings
+        public $property; // Primary Property
+        public $properties; // Array of Properties
+        public $shortlink; // Shortlink Coding per http://tantek.pbworks.com/w/page/21743973/Whistle#design
+        /**
+         * Whether the kind should have an explicit title.
+         *
+         * @since 3.1.0
+         * @var bool
+         */
+        public $title;
+        /**
+         * Whether to show the kind in Settings.
+         *
+         * @since 3.1.0
+         * @var bool
+         */
+        public $show;
+        /**
+         * Primary microformats 2 property, such as 'like-of'.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $property;
+        /**
+         * The fields for the kind. See Kind_Fields.
+         *
+         * @since 3.1.0
+         * @var array
+         */
+        public $properties;
+        /**
+         * Shortlink code, per http://tantek.pbworks.com/w/page/21743973/Whistle#design.
+         *
+         * @since 3.4.0
+         * @var string
+         */
+        public $shortlink;
+        /**
+         * Arguments given at registration that are not declared properties, such as
+         * those a custom kind adds. Kept here rather than as dynamic properties,
+         * which are deprecated in PHP 8.2, and still readable as $kind->name.
+         *
+         * @since 4.0.0
+         * @var array
+         */
+        private $extra = array();
+        /**
+         * Defines a kind.
+         *
+         * @since 3.1.0
+         *
+         * @param string $slug Kind slug.
+         * @param array  $args Optional. Kind arguments. See Kind_Taxonomy::register_post_kind().
+         */
         public function __construct( $slug, $args = array() ) {
                 $this->slug = $slug;
 …
+        }
+        /**
+         * Sets the kind's properties from its arguments, filling in defaults.
+         *
+         * Arguments that are not declared properties are kept as extra arguments.
+         *
+         * @since 3.1.0
+         *
+         * @param array $args Kind arguments. See Kind_Taxonomy::register_post_kind().
+         */
         public function set_props( $args ) {
                 $defaults = array(
 …
                         'format'        => 'standard',
                         'icon'          => $this->slug,
                         'show'          => 'false',
+                        'show'          => false,
                         'property'      => '',
                 );
                 $args     = wp_parse_args( $args, $defaults );
                 foreach ( $args as $property_name => $property_value ) {
+                        $this->$property_name = $property_value;
+                        if ( 'extra' !== $property_name && property_exists( $this, $property_name ) ) {
+                                $this->$property_name = $property_value;
+                        } else {
+                                $this->extra[ $property_name ] = $property_value;
+                        }
+                }
+        }
+        /**
+         * Reads an extra argument given at registration.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name Argument name.
+         * @return mixed The value, or null if it was not given.
+         */
+        public function __get( $name ) {
+                return isset( $this->extra[ $name ] ) ? $this->extra[ $name ] : null;
+        }
+        /**
+         * Whether an extra argument was given at registration.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name Argument name.
+         * @return bool
+         */
+        public function __isset( $name ) {
+                return isset( $this->extra[ $name ] );
+        }
+        /**
+         * Sets an extra argument, without creating a dynamic property.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name  Argument name.
+         * @param mixed  $value Value.
+         */
+        public function __set( $name, $value ) {
+                $this->extra[ $name ] = $value;
+        }
+        /**
+         * Whether the kind has a declared property or an extra argument of this name.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name Property or argument name.
+         * @return bool
+         */
+        public function has( $name ) {
+                return ( 'extra' !== $name && property_exists( $this, $name ) ) || array_key_exists( $name, $this->extra );
+        }
+        /**
+         * Returns the kind's declared properties and extra arguments, for JSON.
+         *
+         * @since 4.0.0
+         *
+         * @return array
+         */
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize() {
+                $vars = get_object_vars( $this );
+                unset( $vars['extra'] );
+                return array_merge( $this->extra, $vars );
+        }
+}

indieweb-post-kinds/tags/4.0.0/includes/compat.php

-              r2973430
+              r3738687
 <?php
+// get_feed_build_date introduced in WordPress 5.2
+if ( ! function_exists( 'get_feed_build_date' ) ) {
+        function get_feed_build_date( $format ) {
+                global $wp_query;
+                if ( empty( $wp_query ) || ! $wp_query->have_posts() ) {
+                        // Fallback to last time any post was modified or published.
+                        return get_lastpostmodified( 'GMT' );
+                }
+                        // Extract the post modified times from the posts.
+                        $modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
+                        // If this is a comment feed, check those objects too.
+                if ( $wp_query->is_comment_feed() && $wp_query->comment_count ) {
+                        // Extract the comment modified times from the comments.
+                        $comment_times = wp_list_pluck( $wp_query->comments, 'comment_date_gmt' );
+                                // Add the comment times to the post times for comparison.
+                                $modified_times = array_merge( $modified_times, $comment_times );
+                }
+                        // Determine the maximum modified time.
+                        $max_modified_time = max(
+                                array_map(
+                                        function ( $time ) use ( $format ) {
+                                                                                return mysql2date( $format, $time, false );
+                                        },
+                                        $modified_times
+                                )
+                        );
+                        /**
+                         * Filters the date the last post or comment in the query was modified.
+                         *
+                         * @since 5.2.0
+                         *
+                         * @param string $max_modified_time Date the last post or comment was modified in the query.
+                         * @param string $format            The date format requested in get_feed_build_date.
+                         */
+                        return apply_filters( 'get_feed_build_date', $max_modified_time, $format );
+/**
+ * Polyfills for functions added to WordPress or PHP after the plugin's minimums
+ * (WordPress 6.2, PHP 7.4).
+ *
+ * Each polyfill is a copy of the core function, guarded by function_exists(),
+ * and notes the version that introduced it so it can be removed once the
+ * minimum catches up. ClassicPress may already provide some of them.
+ *
+ * @package Post_Kinds
+ */
+defined( 'ABSPATH' ) || exit;
+// wp_get_admin_notice() was introduced in WordPress 6.4.
+if ( ! function_exists( 'wp_get_admin_notice' ) ) {
+        /**
+         * Creates and returns the markup for an admin notice.
+         *
+         * @since 6.4.0
+         *
+         * @param string $message The message.
+         * @param array  $args {
+         *     Optional. An array of arguments for the admin notice. Default empty array.
+         *
+         *     @type string   $type               Optional. The type of admin notice.
+         *                                        For example, 'error', 'success', 'warning', 'info'.
+         *                                        Default empty string.
+         *     @type bool     $dismissible        Optional. Whether the admin notice is dismissible. Default false.
+         *     @type string   $id                 Optional. The value of the admin notice's ID attribute. Default empty string.
+         *     @type string[] $additional_classes Optional. A string array of class names. Default empty array.
+         *     @type string[] $attributes         Optional. Additional attributes for the notice div. Default empty array.
+         *     @type bool     $paragraph_wrap     Optional. Whether to wrap the message in paragraph tags. Default true.
+         * }
+         * @return string The markup for an admin notice.
+         */
+        function wp_get_admin_notice( $message, $args = array() ) {
+                $defaults = array(
+                        'type'               => '',
+                        'dismissible'        => false,
+                        'id'                 => '',
+                        'additional_classes' => array(),
+                        'attributes'         => array(),
+                        'paragraph_wrap'     => true,
+                );
+                $args = wp_parse_args( $args, $defaults );
+                /**
+                 * Filters the arguments for an admin notice.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param array  $args    The arguments for the admin notice.
+                 * @param string $message The message for the admin notice.
+                 */
+                $args       = apply_filters( 'wp_admin_notice_args', $args, $message );
+                $id         = '';
+                $classes    = 'notice';
+                $attributes = '';
+                if ( is_string( $args['id'] ) ) {
+                        $trimmed_id = trim( $args['id'] );
+                        if ( '' !== $trimmed_id ) {
+                                $id = 'id="' . $trimmed_id . '" ';
+                        }
+                }
+                if ( is_string( $args['type'] ) ) {
+                        $type = trim( $args['type'] );
+                        if ( str_contains( $type, ' ' ) ) {
+                                _doing_it_wrong(
+                                        __FUNCTION__,
+                                        sprintf(
+                                                /* translators: %s: The "type" key. */
+                                                esc_html__( 'The %s key must be a string without spaces.', 'default' ),
+                                                '<code>type</code>'
+                                        ),
+                                        '6.4.0'
+                                );
+                        }
+                        if ( '' !== $type ) {
+                                $classes .= ' notice-' . $type;
+                        }
+                }
+                if ( true === $args['dismissible'] ) {
+                        $classes .= ' is-dismissible';
+                }
+                if ( is_array( $args['additional_classes'] ) && ! empty( $args['additional_classes'] ) ) {
+                        $classes .= ' ' . implode( ' ', $args['additional_classes'] );
+                }
+                if ( is_array( $args['attributes'] ) && ! empty( $args['attributes'] ) ) {
+                        $attributes = '';
+                        foreach ( $args['attributes'] as $attr => $val ) {
+                                if ( is_bool( $val ) ) {
+                                        $attributes .= $val ? ' ' . $attr : '';
+                                } elseif ( is_int( $attr ) ) {
+                                        $attributes .= ' ' . esc_attr( trim( $val ) );
+                                } elseif ( $val ) {
+                                        $attributes .= ' ' . $attr . '="' . esc_attr( trim( $val ) ) . '"';
+                                }
+                        }
+                }
+                if ( false !== $args['paragraph_wrap'] ) {
+                        $message = "<p>$message</p>";
+                }
+                $markup = sprintf( '<div %1$sclass="%2$s"%3$s>%4$s</div>', $id, $classes, $attributes, $message );
+                /**
+                 * Filters the markup for an admin notice.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string $markup  The HTML markup for the admin notice.
+                 * @param string $message The message for the admin notice.
+                 * @param array  $args    The arguments for the admin notice.
+                 */
+                return apply_filters( 'wp_admin_notice_markup', $markup, $message, $args );
+        }
+}
+// Backcompat for wp_filter_content_tags introduced in 5.5.
+if ( ! function_exists( 'wp_filter_content_tags' ) ) {
+        function wp_filter_content_tags( $content ) {
+                return wp_make_content_images_responsive( $content ); // phpcs:ignore
+// wp_admin_notice() was introduced in WordPress 6.4.
+if ( ! function_exists( 'wp_admin_notice' ) ) {
+        /**
+         * Outputs an admin notice.
+         *
+         * @since 6.4.0
+         *
+         * @param string $message The message to output.
+         * @param array  $args {
+         *     Optional. An array of arguments for the admin notice. Default empty array.
+         *
+         *     @type string   $type               Optional. The type of admin notice.
+         *                                        For example, 'error', 'success', 'warning', 'info'.
+         *                                        Default empty string.
+         *     @type bool     $dismissible        Optional. Whether the admin notice is dismissible. Default false.
+         *     @type string   $id                 Optional. The value of the admin notice's ID attribute. Default empty string.
+         *     @type string[] $additional_classes Optional. A string array of class names. Default empty array.
+         *     @type string[] $attributes         Optional. Additional attributes for the notice div. Default empty array.
+         *     @type bool     $paragraph_wrap     Optional. Whether to wrap the message in paragraph tags. Default true.
+         * }
+         */
+        function wp_admin_notice( $message, $args = array() ) {
+                /**
+                 * Fires before an admin notice is output.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string $message The message for the admin notice.
+                 * @param array  $args    The arguments for the admin notice.
+                 */
+                do_action( 'wp_admin_notice', $message, $args );
+                echo wp_kses_post( wp_get_admin_notice( $message, $args ) );
+        }
+}
+// wp_trigger_error() was introduced in WordPress 6.4 (ClassicPress 2.2.0).
+if ( ! function_exists( 'wp_trigger_error' ) ) {
+        /**
+         * Generates a user-level error/warning/notice/deprecation message.
+         *
+         * Generates the message when `WP_DEBUG` is true.
+         *
+         * @since 6.4.0
+         *
+         * @param string $function_name The function that triggered the error.
+         * @param string $message       The message explaining the error.
+         *                              The message can contain allowed HTML 'a' (with href), 'code',
+         *                              'br', 'em', and 'strong' tags and http or https protocols.
+         *                              If it contains other HTML tags or protocols, the message should be escaped
+         *                              before passing to this function to avoid being stripped {@see wp_kses()}.
+         * @param int    $error_level   Optional. The designated error type for this error.
+         *                              Only works with E_USER family of constants. Default E_USER_NOTICE.
+         *
+         * @throws WP_Exception If the error level is E_USER_ERROR. Exception where WP_Exception does not exist.
+         */
+        function wp_trigger_error( $function_name, $message, $error_level = E_USER_NOTICE ) {
+                // Bail out if WP_DEBUG is not turned on.
+                if ( ! WP_DEBUG ) {
+                        return;
+                }
+                /**
+                 * Fires when the given function triggers a user-level error/warning/notice/deprecation message.
+                 *
+                 * Can be used for debug backtracking.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string $function_name The function that was called.
+                 * @param string $message       A message explaining what has been done incorrectly.
+                 * @param int    $error_level   The designated error type for this error.
+                 */
+                do_action( 'wp_trigger_error_run', $function_name, $message, $error_level );
+                if ( ! empty( $function_name ) ) {
+                        $message = sprintf( '%s(): %s', $function_name, $message );
+                }
+                $message = wp_kses(
+                        $message,
+                        array(
+                                'a'      => array( 'href' => true ),
+                                'br'     => array(),
+                                'code'   => array(),
+                                'em'     => array(),
+                                'strong' => array(),
+                        ),
+                        array( 'http', 'https' )
+                );
+                if ( E_USER_ERROR === $error_level ) {
+                        // WP_Exception was also introduced in WordPress 6.4.
+                        $exception = class_exists( 'WP_Exception' ) ? 'WP_Exception' : 'Exception';
+                        throw new $exception( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
+                }
+                trigger_error( $message, $error_level ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error, WordPress.Security.EscapeOutput.OutputNotEscaped
+        }
+}

indieweb-post-kinds/tags/4.0.0/includes/kind-functions.php

-              r3014138
+              r3738687
 <?php
 /**
  * Kind Functions
+ * Global functions for registering, reading and displaying kinds.
+ *
+ * Global Scoped Functions for Handling Kinds.
+ *
+ * @package Post Kinds
+ * @package Post_Kinds
+ * @since   2.0.2
  */
+/**
+ *
+ */
+function register_post_kind( $slug, $args ) {
+        Kind_Taxonomy::register_post_kind( $slug, $args );
+}
+function set_post_kind_visibility( $slug, $show = true ) {
+        Kind_Taxonomy::set_post_kind_visibility( $slug, $show );
+}
+/**
+ * Retrieves an array of post kind slugs.
+ *
+ * @return array The array of post kind slugs.
+ */
+function get_post_kind_slugs() {
+        return Kind_Taxonomy::get_post_kind_slugs();
+}
+/**
+ * Returns a pretty, translated version of a post kind slug
+ *
+ * @param string $slug A post format slug.
+ * @return string The translated post format name.
+ */
+function get_post_kind_string( $slug ) {
+        return Kind_Taxonomy::get_post_kind_string( $slug );
+}
+/**
+ * Returns a link to a post kind index.
+ *
+ * @param string $kind The post kind slug.
+ * @return string The post kind term link.
+ */
+function get_post_kind_link( $kind ) {
+        return Kind_Taxonomy::get_post_kind_link( $kind );
+}
+/**
+ * Returns the post kind slug for the current post.
+ *
+ * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+ * @return string The post kind slug.
+ */
+function get_post_kind_slug( $post = null ) {
+        return Kind_Taxonomy::get_post_kind_slug( $post );
+}
+/**
+ * Returns the post kind name for the current post.
+ *
+ * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+ * @return string The post kind name.
+ */
+function get_post_kind( $post = null ) {
+        return Kind_Taxonomy::get_post_kind( $post );
+}
+/**
+ * Check if a post has any of the given kinds, or any kind.
+ *
+ * @uses has_term()
+ *
+ * @param string|array $kinds Optional. The kind to check.
+ * @param object|int   $post Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
+ * @return bool True if the post has any of the given kinds (or any kind, if no kind specified), false otherwise.
+ */
+function has_post_kind( $kinds = array(), $post = null ) {
+        return Kind_Taxonomy::has_post_kind( $kinds, $post );
+}
+/**
+ * Assign a kind to a post
+ *
+ * @param int|object $post The post for which to assign a kind.
+ * @param string     $kind A kind to assign. Using an empty string or array will default to note.
+ * @return mixed WP_Error on error. Array of affected term IDs on success.
+ */
+function set_post_kind( $post, $kind ) {
+        return Kind_Taxonomy::set_post_kind( $post, $kind );
+}
+/**
+ * Return the Displayed Response for a Specific Kind
+ *
+ * @param $slug
+ * @param $name
+ * @param $args
+ * @return string
+ */
+function get_kind_view_part( $slug, $name = null, $args = null ) {
+        Kind_View::get_view_part( $slug, $name, $args );
+}
+function kind_display( $post_id = null ) {
+                echo Kind_View::get_display( $post_id ); // phpcs:ignore
+}
+function kind_flatten_array( $a ) {
+        if ( ! is_array( $a ) ) {
+defined( 'ABSPATH' ) || exit;
+if ( ! function_exists( 'register_post_kind' ) ) {
+        /**
+         * Registers a post kind.
+         *
+         * @since 3.1.0
+         *
+         * @param string $slug Post kind slug.
+         * @param array  $args Post kind arguments. See Kind_Taxonomy::register_post_kind().
+         */
+        function register_post_kind( $slug, $args ) {
+                Kind_Taxonomy::register_post_kind( $slug, $args );
+        }
+}
+if ( ! function_exists( 'set_post_kind_visibility' ) ) {
+        /**
+         * Shows or hides a post kind in Settings.
+         *
+         * @since 3.1.0
+         *
+         * @param string $slug Post kind slug.
+         * @param bool   $show Optional. Whether to show the kind. Default true.
+         */
+        function set_post_kind_visibility( $slug, $show = true ) {
+                Kind_Taxonomy::set_post_kind_visibility( $slug, $show );
+        }
+}
+if ( ! function_exists( 'get_post_kind_slugs' ) ) {
+        /**
+         * Retrieves an array of post kind slugs.
+         *
+         * @since 0.30
+         *
+         * @return array The array of post kind slugs.
+         */
+        function get_post_kind_slugs() {
+                return Kind_Taxonomy::get_kind_list();
+        }
+}
+if ( ! function_exists( 'get_post_kind_string' ) ) {
+        /**
+         * Returns a pretty, translated version of a post kind slug.
+         *
+         * @since 0.30
+         *
+         * @param string $slug A post kind slug.
+         * @return string The translated post kind name, or an empty string if the kind is not registered.
+         */
+        function get_post_kind_string( $slug ) {
+                return Kind_Taxonomy::get_post_kind_string( $slug );
+        }
+}
+if ( ! function_exists( 'get_post_kind_link' ) ) {
+        /**
+         * Returns a link to a post kind index.
+         *
+         * @since 0.30
+         *
+         * @param string $kind The post kind slug.
+         * @return string|WP_Error|false The post kind term link, a WP_Error from get_term_link(),
+         *                               or false if the kind has no term.
+         */
+        function get_post_kind_link( $kind ) {
+                return Kind_Taxonomy::get_post_kind_link( $kind );
+        }
+}
+if ( ! function_exists( 'get_post_kind_slug' ) ) {
+        /**
+         * Returns the post kind slug for the current post.
+         *
+         * @since 0.30
+         *
+         * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+         * @return string|false The post kind slug, or false if the post has no kind.
+         */
+        function get_post_kind_slug( $post = null ) {
+                return Kind_Taxonomy::get_post_kind_slug( $post );
+        }
+}
+if ( ! function_exists( 'get_post_kind' ) ) {
+        /**
+         * Returns the post kind name for the current post.
+         *
+         * @since 0.30
+         *
+         * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+         * @return string|false The translated post kind name, or false if the post has no kind.
+         */
+        function get_post_kind( $post = null ) {
+                return Kind_Taxonomy::get_post_kind( $post );
+        }
+}
+if ( ! function_exists( 'has_post_kind' ) ) {
+        /**
+         * Check if a post has any of the given kinds, or any kind.
+         *
+         * @since 0.30
+         *
+         * @uses has_term()
+         *
+         * @param string|array $kinds Optional. The kind to check.
+         * @param WP_Post|int  $post  Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
+         * @return bool True if the post has any of the given kinds (or any kind, if no kind specified), false otherwise.
+         */
+        function has_post_kind( $kinds = array(), $post = null ) {
+                return Kind_Taxonomy::has_post_kind( $kinds, $post );
+        }
+}
+if ( ! function_exists( 'set_post_kind' ) ) {
+        /**
+         * Assign a kind to a post.
+         *
+         * @since 0.30
+         *
+         * @param int|WP_Post $post The post for which to assign a kind.
+         * @param string      $kind A registered kind's slug.
+         * @return array|false|WP_Error Array of affected term IDs on success. WP_Error if the post
+         *                              or the kind is not valid, or false on failure.
+         */
+        function set_post_kind( $post, $kind ) {
+                return Kind_Taxonomy::set_post_kind( $post, $kind );
+        }
+}
+if ( ! function_exists( 'get_kind_view_part' ) ) {
+        /**
+         * Returns the rendered view for a kind.
+         *
+         * @since 2.5.0
+         *
+         * @param string     $slug View slug, such as 'kind'.
+         * @param string     $name Optional. Kind slug, such as 'like'. Default null.
+         * @param array|null $args Optional. Arguments for the view. See Kind_View::get_view_part(). Default null.
+         * @return string The view's markup.
+         */
+        function get_kind_view_part( $slug, $name = null, $args = null ) {
+                return Kind_View::get_view_part( $slug, $name, $args );
+        }
+}
+if ( ! function_exists( 'kind_display' ) ) {
+        /**
+         * Outputs the kind markup for a post.
+         *
+         * For themes that place the markup themselves instead of adding it to the content.
+         *
+         * @since 2.6.1
+         *
+         * @param int|null $post_id Optional. Post ID. Default the current post.
+         */
+        function kind_display( $post_id = null ) {
+                        echo Kind_View::get_display( $post_id ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The view escapes its output as it is built.
+        }
+}
+if ( ! function_exists( 'kind_flatten_array' ) ) {
+        /**
+         * Removes empty values from an array and unwraps single-item lists, recursively.
+         *
+         * @since 2.7.5
+         *
+         * @param mixed $a The value to flatten.
+         * @return mixed The flattened value. An empty string if nothing is left.
+         */
+        function kind_flatten_array( $a ) {
+                if ( ! is_array( $a ) ) {
+                        return $a;
+                }
+                if ( wp_is_numeric_array( $a ) ) {
+                        $a = array_values( array_filter( array_map( 'kind_flatten_array', $a ) ) );
+                } else {
+                        $a = array_filter( $a );
+                }
+                if ( empty( $a ) ) {
+                        return '';
+                }
+                if ( 1 === count( $a ) && isset( $a[0] ) ) {
+                        return $a[0];
+                }
                 return $a;
+        }
+        if ( wp_is_numeric_array( $a ) ) {
+                $array = array_map( 'kind_flatten_array', $a );
+        }
+        $array = array_filter( $a );
+        if ( 1 === count( $a ) ) {
+                return $a[0];
+        }
+}
+// Return any sort of src urls in content
+function kind_src_url_in_content( $content ) {
+        if ( ! $content ) {
+}
+if ( ! function_exists( 'kind_src_url_in_content' ) ) {
+        /**
+         * Returns every src attribute value in some markup.
+         *
+         * @since 3.0.0
+         *
+         * @param string $content The markup.
+         * @return string[]|int The src URLs, or 0 if there are none.
+         */
+        function kind_src_url_in_content( $content ) {
+                if ( ! $content ) {
+                        return 0;
+                }
+                if ( preg_match_all( '@src="([^"]+)"@', $content, $output ) ) {
+                        return array_pop( $output );
+                }
                 return 0;
+        }
+        if ( preg_match_all( '@src="([^"]+)"@', $content, $output ) ) {
+                return array_pop( $output );
+        }
+        return 0;
+}
+/**
+ * Get a Marketed Up Link to the Post.
+ *
+ * @param WP_Post|null Post to Display.
+ * @param string|array Classes to add to link
+ * @param string|array Classes to add to the date
+ * @return string Marked up link to a post.
+ **/
+function kind_get_the_link( $post = null, $cls = null, $date_cls = null ) {
+        $post = get_post( $post );
+        $kind = get_post_kind_slug( $post );
+        if ( is_array( $cls ) ) {
+                $cls = implode( ' ', $cls );
+        }
+        if ( is_array( $date_cls ) ) {
+                $date_cls = implode( ' ', $date_cls );
+        }
+        $time_string = '<time class="%3$s" datetime="%1$s">%2$s</time>';
+        $time_string = sprintf(
+                $time_string,
+                esc_attr( get_the_date( DATE_W3C, $post ) ),
+                get_the_date( '', $post ),
+                $date_cls
+        );
+        return sprintf( '<a class="%4$s" href="%2$s">%1$s</a> - %3$s', kind_get_the_title( $post, $kind ), get_the_permalink( $post ), $time_string, esc_attr( $cls ) );
+}
+/**
+ * Get a Generated Title for a Post as Most Post Kinds do Not Have an Explicit Title.
+ *
+ * @param WP_Post|null Post to Display.
+ * @param array $args Arguments.
+ * @return string Marked up link to a post.
+ **/
+function kind_get_the_title( $post = null, $args = array() ) {
+        $defaults = array(
+                'photo_size' => array( 32, 32 ),
+        );
+        $args = wp_parse_args( $args, $defaults );
+        $post      = get_post( $post );
+        $kind      = get_post_kind_slug( $post );
+        $title     = get_the_title( $post );
+        $before    = Kind_Taxonomy::get_before_kind( $kind );
+        $content   = '';
+        $kind_post = new Kind_Post( $post );
+        if ( ! empty( $title ) ) {
+                return $title;
+        }
+        if ( in_array( $kind, array( 'audio', 'video', 'photo' ), true ) ) {
+                switch ( $kind ) {
+                        case 'photo':
+                                $photos = $kind_post->get_photo();
+                                $before = wp_get_attachment_image(
+                                        $photos[0],
+                                        $args['photo_size'],
+                                        false,
+                                        array(
+                                                'class' => 'kind-photo-thumbnail',
+                                        )
+                                );
+                }
+        } elseif ( ! in_array( $kind, array( 'note', 'article' ), true ) ) {
+                $cite = $kind_post->get_cite( 'name' );
+                if ( false === $cite ) {
+                        $content = Kind_View::get_post_type_string( $kind_post->get_cite( 'url' ) );
+}
+if ( ! function_exists( 'kind_get_the_link' ) ) {
+        /**
+         * Returns a marked up link to a post, followed by its date.
+         *
+         * @since 3.5.9
+         *
+         * @param WP_Post|int|null  $post     Optional. Post to display. Default the current post.
+         * @param string|array|null $cls      Optional. Classes to add to the link. Default null.
+         * @param string|array|null $date_cls Optional. Classes to add to the date. Default null.
+         * @return string Marked up link to a post.
+         */
+        function kind_get_the_link( $post = null, $cls = null, $date_cls = null ) {
+                $post = get_post( $post );
+                $kind = get_post_kind_slug( $post );
+                if ( is_array( $cls ) ) {
+                        $cls = implode( ' ', $cls );
+                }
+                if ( is_array( $date_cls ) ) {
+                        $date_cls = implode( ' ', $date_cls );
+                }
+                $time_string = '<time class="%3$s" datetime="%1$s">%2$s</time>';
+                $time_string = sprintf(
+                        $time_string,
+                        esc_attr( get_the_date( DATE_W3C, $post ) ),
+                        esc_html( get_the_date( '', $post ) ),
+                        esc_attr( $date_cls )
+                );
+                return sprintf( '<a class="%4$s" href="%2$s">%1$s</a> - %3$s', kind_get_the_title( $post, $kind ), esc_url( get_the_permalink( $post ) ), $time_string, esc_attr( $cls ) );
+        }
+}
+if ( ! function_exists( 'kind_get_the_title' ) ) {
+        /**
+         * Returns a post's title, generating one if the post has none.
+         *
+         * Most post kinds do not have an explicit title.
+         *
+         * @since 3.5.9
+         *
+         * @param WP_Post|int|null $post Optional. Post to display. Default the current post.
+         * @param array            $args {
+         *     Optional. Arguments.
+         *
+         *     @type int[]|string $photo_size Image size for a photo post's thumbnail. Default array( 32, 32 ).
+         * }
+         * @return string The title, or the kind's icon or name and generated text.
+         */
+        function kind_get_the_title( $post = null, $args = array() ) {
+                $defaults = array(
+                        'photo_size' => array( 32, 32 ),
+                );
+                $args = wp_parse_args( $args, $defaults );
+                $post      = get_post( $post );
+                $kind      = get_post_kind_slug( $post );
+                $title     = get_the_title( $post );
+                $before    = Kind_Taxonomy::get_before_kind( $kind );
+                $content   = '';
+                $kind_post = new Kind_Post( $post );
+                if ( ! empty( $title ) ) {
+                        return $title;
+                }
+                if ( in_array( $kind, array( 'audio', 'video', 'photo' ), true ) ) {
+                        switch ( $kind ) {
+                                case 'photo':
+                                        $photos = $kind_post->get_photo();
+                                        $before = wp_get_attachment_image(
+                                                $photos[0],
+                                                $args['photo_size'],
+                                                false,
+                                                array(
+                                                        'class' => 'kind-photo-thumbnail',
+                                                )
+                                        );
+                        }
+                } elseif ( ! in_array( $kind, array( 'note', 'article' ), true ) ) {
+                        $cite = $kind_post->get_cite( 'name' );
+                        if ( false === $cite ) {
+                                $content = Kind_View::get_post_type_string( $kind_post->get_cite( 'url' ) );
+                        } else {
+                                $content = $cite;
+                        }
                 } else {
+                        $content = $cite;
+                }
+        } else {
+                $content = $post->post_excerpt;
+                // If no excerpt use content
+                if ( ! $content ) {
+                        $content = $post->post_content;
+                }
+                // If no content use date
+                if ( $content ) {
+                        $content = mb_strimwidth( wp_strip_all_tags( $content ), 0, 40, '...' );
+                }
+        }
+        if ( is_array( $content ) ) {
+                $content = wp_json_encode( $content );
+        }
+        $content = apply_filters( 'kind_get_the_title_content', $content, $post );
+        $before  = apply_filters( 'kind_get_the_title_before', $before, $post );
+        return trim( sprintf( '%1$s %2$s', $before, $content ) );
+}
+                        $content = $post->post_excerpt;
+                        // If no excerpt use content.
+                        if ( ! $content ) {
+                                $content = $post->post_content;
+                        }
+                        // If no content use date.
+                        if ( $content ) {
+                                $content = mb_strimwidth( wp_strip_all_tags( $content ), 0, 40, '...' );
+                        }
+                }
+                if ( is_array( $content ) ) {
+                        $content = wp_json_encode( $content );
+                }
+                // The content is text (a cited name or an excerpt), often from another site.
+                $content = esc_html( wp_strip_all_tags( (string) $content ) );
+                /**
+                 * Filters the text of a generated post title.
+                 *
+                 * The text is a cited name, an excerpt or similar, already escaped. A callback
+                 * that adds markup must escape what it adds.
+                 *
+                 * @since 3.5.9
+                 *
+                 * @param string  $content Escaped title text.
+                 * @param WP_Post $post    The post.
+                 */
+                $content = apply_filters( 'kind_get_the_title_content', $content, $post );
+                /**
+                 * Filters the markup shown before a generated post title.
+                 *
+                 * The markup is output as-is, so it must be escaped.
+                 *
+                 * @since 3.5.9
+                 *
+                 * @param string  $before The kind's icon or name, from Kind_Taxonomy::get_before_kind().
+                 * @param WP_Post $post   The post.
+                 */
+                $before  = apply_filters( 'kind_get_the_title_before', $before, $post );
+                return trim( sprintf( '%1$s %2$s', $before, $content ) );
+        }
+}

indieweb-post-kinds/tags/4.0.0/includes/register-kinds.php

-              r3001401
+              r3738687
 <?php
+/* Registers built-in Post Kinds
+/**
+ * Registers the built-in kinds.
+ *
+ * The arguments each kind takes are documented in
+ * Kind_Taxonomy::register_post_kind().
+ *
+ * @package Post_Kinds
+ * @since   3.3.4
  */
+defined( 'ABSPATH' ) || exit;
 register_post_kind(
         'article',
         array(
                 'singular_name'   => __( 'Article', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Articles', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => '', // microformats 2 property
+                'singular_name'   => __( 'Article', 'indieweb-post-kinds' ),
+                'name'            => __( 'Articles', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => '',
                 'properties'      => array(),
                 'format'          => '', // Post Format that maps to this
+                'format'          => '',
                 'description'     => __( 'traditional long form content: a post with an explicit title and body', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/article',
                 'shortlink'       => 'b',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => true,
+                'show'            => true,
+        )
 );
 …
         'note',
         array(
                 'singular_name'   => __( 'Note', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Notes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => '', // microformats 2 property
+                'singular_name'   => __( 'Note', 'indieweb-post-kinds' ),
+                'name'            => __( 'Notes', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => '',
                 'properties'      => array(),
                 'format'          => 'aside', // Post Format that maps to this
+                'format'          => 'aside',
                 'description'     => __( 'short content: a post or status update with just plain content and typically without a title', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/note',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'reply',
         array(
                 'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Replies', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Replied to', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'in-reply-to', // microformats 2 property
+                'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ),
+                'name'            => __( 'Replies', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Replied to', 'indieweb-post-kinds' ),
+                'property'        => 'in-reply-to',
                 'properties'      => array(
                         'in-reply-to' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'a reply to content typically on another site', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/reply',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'repost',
         array(
                 'singular_name'   => __( 'Repost', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Reposts', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Reposted', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'repost-of', // microformats 2 property
+                'singular_name'   => __( 'Repost', 'indieweb-post-kinds' ),
+                'name'            => __( 'Reposts', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Reposted', 'indieweb-post-kinds' ),
+                'property'        => 'repost-of',
                 'properties'      => array(
                         'repost-of' => array(
 …
                         ),
                 ),
                 'format'          => '', // Post Format that maps to this
+                'format'          => '',
                 'description'     => __( 'a complete reposting of content from another site', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/repost',
                 'shortlink'       => 'b',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => true,
+                'show'            => true,
+        )
 );
 …
         'like',
         array(
                 'singular_name'   => __( 'Like', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Likes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Liked', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'like-of', // microformats 2 property
+                'singular_name'   => __( 'Like', 'indieweb-post-kinds' ),
+                'name'            => __( 'Likes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Liked', 'indieweb-post-kinds' ),
+                'property'        => 'like-of',
                 'properties'      => array(
                         'like-of' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'a way to pay compliments to the original post/poster of external content', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/like',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'favorite',
         array(
                 'singular_name'   => __( 'Favorite', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Favorites', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Favorited', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'favorite-of', // microformats 2 property
+                'singular_name'   => __( 'Favorite', 'indieweb-post-kinds' ),
+                'name'            => __( 'Favorites', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Favorited', 'indieweb-post-kinds' ),
+                'property'        => 'favorite-of',
                 'properties'      => array(
                         'favorite-of' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'special to the author', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/favorite',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'bookmark',
         array(
                 'singular_name'   => __( 'Bookmark', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Bookmarks', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Bookmarked', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'bookmark-of', // microformats 2 property
+                'singular_name'   => __( 'Bookmark', 'indieweb-post-kinds' ),
+                'name'            => __( 'Bookmarks', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Bookmarked', 'indieweb-post-kinds' ),
+                'property'        => 'bookmark-of',
                 'properties'      => array(
                         'bookmark-of' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'storing a link/bookmark for personal use or sharing with others', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/bookmark',
                 'shortlink'       => 'h',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'photo',
         array(
                 'singular_name'   => __( 'Photo', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Photos', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'photo', // microformats 2 property
                 'format'          => 'image', // Post Format that maps to this
+                'singular_name'   => __( 'Photo', 'indieweb-post-kinds' ),
+                'name'            => __( 'Photos', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'photo',
+                'format'          => 'image',
                 'description'     => __( 'a post with an embedded image/photo as its primary focus', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/photo',
                 'shortlink'       => 'p',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'video',
         array(
                 'singular_name'   => __( 'Video', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Videos', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'video', // microformats 2 property
                 'format'          => 'video', // Post Format that maps to this
+                'singular_name'   => __( 'Video', 'indieweb-post-kinds' ),
+                'name'            => __( 'Videos', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'video',
+                'format'          => 'video',
                 'description'     => __( 'a post with an embedded video as its primary focus', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/video',
                 'shortlink'       => 'a',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'audio',
         array(
                 'singular_name'   => __( 'Audio', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Audios', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'audio', // microformats 2 property
                 'format'          => 'audio', // Post Format that maps to this
+                'singular_name'   => __( 'Audio', 'indieweb-post-kinds' ),
+                'name'            => __( 'Audios', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'audio',
+                'format'          => 'audio',
                 'description'     => __( 'a post with an embedded audio file as its primary focus', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/audio',
                 'shortlink'       => 'a',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'tag',
         array(
                 'singular_name'   => __( 'Tag', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Tags', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Tagged', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'tag-of', // microformats 2 property
                 'format'          => 'link', // Post Format that maps to this
+                'singular_name'   => __( 'Tag', 'indieweb-post-kinds' ),
+                'name'            => __( 'Tags', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Tagged', 'indieweb-post-kinds' ),
+                'property'        => 'tag-of',
+                'format'          => 'link',
                 'description'     => __( 'allows you to tag a post as being of a specific category or tag, or for person tagging', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/tag',
                 'shortlink'       => 'd',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'rsvp',
         array(
                 'singular_name'   => __( 'RSVP', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'RSVPs', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'RSVPed', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'in-reply-to', // microformats 2 property
+                'singular_name'   => __( 'RSVP', 'indieweb-post-kinds' ),
+                'name'            => __( 'RSVPs', 'indieweb-post-kinds' ),
+                'verb'            => __( 'RSVPed', 'indieweb-post-kinds' ),
+                'property'        => 'in-reply-to',
                 'properties'      => array(
                         'rsvp'        => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'a specific type of reply regarding attendance of an event', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/rsvp',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'listen',
         array(
                 'singular_name'   => __( 'Listen', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Listens', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Listened', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'listen-of', // microformats 2 property
+                'singular_name'   => __( 'Listen', 'indieweb-post-kinds' ),
+                'name'            => __( 'Listens', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Listened', 'indieweb-post-kinds' ),
+                'property'        => 'listen-of',
                 'properties'      => array(
                         'listen-of' => array(
 …
                         ),
                 ),
                 'format'          => 'audio', // Post Format that maps to this
+                'format'          => 'audio',
                 'description'     => __( 'listening to audio; sometimes called a scrobble', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/listen',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'watch',
         array(
                 'singular_name'   => __( 'Watch', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Watches', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Watched', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'watch-of', // microformats 2 property
+                'singular_name'   => __( 'Watch', 'indieweb-post-kinds' ),
+                'name'            => __( 'Watches', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Watched', 'indieweb-post-kinds' ),
+                'property'        => 'watch-of',
                 'properties'      => array(
                         'watch-of' => array(
 …
                         ),
                 ),
                 'format'          => 'video', // Post Format that maps to this
+                'format'          => 'video',
                 'description'     => __( 'watching a movie, television show, online video, play or other visual-based event', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/watch',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'checkin',
         array(
                 'singular_name'   => __( 'Checkin', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Checkins', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Checked into', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'checkin', // microformats 2 property
+                'singular_name'   => __( 'Checkin', 'indieweb-post-kinds' ),
+                'name'            => __( 'Checkins', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Checked into', 'indieweb-post-kinds' ),
+                'property'        => 'checkin',
                 'properties'      => array(
                         'checkin' => array(
 …
                         ),
                 ),
                 'format'          => 'status', // Post Format that maps to this
+                'format'          => 'status',
                 'description'     => __( 'identifying you are at a particular geographic location', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/checkin',
                 'shortlink'       => 'g',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'wish',
         array(
                 'singular_name'   => __( 'Wish', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Wishes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Wished', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'wish-of', // microformats 2 property
                 'format'          => 'link', // Post Format that maps to this
+                'singular_name'   => __( 'Wish', 'indieweb-post-kinds' ),
+                'name'            => __( 'Wishes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Wished', 'indieweb-post-kinds' ),
+                'property'        => 'wish-of',
+                'format'          => 'link',
                 'description'     => __( 'a post indicating a desire/wish. The archive of which would be a wishlist, such as a gift registry or similar', 'indieweb-post-kinds' ),
                 'description_url' => '',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'play',
         array(
                 'singular_name'   => __( 'Play', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Playing', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Played', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'play-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Play', 'indieweb-post-kinds' ),
+                'name'            => __( 'Playing', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Played', 'indieweb-post-kinds' ),
+                'property'        => 'play-of',
+                'format'          => 'status',
                 'description'     => __( 'playing a game', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/game_play',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'weather',
         array(
                 'singular_name'   => __( 'Weather', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Weather', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'weather', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Weather', 'indieweb-post-kinds' ),
+                'name'            => __( 'Weather', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'weather',
+                'format'          => 'status',
                 'description'     => __( 'current weather conditions', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/weather',
                 'shortlink'       => 'u',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'exercise',
         array(
                 'singular_name'   => __( 'Exercise', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Exercise', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Exercised', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'exercise', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Exercise', 'indieweb-post-kinds' ),
+                'name'            => __( 'Exercise', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Exercised', 'indieweb-post-kinds' ),
+                'property'        => 'exercise',
+                'format'          => 'status',
                 'description'     => __( 'some form of physical activity or workout (examples: walk, run, cycle, hike, yoga, etc.)', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/exercise',
                 'shortlink'       => 'm',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'trip',
         array(
                 'singular_name'   => __( 'Trip', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Trips', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Travelled', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'trip', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Trip', 'indieweb-post-kinds' ),
+                'name'            => __( 'Trips', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Travelled', 'indieweb-post-kinds' ),
+                'property'        => 'trip',
+                'format'          => '',
                 'description'     => __( 'represents a geographic journey', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/trip',
                 'shortlink'       => 'e',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'itinerary',
         array(
                 'singular_name'   => __( 'Itinerary', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Itineraries', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Travelled', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'itinerary', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Itinerary', 'indieweb-post-kinds' ),
+                'name'            => __( 'Itineraries', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Travelled', 'indieweb-post-kinds' ),
+                'property'        => 'itinerary',
+                'format'          => '',
                 'description'     => __( 'parts of a scheduled trip including transit by car, plane, train, etc.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/trip',
                 'shortlink'       => 'e',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'eat',
         array(
                 'singular_name'   => __( 'Eat', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Eat', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Ate', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'ate', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Eat', 'indieweb-post-kinds' ),
+                'name'            => __( 'Eat', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Ate', 'indieweb-post-kinds' ),
+                'property'        => 'ate',
+                'format'          => 'status',
                 'description'     => __( 'what you are eating, perhaps for a food diary', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/food',
                 'shortlink'       => 'u',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'drink',
         array(
                 'singular_name'   => __( 'Drink', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Drinks', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Drank', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'drank', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Drink', 'indieweb-post-kinds' ),
+                'name'            => __( 'Drinks', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Drank', 'indieweb-post-kinds' ),
+                'property'        => 'drank',
+                'format'          => 'status',
                 'description'     => __( 'what you are drinking, perhaps for a food dairy', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/food',
                 'shortlink'       => 'u',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'follow',
         array(
                 'singular_name'   => __( 'Follow', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Follows', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Followed', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'follow-of', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Follow', 'indieweb-post-kinds' ),
+                'name'            => __( 'Follows', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Followed', 'indieweb-post-kinds' ),
+                'property'        => 'follow-of',
+                'format'          => '',
                 'description'     => __( 'indicating you are now following or subscribing to another person`s activities online', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/follow',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'jam',
         array(
                 'singular_name'   => __( 'Jam', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Jams', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Listened to', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'jam-of', // microformats 2 property
                 'format'          => 'audio', // Post Format that maps to this
+                'singular_name'   => __( 'Jam', 'indieweb-post-kinds' ),
+                'name'            => __( 'Jams', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Listened to', 'indieweb-post-kinds' ),
+                'property'        => 'jam-of',
+                'format'          => 'audio',
                 'description'     => __( 'a particularly personally meaningful song (a listen with added emphasis)', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/jam',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'read',
         array(
                 'singular_name'   => __( 'Read', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Reads', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Read', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'read-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Read', 'indieweb-post-kinds' ),
+                'name'            => __( 'Reads', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Read', 'indieweb-post-kinds' ),
+                'property'        => 'read-of',
+                'format'          => 'status',
                 'description'     => __( 'reading a book, magazine, newspaper, other physical document, or online post', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/read',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'quote',
         array(
                 'singular_name'   => __( 'Quote', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Quotes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Quoted', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'quotation-of', // microformats 2 property
                 'format'          => 'quote', // Post Format that maps to this
+                'singular_name'   => __( 'Quote', 'indieweb-post-kinds' ),
+                'name'            => __( 'Quotes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Quoted', 'indieweb-post-kinds' ),
+                'property'        => 'quotation-of',
+                'format'          => 'quote',
                 'description'     => __( 'quoted content', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/quote',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'mood',
         array(
                 'singular_name'   => __( 'Mood', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Moods', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Felt', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'mood', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Mood', 'indieweb-post-kinds' ),
+                'name'            => __( 'Moods', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Felt', 'indieweb-post-kinds' ),
+                'property'        => 'mood',
+                'format'          => 'status',
                 'description'     => __( 'how you are feeling (example: happy, sad, indifferent, etc.)', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/mood',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'recipe',
         array(
                 'singular_name'   => __( 'Recipe', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Recipes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Cooked', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'recipe', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Recipe', 'indieweb-post-kinds' ),
+                'name'            => __( 'Recipes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Cooked', 'indieweb-post-kinds' ),
+                'property'        => 'recipe',
+                'format'          => '',
                 'description'     => __( 'list of ingredients and directions for making food or drink', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/recipe',
                 'shortlink'       => 'b',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => true,
+                'show'            => false,
+        )
 );
 …
         'issue',
         array(
                 'singular_name'   => __( 'Issue', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Issues', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Filed an Issue', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'in-reply-to', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Issue', 'indieweb-post-kinds' ),
+                'name'            => __( 'Issues', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Filed an Issue', 'indieweb-post-kinds' ),
+                'property'        => 'in-reply-to',
+                'format'          => '',
                 'description'     => __( 'Issue is a special kind of article post that is a reply to typically some source code, though potentially anything at a source control repository.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/issue',
                 'shortlink'       => 't',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => true,
+                'show'            => true,
+        )
 );
 …
         'question',
         array(
                 'singular_name'   => __( 'Question', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Questions', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Asked a question', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'question', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Question', 'indieweb-post-kinds' ),
+                'name'            => __( 'Questions', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Asked a question', 'indieweb-post-kinds' ),
+                'property'        => 'question',
+                'format'          => '',
                 'description'     => __( 'Question is a post type for soliciting answer replies, which are then typically up/down voted by others and then displayed underneath the question post ordered by highest positive vote count rather than time ordered.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/question',
                 'shortlink'       => 'q',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'sleep',
         array(
                 'singular_name'   => __( 'Sleep', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Sleeps', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Slept', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'sleep', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Sleep', 'indieweb-post-kinds' ),
+                'name'            => __( 'Sleeps', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Slept', 'indieweb-post-kinds' ),
+                'property'        => 'sleep',
+                'format'          => '',
                 'description'     => __( 'Sleep is a passive metrics post type that indicates how much time (and often a graph of how deeply) a person has slept.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/sleep',
                 'shortlink'       => 'm',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'event',
         array(
                 'singular_name'   => __( 'Event', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Events', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Planned', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'event', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Event', 'indieweb-post-kinds' ),
+                'name'            => __( 'Events', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Planned', 'indieweb-post-kinds' ),
+                'property'        => 'event',
+                'format'          => '',
                 'description'     => __( 'An event is a type of post that in addition to a post name (event title) has a start datetime (likely end datetime), and a location.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/event',
                 'shortlink'       => 'e',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => true,
+                'show'            => false,
+        )
 );
 …
         'review',
         array(
                 'singular_name'   => __( 'Review', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Reviews', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Reviewed', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'review-of', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Review', 'indieweb-post-kinds' ),
+                'name'            => __( 'Reviews', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Reviewed', 'indieweb-post-kinds' ),
+                'property'        => 'review-of',
+                'format'          => '',
                 'description'     => __( 'A review is a post evaluating a product or service, usually involving a written description, sometimes with summary numerical evaluations, also known as just a rating.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/review',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'acquisition',
         array(
                 'singular_name'   => __( 'Acquisition', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Acquisitions', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Acquired', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'acquired-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Acquisition', 'indieweb-post-kinds' ),
+                'name'            => __( 'Acquisitions', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Acquired', 'indieweb-post-kinds' ),
+                'property'        => 'acquired-of',
+                'format'          => 'status',
                 'description'     => __( 'Purchases, gifts, found things, or objects donated', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/acquisition',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'craft',
         array(
                 'singular_name'   => __( 'Craft', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Crafts', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Crafted', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'craft-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Craft', 'indieweb-post-kinds' ),
+                'name'            => __( 'Crafts', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Crafted', 'indieweb-post-kinds' ),
+                'property'        => 'craft-of',
+                'format'          => 'status',
                 'description'     => __( 'Activities like knitting, crocheting, cross stitch, wood working, restoration, 3d printing...the activity of building something.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/crafts',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+        )
 );
+                'title'           => false,
+                'show'            => true,
+        )
+);

indieweb-post-kinds/tags/4.0.0/includes/time-functions.php

-              r2973430
+              r3738687
 <?php
 /**
  * Time Functions
+ * Global date and time functions.
+ *
+ * Global Scoped Functions for Handling Time.
+ * The generic helpers moved to Kind_Time in 4.0.0; their global names remain
+ * here as deprecated wrappers.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
  */
+defined( 'ABSPATH' ) || exit;
+if ( ! function_exists( 'kind_safe_datetime' ) ) {
+        /**
+         * Creates a date from a value without throwing on invalid input.
+         *
+         * Dates come from post meta and Micropub requests, where a malformed value
+         * would otherwise throw an uncaught exception and break the page.
+         *
+         * @since 4.0.0
+         *
+         * @param DateTimeInterface|string $value     Date, or a date string.
+         * @param DateTimeZone|null        $timezone  Optional. Timezone for strings without one.
+         * @param bool                     $immutable Optional. Whether to return a DateTimeImmutable. Default true.
+         * @return DateTimeImmutable|DateTime|false The date, or false if the value is not a valid date.
+         */
+        function kind_safe_datetime( $value, $timezone = null, $immutable = true ) {
+                if ( $value instanceof DateTimeInterface ) {
+                        if ( $immutable ) {
+                                return $value instanceof DateTimeImmutable ? $value : DateTimeImmutable::createFromMutable( $value );
+                        }
+                        return $value instanceof DateTime ? $value : DateTime::createFromImmutable( $value );
+                }
+                if ( ! is_string( $value ) || '' === trim( $value ) ) {
+                        return false;
+                }
+                try {
+                        return $immutable ? new DateTimeImmutable( $value, $timezone ) : new DateTime( $value, $timezone );
+                } catch ( Exception $e ) {
+                        return false;
+                }
+        }
+}
+if ( ! function_exists( 'kind_safe_interval' ) ) {
+        /**
+         * Creates a duration from an ISO 8601 duration without throwing on invalid input.
+         *
+         * @since 4.0.0
+         *
+         * @param DateInterval|string $value Duration, or an ISO 8601 duration such as PT3M30S.
+         * @return DateInterval|false The duration, or false if the value is not a valid duration.
+         */
+        function kind_safe_interval( $value ) {
+                if ( $value instanceof DateInterval ) {
+                        return $value;
+                }
+                if ( ! is_string( $value ) || '' === trim( $value ) ) {
+                        return false;
+                }
+                try {
+                        return new DateInterval( $value );
+                } catch ( Exception $e ) {
+                        return false;
+                }
+        }
+}
 if ( ! function_exists( 'tz_seconds_to_offset' ) ) {
+        /**
+         * Converts a UTC offset in seconds to an offset string.
+         *
+         * @since 2.3.0
+         *
+         * @param int $seconds Offset in seconds.
+         * @return string Offset such as '-05:00'.
+         */
         function tz_seconds_to_offset( $seconds ) {
                 return ( $seconds < 0 ? '-' : '+' ) . sprintf( '%02d:%02d', abs( $seconds / 60 / 60 ), abs( $seconds / 60 ) % 60 );
 …
 if ( ! function_exists( 'tz_offset_to_seconds' ) ) {
+        /**
+         * Converts an offset string to a UTC offset in seconds.
+         *
+         * @since 2.3.0
+         *
+         * @param string $offset Offset such as '-05:00' or '-0500'.
+         * @return int Offset in seconds, or 0 if the string is not an offset.
+         */
         function tz_offset_to_seconds( $offset ) {
                 if ( preg_match( '/([+-])(\d{2}):?(\d{2})/', $offset, $match ) ) {
                         $sign = ( '-' ? -1 : 1 === $match[1] );
+                        $sign = ( '-' === $match[1] ) ? -1 : 1;
                         return ( ( $match[2] * 60 * 60 ) + ( $match[3] * 60 ) ) * $sign;
                 } else {
 …
 if ( ! function_exists( 'tz_seconds_to_timezone' ) ) {
+        /**
+         * Converts a UTC offset in seconds to a time zone.
+         *
+         * @since 3.2.2
+         *
+         * @param int $seconds Offset in seconds.
+         * @return DateTimeZone|false The time zone, or false if it cannot be created.
+         */
         function tz_seconds_to_timezone( $seconds ) {
-                if ( version_compare( phpversion(), '5.5.10', '<' ) ) {
-                        return timezone_name_from_abbr( '', $seconds, 0 );
+                }
                 if ( 0 !== $seconds ) {
                         $tz = timezone_open( tz_seconds_to_offset( $seconds ) );
 …
 if ( ! function_exists( 'tz_timezone_to_seconds' ) ) {
+        /**
+         * Returns a time zone's UTC offset in seconds.
+         *
+         * @since 3.2.2
+         *
+         * @param string $timezone Time zone name or offset string.
+         * @return int|false Offset in seconds, or false if the time zone is not valid.
+         */
         function tz_timezone_to_seconds( $timezone ) {
                 $tz = timezone_open( $timezone );
 …
 if ( ! function_exists( 'get_gmt_offsets' ) ) {
+        /**
+         * Returns the UTC offsets currently in use by any time zone, sorted.
+         *
+         * The list is built from every time zone, so it is kept in the object
+         * cache for the day: for the request, and across requests when the cache
+         * is persistent. Daylight saving changes it at most a few times a year.
+         *
+         * @since 3.0.0
+         *
+         * @return string[] Offsets such as '-05:00'.
+         */
         function get_gmt_offsets() {
+                $key = 'gmt_offsets_' . gmdate( 'Y-m-d' );
+                $o   = wp_cache_get( $key, 'post-kinds' );
+                if ( is_array( $o ) ) {
+                        return $o;
+                }
                 $o       = array();
                 $t_zones = timezone_identifiers_list();
                 foreach ( $t_zones as $a ) {
-                        $t = '';
                         try {
                                 // this throws exception for 'US/Pacific-New'
+                                // Some identifiers, such as 'US/Pacific-New', throw on some PHP versions.
                                 $zone    = new DateTimeZone( $a );
                                 $seconds = $zone->getOffset( new DateTime( 'now', $zone ) );
                                 $o[]     = tz_seconds_to_offset( $seconds );
                         } catch ( Exception $e ) {
                                 die( 'Exception : ' . esc_html( $e->getMessage() ) . '<br />' );
                                 // what to do in catch ? , nothing just relax
+                                // Skip the zone rather than fail.
+                                continue;
+                        }
+                }
                 $o = array_unique( $o );
                 asort( $o );
+                wp_cache_set( $key, $o, 'post-kinds', DAY_IN_SECONDS );
                 return $o;
+        }
 …
 if ( ! function_exists( 'get_default_offset' ) ) {
+        // Gets the default offset
+        /**
+         * Returns the site's UTC offset, from its gmt_offset option.
+         *
+         * @since 3.0.0
+         *
+         * @return string Offset such as '-05:00'.
+         */
         function get_default_offset() {
                 $tz_seconds = get_option( 'gmt_offset' ) * 3600;
 …
 if ( ! function_exists( 'build_iso8601_time' ) ) {
+        // Turns individual pieces of a date and time into a single ISO8601 string
+        /**
+         * Joins a date, time and offset into an ISO 8601 string.
+         *
+         * @since 3.0.0
+         *
+         * @param string $date   Date in Y-m-d format.
+         * @param string $time   Time in H:i:s format.
+         * @param string $offset Offset such as '-05:00'. Empty for the site's offset.
+         * @return string The date and time, or an empty string if both are empty.
+         */
         function build_iso8601_time( $date, $time, $offset ) {
                 if ( empty( $date ) && empty( $time ) ) {
 …
 if ( ! function_exists( 'build_iso8601_duration' ) ) {
+        // Given an array with the pieces of a duration build an ISO8601 duration
+        /**
+         * Builds an ISO 8601 duration from its pieces.
+         *
+         * @since 3.0.0
+         *
+         * @param int[] $values Years (Y), months (M), days (D), hours (H), minutes (I) and seconds (S).
+         * @return string The duration, or an empty string if every piece is empty.
+         */
         function build_iso8601_duration( $values ) {
                 $values = array_filter( $values );
 …
 if ( ! function_exists( 'calculate_duration' ) ) {
+        // Given two ISO8601 time strings return a DateInterval Object
+        /**
+         * Returns the duration between two dates.
+         *
+         * @since 2.5.0
+         * @since 4.0.0 Also accepts DateTimeInterface objects, such as Kind_Post::get( 'start' ) returns.
+         *
+         * @param DateTimeInterface|string $start_string Start, as a date or a string in Y-m-d\TH:i:sP format.
+         * @param DateTimeInterface|string $end_string   End, as a date or a string in Y-m-d\TH:i:sP format.
+         * @return DateInterval|false The duration, or false if either date is not valid or they are the same.
+         */
         function calculate_duration( $start_string, $end_string ) {
+                $start = array();
+                $end   = array();
+                if ( ! is_string( $start_string ) || ! is_string( $end_string ) ) {
+                $dates = array();
+                foreach ( array( $start_string, $end_string ) as $value ) {
+                        if ( is_string( $value ) ) {
+                                // Only the full format: looser parsing reads stray text, such as a single letter, as a date.
+                                $value = date_create_immutable_from_format( 'Y-m-d\TH:i:sP', $value );
+                        }
+                        if ( ! $value instanceof DateTimeInterface ) {
+                                return false;
+                        }
+                        $dates[] = $value;
+                }
+                list( $start, $end ) = $dates;
+                if ( $start == $end ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual -- Compares the moments, not the objects.
                         return false;
+                }
+                if ( $start_string === $end_string ) {
+                        return false;
+                }
+                $start = date_create_from_format( 'Y-m-d\TH:i:sP', $start_string );
+                $end   = date_create_from_format( 'Y-m-d\TH:i:sP', $end_string );
+                if ( ( $start instanceof DateTime ) && ( $end instanceof DateTime ) ) {
+                        $duration = $start->diff( $end );
+                        return $duration;
+                }
+                return false;
+        }
+}
+if ( ! function_exists( 'seconds_to_iso8601' ) ) {
+        function seconds_to_iso8601( $second ) {
+                $h   = intval( $second / 3600 );
+                $m   = intval( ( $second - $h * 3600 ) / 60 );
+                $s   = $second - ( $h * 3600 + $m * 60 );
+                $ret = 'PT';
+                if ( $h ) {
+                        $ret .= $h . 'H';
+                }
+                if ( $m ) {
+                        $ret .= $m . 'M';
+                }
+                if ( ( ! $h && ! $m ) || $s ) {
+                        $ret .= $s . 'S';
+                }
+                return $ret;
+                return $start->diff( $end );
+        }
+}
 if ( ! function_exists( 'date_interval_to_iso8601' ) ) {
+        // Return a date interval as an ISO8601 string
+        /**
+         * Converts a duration to an ISO 8601 duration string.
+         *
+         * @since 3.0.0
+         *
+         * @param \DateInterval $interval The duration.
+         * @return string The duration, such as 'PT3M30S'.
+         */
         function date_interval_to_iso8601( \DateInterval $interval ) {
                 // Reading all non-zero date parts.
 …
+}
+function display_formatted_datetime( $date ) {
+        if ( is_string( $date ) ) {
+                $date = new DateTimeImmutable( $date );
+        }
+        return $date->format( get_option( 'date_format' ) ) . ' ' . $date->format( get_option( 'time_format' ) );
+}
+/**
+ * Function to divide a datetime into an array for use in a field
+ *
+ * @access public
+ *
+ * @param DateTime $datetime
+ * @return array {
+ *  @type string $date Date in Y-m-d format.
+ *  @type string $time Time in H:i:s format.
+ *  @type DateTimeZone $timezone Timezone object.
+ * }
+ */
+function divide_datetime( $datetime ) {
+        if ( ! $datetime ) {
+                return false;
+        }
+        if ( is_string( $datetime ) ) {
+                $datetime = new DateTime( $datetime );
+        }
+        if ( ! $datetime ) {
+                return false;
+        }
+        $time         = array();
+        $time['date'] = $datetime->format( 'Y-m-d' );
+        if ( '0000-01-01' === $time['date'] ) {
+                $time['date'] = '';
+        }
+        $time['time']   = $datetime->format( 'H:i:s' );
+        $time['offset'] = get_datetime_offset( $datetime );
+        $time['class']  = get_class( $datetime );
+        return array_filter( $time );
+}
+/**
+ * Function to build a datetime from individual pieces
+ *
+ * @access public
+ *
+ * @param string $date Date in Y-m-d format.
+ * @param string $time Time in H:i:s format.
+ * @param DateTimeZone $timezone Timezone object.
+ *
+ * @return DateTimeImmutable|false DateTime object or false if not valid
+ */
+function build_datetime( $date, $time, $offset = null ) {
+        if ( empty( $date ) && empty( $time ) ) {
+                return false;
+        }
+        if ( is_string( $offset ) ) {
+                $timezone = timezone_open( $offset );
+        } elseif ( $offset instanceof DateTimeZone ) {
+                $timezone = $offset;
+        } else {
+                return false;
+        }
+        if ( ! $timezone ) {
+                $timezone = wp_timezone();
+        }
+        return date_create_immutable_from_format( 'Y-m-d\TH:i:sP', $date . 'T' . $time, $timezone );
+}
+/**
+ * Return a formatted offset from a datetime object
+ *
+ * @access public
+ *
+ * @param DateTime $datetime DateTime object or if not passed set to now and site timezone
+ *
+ * @return string|false Formatted offset or false if not valid
+ */
+function get_datetime_offset( $datetime = null ) {
+        if ( ! $datetime ) {
+                $datetime = new DateTimeImmutable( 'now', wp_timezone() );
+        }
+        $seconds = $datetime->getOffset();
+        if ( false === $seconds ) {
+                return false;
+        }
+        return ( $seconds < 0 ? '-' : '+' ) . sprintf( '%02d:%02d', abs( $seconds / 60 / 60 ), abs( $seconds / 60 ) % 60 );
+}
+// Given an ISO8601 duration return an array with the piece otherwise 0 duration.
+function divide_interval( $interval ) {
+        $default = array(
+                'Y' => 0,
+                'M' => 0,
+                'D' => 0,
+                'H' => 0,
+                'I' => 0,
+                'S' => 0,
+        );
+        if ( ! $interval ) {
+                return $default;
+        }
+        if ( is_string( $interval ) && ! empty( $interval ) ) {
+                try {
+                        $interval = new DateInterval( $interval );
+                } catch ( \Exception $e ) {
+                        return $default;
+                }
+        }
+        // Reading all non-zero date parts.
+        $return = array(
+                'Y' => $interval->y,
+                'M' => $interval->m,
+                'D' => $interval->d,
+                'H' => $interval->h,
+                'I' => $interval->i,
+                'S' => $interval->s,
+        );
+        return wp_parse_args( $return, $default );
+}
+// Given an array with the pieces of a duration build an ISO8601 duration
+function build_interval( $values ) {
+        $date = wp_array_slice_assoc( $values, array( 'Y', 'M', 'D' ) );
+        $time = wp_array_slice_assoc( $values, array( 'H', 'I', 'S' ) );
+        if ( ! $date || ! $time ) {
+                return '';
+        }
+        $spec = 'P';
+        // Adding each part to the spec-string.
+        foreach ( $date as $key => $value ) {
+                $spec .= $value . $key;
+        }
+        if ( count( $time ) > 0 ) {
+                $spec .= 'T';
+                foreach ( $time as $key => $value ) {
+                        if ( 'I' === $key ) {
+                                $spec .= $value . 'M';
+                        } else {
+                                $spec .= $value . $key;
+                        }
+                }
+        }
+        return $spec;
+}
+if ( ! function_exists( 'display_formatted_datetime' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::display_formatted_datetime().
+         *
+         * @since 3.2.0
+         * @deprecated 4.0.0 Use Kind_Time::display_formatted_datetime(). Will be removed in 5.0.0.
+         *
+         * @param DateTimeInterface|string $date Date, or a string kind_safe_datetime() accepts.
+         * @return string The formatted date and time, or an empty string if the date is not valid.
+         */
+        function display_formatted_datetime( $date ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::display_formatted_datetime()' );
+                return Kind_Time::display_formatted_datetime( $date );
+        }
+}
+if ( ! function_exists( 'divide_datetime' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::divide_datetime().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::divide_datetime(). Will be removed in 5.0.0.
+         *
+         * @param DateTimeInterface|string $datetime Date, or a string kind_safe_datetime() accepts.
+         * @return array|false The date's parts. See Kind_Time::divide_datetime().
+         */
+        function divide_datetime( $datetime ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::divide_datetime()' );
+                return Kind_Time::divide_datetime( $datetime );
+        }
+}
+if ( ! function_exists( 'build_datetime' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::build_datetime().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::build_datetime(). Will be removed in 5.0.0.
+         *
+         * @param string                   $date   Date in Y-m-d format.
+         * @param string                   $time   Time in H:i or H:i:s format.
+         * @param string|DateTimeZone|null $offset Optional. Offset or time zone. Default the site's time zone.
+         * @return DateTimeImmutable|false The date, or false if it is not valid.
+         */
+        function build_datetime( $date, $time, $offset = null ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::build_datetime()' );
+                return Kind_Time::build_datetime( $date, $time, $offset );
+        }
+}
+if ( ! function_exists( 'get_datetime_offset' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::get_datetime_offset().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::get_datetime_offset(). Will be removed in 5.0.0.
+         *
+         * @param DateTimeInterface|null $datetime Optional. Date. Default now, in the site's time zone.
+         * @return string|false The offset, or false if it cannot be read.
+         */
+        function get_datetime_offset( $datetime = null ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::get_datetime_offset()' );
+                return Kind_Time::get_datetime_offset( $datetime );
+        }
+}
+if ( ! function_exists( 'divide_interval' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::divide_interval().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::divide_interval(). Will be removed in 5.0.0.
+         *
+         * @param DateInterval|string|null $interval Duration, or an ISO 8601 duration string.
+         * @return int[] The duration's parts. See Kind_Time::divide_interval().
+         */
+        function divide_interval( $interval ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::divide_interval()' );
+                return Kind_Time::divide_interval( $interval );
+        }
+}
+if ( ! function_exists( 'build_interval' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::build_interval().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::build_interval(). Will be removed in 5.0.0.
+         *
+         * @param int[] $values Years (Y), months (M), days (D), hours (H), minutes (I) and seconds (S).
+         * @return string The duration, or an empty string if every piece is 0.
+         */
+        function build_interval( $values ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::build_interval()' );
+                return Kind_Time::build_interval( $values );
+        }
+}

indieweb-post-kinds/tags/4.0.0/indieweb-post-kinds.php

-              r3067251
+              r3738687
+ *
  * @link    http://indieweb.org/Post_Kinds_Plugin
  * @package Post Kinds
+ * @package Post_Kinds
  * Plugin Name: Post Kinds
  * Plugin URI: https://wordpress.org/plugins/indieweb-post-kinds/
  * Description: Ever want to reply to someone else's post with a post on your own site? Or to "like" someone else's post, but with your own site?
+ * Version: 3.7.3
+ * Version: 4.0.0
+ * Requires at least: 6.2
+ * Requires PHP: 7.4
+ * License: GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Author: David Shanske
  * Author URI: https://david.shanske.com
 …
  * Domain Path:  /languages
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! defined( 'POST_KINDS_KSES' ) ) {
 …
 add_action( 'upgrader_process_complete', array( 'Post_Kinds_Plugin', 'upgrader_process_complete' ), 10, 2 );
-if ( ! file_exists( plugin_dir_path( __FILE__ ) . 'lib/parse-this/parse-this.php' ) ) {
-        add_action( 'admin_notices', array( 'Post_Kinds_Plugin', 'parse_this_error' ) );
+}
 if ( Post_Kinds_Plugin::show_editor_error() ) {
 …
 add_action( 'init', array( 'Post_Kinds_Plugin', 'init' ) );
+/**
+ * Loads the plugin, its assets and its global functions.
+ */
 class Post_Kinds_Plugin {
+        /**
+         * Plugin version, read from the plugin header on init.
+         *
+         * @since 2.4.0
+         * @var string
+         */
         public static $version;
+        /**
+         * Sets the version and registers the kind taxonomy.
+         *
+         * @since 2.4.0
+         */
         public static function init() {
                 self::$version = get_file_data( __FILE__, array( 'Version' => 'Version' ) )['Version'];
 …
+        }
+        /**
+         * Outputs an admin notice when Parse This is not available at all.
+         *
+         * @since 3.1.0
+         */
         public static function parse_this_error() {
+                $class   = 'notice notice-error';
+                $message = __( 'Parse This is not installed. Please advise the developer', 'indieweb-post-kinds' );
+                printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), esc_html( $message ) );
+        }
+                wp_admin_notice(
+                        esc_html__( 'Parse This is not installed. Please advise the developer', 'indieweb-post-kinds' ),
+                        array( 'type' => 'error' )
+                );
+        }
+        /**
+         * Outputs an admin notice when another plugin loaded a copy of Parse This
+         * older than 2.0.0.
+         *
+         * Post Kinds still works, because its bundled 2.0 API is loaded alongside the
+         * older copy, but the older copy serves the parse-this REST route used by the
+         * reply metabox.
+         *
+         * @since 4.0.0
+         */
+        public static function parse_this_outdated_notice() {
+                if ( ! current_user_can( 'activate_plugins' ) ) {
+                        return;
+                }
+                wp_admin_notice(
+                        sprintf(
+                                /* translators: %s: Name of the plugin, or path of the file, that loaded the older copy of Parse This. */
+                                esc_html__( 'Post Kinds: %s is loading a copy of Parse This older than version 2.0. Post Kinds will keep working, but URL lookups in the post editor use that older copy. Updating that plugin, or installing the Parse This plugin (version 2.0 or later), resolves this.', 'indieweb-post-kinds' ),
+                                '<strong>' . esc_html( self::parse_this_source() ) . '</strong>'
+                        ),
+                        array( 'type' => 'warning' )
+                );
+        }
+        /**
+         * Returns whether the loaded copy of Parse This is version 2.0.0 or later.
+         *
+         * Copies older than 2.0.0 do not define PARSE_THIS_VERSION.
+         *
+         * @since 4.0.0
+         *
+         * @return bool
+         */
+        public static function parse_this_is_current() {
+                return defined( 'PARSE_THIS_VERSION' ) && version_compare( PARSE_THIS_VERSION, '2.0.0', '>=' );
+        }
+        /**
+         * Returns a name for whatever loaded Parse This: the plugin's name, or the
+         * file's path relative to the content directory if it isn't a plugin.
+         *
+         * @since 4.0.0
+         *
+         * @return string
+         */
+        public static function parse_this_source() {
+                if ( ! function_exists( 'parse_this_loader' ) ) {
+                        return '';
+                }
+                $file = wp_normalize_path( ( new ReflectionFunction( 'parse_this_loader' ) )->getFileName() );
+                $dir  = trailingslashit( wp_normalize_path( WP_PLUGIN_DIR ) );
+                if ( 0 === strpos( $file, $dir ) ) {
+                        $slug = strtok( substr( $file, strlen( $dir ) ), '/' );
+                        if ( ! function_exists( 'get_plugins' ) ) {
+                                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                        }
+                        foreach ( get_plugins() as $basename => $data ) {
+                                if ( 0 === strpos( $basename, $slug . '/' ) ) {
+                                        return $data['Name'];
+                                }
+                        }
+                        return $slug;
+                }
+                return str_replace( trailingslashit( wp_normalize_path( WP_CONTENT_DIR ) ), '', $file );
+        }
+        /**
+         * Whether to check for the block editor and warn about it.
+         *
+         * Not on ClassicPress, or when the Classic Editor plugin is active.
+         *
+         * @since 3.3.4
+         *
+         * @return bool
+         */
         public static function show_editor_error() {
                 // Do not show this error in ClassicPress
+                // Do not show this error in ClassicPress.
                 if ( self::is_classicpress() ) {
                         return false;
+                }
-                // Do not show if less than Version 5
-                if ( version_compare( get_bloginfo( 'version' ), '5.0' ) <= 0 ) {
-                        return false;
+                }
                 if ( class_exists( 'Classic_Editor' ) ) {
                         return false;
 …
+        }
+        /**
+         * Whether the site runs ClassicPress.
+         *
+         * @since 3.6.0
+         *
+         * @return bool
+         */
         public static function is_classicpress() {
                 return function_exists( 'classicpress_version' );
+        }
+        /**
+         * Outputs an admin notice on screens that use the block editor.
+         *
+         * Post Kinds works only with the Classic Editor. The notice is not shown
+         * if the Classic Editor or Disable Gutenberg plugin is active.
+         *
+         * @since 3.2.6
+         *
+         * @return string|void An empty string if no notice is needed.
+         */
         public static function classic_editor_error() {
                 if ( ! self::post_uses_gutenberg() ) {
 …
+        /**
+         * Flushes the rewrite rules after Post Kinds is updated.
+         *
+         * @since 3.4.19
+         *
+         * @param WP_Upgrader $upgrade_object The upgrader.
+         * @param array       $options        Details of the update.
+         */
         public static function upgrader_process_complete( $upgrade_object, $options ) {
                 $current_plugin_path_name = plugin_basename( __FILE__ );
 …
+        }
+        /**
+         * Creates the kind terms and flushes the rewrite rules on activation.
+         *
+         * @since 3.3.0
+         */
         public static function activate() {
                 Kind_Taxonomy::activate_kinds();
 …
+        }
+        /**
+         * Flushes the rewrite rules on deactivation.
+         *
+         * @since 3.3.0
+         */
         public static function deactivate() {
                 flush_rewrite_rules();
+        }
+        /**
+         * Loads the translations, global functions and Parse This, and adds the hooks.
+         *
+         * @since 2.5.2
+         */
         public static function plugins_loaded() {
                 $cls = get_called_class();
                 load_plugin_textdomain( 'indieweb-post-kinds', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
                 // Add WordPress Compatibility File for Functions Introduced Post 4.9.9.
+                // Polyfills for functions newer than the plugin's minimums.
                 require_once plugin_dir_path( __FILE__ ) . 'includes/compat.php';
-                // Parse this Compat File.
-                require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/compat-functions.php';
                 // Add Kind Global Functions.
 …
                 require_once plugin_dir_path( __FILE__ ) . '/includes/time-functions.php';
+                // Parse This
+                require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/autoload.php';
+                if ( ! class_exists( 'REST_Parse_This' ) ) {
+                        require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/class-rest-parse-this.php';
+                }
+                require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/functions.php';
+                /*
+                 * Parse This. The standalone plugin, if active, has already loaded at
+                 * plugins_loaded priority 9 and defined parse_this_loader(). Otherwise
+                 * load the bundled copy. Its loader sets up the classes, the functions
+                 * and the REST route.
+                 */
+                $parse_this = plugin_dir_path( __FILE__ ) . 'lib/parse-this/parse-this.php';
+                if ( ! function_exists( 'parse_this_loader' ) && file_exists( $parse_this ) ) {
+                        require_once $parse_this;
+                        parse_this_loader();
+                }
+                if ( ! function_exists( 'parse_this_loader' ) ) {
+                        add_action( 'admin_notices', array( $cls, 'parse_this_error' ) );
+                } elseif ( ! self::parse_this_is_current() ) {
+                        /*
+                         * Another plugin loaded a copy older than 2.0.0. Load the bundled 2.0
+                         * API alongside it: everything in 2.0 is in the ParseThis namespace,
+                         * so it does not clash with the old copy's global names, and both
+                         * versions only load their bundled Mf2\Parser and Masterminds\HTML5
+                         * if those classes do not already exist.
+                         */
+                        $includes = plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/';
+                        if ( file_exists( $includes . 'autoload.php' ) ) {
+                                require_once $includes . 'autoload.php';
+                                require_once $includes . 'functions.php';
+                        }
+                        add_action( 'admin_notices', array( $cls, 'parse_this_outdated_notice' ) );
+                }
                 $class_load = array(
+                        'Plugins', // Plugin Specific Customization
+                        'Media_Metadata', // Media Metadata Enhancements
+                        'Config', // Configuration Menu
+                        'Metabox', // Metabox for Classic Editor
+                        'View', // Kind Display Functionality
+                        'Plugins', // Plugin Specific Customization.
+                        'Media_Metadata', // Media Metadata Enhancements.
+                        'Config', // Configuration Menu.
+                        'Metabox', // Metabox for Classic Editor.
+                        'View', // Kind Display Functionality.
+                        'Upgrade', // One-time upgrade of stored data.
                 );
                 foreach ( $class_load as $load ) {
                         add_action( 'init', array( 'Kind_' . $load, 'init' ) );
+                }
+                if ( defined( 'WP_CLI' ) && WP_CLI ) {
+                        WP_CLI::add_command( 'post-kinds upgrade', array( 'Kind_Upgrade', 'cli' ) );
+                }
 …
                 add_action( 'admin_enqueue_scripts', array( $cls, 'admin_style_load' ) );
                 // Load Privacy Declaration
+                // Load Privacy Declaration.
                 add_action( 'admin_init', array( $cls, 'privacy_declaration' ) );
+                remove_all_actions( 'do_feed_rss2' );
+                remove_all_actions( 'do_feed_atom' );
+                add_action( 'do_feed_rss2', array( $cls, 'do_feed_rss2' ), 10, 1 );
+                add_action( 'do_feed_atom', array( $cls, 'do_feed_atom' ), 10, 1 );
+                // Register Widgets
+                // Register Widgets.
                 add_action(
                         'widgets_init',
 …
+        }
-        public static function do_feed_atom( $for_comments ) {
-                if ( $for_comments ) {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-atom-comments.php' );
-                } else {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-atom.php' );
+                }
+        }
-        public static function do_feed_rss2( $for_comments ) {
-                if ( $for_comments ) {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-rss2-comments.php' );
-                } else {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-rss2.php' );
+                }
+        }
         /**
          * Adds link to Plugin Page for Options Page.
+         *
+         * @since 2.4.0
+         *
          * @access public
 …
         /**
          * Loads the Stylesheet for the Plugin.
+         *
+         * @since 2.4.0
          */
         public static function style_load() {
 …
         /**
          * Loads the Admin Stylesheet for the Plugin.
+         *
+         * @since 2.4.0
          */
         public static function admin_style_load() {
 …
+        }
+        /**
+         * Adds suggested text to the privacy policy guide.
+         *
+         * @since 3.0.5
+         */
         public static function privacy_declaration() {
                 if ( function_exists( 'wp_add_privacy_policy_content' ) ) {
 …
+        }
+        /**
+         * Whether the current screen uses the block editor.
+         *
+         * Screens other than the post editor count as using it.
+         *
+         * @since 3.3.2
+         *
+         * @return bool
+         */
         public static function post_uses_gutenberg() {
                 $screen = get_current_screen();

indieweb-post-kinds/tags/4.0.0/js/clone-media-fragment.js

-              r2110745
+              r3738687
 function cloneMediaFragment() {
   // Check that the fragment is a Media Fragment (starts with t=)
   if(window.location.hash && window.location.hash.match(/^#t=/)) {
     // Find any video and audio tags on the page
     document.querySelectorAll("video,audio").forEach(function(el){
       // Create a virtual element to use as a URI parser
       var parser = document.createElement('a');
       parser.href = el.currentSrc;
+      // Replace the hash
       parser.hash = window.location.hash;
       // Set the src of the video/audio tag to the full URL
       el.src = parser.href;
     });
+  }
+        // Check that the fragment is a Media Fragment (starts with t=)
+        if ( window.location.hash && window.location.hash.match( /^#t=/ ) ) {
+                // Find any video and audio tags on the page
+                document.querySelectorAll( 'video,audio' ).forEach( function( el ) {
+                        // Create a virtual element to use as a URI parser
+                        var parser = document.createElement( 'a' );
+                        parser.href = el.currentSrc;
+                        // Replace the hash
+                        parser.hash = window.location.hash;
+                        // Set the src of the video/audio tag to the full URL
+                        el.src = parser.href;
+                } );
+        }
+}
 document.addEventListener("DOMContentLoaded", function() {
   cloneMediaFragment();
   // When the media is paused, update the fragment of the page
+  document.querySelectorAll("video,audio").forEach(function(el) {
     el.addEventListener("pause", function(event) {
       // Update the media fragment to the current time
       // Use replaceState to avoid triggering the "hashchange" listener above
       history.replaceState(null, null, "#t=" + Math.round(event.target.currentTime));
     });
   });
 });
+document.addEventListener( 'DOMContentLoaded', function() {
+        cloneMediaFragment();
+        // When the media is paused, update the fragment of the page
+        document.querySelectorAll( 'video,audio' ).forEach( function( el ) {
+                el.addEventListener( 'pause', function( event ) {
+                        // Update the media fragment to the current time
+                        // Use replaceState to avoid triggering the "hashchange" listener above
+                        history.replaceState( null, null, '#t=' + Math.round( event.target.currentTime ) );
+                } );
+        } );
+} );
 // If the user changes the hash manually, clone the fragment to the media URLs
 window.addEventListener("hashchange", cloneMediaFragment);
+window.addEventListener( 'hashchange', cloneMediaFragment );

indieweb-post-kinds/tags/4.0.0/js/kind.js

-              r3001401
+              r3738687
+/* global PKAPI, moment, wp */
+/* eslint-disable no-alert -- The metabox uses alert() and confirm() for feedback by design. */
 jQuery( document ).ready( function( $ ) {
+        var KindWindow;
         changeSettings();
+function clearPostProperties() {
+        var fieldIds = [
+                'cite_url',
+                'cite_name',
+                'cite_summary',
+                'cite_tags',
+                'cite_media',
+                'cite_author_name',
+                'cite_author_url',
+                'cite_author_photo',
+                'cite_featured',
+                'cite_publication',
+                'mf2_rsvp',
+                'mf2_rating',
+                'mf2_start_time',
+                'mf2_start_date',
+                'mf2_end_time',
+                'mf2_end_date',
+                'cite_published_time',
+                'cite_published_date',
+                'cite_updated_time',
+                'cite_updated_date',
+                'duration_years',
+                'duration_months',
+                'duration_days',
+                'duration_hours',
+                'duration_minutes',
+                'duration_seconds'
+        ];
+        function clearPostProperties() {
+                var fieldIds = [
+                        'cite_url',
+                        'cite_name',
+                        'cite_summary',
+                        'cite_tags',
+                        'cite_media',
+                        'cite_author_name',
+                        'cite_author_url',
+                        'cite_author_photo',
+                        'cite_featured',
+                        'cite_publication',
+                        'mf2_rsvp',
+                        'mf2_rating',
+                        'mf2_start_time',
+                        'mf2_start_date',
+                        'mf2_end_time',
+                        'mf2_end_date',
+                        'cite_published_time',
+                        'cite_published_date',
+                        'cite_updated_time',
+                        'cite_updated_date',
+                        'duration_years',
+                        'duration_months',
+                        'duration_days',
+                        'duration_hours',
+                        'duration_minutes',
+                        'duration_seconds',
+                ];
                 if ( ! confirm( PKAPI.clear_message ) ) {
                         return;
 …
                 $.each( fieldIds, function( count, val ) {
                         document.getElementById( val ).value = '';
                 });
+                } );
                 $( '#kind-media-container' ).addClass( 'hidden' );
                 $( '#kind-media-container' ).children( 'img' ).hide();
                 $( '#add-kind-media' ).show();
+}
+function addhttp( url ) {
+        if ( ! /^(?:f|ht)tps?\:\/\//.test( url ) ) {
+                url = 'http://' + url;
+        }
+        return url;
+}
+function showLoadingSpinner() {
+        $( '#replybox-meta' ).addClass( 'is-loading' );
+}
+function hideLoadingSpinner() {
+        $( '#replybox-meta' ).removeClass( 'is-loading' );
+}
+//function used to validate website URL
+function checkUrl( url ) {
+    //regular expression for URL
+    var pattern = /^(http|https)?:\/\/[a-zA-Z0-9-\.]+\.[a-z]{2,4}/;
+    if ( pattern.test( url ) ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+function getLinkPreview() {
+        if ( '' === $( '#cite_url' ).val() ) {
+                return;
+        }
+        $.ajax({
+                type: 'GET',
+                // Here we supply the endpoint url, as opposed to the action in the data object with the admin-ajax method
+                url: PKAPI.api_url + 'parse/',
+                beforeSend: function( xhr ) {
+                // Here we set a header 'X-WP-Nonce' with the nonce as opposed to the nonce in the data object with admin-ajax
+                xhr.setRequestHeader( 'X-WP-Nonce', PKAPI.api_nonce );
+                },
+                data: {
+                        url: $( '#cite_url' ).val(),
+                        kind: $( 'input[name=\'tax_input[kind]\']:checked' ).val(),
+                        follow: true
+                },
+                success: function( response ) {
+                        var published;
+                        var updated;
+                        if ( 'undefined' === typeof response ) {
+                                alert( 'Error: Unable to Retrieve' );
+        }
+        function showLoadingSpinner() {
+                $( '#replybox-meta' ).addClass( 'is-loading' );
+        }
+        function hideLoadingSpinner() {
+                $( '#replybox-meta' ).removeClass( 'is-loading' );
+        }
+        //function used to validate website URL
+        function checkUrl( url ) {
+                //regular expression for URL
+                var pattern = /^(http|https)?:\/\/[a-zA-Z0-9-\.]+\.[a-z]{2,4}/;
+                return pattern.test( url );
+        }
+        // Fills the Author tab from one author or a list. Each field holds one value
+        // per author, separated by semicolons, so the values stay paired by position.
+        function fillAuthors( authors ) {
+                var fields = { name: [], url: [], photo: [] };
+                if ( ! Array.isArray( authors ) ) {
+                        authors = [ authors ];
+                }
+                $.each( authors, function( index, author ) {
+                        if ( 'string' === typeof author ) {
+                                author = checkUrl( author ) ? { url: author } : { name: author };
+                        }
+                        if ( ! author || 'object' !== typeof author ) {
                                 return;
+                        }
+                        if ( 'message' in response ) {
+                                alert( response.message );
+                        $.each( fields, function( key, values ) {
+                                var value = author[ key ];
+                                if ( Array.isArray( value ) ) {
+                                        value = value.join( '; ' );
+                                } else if ( value && 'object' === typeof value ) {
+                                        value = value.value;
+                                }
+                                values.push( 'string' === typeof value ? value : '' );
+                        } );
+                } );
+                $.each( fields, function( key, values ) {
+                        $( '#cite_author_' + key ).val( values.join( '' ) ? values.join( '; ' ) : '' );
+                } );
+        }
+        function getLinkPreview() {
+                if ( '' === $( '#cite_url' ).val() ) {
+                        return;
+                }
+                $.ajax( {
+                        type: 'GET',
+                        // Here we supply the endpoint url, as opposed to the action in the data object with the admin-ajax method
+                        url: PKAPI.api_url + 'parse/',
+                        beforeSend: function( xhr ) {
+                                // Here we set a header 'X-WP-Nonce' with the nonce as opposed to the nonce in the data object with admin-ajax
+                                xhr.setRequestHeader( 'X-WP-Nonce', PKAPI.api_nonce );
+                        },
+                        data: {
+                                url: $( '#cite_url' ).val(),
+                                follow: true,
+                        },
+                        success: function( response ) {
+                                var published, updated, duration;
+                                if ( 'undefined' === typeof response ) {
+                                        alert( PKAPI.error_message );
+                                        return;
+                                }
+                                if ( 'message' in response ) {
+                                        alert( response.message );
+                                        return;
+                                }
+                                if ( 'name' in response ) {
+                                        $( '#cite_name' ).val( response.name );
+                                }
+                                if ( 'published' in response ) {
+                                        published = moment.parseZone( response.published );
+                                        $( '#cite_published_date' ).val( published.format( 'YYYY-MM-DD' ) );
+                                        $( '#cite_published_time' ).val( published.format( 'HH:mm:ss' ) );
+                                        $( '#cite_published_offset' ).val( published.format( 'Z' ) );
+                                }
+                                if ( 'updated' in response ) {
+                                        updated = moment.parseZone( response.updated );
+                                        $( '#cite_updated_date' ).val( updated.format( 'YYYY-MM-DD' ) );
+                                        $( '#cite_updated_time' ).val( updated.format( 'HH:mm:ss' ) );
+                                        $( '#cite_updated_offset' ).val( updated.format( 'Z' ) );
+                                }
+                                if ( 'duration' in response ) {
+                                        duration = moment.duration( response.duration );
+                                        $( '#duration_years' ).val( duration.years() );
+                                        $( '#duration_months' ).val( duration.months() );
+                                        $( '#duration_days' ).val( duration.days() );
+                                        $( '#duration_hours' ).val( duration.hours() );
+                                        $( '#duration_minutes' ).val( duration.minutes() );
+                                        $( '#duration_seconds' ).val( duration.seconds() );
+                                }
+                                if ( 'summary' in response ) {
+                                        $( '#cite_summary' ).val( response.summary );
+                                }
+                                if ( 'featured' in response ) {
+                                        $( '#cite_featured' ).val( response.featured );
+                                }
+                                if ( 'author' in response ) {
+                                        fillAuthors( response.author );
+                                }
+                                if ( 'publication' in response && ( 'string' !== typeof response.publication ) ) {
+                                        if ( 'name' in response.publication ) {
+                                                $( '#cite_publication' ).val( response.publication.name );
+                                        }
+                                } else {
+                                        $( '#cite_publication' ).val( response.publication );
+                                }
+                                if ( 'category' in response ) {
+                                        if ( 'object' === typeof response.category ) {
+                                                $( '#cite_tags' ).val( response.category.join( ';' ) );
+                                        }
+                                }
+                                alert( PKAPI.success_message );
+                        },
+                        error: function( jqXHR ) {
+                                if ( jqXHR.responseJSON && jqXHR.responseJSON.message ) {
+                                        alert( jqXHR.responseJSON.message );
+                                } else {
+                                        alert( PKAPI.error_message );
+                                }
+                        },
+                        complete: hideLoadingSpinner,
+                } );
+        }
+        function changeSettings() {
+                var kind = $( 'input[name=\'tax_input[kind]\']:checked' ).val();
+                switch ( kind ) {
+                        case 'note':
+                                hideTitle();
+                                hideReply();
+                                hideRSVP();
+                                hideRating();
+                                hideTime();
+                                hideMedia();
+                                break;
+                        case 'article':
+                                showTitle();
+                                hideReply();
+                                hideRSVP();
+                                hideRating();
+                                hideTime();
+                                hideMedia();
+                                break;
+                        case 'issue':
+                                showTitle();
+                                showReply();
+                                hideRSVP();
+                                hideRating();
+                                hideTime();
+                                hideMedia();
+                                break;
+                        case 'listen':
+                        case 'jam':
+                        case 'watch':
+                        case 'read':
+                        case 'play':
+                                hideTitle();
+                                showReply();
+                                hideRSVP();
+                                showRating();
+                                showTime();
+                                hideMedia();
+                                break;
+                        case 'photo':
+                        case 'video':
+                        case 'audio':
+                                hideTitle();
+                                showReply();
+                                hideRSVP();
+                                hideRating();
+                                showTime();
+                                showMedia();
+                                break;
+                        case 'rsvp':
+                                showReply();
+                                hideTitle();
+                                hideTime();
+                                showRSVP();
+                                hideRating();
+                                hideMedia();
+                                break;
+                        case 'review':
+                        case 'drink':
+                        case 'eat':
+                                showReply();
+                                hideTitle();
+                                hideTime();
+                                hideRSVP();
+                                showRating();
+                                hideMedia();
+                                break;
+                        default:
+                                showReply();
+                                hideTime();
+                                hideTitle();
+                                hideRSVP();
+                                hideRating();
+                                hideMedia();
+                }
+        }
+        function showReply() {
+                $( '#replybox-meta' ).removeClass( 'hidden' );
+        }
+        function hideReply() {
+                $( '#replybox-meta' ).addClass( 'hidden' );
+        }
+        function showMedia() {
+                $( '#add-kind-media' ).removeClass( 'hidden' );
+        }
+        function hideMedia() {
+                $( '#add-kind-media' ).addClass( 'hidden' );
+        }
+        function showTitle() {
+                var titlediv = $( '#titlediv' ).detach();
+                titlediv.prependTo( '#post-body-content' );
+        }
+        function hideTitle() {
+                var titlediv = $( '#titlediv' ).detach();
+                titlediv.insertAfter( '#postdivrich' );
+        }
+        function showRSVP() {
+                $( '#rsvp-option' ).removeClass( 'hide-if-js' );
+        }
+        function hideRSVP() {
+                $( '#rsvp-option' ).addClass( 'hide-if-js' );
+        }
+        function showRating() {
+                $( '#rating-option' ).removeClass( 'hide-if-js' );
+        }
+        function hideRating() {
+                $( '#rating-option' ).addClass( 'hide-if-js' );
+        }
+        function showTime() {
+                $( '#kind-time' ).removeClass( 'hide-if-js' );
+        }
+        function hideTime() {
+                $( '#kind-time' ).addClass( 'hide-if-js' );
+        }
+        function handleKindMediaWindow() {
+                'use strict';
+                var json;
+                /**
+                 * If an instance of KindWindow already exists, then we can open it
+                 * rather than creating a new instance.
+                 */
+                if ( undefined !== KindWindow ) {
+                        KindWindow.open();
+                        return;
+                }
+                KindWindow = wp.media.frames.KindWindow = wp.media( {
+                        title: PKAPI.media_title,
+                        button: {
+                                text: PKAPI.media_button,
+                        },
+                        multiple: false,
+                } );
+                KindWindow.on( 'select', function() {
+                        json = KindWindow.state().get( 'selection' ).first().toJSON();
+                        if ( ! json.url ) {
                                 return;
+                        }
+                        if ( 'name' in response ) {
+                                $( '#cite_name' ).val( response.name );
+                        }
+                        if ( 'published' in response ) {
+                                var published = moment.parseZone( response.published );
+                                $( '#cite_published_date' ).val( published.format( 'YYYY-MM-DD' ) ) ;
+                                $( '#cite_published_time' ).val( published.format( 'HH:mm:ss' ) ) ;
+                                $( '#cite_published_offset' ).val( published.format( 'Z' ) );
+                        }
+                        if ( 'updated' in response ) {
+                                var updated = moment.parseZone( response.updated );
+                                $( '#cite_updated_date' ).val( updated.format( 'YYYY-MM-DD' ) ) ;
+                                $( '#cite_updated_time' ).val( updated.format( 'HH:mm:ss' ) ) ;
+                                $( '#cite_updated_offset' ).val( updated.format( 'Z' ) );
+                        }
+                        if ( 'duration' in response ) {
+                                var duration = moment.duration( response.duration);
+                                $( '#duration_years' ).val( duration.years() );
+                                $( '#duration_months' ).val( duration.months() );
+                                $( '#duration_days' ).val( duration.days() );
+                                $( '#duration_hours' ).val( duration.hours() );
+                                $( '#duration_minutes' ).val( duration.minutes() );
+                                $( '#duration_seconds' ).val( duration.seconds() );
+                        }
+                        if ( 'summary' in response ) {
+                                $( '#cite_summary' ).val( response.summary ) ;
+                        }
+                        if ( 'featured' in response ) {
+                                $( '#cite_featured' ).val( response.featured ) ;
+                        }
+                        if ( ( 'author' in response ) && ( 'string' != typeof response.author ) ) {
+                                if ( 'name' in response.author ) {
+                                        if ( 'string' === typeof response.author.name ) {
+                                                $( '#cite_author_name' ).val( response.author.name );
+                                        } else {
+                                                $( '#cite_author_name' ).val( response.author.name.join( ';' ) ) ;
+                                        }
+                                }
+                                if ( 'photo' in response.author ) {
+                                        if ( 'string' === typeof response.author.name ) {
+                                                $( '#cite_author_photo' ).val( response.author.photo );
+                                        } else {
+                                                $( '#cite_author_photo' ).val( response.author.photo.join( ';' ) ) ;
+                                        }
+                                }
+                                if ( 'url' in response.author ) {
+                                        if ( 'string' === typeof response.author.url ) {
+                                                $( '#cite_author_url' ).val( response.author.url );
+                                        } else {
+                                                $( '#cite_author_url' ).val( response.author.url.join( ';' ) ) ;
+                                        }
+                                }
+                        }
+                        if ( 'publication' in response && ( 'string' != typeof response.publication ) ) {
+                                if ( 'name' in response.publication ) {
+                                        $( '#cite_publication' ).val( response.publication.name );
+                                }
+                        $( '#cite_name' ).val( json.title );
+                        $( '#cite_url' ).val( json.url );
+                        $( '#cite_media' ).val( json.id );
+                        $( '#cite_summary' ).val( json.description );
+                        $( '#kind-media-container' )
+                                .children( 'img' )
+                                .attr( 'src', json.url )
+                                .attr( 'alt', json.caption )
+                                .attr( 'title', json.title )
+                                .show()
+                                .parent()
+                                .removeClass( 'hidden' );
+                        $( '#add-kind-media' ).hide();
+                } );
+                KindWindow.open();
+        }
+        jQuery( document )
+                .on( 'change', '#taxonomy-kind', function( event ) {
+                        changeSettings();
+                        event.preventDefault();
+                } )
+                .on( 'blur', '#cite_url', function( event ) {
+                        if ( '' !== $( '#cite_url' ).val() ) {
+                                if ( false === checkUrl( $( '#cite_url' ).val() ) ) {
+                                        alert( PKAPI.invalid_url );
+                                } else if ( '' === $( '#cite_name' ).val() ) {
+                                        showLoadingSpinner();
+                                        getLinkPreview();
+                                }
+                                event.preventDefault();
+                        }
+                } )
+                .on( 'click', '.clear-kindmeta-button', function( event ) {
+                        clearPostProperties();
+                        event.preventDefault();
+                } )
+                .on( 'click', 'a.show-kind-details', function( event ) {
+                        if ( $( '#kind-details' ).is( ':hidden' ) ) {
+                                $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' );
+                                $( '#kind-details' ).slideDown( 'fast' ).siblings( 'a.hide-kind-details' ).show().focus();
                         } else {
+                                $( '#cite_publication' ).val( response.publication ) ;
+                        }
+                        if ( 'category' in response ) {
+                                if ( 'object' === typeof response.category ) {
+                                        $( '#cite_tags' ).val( response.category.join( ';' ) );
+                                }
+                        }
+                alert( PKAPI.success_message );
+                console.log( response );
+                },
+                fail: function( response ) {
+                        console.log( response );
+                        alert( response.message );
+                },
+                error: function( jqXHR, textStatus, errorThrown ) {
+                        alert( jqXHR.responseJSON.message );
+                        console.log( jqXHR );
+                },
+                always: hideLoadingSpinner()
+        });
+}
+function changeSettings() {
+        kind = $( 'input[name=\'tax_input[kind]\']:checked' ).val();
+        switch ( kind ) {
+                case 'note':
+                        hideTitle();
+                        hideReply();
+                        hideRSVP();
+                        hideRating();
+                        hideTime();
+                        hideMedia();
+                        break;
+                case 'article':
+                        showTitle();
+                        hideReply();
+                        hideRSVP();
+                        hideRating();
+                        hideTime();
+                        hideMedia();
+                        break;
+                case 'issue':
+                        showTitle();
+                        showReply();
+                        hideRSVP();
+                        hideRating();
+                        hideTime();
+                        hideMedia();
+                        break;
+                case 'listen':
+                case 'jam':
+                case 'watch':
+                case 'read':
+                case 'play':
+                        hideTitle();
+                        showReply();
+                        hideRSVP();
+                        showRating();
+                        showTime();
+                        hideMedia();
+                        break;
+                case 'photo':
+                case 'video':
+                case 'audio':
+                        hideTitle();
+                        showReply();
+                        hideRSVP();
+                        hideRating();
+                        showTime();
+                        showMedia();
+                        break;
+                case 'rsvp':
+                        showReply();
+                        hideTitle();
+                        hideTime();
+                        showRSVP();
+                        hideRating();
+                        hideMedia();
+                        break;
+                case 'review':
+                case 'drink':
+                case 'eat':
+                        showReply();
+                        hideTitle();
+                        hideTime();
+                        hideRSVP();
+                        showRating();
+                        hideMedia();
+                        break;
+                default:
+                        showReply();
+                        hideTime();
+                        hideTitle();
+                        hideRSVP();
+                        hideRating();
+                        hideMedia();
+        }
+}
+function showReply() {
+        $( '#replybox-meta' ).removeClass( 'hidden' );
+}
+function hideReply() {
+        $( '#replybox-meta' ).addClass( 'hidden' );
+}
+function showMedia() {
+        $( '#add-kind-media' ).removeClass( 'hidden' );
+}
+function hideMedia() {
+        $( '#add-kind-media' ).addClass( 'hidden' );
+}
+function showTitle() {
+        var titlediv = $( '#titlediv' ).detach();
+        titlediv.prependTo( '#post-body-content' );
+}
+function hideTitle() {
+        var titlediv = $( '#titlediv' ).detach();
+        titlediv.insertAfter( '#postdivrich' );
+}
+function showRSVP() {
+        $( '#rsvp-option' ).removeClass( 'hide-if-js' );
+}
+function hideRSVP() {
+        $( '#rsvp-option' ).addClass( 'hide-if-js' );
+}
+function showRating() {
+        $( '#rating-option' ).removeClass( 'hide-if-js' );
+}
+function hideRating() {
+        $( '#rating-option' ).addClass( 'hide-if-js' );
+}
+function showTime() {
+        $( '#kind-time' ).removeClass( 'hide-if-js' );
+}
+function hideTime() {
+        $( '#kind-time' ).addClass( 'hide-if-js' );
+}
+function handleKindMediaWindow() {
+        'use strict';
+        var KindWindow, ImageData, json;
+        /**
+         * If an instance of KindWindow already exists, then we can open it
+         * rather than creating a new instance.
+         */
+        if ( undefined !== KindWindow ) {
+                KindWindow.open();
+                return;
+        }
+        KindWindow = wp.media.frames.KindWindow = wp.media({
+                title: 'Attach',
+                button: {
+                        text: 'Use this media'
+                },
+                multiple: false
+        });
+        KindWindow.on( 'select', function() {
+                json = KindWindow.state().get( 'selection' ).first().toJSON();
+                console.log( json );
+                if ( 0 > $.trim( json.url.length ) ) {
+                        return;
+                }
+                $( '#cite_name' ).val( json.title );
+                $( '#cite_url' ).val( json.url );
+                $( '#cite_media' ).val( json.id );
+                $( '#cite_summary' ).val( json.description );
+                $( '#kind-media-container' )
+                        .children( 'img' )
+                        .attr( 'src', json.url )
+                        .attr( 'alt', json.caption )
+                        .attr( 'title', json.title )
+                        .show()
+                        .parent()
+                        .removeClass( 'hidden' );
+                $( '#add-kind-media' ).hide();
+        });
+        KindWindow.open();
+}
+jQuery( document )
+        .on( 'change', '#taxonomy-kind', function( event ) {
+                changeSettings();
+                event.preventDefault();
+        })
+        .on( 'blur', '#cite_url', function( event ) {
+                if ( '' !== $( '#cite_url' ).val() ) {
+                        if ( false == checkUrl( $( '#cite_url' ).val() ) ) {
+                                alert( 'Invalid URL' );
+                        } else if ( '' === $( '#cite_name' ).val() ) {
+                                showLoadingSpinner();
+                                getLinkPreview();
+                        }
+                        event.preventDefault();
+                }
+        })
+        .on( 'click', '.clear-kindmeta-button', function( event ) {
+                clearPostProperties();
+                event.preventDefault();
+        })
+        .on( 'click', 'a.show-kind-details', function( event ) {
+                if ( $( '#kind-details' ).is( ':hidden' ) ) {
+                        $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' );
+                        $( '#kind-details' ).slideDown( 'fast' ).siblings( 'a.hide-kind-details' ).show().focus();
+                } else {
+                        $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' ).focus();
+                }
+                event.preventDefault();
+        })
+        .on( 'click', 'a.show-kind-author-details', function( event ) {
+                if ( $( '#kind-author' ).is( ':hidden' ) ) {
+                        $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' );
+                        $( '#kind-author' ).slideDown( 'fast' ).siblings( 'a.hide-kind-author' ).show().focus();
+                } else {
+                        $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' ).focus();
+                }
+                event.preventDefault();
+        })
+        .on( 'click', '#add-kind-media', function( event ) {
+                event.preventDefault();
+                handleKindMediaWindow();
+        });
+});
+                                $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' ).focus();
+                        }
+                        event.preventDefault();
+                } )
+                .on( 'click', 'a.show-kind-author-details', function( event ) {
+                        if ( $( '#kind-author' ).is( ':hidden' ) ) {
+                                $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' );
+                                $( '#kind-author' ).slideDown( 'fast' ).siblings( 'a.hide-kind-author' ).show().focus();
+                        } else {
+                                $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' ).focus();
+                        }
+                        event.preventDefault();
+                } )
+                .on( 'click', '#add-kind-media', function( event ) {
+                        event.preventDefault();
+                        handleKindMediaWindow();
+                } );
+} );

indieweb-post-kinds/tags/4.0.0/languages/indieweb-post-kinds.pot

-              r3067251
+              r3738687
 # Copyright (C) 2024 David Shanske
 # This file is distributed under the same license as the Post Kinds plugin.
+# Copyright (C) 2026 David Shanske
+# This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
 "Project-Id-Version: Post Kinds 3.7.3\n"
+"Project-Id-Version: Post Kinds 4.0.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/indieweb-post-kinds\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 …
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Creation-Date: 2024-04-09T03:10:32+00:00\n"
+"POT-Creation-Date: 2026-10-10T20:26:16+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
+"X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: indieweb-post-kinds\n"
 #. Plugin Name of the plugin
 #: indieweb-post-kinds.php
 #: includes/class-kind-config.php:251
 #: includes/class-kind-config.php:252
 #: includes/class-kind-config.php:258
+#: indieweb-post-kinds.php:7
+#: includes/class-kind-config.php:433
+#: includes/class-kind-config.php:434
+#: includes/class-kind-config.php:440
 msgid "Post Kinds"
 msgstr ""
 #. Plugin URI of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:8
 msgid "https://wordpress.org/plugins/indieweb-post-kinds/"
 msgstr ""
 #. Description of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:9
 msgid "Ever want to reply to someone else's post with a post on your own site? Or to \"like\" someone else's post, but with your own site?"
 msgstr ""
 #. Author of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:15
 msgid "David Shanske"
 msgstr ""
 #. Author URI of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:16
 msgid "https://david.shanske.com"
 msgstr ""
+#: includes/class-kind-config.php:96
+#: includes/class-kind-config.php:224
+msgid "The allowed HTML must be a valid JSON object. The previous value has been kept."
+msgstr ""
+#: includes/class-kind-config.php:261
+msgid "Kind base"
+msgstr ""
+#: includes/class-kind-config.php:269
 msgid "Content Options"
 msgstr ""
 #: includes/class-kind-config.php:105
+#: includes/class-kind-config.php:278
 msgid "Select All Kinds You Wish to Use"
 msgstr ""
 #: includes/class-kind-config.php:112
+#: includes/class-kind-config.php:285
 msgid "Default Kind for New Posts"
 msgstr ""
 #: includes/class-kind-config.php:120
+#: includes/class-kind-config.php:293
 msgid "Embed Sites into your Response"
 msgstr ""
 #: includes/class-kind-config.php:131
+#: includes/class-kind-config.php:304
 msgid "Kinds to Show in Main Feed. Selecting None will Disable this Filter"
 msgstr ""
 #: includes/class-kind-config.php:142
+#: includes/class-kind-config.php:315
 msgid "Move Response to Bottom of Content"
 msgstr ""
 #: includes/class-kind-config.php:153
+#: includes/class-kind-config.php:326
 msgid "Display Before Kind"
 msgstr ""
 #: includes/class-kind-config.php:161
+#: includes/class-kind-config.php:334
 msgid "Show Icon"
 msgstr ""
 #: includes/class-kind-config.php:162
+#: includes/class-kind-config.php:335
 msgid "Show Text"
 msgstr ""
 #: includes/class-kind-config.php:163
+#: includes/class-kind-config.php:336
 msgid "Show Icon and Text"
 msgstr ""
 #: includes/class-kind-config.php:164
+#: includes/class-kind-config.php:337
 msgid "Display Nothing"
 msgstr ""
 #: includes/class-kind-config.php:172
+#: includes/class-kind-config.php:345
 msgid "Response Content Allowed Html Elements"
 msgstr ""
 #: includes/class-kind-config.php:183
+#: includes/class-kind-config.php:356
 msgid "Automatically add the Kind to the Title"
 msgstr ""
 #: includes/class-kind-config.php:391
+#: includes/class-kind-config.php:593
 msgid "Indieweb Post Kinds"
 msgstr ""
 #: includes/class-kind-config.php:392
+#: includes/class-kind-config.php:594
 msgid "Adds support for responding and interacting with other sites."
 msgstr ""
 #: includes/class-kind-config.php:415
+#: includes/class-kind-config.php:619
 msgid "Post Properties"
 msgstr ""
 #: includes/class-kind-config.php:416
+#: includes/class-kind-config.php:620
 msgid ""
 "\n"
 …
 msgstr ""
 #: includes/class-kind-fields.php:27
+#: includes/class-kind-fields.php:39
 msgid "(GMT-11:00) Niue"
 msgstr ""
 #: includes/class-kind-fields.php:28
+#: includes/class-kind-fields.php:40
 msgid "(GMT-11:00) Pago Pago"
 msgstr ""
 #: includes/class-kind-fields.php:29
+#: includes/class-kind-fields.php:41
 msgid "(GMT-10:00) Hawaii Time"
 msgstr ""
 #: includes/class-kind-fields.php:30
+#: includes/class-kind-fields.php:42
 msgid "(GMT-10:00) Rarotonga"
 msgstr ""
 #: includes/class-kind-fields.php:31
+#: includes/class-kind-fields.php:43
 msgid "(GMT-10:00) Tahiti"
 msgstr ""
 #: includes/class-kind-fields.php:32
+#: includes/class-kind-fields.php:44
 msgid "(GMT-09:30) Marquesas"
 msgstr ""
 #: includes/class-kind-fields.php:33
+#: includes/class-kind-fields.php:45
 msgid "(GMT-09:00) Alaska Time"
 msgstr ""
 #: includes/class-kind-fields.php:34
+#: includes/class-kind-fields.php:46
 msgid "(GMT-09:00) Gambier"
 msgstr ""
 #: includes/class-kind-fields.php:35
+#: includes/class-kind-fields.php:47
 msgid "(GMT-08:00) Pacific Time"
 msgstr ""
 #: includes/class-kind-fields.php:36
+#: includes/class-kind-fields.php:48
 msgid "(GMT-08:00) Pacific Time - Tijuana"
 msgstr ""
 #: includes/class-kind-fields.php:37
+#: includes/class-kind-fields.php:49
 msgid "(GMT-08:00) Pacific Time - Vancouver"
 msgstr ""
 #: includes/class-kind-fields.php:38
+#: includes/class-kind-fields.php:50
 msgid "(GMT-08:00) Pacific Time - Whitehorse"
 msgstr ""
 #: includes/class-kind-fields.php:39
+#: includes/class-kind-fields.php:51
 msgid "(GMT-08:00) Pitcairn"
 msgstr ""
 #: includes/class-kind-fields.php:40
+#: includes/class-kind-fields.php:52
 msgid "(GMT-07:00) Mountain Time - Dawson Creek"
 msgstr ""
 #: includes/class-kind-fields.php:41
+#: includes/class-kind-fields.php:53
 msgid "(GMT-07:00) Mountain Time"
 msgstr ""
 #: includes/class-kind-fields.php:42
+#: includes/class-kind-fields.php:54
 msgid "(GMT-07:00) Mountain Time - Edmonton"
 msgstr ""
 #: includes/class-kind-fields.php:43
+#: includes/class-kind-fields.php:55
 msgid "(GMT-07:00) Mountain Time - Hermosillo"
 msgstr ""
 #: includes/class-kind-fields.php:44
+#: includes/class-kind-fields.php:56
 msgid "(GMT-07:00) Mountain Time - Chihuahua, Mazatlan"
 msgstr ""
 #: includes/class-kind-fields.php:45
+#: includes/class-kind-fields.php:57
 msgid "(GMT-07:00) Mountain Time - Arizona"
 msgstr ""
 #: includes/class-kind-fields.php:46
+#: includes/class-kind-fields.php:58
 msgid "(GMT-07:00) Mountain Time - Yellowknife"
 msgstr ""
 #: includes/class-kind-fields.php:47
+#: includes/class-kind-fields.php:59
 msgid "(GMT-06:00) Belize"
 msgstr ""
 #: includes/class-kind-fields.php:48
+#: includes/class-kind-fields.php:60
 msgid "(GMT-06:00) Central Time"
 msgstr ""
 #: includes/class-kind-fields.php:49
+#: includes/class-kind-fields.php:61
 msgid "(GMT-06:00) Costa Rica"
 msgstr ""
 #: includes/class-kind-fields.php:50
+#: includes/class-kind-fields.php:62
 msgid "(GMT-06:00) El Salvador"
 msgstr ""
 #: includes/class-kind-fields.php:51
+#: includes/class-kind-fields.php:63
 msgid "(GMT-06:00) Guatemala"
 msgstr ""
 #: includes/class-kind-fields.php:52
+#: includes/class-kind-fields.php:64
 msgid "(GMT-06:00) Managua"
 msgstr ""
 #: includes/class-kind-fields.php:53
+#: includes/class-kind-fields.php:65
 msgid "(GMT-06:00) Central Time - Mexico City"
 msgstr ""
 #: includes/class-kind-fields.php:54
+#: includes/class-kind-fields.php:66
 msgid "(GMT-06:00) Central Time - Regina"
 msgstr ""
 #: includes/class-kind-fields.php:55
+#: includes/class-kind-fields.php:67
 msgid "(GMT-06:00) Central Time - Tegucigalpa"
 msgstr ""
 #: includes/class-kind-fields.php:56
+#: includes/class-kind-fields.php:68
 msgid "(GMT-06:00) Central Time - Winnipeg"
 msgstr ""
 #: includes/class-kind-fields.php:57
+#: includes/class-kind-fields.php:69
 msgid "(GMT-06:00) Galapagos"
 msgstr ""
 #: includes/class-kind-fields.php:58
+#: includes/class-kind-fields.php:70
 msgid "(GMT-05:00) Bogota"
 msgstr ""
 #: includes/class-kind-fields.php:59
+#: includes/class-kind-fields.php:71
 msgid "(GMT-05:00) America Cancun"
 msgstr ""
 #: includes/class-kind-fields.php:60
+#: includes/class-kind-fields.php:72
 msgid "(GMT-05:00) Cayman"
 msgstr ""
 #: includes/class-kind-fields.php:61
+#: includes/class-kind-fields.php:73
 msgid "(GMT-05:00) Guayaquil"
 msgstr ""
 #: includes/class-kind-fields.php:62
+#: includes/class-kind-fields.php:74
 msgid "(GMT-05:00) Havana"
 msgstr ""
 #: includes/class-kind-fields.php:63
+#: includes/class-kind-fields.php:75
 msgid "(GMT-05:00) Eastern Time - Iqaluit"
 msgstr ""
 #: includes/class-kind-fields.php:64
+#: includes/class-kind-fields.php:76
 msgid "(GMT-05:00) Jamaica"
 msgstr ""
 #: includes/class-kind-fields.php:65
+#: includes/class-kind-fields.php:77
 msgid "(GMT-05:00) Lima"
 msgstr ""
 #: includes/class-kind-fields.php:66
+#: includes/class-kind-fields.php:78
 msgid "(GMT-05:00) Nassau"
 msgstr ""
 #: includes/class-kind-fields.php:67
+#: includes/class-kind-fields.php:79
 msgid "(GMT-05:00) Eastern Time"
 msgstr ""
 #: includes/class-kind-fields.php:68
+#: includes/class-kind-fields.php:80
 msgid "(GMT-05:00) Panama"
 msgstr ""
 #: includes/class-kind-fields.php:69
+#: includes/class-kind-fields.php:81
 msgid "(GMT-05:00) Port-au-Prince"
 msgstr ""
 #: includes/class-kind-fields.php:70
+#: includes/class-kind-fields.php:82
 msgid "(GMT-05:00) Rio Branco"
 msgstr ""
 #: includes/class-kind-fields.php:71
+#: includes/class-kind-fields.php:83
 msgid "(GMT-05:00) Eastern Time - Toronto"
 msgstr ""
 #: includes/class-kind-fields.php:72
+#: includes/class-kind-fields.php:84
 msgid "(GMT-05:00) Easter Island"
 msgstr ""
 #: includes/class-kind-fields.php:73
+#: includes/class-kind-fields.php:85
 msgid "(GMT-04:30) Caracas"
 msgstr ""
 #: includes/class-kind-fields.php:74
+#: includes/class-kind-fields.php:86
 msgid "(GMT-03:00) Asuncion"
 msgstr ""
 #: includes/class-kind-fields.php:75
+#: includes/class-kind-fields.php:87
 msgid "(GMT-04:00) Barbados"
 msgstr ""
 #: includes/class-kind-fields.php:76
+#: includes/class-kind-fields.php:88
 msgid "(GMT-04:00) Boa Vista"
 msgstr ""
 #: includes/class-kind-fields.php:77
+#: includes/class-kind-fields.php:89
 msgid "(GMT-03:00) Campo Grande"
 msgstr ""
 #: includes/class-kind-fields.php:78
+#: includes/class-kind-fields.php:90
 msgid "(GMT-03:00) Cuiaba"
 msgstr ""
 #: includes/class-kind-fields.php:79
+#: includes/class-kind-fields.php:91
 msgid "(GMT-04:00) Curacao"
 msgstr ""
 #: includes/class-kind-fields.php:80
+#: includes/class-kind-fields.php:92
 msgid "(GMT-04:00) Grand Turk"
 msgstr ""
 #: includes/class-kind-fields.php:81
+#: includes/class-kind-fields.php:93
 msgid "(GMT-04:00) Guyana"
 msgstr ""
 #: includes/class-kind-fields.php:82
+#: includes/class-kind-fields.php:94
 msgid "(GMT-04:00) Atlantic Time - Halifax"
 msgstr ""
 #: includes/class-kind-fields.php:83
+#: includes/class-kind-fields.php:95
 msgid "(GMT-04:00) La Paz"
 msgstr ""
 #: includes/class-kind-fields.php:84
+#: includes/class-kind-fields.php:96
 msgid "(GMT-04:00) Manaus"
 msgstr ""
 #: includes/class-kind-fields.php:85
+#: includes/class-kind-fields.php:97
 msgid "(GMT-04:00) Martinique"
 msgstr ""
 #: includes/class-kind-fields.php:86
+#: includes/class-kind-fields.php:98
 msgid "(GMT-04:00) Port of Spain"
 msgstr ""
 #: includes/class-kind-fields.php:87
+#: includes/class-kind-fields.php:99
 msgid "(GMT-04:00) Porto Velho"
 msgstr ""
 #: includes/class-kind-fields.php:88
+#: includes/class-kind-fields.php:100
 msgid "(GMT-04:00) Puerto Rico"
 msgstr ""
 #: includes/class-kind-fields.php:89
+#: includes/class-kind-fields.php:101
 msgid "(GMT-04:00) Santo Domingo"
 msgstr ""
 #: includes/class-kind-fields.php:90
+#: includes/class-kind-fields.php:102
 msgid "(GMT-04:00) Thule"
 msgstr ""
 #: includes/class-kind-fields.php:91
+#: includes/class-kind-fields.php:103
 msgid "(GMT-04:00) Bermuda"
 msgstr ""
 #: includes/class-kind-fields.php:92
+#: includes/class-kind-fields.php:104
 msgid "(GMT-03:30) Newfoundland Time - St. Johns"
 msgstr ""
 #: includes/class-kind-fields.php:93
+#: includes/class-kind-fields.php:105
 msgid "(GMT-03:00) Araguaina"
 msgstr ""
 #: includes/class-kind-fields.php:94
+#: includes/class-kind-fields.php:106
 msgid "(GMT-03:00) Buenos Aires"
 msgstr ""
 #: includes/class-kind-fields.php:95
+#: includes/class-kind-fields.php:107
 msgid "(GMT-03:00) Salvador"
 msgstr ""
 #: includes/class-kind-fields.php:96
+#: includes/class-kind-fields.php:108
 msgid "(GMT-03:00) Belem"
 msgstr ""
 #: includes/class-kind-fields.php:97
+#: includes/class-kind-fields.php:109
 msgid "(GMT-03:00) Cayenne"
 msgstr ""
 #: includes/class-kind-fields.php:98
+#: includes/class-kind-fields.php:110
 msgid "(GMT-03:00) Fortaleza"
 msgstr ""
 #: includes/class-kind-fields.php:99
+#: includes/class-kind-fields.php:111
 msgid "(GMT-03:00) Godthab"
 msgstr ""
 #: includes/class-kind-fields.php:100
+#: includes/class-kind-fields.php:112
 msgid "(GMT-03:00) Maceio"
 msgstr ""
 #: includes/class-kind-fields.php:101
+#: includes/class-kind-fields.php:113
 msgid "(GMT-03:00) Miquelon"
 msgstr ""
 #: includes/class-kind-fields.php:102
+#: includes/class-kind-fields.php:114
 msgid "(GMT-03:00) Montevideo"
 msgstr ""
 #: includes/class-kind-fields.php:103
+#: includes/class-kind-fields.php:115
 msgid "(GMT-03:00) Paramaribo"
 msgstr ""
 #: includes/class-kind-fields.php:104
+#: includes/class-kind-fields.php:116
 msgid "(GMT-03:00) Recife"
 msgstr ""
 #: includes/class-kind-fields.php:105
+#: includes/class-kind-fields.php:117
 msgid "(GMT-03:00) Santiago"
 msgstr ""
 #: includes/class-kind-fields.php:106
+#: includes/class-kind-fields.php:118
 msgid "(GMT-02:00) Sao Paulo"
 msgstr ""
 #: includes/class-kind-fields.php:107
+#: includes/class-kind-fields.php:119
 msgid "(GMT-03:00) Palmer"
 msgstr ""
 #: includes/class-kind-fields.php:108
+#: includes/class-kind-fields.php:120
 msgid "(GMT-03:00) Rothera"
 msgstr ""
 #: includes/class-kind-fields.php:109
+#: includes/class-kind-fields.php:121
 msgid "(GMT-03:00) Stanley"
 msgstr ""
 #: includes/class-kind-fields.php:110
+#: includes/class-kind-fields.php:122
 msgid "(GMT-02:00) Noronha"
 msgstr ""
 #: includes/class-kind-fields.php:111
+#: includes/class-kind-fields.php:123
 msgid "(GMT-02:00) South Georgia"
 msgstr ""
 #: includes/class-kind-fields.php:112
+#: includes/class-kind-fields.php:124
 msgid "(GMT-01:00) Scoresbysund"
 msgstr ""
 #: includes/class-kind-fields.php:113
+#: includes/class-kind-fields.php:125
 msgid "(GMT-01:00) Azores"
 msgstr ""
 #: includes/class-kind-fields.php:114
+#: includes/class-kind-fields.php:126
 msgid "(GMT-01:00) Cape Verde"
 msgstr ""
 #: includes/class-kind-fields.php:115
+#: includes/class-kind-fields.php:127
 msgid "(GMT+00:00) Abidjan"
 msgstr ""
 #: includes/class-kind-fields.php:116
+#: includes/class-kind-fields.php:128
 msgid "(GMT+00:00) Accra"
 msgstr ""
 #: includes/class-kind-fields.php:117
+#: includes/class-kind-fields.php:129
 msgid "(GMT+00:00) Bissau"
 msgstr ""
 #: includes/class-kind-fields.php:118
+#: includes/class-kind-fields.php:130
 msgid "(GMT+00:00) Casablanca"
 msgstr ""
 #: includes/class-kind-fields.php:119
+#: includes/class-kind-fields.php:131
 msgid "(GMT+00:00) El Aaiun"
 msgstr ""
 #: includes/class-kind-fields.php:120
+#: includes/class-kind-fields.php:132
 msgid "(GMT+00:00) Monrovia"
 msgstr ""
 #: includes/class-kind-fields.php:121
+#: includes/class-kind-fields.php:133
 msgid "(GMT+00:00) Danmarkshavn"
 msgstr ""
 #: includes/class-kind-fields.php:122
+#: includes/class-kind-fields.php:134
 msgid "(GMT+00:00) Canary Islands"
 msgstr ""
 #: includes/class-kind-fields.php:123
+#: includes/class-kind-fields.php:135
 msgid "(GMT+00:00) Faeroe"
 msgstr ""
 #: includes/class-kind-fields.php:124
+#: includes/class-kind-fields.php:136
 msgid "(GMT+00:00) Reykjavik"
 msgstr ""
 #: includes/class-kind-fields.php:125
+#: includes/class-kind-fields.php:137
 msgid "(GMT+00:00) GMT (no daylight saving)"
 msgstr ""
 #: includes/class-kind-fields.php:126
+#: includes/class-kind-fields.php:138
 msgid "(GMT+00:00) Dublin"
 msgstr ""
 #: includes/class-kind-fields.php:127
+#: includes/class-kind-fields.php:139
 msgid "(GMT+00:00) Lisbon"
 msgstr ""
 #: includes/class-kind-fields.php:128
+#: includes/class-kind-fields.php:140
 msgid "(GMT+00:00) London"
 msgstr ""
 #: includes/class-kind-fields.php:129
+#: includes/class-kind-fields.php:141
 msgid "(GMT+01:00) Algiers"
 msgstr ""
 #: includes/class-kind-fields.php:130
+#: includes/class-kind-fields.php:142
 msgid "(GMT+01:00) Ceuta"
 msgstr ""
 #: includes/class-kind-fields.php:131
+#: includes/class-kind-fields.php:143
 msgid "(GMT+01:00) Lagos"
 msgstr ""
 #: includes/class-kind-fields.php:132
+#: includes/class-kind-fields.php:144
 msgid "(GMT+01:00) Ndjamena"
 msgstr ""
 #: includes/class-kind-fields.php:133
+#: includes/class-kind-fields.php:145
 msgid "(GMT+01:00) Tunis"
 msgstr ""
 #: includes/class-kind-fields.php:134
+#: includes/class-kind-fields.php:146
 msgid "(GMT+02:00) Windhoek"
 msgstr ""
 #: includes/class-kind-fields.php:135
+#: includes/class-kind-fields.php:147
 msgid "(GMT+01:00) Amsterdam"
 msgstr ""
 #: includes/class-kind-fields.php:136
+#: includes/class-kind-fields.php:148
 msgid "(GMT+01:00) Andorra"
 msgstr ""
 #: includes/class-kind-fields.php:137
+#: includes/class-kind-fields.php:149
 msgid "(GMT+01:00) Central European Time - Belgrade"
 msgstr ""
 #: includes/class-kind-fields.php:138
+#: includes/class-kind-fields.php:150
 msgid "(GMT+01:00) Berlin"
 msgstr ""
 #: includes/class-kind-fields.php:139
+#: includes/class-kind-fields.php:151
 msgid "(GMT+01:00) Brussels"
 msgstr ""
 #: includes/class-kind-fields.php:140
+#: includes/class-kind-fields.php:152
 msgid "(GMT+01:00) Budapest"
 msgstr ""
 #: includes/class-kind-fields.php:141
+#: includes/class-kind-fields.php:153
 msgid "(GMT+01:00) Copenhagen"
 msgstr ""
 #: includes/class-kind-fields.php:142
+#: includes/class-kind-fields.php:154
 msgid "(GMT+01:00) Gibraltar"
 msgstr ""
 #: includes/class-kind-fields.php:143
+#: includes/class-kind-fields.php:155
 msgid "(GMT+01:00) Luxembourg"
 msgstr ""
 #: includes/class-kind-fields.php:144
+#: includes/class-kind-fields.php:156
 msgid "(GMT+01:00) Madrid"
 msgstr ""
 #: includes/class-kind-fields.php:145
+#: includes/class-kind-fields.php:157
 msgid "(GMT+01:00) Malta"
 msgstr ""
 #: includes/class-kind-fields.php:146
+#: includes/class-kind-fields.php:158
 msgid "(GMT+01:00) Monaco"
 msgstr ""
 #: includes/class-kind-fields.php:147
+#: includes/class-kind-fields.php:159
 msgid "(GMT+01:00) Oslo"
 msgstr ""
 #: includes/class-kind-fields.php:148
+#: includes/class-kind-fields.php:160
 msgid "(GMT+01:00) Paris"
 msgstr ""
 #: includes/class-kind-fields.php:149
+#: includes/class-kind-fields.php:161
 msgid "(GMT+01:00) Central European Time - Prague"
 msgstr ""
 #: includes/class-kind-fields.php:150
+#: includes/class-kind-fields.php:162
 msgid "(GMT+01:00) Rome"
 msgstr ""
 #: includes/class-kind-fields.php:151
+#: includes/class-kind-fields.php:163
 msgid "(GMT+01:00) Stockholm"
 msgstr ""
 #: includes/class-kind-fields.php:152
+#: includes/class-kind-fields.php:164
 msgid "(GMT+01:00) Tirane"
 msgstr ""
 #: includes/class-kind-fields.php:153
+#: includes/class-kind-fields.php:165
 msgid "(GMT+01:00) Vienna"
 msgstr ""
 #: includes/class-kind-fields.php:154
+#: includes/class-kind-fields.php:166
 msgid "(GMT+01:00) Warsaw"
 msgstr ""
 #: includes/class-kind-fields.php:155
+#: includes/class-kind-fields.php:167
 msgid "(GMT+01:00) Zurich"
 msgstr ""
 #: includes/class-kind-fields.php:156
+#: includes/class-kind-fields.php:168
 msgid "(GMT+02:00) Cairo"
 msgstr ""
 #: includes/class-kind-fields.php:157
+#: includes/class-kind-fields.php:169
 msgid "(GMT+02:00) Johannesburg"
 msgstr ""
 #: includes/class-kind-fields.php:158
+#: includes/class-kind-fields.php:170
 msgid "(GMT+02:00) Maputo"
 msgstr ""
 #: includes/class-kind-fields.php:159
+#: includes/class-kind-fields.php:171
 msgid "(GMT+02:00) Tripoli"
 msgstr ""
 #: includes/class-kind-fields.php:160
+#: includes/class-kind-fields.php:172
 msgid "(GMT+02:00) Amman"
 msgstr ""
 #: includes/class-kind-fields.php:161
+#: includes/class-kind-fields.php:173
 msgid "(GMT+02:00) Beirut"
 msgstr ""
 #: includes/class-kind-fields.php:162
+#: includes/class-kind-fields.php:174
 msgid "(GMT+02:00) Damascus"
 msgstr ""
 #: includes/class-kind-fields.php:163
+#: includes/class-kind-fields.php:175
 msgid "(GMT+02:00) Gaza"
 msgstr ""
 #: includes/class-kind-fields.php:164
+#: includes/class-kind-fields.php:176
 msgid "(GMT+02:00) Jerusalem"
 msgstr ""
 #: includes/class-kind-fields.php:165
+#: includes/class-kind-fields.php:177
 msgid "(GMT+02:00) Nicosia"
 msgstr ""
 #: includes/class-kind-fields.php:166
+#: includes/class-kind-fields.php:178
 msgid "(GMT+02:00) Athens"
 msgstr ""
 #: includes/class-kind-fields.php:167
+#: includes/class-kind-fields.php:179
 msgid "(GMT+02:00) Bucharest"
 msgstr ""
 #: includes/class-kind-fields.php:168
+#: includes/class-kind-fields.php:180
 msgid "(GMT+02:00) Chisinau"
 msgstr ""
 #: includes/class-kind-fields.php:169
+#: includes/class-kind-fields.php:181
 msgid "(GMT+02:00) Helsinki"
 msgstr ""
 #: includes/class-kind-fields.php:170
+#: includes/class-kind-fields.php:182
 msgid "(GMT+02:00) Istanbul"
 msgstr ""
 #: includes/class-kind-fields.php:171
+#: includes/class-kind-fields.php:183
 msgid "(GMT+02:00) Moscow-01 - Kaliningrad"
 msgstr ""
 #: includes/class-kind-fields.php:172
+#: includes/class-kind-fields.php:184
 msgid "(GMT+02:00) Kiev"
 msgstr ""
 #: includes/class-kind-fields.php:173
+#: includes/class-kind-fields.php:185
 msgid "(GMT+02:00) Riga"
 msgstr ""
 #: includes/class-kind-fields.php:174
+#: includes/class-kind-fields.php:186
 msgid "(GMT+02:00) Sofia"
 msgstr ""
 #: includes/class-kind-fields.php:175
+#: includes/class-kind-fields.php:187
 msgid "(GMT+02:00) Tallinn"
 msgstr ""
 #: includes/class-kind-fields.php:176
+#: includes/class-kind-fields.php:188
 msgid "(GMT+02:00) Vilnius"
 msgstr ""
 #: includes/class-kind-fields.php:177
+#: includes/class-kind-fields.php:189
 msgid "(GMT+03:00) Khartoum"
 msgstr ""
 #: includes/class-kind-fields.php:178
+#: includes/class-kind-fields.php:190
 msgid "(GMT+03:00) Nairobi"
 msgstr ""
 #: includes/class-kind-fields.php:179
+#: includes/class-kind-fields.php:191
 msgid "(GMT+03:00) Syowa"
 msgstr ""
 #: includes/class-kind-fields.php:180
+#: includes/class-kind-fields.php:192
 msgid "(GMT+03:00) Baghdad"
 msgstr ""
 #: includes/class-kind-fields.php:181
+#: includes/class-kind-fields.php:193
 msgid "(GMT+03:00) Qatar"
 msgstr ""
 #: includes/class-kind-fields.php:182
+#: includes/class-kind-fields.php:194
 msgid "(GMT+03:00) Riyadh"
 msgstr ""
 #: includes/class-kind-fields.php:183
+#: includes/class-kind-fields.php:195
 msgid "(GMT+03:00) Minsk"
 msgstr ""
 #: includes/class-kind-fields.php:184
+#: includes/class-kind-fields.php:196
 msgid "(GMT+03:00) Moscow+00 - Moscow"
 msgstr ""
 #: includes/class-kind-fields.php:185
+#: includes/class-kind-fields.php:197
 msgid "(GMT+03:30) Tehran"
 msgstr ""
 #: includes/class-kind-fields.php:186
+#: includes/class-kind-fields.php:198
 msgid "(GMT+04:00) Baku"
 msgstr ""
 #: includes/class-kind-fields.php:187
+#: includes/class-kind-fields.php:199
 msgid "(GMT+04:00) Dubai"
 msgstr ""
 #: includes/class-kind-fields.php:188
+#: includes/class-kind-fields.php:200
 msgid "(GMT+04:00) Tbilisi"
 msgstr ""
 #: includes/class-kind-fields.php:189
+#: includes/class-kind-fields.php:201
 msgid "(GMT+04:00) Yerevan"
 msgstr ""
 #: includes/class-kind-fields.php:190
+#: includes/class-kind-fields.php:202
 msgid "(GMT+04:00) Moscow+01 - Samara"
 msgstr ""
 #: includes/class-kind-fields.php:191
+#: includes/class-kind-fields.php:203
 msgid "(GMT+04:00) Mahe"
 msgstr ""
 #: includes/class-kind-fields.php:192
+#: includes/class-kind-fields.php:204
 msgid "(GMT+04:00) Mauritius"
 msgstr ""
 #: includes/class-kind-fields.php:193
+#: includes/class-kind-fields.php:205
 msgid "(GMT+04:00) Reunion"
 msgstr ""
 #: includes/class-kind-fields.php:194
+#: includes/class-kind-fields.php:206
 msgid "(GMT+04:30) Kabul"
 msgstr ""
 #: includes/class-kind-fields.php:195
+#: includes/class-kind-fields.php:207
 msgid "(GMT+05:00) Mawson"
 msgstr ""
 #: includes/class-kind-fields.php:196
+#: includes/class-kind-fields.php:208
 msgid "(GMT+05:00) Aqtau"
 msgstr ""
 #: includes/class-kind-fields.php:197
+#: includes/class-kind-fields.php:209
 msgid "(GMT+05:00) Aqtobe"
 msgstr ""
 #: includes/class-kind-fields.php:198
+#: includes/class-kind-fields.php:210
 msgid "(GMT+05:00) Ashgabat"
 msgstr ""
 #: includes/class-kind-fields.php:199
+#: includes/class-kind-fields.php:211
 msgid "(GMT+05:00) Dushanbe"
 msgstr ""
 #: includes/class-kind-fields.php:200
+#: includes/class-kind-fields.php:212
 msgid "(GMT+05:00) Karachi"
 msgstr ""
 #: includes/class-kind-fields.php:201
+#: includes/class-kind-fields.php:213
 msgid "(GMT+05:00) Tashkent"
 msgstr ""
 #: includes/class-kind-fields.php:202
+#: includes/class-kind-fields.php:214
 msgid "(GMT+05:00) Moscow+02 - Yekaterinburg"
 msgstr ""
 #: includes/class-kind-fields.php:203
+#: includes/class-kind-fields.php:215
 msgid "(GMT+05:00) Kerguelen"
 msgstr ""
 #: includes/class-kind-fields.php:204
+#: includes/class-kind-fields.php:216
 msgid "(GMT+05:00) Maldives"
 msgstr ""
 #: includes/class-kind-fields.php:205
+#: includes/class-kind-fields.php:217
 msgid "(GMT+05:30) India Standard Time"
 msgstr ""
 #: includes/class-kind-fields.php:206
+#: includes/class-kind-fields.php:218
 msgid "(GMT+05:30) Colombo"
 msgstr ""
 #: includes/class-kind-fields.php:207
+#: includes/class-kind-fields.php:219
 msgid "(GMT+05:45) Katmandu"
 msgstr ""
 #: includes/class-kind-fields.php:208
+#: includes/class-kind-fields.php:220
 msgid "(GMT+06:00) Vostok"
 msgstr ""
 #: includes/class-kind-fields.php:209
+#: includes/class-kind-fields.php:221
 msgid "(GMT+06:00) Almaty"
 msgstr ""
 #: includes/class-kind-fields.php:210
+#: includes/class-kind-fields.php:222
 msgid "(GMT+06:00) Bishkek"
 msgstr ""
 #: includes/class-kind-fields.php:211
+#: includes/class-kind-fields.php:223
 msgid "(GMT+06:00) Dhaka"
 msgstr ""
 #: includes/class-kind-fields.php:212
+#: includes/class-kind-fields.php:224
 msgid "(GMT+06:00) Moscow+03 - Omsk, Novosibirsk"
 msgstr ""
 #: includes/class-kind-fields.php:213
+#: includes/class-kind-fields.php:225
 msgid "(GMT+06:00) Thimphu"
 msgstr ""
 #: includes/class-kind-fields.php:214
+#: includes/class-kind-fields.php:226
 msgid "(GMT+06:00) Chagos"
 msgstr ""
 #: includes/class-kind-fields.php:215
+#: includes/class-kind-fields.php:227
 msgid "(GMT+06:30) Rangoon"
 msgstr ""
 #: includes/class-kind-fields.php:216
+#: includes/class-kind-fields.php:228
 msgid "(GMT+06:30) Cocos"
 msgstr ""
 #: includes/class-kind-fields.php:217
+#: includes/class-kind-fields.php:229
 msgid "(GMT+07:00) Davis"
 msgstr ""
 #: includes/class-kind-fields.php:218
+#: includes/class-kind-fields.php:230
 msgid "(GMT+07:00) Bangkok"
 msgstr ""
 #: includes/class-kind-fields.php:219
+#: includes/class-kind-fields.php:231
 msgid "(GMT+07:00) Hovd"
 msgstr ""
 #: includes/class-kind-fields.php:220
+#: includes/class-kind-fields.php:232
 msgid "(GMT+07:00) Jakarta"
 msgstr ""
 #: includes/class-kind-fields.php:221
+#: includes/class-kind-fields.php:233
 msgid "(GMT+07:00) Moscow+04 - Krasnoyarsk"
 msgstr ""
 #: includes/class-kind-fields.php:222
+#: includes/class-kind-fields.php:234
 msgid "(GMT+07:00) Hanoi"
 msgstr ""
 #: includes/class-kind-fields.php:223
+#: includes/class-kind-fields.php:235
 msgid "(GMT+07:00) Ho Chi Minh"
 msgstr ""
 #: includes/class-kind-fields.php:224
+#: includes/class-kind-fields.php:236
 msgid "(GMT+07:00) Christmas"
 msgstr ""
 #: includes/class-kind-fields.php:225
+#: includes/class-kind-fields.php:237
 msgid "(GMT+08:00) Casey"
 msgstr ""
 #: includes/class-kind-fields.php:226
+#: includes/class-kind-fields.php:238
 msgid "(GMT+08:00) Brunei"
 msgstr ""
 #: includes/class-kind-fields.php:227
+#: includes/class-kind-fields.php:239
 msgid "(GMT+08:00) Choibalsan"
 msgstr ""
 #: includes/class-kind-fields.php:228
+#: includes/class-kind-fields.php:240
 msgid "(GMT+08:00) Hong Kong"
 msgstr ""
 #: includes/class-kind-fields.php:229
+#: includes/class-kind-fields.php:241
 msgid "(GMT+08:00) Moscow+05 - Irkutsk"
 msgstr ""
 #: includes/class-kind-fields.php:230
+#: includes/class-kind-fields.php:242
 msgid "(GMT+08:00) Kuala Lumpur"
 msgstr ""
 #: includes/class-kind-fields.php:231
+#: includes/class-kind-fields.php:243
 msgid "(GMT+08:00) Macau"
 msgstr ""
 #: includes/class-kind-fields.php:232
+#: includes/class-kind-fields.php:244
 msgid "(GMT+08:00) Makassar"
 msgstr ""
 #: includes/class-kind-fields.php:233
+#: includes/class-kind-fields.php:245
 msgid "(GMT+08:00) Manila"
 msgstr ""
 #: includes/class-kind-fields.php:234
+#: includes/class-kind-fields.php:246
 msgid "(GMT+08:00) China Time - Beijing"
 msgstr ""
 #: includes/class-kind-fields.php:235
+#: includes/class-kind-fields.php:247
 msgid "(GMT+08:00) Singapore"
 msgstr ""
 #: includes/class-kind-fields.php:236
+#: includes/class-kind-fields.php:248
 msgid "(GMT+08:00) Taipei"
 msgstr ""
 #: includes/class-kind-fields.php:237
+#: includes/class-kind-fields.php:249
 msgid "(GMT+08:00) Ulaanbaatar"
 msgstr ""
 #: includes/class-kind-fields.php:238
+#: includes/class-kind-fields.php:250
 msgid "(GMT+08:00) Western Time - Perth"
 msgstr ""
 #: includes/class-kind-fields.php:239
+#: includes/class-kind-fields.php:251
 msgid "(GMT+08:30) Pyongyang"
 msgstr ""
 #: includes/class-kind-fields.php:240
+#: includes/class-kind-fields.php:252
 msgid "(GMT+09:00) Dili"
 msgstr ""
 #: includes/class-kind-fields.php:241
+#: includes/class-kind-fields.php:253
 msgid "(GMT+09:00) Jayapura"
 msgstr ""
 #: includes/class-kind-fields.php:242
+#: includes/class-kind-fields.php:254
 msgid "(GMT+09:00) Seoul"
 msgstr ""
 #: includes/class-kind-fields.php:243
+#: includes/class-kind-fields.php:255
 msgid "(GMT+09:00) Tokyo"
 msgstr ""
 #: includes/class-kind-fields.php:244
+#: includes/class-kind-fields.php:256
 msgid "(GMT+09:00) Moscow+06 - Yakutsk"
 msgstr ""
 #: includes/class-kind-fields.php:245
+#: includes/class-kind-fields.php:257
 msgid "(GMT+09:00) Palau"
 msgstr ""
 #: includes/class-kind-fields.php:246
+#: includes/class-kind-fields.php:258
 msgid "(GMT+10:30) Central Time - Adelaide"
 msgstr ""
 #: includes/class-kind-fields.php:247
+#: includes/class-kind-fields.php:259
 msgid "(GMT+09:30) Central Time - Darwin"
 msgstr ""
 #: includes/class-kind-fields.php:249
+#: includes/class-kind-fields.php:261
 msgid "(GMT+10:00) Moscow+07 - Magadan"
 msgstr ""
 #: includes/class-kind-fields.php:250
+#: includes/class-kind-fields.php:262
 msgid "(GMT+10:00) Moscow+07 - Yuzhno-Sakhalinsk"
 msgstr ""
 #: includes/class-kind-fields.php:251
+#: includes/class-kind-fields.php:263
 msgid "(GMT+10:00) Eastern Time - Brisbane"
 msgstr ""
 #: includes/class-kind-fields.php:252
+#: includes/class-kind-fields.php:264
 msgid "(GMT+11:00) Eastern Time - Hobart"
 msgstr ""
 #: includes/class-kind-fields.php:253
+#: includes/class-kind-fields.php:265
 msgid "(GMT+11:00) Eastern Time - Melbourne, Sydney"
 msgstr ""
 #: includes/class-kind-fields.php:254
+#: includes/class-kind-fields.php:266
 msgid "(GMT+10:00) Truk"
 msgstr ""
 #: includes/class-kind-fields.php:255
+#: includes/class-kind-fields.php:267
 msgid "(GMT+10:00) Guam"
 msgstr ""
 #: includes/class-kind-fields.php:256
+#: includes/class-kind-fields.php:268
 msgid "(GMT+10:00) Port Moresby"
 msgstr ""
 #: includes/class-kind-fields.php:257
+#: includes/class-kind-fields.php:269
 msgid "(GMT+11:00) Efate"
 msgstr ""
 #: includes/class-kind-fields.php:258
+#: includes/class-kind-fields.php:270
 msgid "(GMT+11:00) Guadalcanal"
 msgstr ""
 #: includes/class-kind-fields.php:259
+#: includes/class-kind-fields.php:271
 msgid "(GMT+11:00) Kosrae"
 msgstr ""
 #: includes/class-kind-fields.php:260
+#: includes/class-kind-fields.php:272
 msgid "(GMT+11:00) Norfolk"
 msgstr ""
 #: includes/class-kind-fields.php:261
+#: includes/class-kind-fields.php:273
 msgid "(GMT+11:00) Noumea"
 msgstr ""
 #: includes/class-kind-fields.php:262
+#: includes/class-kind-fields.php:274
 msgid "(GMT+11:00) Ponape"
 msgstr ""
 #: includes/class-kind-fields.php:263
+#: includes/class-kind-fields.php:275
 msgid "(GMT+12:00) Moscow+09 - Petropavlovsk-Kamchatskiy"
 msgstr ""
 #: includes/class-kind-fields.php:264
+#: includes/class-kind-fields.php:276
 msgid "(GMT+13:00) Auckland"
 msgstr ""
 #: includes/class-kind-fields.php:265
+#: includes/class-kind-fields.php:277
 msgid "(GMT+13:00) Fiji"
 msgstr ""
 #: includes/class-kind-fields.php:266
+#: includes/class-kind-fields.php:278
 msgid "(GMT+12:00) Funafuti"
 msgstr ""
 #: includes/class-kind-fields.php:267
+#: includes/class-kind-fields.php:279
 msgid "(GMT+12:00) Kwajalein"
 msgstr ""
 #: includes/class-kind-fields.php:268
+#: includes/class-kind-fields.php:280
 msgid "(GMT+12:00) Majuro"
 msgstr ""
 #: includes/class-kind-fields.php:269
+#: includes/class-kind-fields.php:281
 msgid "(GMT+12:00) Nauru"
 msgstr ""
 #: includes/class-kind-fields.php:270
+#: includes/class-kind-fields.php:282
 msgid "(GMT+12:00) Tarawa"
 msgstr ""
 #: includes/class-kind-fields.php:271
+#: includes/class-kind-fields.php:283
 msgid "(GMT+12:00) Wake"
 msgstr ""
 #: includes/class-kind-fields.php:272
+#: includes/class-kind-fields.php:284
 msgid "(GMT+12:00) Wallis"
 msgstr ""
 #: includes/class-kind-fields.php:273
+#: includes/class-kind-fields.php:285
 msgid "(GMT+14:00) Apia"
 msgstr ""
 #: includes/class-kind-fields.php:274
+#: includes/class-kind-fields.php:286
 msgid "(GMT+13:00) Enderbury"
 msgstr ""
 #: includes/class-kind-fields.php:275
+#: includes/class-kind-fields.php:287
 msgid "(GMT+13:00) Fakaofo"
 msgstr ""
 #: includes/class-kind-fields.php:276
+#: includes/class-kind-fields.php:288
 msgid "(GMT+13:00) Tongatapu"
 msgstr ""
 #: includes/class-kind-fields.php:277
+#: includes/class-kind-fields.php:289
 msgid "(GMT+14:00) Kiritimati"
 msgstr ""
 #: includes/class-kind-fields.php:385
+#: includes/class-kind-fields.php:396
 msgid "Author Name"
 msgstr ""
 #: includes/class-kind-fields.php:389
 #: templates/reply-author.php:12
+#: includes/class-kind-fields.php:400
+#: templates/reply-author.php:26
 msgid "Author URL"
 msgstr ""
 #: includes/class-kind-fields.php:393
+#: includes/class-kind-fields.php:404
 msgid "Author Photo"
 msgstr ""
 #: includes/class-kind-media-metadata.php:66
 #: includes/register-kinds.php:542
 #: includes/register-kinds.php:607
+#: includes/class-kind-media-metadata.php:125
+#: includes/register-kinds.php:551
+#: includes/register-kinds.php:616
 msgid "Artist"
 msgstr ""
 #: includes/class-kind-media-metadata.php:67
+#: includes/class-kind-media-metadata.php:126
 msgid "The creator of the image"
 msgstr ""
 #: includes/class-kind-media-metadata.php:72
+#: includes/class-kind-media-metadata.php:131
 msgid "Artist URL"
 msgstr ""
 #: includes/class-kind-media-metadata.php:73
+#: includes/class-kind-media-metadata.php:132
 msgid "The Artists URL or webpage"
 msgstr ""
 #: includes/class-kind-menu-widget.php:10
+#: includes/class-kind-menu-widget.php:25
 msgid "Kind Menu Widget"
 msgstr ""
 #: includes/class-kind-menu-widget.php:13
+#: includes/class-kind-menu-widget.php:28
 msgid "A widget that allows you to display a menu of kind archives"
 msgstr ""
 #. translators: 1. Blog Title 2. Kind Singular Name
+#: includes/class-kind-menu-widget.php:62
+msgid "title=\"%1$s %2$s Feed\""
+msgstr ""
+#: includes/class-kind-menu-widget.php:78
+#: includes/class-kind-menu-widget.php:80
+#, php-format
+msgid "%1$s %2$s Feed"
+msgstr ""
+#: includes/class-kind-menu-widget.php:96
 msgid "All Posts"
 msgstr ""
 #: includes/class-kind-menu-widget.php:122
 #: includes/class-kind-post-widget.php:95
+#: includes/class-kind-menu-widget.php:149
+#: includes/class-kind-post-widget.php:118
 msgid "Title: "
 msgstr ""
 #: includes/class-kind-menu-widget.php:143
+#: includes/class-kind-menu-widget.php:169
 msgid "Show Link to All:"
 msgstr ""
 #: includes/class-kind-menu-widget.php:148
+#: includes/class-kind-menu-widget.php:174
 msgid "Show Count:"
 msgstr ""
 #: includes/class-kind-metabox.php:154
+#: includes/class-kind-metabox.php:211
 msgid "Your URL has been successfully retrieved and parsed"
 msgstr ""
 #: includes/class-kind-metabox.php:155
+#: includes/class-kind-metabox.php:212
 msgid "Are you sure you want to clear post properties?"
 msgstr ""
+#: includes/class-kind-metabox.php:272
+#: includes/class-kind-metabox.php:213
+msgid "Error: Unable to Retrieve"
+msgstr ""
+#: includes/class-kind-metabox.php:214
+msgid "Invalid URL"
+msgstr ""
+#: includes/class-kind-metabox.php:215
+msgid "Attach"
+msgstr ""
+#: includes/class-kind-metabox.php:216
+msgid "Use this media"
+msgstr ""
+#: includes/class-kind-metabox.php:346
 msgid "Very Dissatisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:273
+#: includes/class-kind-metabox.php:347
 msgid "Dissatisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:274
+#: includes/class-kind-metabox.php:348
 msgid "Neutral"
 msgstr ""
 #: includes/class-kind-metabox.php:275
+#: includes/class-kind-metabox.php:349
 msgid "Satisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:276
+#: includes/class-kind-metabox.php:350
 msgid "Very Satisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:300
 #: includes/register-kinds.php:459
+#: includes/class-kind-metabox.php:376
+#: includes/register-kinds.php:468
 msgid "Yes"
 msgstr ""
+#: includes/class-kind-metabox.php:301
+#: includes/class-kind-metabox.php:377
+#: includes/register-kinds.php:469
+msgid "No"
+msgstr ""
+#: includes/class-kind-metabox.php:378
+#: includes/register-kinds.php:470
+msgid "Maybe"
+msgstr ""
+#: includes/class-kind-metabox.php:379
+#: includes/register-kinds.php:471
+msgid "Interested"
+msgstr ""
+#: includes/class-kind-metabox.php:380
+#: includes/register-kinds.php:472
+msgid "Remote"
+msgstr ""
+#: includes/class-kind-metabox.php:404
 #: includes/register-kinds.php:460
+msgid "No"
+msgstr ""
+#: includes/class-kind-metabox.php:302
+#: includes/register-kinds.php:461
+msgid "Maybe"
+msgstr ""
+#: includes/class-kind-metabox.php:303
+#: includes/register-kinds.php:462
+msgid "Interested"
+msgstr ""
+#: includes/class-kind-metabox.php:304
+#: includes/register-kinds.php:463
+msgid "Remote"
+msgstr ""
+#: includes/class-kind-metabox.php:326
+#: includes/register-kinds.php:451
+#: views/kind.php:81
 msgid "RSVP"
 msgstr ""
 #: includes/class-kind-metabox.php:342
+#: includes/class-kind-metabox.php:422
 msgid "Rating"
 msgstr ""
 #: includes/class-kind-metabox.php:357
+#: includes/class-kind-metabox.php:461
 msgid "Response Properties"
 msgstr ""
 #: includes/class-kind-plugins.php:133
+#: includes/class-kind-plugins.php:209
 msgctxt "direct article"
 msgid "this"
 msgstr ""
+#: includes/class-kind-post-widget.php:10
+#: includes/class-kind-plugins.php:535
+msgid "Nothing could be parsed from the URL."
+msgstr ""
+#: includes/class-kind-post-widget.php:25
 msgid "Kind Post Widget"
 msgstr ""
 #: includes/class-kind-post-widget.php:13
+#: includes/class-kind-post-widget.php:28
 msgid "A widget that allows you to display a list of posts by type"
 msgstr ""
+#: includes/class-kind-post-widget.php:63
+msgid "No Posts Found"
+msgstr ""
+#: includes/class-kind-post-widget.php:115
+#: includes/class-kind-post-widget.php:137
 msgid "Number of Posts:"
 msgstr ""
+#: includes/class-kind-taxonomy.php:305
+msgid "Post Kind"
+msgstr ""
+#: includes/class-kind-taxonomy.php:526
+#: includes/class-kind-taxonomy.php:161
+msgid "Unknown post kind."
+msgstr ""
+#: includes/class-kind-taxonomy.php:363
+msgid "The post kind, or false if the post has none."
+msgstr ""
+#: includes/class-kind-taxonomy.php:609
+msgid "Post Kinds replaces the IndieWeb Taxonomy plugin. Deactivate IndieWeb Taxonomy, then activate Post Kinds."
+msgstr ""
+#: includes/class-kind-taxonomy.php:697
 msgctxt "taxonomy general name"
 msgid "Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:527
+#: includes/class-kind-taxonomy.php:698
 msgctxt "taxonomy singular name"
 msgid "Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:528
+#: includes/class-kind-taxonomy.php:699
 msgctxt "search locations"
 msgid "Search Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:529
+#: includes/class-kind-taxonomy.php:700
 msgctxt "popular kinds"
 msgid "Popular Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:530
+#: includes/class-kind-taxonomy.php:701
 msgctxt "all taxonomy items"
 msgid "All Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:531
+#: includes/class-kind-taxonomy.php:702
 msgctxt "taxonomy parent item"
 msgid "Parent Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:532
+#: includes/class-kind-taxonomy.php:703
 msgctxt "taxonomy parent item with colon"
 msgid "Parent Kind:"
 msgstr ""
 #: includes/class-kind-taxonomy.php:533
+#: includes/class-kind-taxonomy.php:704
 msgid "This will appear on archives as the description if your theme supports"
 msgstr ""
 #: includes/class-kind-taxonomy.php:534
+#: includes/class-kind-taxonomy.php:705
 msgctxt "edit taxonomy item"
 msgid "Edit Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:535
+#: includes/class-kind-taxonomy.php:706
 msgctxt "view taxonomy item"
 msgid "View Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:536
+#: includes/class-kind-taxonomy.php:707
 msgctxt "update taxonomy item"
 msgid "Update Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:537
+#: includes/class-kind-taxonomy.php:708
 msgctxt "add taxonomy item"
 msgid "Add New Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:538
+#: includes/class-kind-taxonomy.php:709
 msgctxt "new taxonomy item"
 msgid "New Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:539
+#: includes/class-kind-taxonomy.php:710
 msgctxt "separate kinds with commas"
 msgid "Separate kinds with commas"
 msgstr ""
 #: includes/class-kind-taxonomy.php:540
+#: includes/class-kind-taxonomy.php:711
 msgctxt "add or remove items"
 msgid "Add or remove kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:541
+#: includes/class-kind-taxonomy.php:712
 msgctxt "choose most used"
 msgid "Choose from the most used kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:542
+#: includes/class-kind-taxonomy.php:713
 msgctxt "no kinds found"
 msgid "No kinds found"
 msgstr ""
 #: includes/class-kind-taxonomy.php:543
+#: includes/class-kind-taxonomy.php:714
 msgctxt "no kinds"
 msgid "No kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:544
+#: includes/class-kind-taxonomy.php:715
 msgid "Back to Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:545
+#: includes/class-kind-taxonomy.php:716
 msgid "Kind Link"
 msgstr ""
 #: includes/class-kind-taxonomy.php:546
+#: includes/class-kind-taxonomy.php:717
 msgid "A link to a kind"
-msgstr ""
-#: includes/class-kind-taxonomy.php:565
-#: includes/register-kinds.php:8
-msgid "Article"
 msgstr ""
 …
 #. translators: 1: Taxonomy. 2: Month name and year
 #. translators: 1. Taxonomy . 1: Date
+#: includes/class-kind-taxonomy.php:860
+#: includes/class-kind-taxonomy.php:863
+#: includes/class-kind-taxonomy.php:866
+#: includes/class-kind-taxonomy.php:1114
+#: includes/class-kind-taxonomy.php:1117
+#: includes/class-kind-taxonomy.php:1120
+#, php-format
 msgid "%1$1s - %2$2s"
 msgstr ""
 #. translators: 1: Taxonomy. Yearly archive title. 2: Year
 #: includes/class-kind-taxonomy.php:860
+#: includes/class-kind-taxonomy.php:1114
 msgctxt "yearly archives date format"
 msgid "Y"
 …
 #. translators: 1: Taxonomy. 2: Month name and year
 #: includes/class-kind-taxonomy.php:863
+#: includes/class-kind-taxonomy.php:1117
 msgctxt "monthly archives date format"
 msgid "F Y"
 …
 #. translators: 1. Taxonomy . 1: Date
 #: includes/class-kind-taxonomy.php:866
+#: includes/class-kind-taxonomy.php:1120
 msgctxt "daily archives date format"
 msgid "F j, Y"
 …
 #. translators: 1. Title 2. Translated term for Firehose Feed
+#: includes/class-kind-taxonomy.php:870
+#: includes/class-kind-taxonomy.php:1124
+#, php-format
 msgid "%1$s - %2$2s"
 msgstr ""
 #. translators: 1. Title 2. Translated term for Firehose Feed
 #: includes/class-kind-taxonomy.php:870
+#: includes/class-kind-taxonomy.php:1124
 msgid "Firehose"
 msgstr ""
 #. translators: 1: Title prefix. 2: Title.
+#: includes/class-kind-taxonomy.php:876
+#: includes/class-kind-taxonomy.php:1130
+#, php-format
 msgctxt "archive title"
 msgid "%1$s %2$s"
 …
 #. translators: All
+#: includes/class-kind-taxonomy.php:1164
+#: includes/class-kind-taxonomy.php:1455
+#, php-format
 msgid "All %1s"
 msgstr ""
 #: includes/class-kind-taxonomy.php:1334
+#: includes/class-kind-taxonomy.php:1647
 msgid "Invalid post"
 msgstr ""
 #: includes/class-kind-taxonomy.php:1337
+#: includes/class-kind-taxonomy.php:1650
 msgid "Invalid Kind"
 msgstr ""
+#: includes/class-kind-view.php:418
+#: includes/class-kind-taxonomy.php:1670
+msgid "Invalid post."
+msgstr ""
+#: includes/class-kind-taxonomy.php:1673
+msgid "Sorry, you are not allowed to set the kind of this post."
+msgstr ""
+#: includes/class-kind-view.php:495
 msgctxt "singular Twitter"
 msgid "a tweet"
 msgstr ""
 #: includes/class-kind-view.php:419
+#: includes/class-kind-view.php:496
 msgctxt "singular Vimeo"
 msgid "a video"
 msgstr ""
 #: includes/class-kind-view.php:420
+#: includes/class-kind-view.php:497
 msgctxt "singular Youtube"
 msgid "a video"
 msgstr ""
 #: includes/class-kind-view.php:421
+#: includes/class-kind-view.php:498
 msgctxt "singular Intagram"
 msgid "an image"
 msgstr ""
 #: includes/class-kind-view.php:427
+#: includes/class-kind-view.php:513
 msgctxt "singular post"
 msgid "a post"
 msgstr ""
 #: includes/class-kind-view.php:494
+#: includes/class-kind-view.php:589
 msgid "an author"
 msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:614
+msgid "Attending <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:616
+msgid "Might be attending <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:618
+msgid "Unable to Attend <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:620
+msgid "Interested in Attending <a href=\"%1$s\" class=u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:622
+msgid "Attending <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a> remotely"
+msgstr ""
+#: includes/class-kind-view.php:640
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:752
+#, php-format
+msgid "Attending %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:754
+#, php-format
+msgid "Might be attending %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:756
+#, php-format
+msgid "Unable to Attend %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:758
+#, php-format
+msgid "Interested in Attending %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:760
+#, php-format
+msgid "Attending %s remotely"
+msgstr ""
+#: includes/class-kind-view.php:794
 msgid "Want to Read: "
 msgstr ""
 #: includes/class-kind-view.php:641
+#: includes/class-kind-view.php:795
 msgid "Reading: "
 msgstr ""
 #: includes/class-kind-view.php:642
+#: includes/class-kind-view.php:796
 msgid "Finished Reading: "
 msgstr ""
 #. translators: singular and plural
+#: includes/class-kind-view.php:674
+#: includes/class-kind-view.php:828
+#, php-format
 msgid "%d year"
 msgid_plural "%d years"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:678
+#: includes/class-kind-view.php:832
+#, php-format
 msgid "%d month"
 msgid_plural "%d months"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:682
+#: includes/class-kind-view.php:836
+#, php-format
 msgid "%d day"
 msgid_plural "%d days"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:686
+#: includes/class-kind-view.php:840
+#, php-format
 msgid "%d hour"
 msgid_plural "%d hours"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:690
+#: includes/class-kind-view.php:844
+#, php-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:694
+#: includes/class-kind-view.php:848
+#, php-format
 msgid "%d second"
 msgid_plural "%d seconds"
 …
 msgstr[1] ""
+#: includes/register-kinds.php:9
+#: includes/register-kinds.php:17
+msgid "Article"
+msgstr ""
+#: includes/register-kinds.php:18
 msgid "Articles"
 msgstr ""
 #: includes/register-kinds.php:14
+#: includes/register-kinds.php:23
 msgid "traditional long form content: a post with an explicit title and body"
 msgstr ""
 #: includes/register-kinds.php:25
+#: includes/register-kinds.php:34
 msgid "Note"
 msgstr ""
 #: includes/register-kinds.php:26
+#: includes/register-kinds.php:35
 msgid "Notes"
 msgstr ""
 #: includes/register-kinds.php:31
+#: includes/register-kinds.php:40
 msgid "short content: a post or status update with just plain content and typically without a title"
 msgstr ""
 #: includes/register-kinds.php:42
+#: includes/register-kinds.php:51
 msgid "Reply"
 msgstr ""
 #: includes/register-kinds.php:43
+#: includes/register-kinds.php:52
 msgid "Replies"
 msgstr ""
 #: includes/register-kinds.php:44
+#: includes/register-kinds.php:53
 msgid "Replied to"
 msgstr ""
 #: includes/register-kinds.php:49
+#: includes/register-kinds.php:58
 msgid "In Reply To"
 msgstr ""
+#: includes/register-kinds.php:53
+#: includes/register-kinds.php:62
+#: includes/register-kinds.php:131
+#: includes/register-kinds.php:200
+#: includes/register-kinds.php:269
+#: includes/register-kinds.php:338
+#: includes/register-kinds.php:481
+#: includes/register-kinds.php:543
+#: includes/register-kinds.php:608
+#: includes/register-kinds.php:673
+#: templates/reply-metabox.php:56
+msgid "Name"
+msgstr ""
+#: includes/register-kinds.php:66
+#: includes/register-kinds.php:135
+#: includes/register-kinds.php:204
+#: includes/register-kinds.php:273
+#: includes/register-kinds.php:342
+#: includes/register-kinds.php:485
+#: includes/register-kinds.php:547
+#: includes/register-kinds.php:612
+#: includes/register-kinds.php:677
+#: templates/reply-metabox.php:50
+msgid "URL"
+msgstr ""
+#: includes/register-kinds.php:70
+#: includes/register-kinds.php:139
+#: includes/register-kinds.php:208
+#: includes/register-kinds.php:277
+#: includes/register-kinds.php:346
+#: templates/reply-author.php:20
+#: templates/reply-metabox.php:45
+msgid "Author"
+msgstr ""
+#: includes/register-kinds.php:77
+#: includes/register-kinds.php:146
+#: includes/register-kinds.php:215
+#: includes/register-kinds.php:284
+#: includes/register-kinds.php:353
+#: includes/register-kinds.php:489
+#: includes/register-kinds.php:558
+#: includes/register-kinds.php:623
+msgid "Summary"
+msgstr ""
+#: includes/register-kinds.php:81
+#: includes/register-kinds.php:150
+#: includes/register-kinds.php:219
+#: includes/register-kinds.php:288
+#: includes/register-kinds.php:357
+#: includes/register-kinds.php:493
+msgid "Publication/Website"
+msgstr ""
+#: includes/register-kinds.php:85
+#: includes/register-kinds.php:154
+#: includes/register-kinds.php:223
+#: includes/register-kinds.php:292
+#: includes/register-kinds.php:361
+msgid "Publish Date"
+msgstr ""
+#: includes/register-kinds.php:89
+#: includes/register-kinds.php:158
+#: includes/register-kinds.php:227
+#: includes/register-kinds.php:296
+#: includes/register-kinds.php:365
+msgid "Updated Time"
+msgstr ""
+#: includes/register-kinds.php:93
+#: includes/register-kinds.php:162
+#: includes/register-kinds.php:231
+#: includes/register-kinds.php:300
+#: includes/register-kinds.php:369
+#: includes/register-kinds.php:445
+#: includes/register-kinds.php:505
+#: includes/register-kinds.php:570
+#: includes/register-kinds.php:635
+msgid "Tags"
+msgstr ""
+#: includes/register-kinds.php:100
+#: includes/register-kinds.php:169
+#: includes/register-kinds.php:238
+#: includes/register-kinds.php:307
+#: includes/register-kinds.php:376
+#: includes/register-kinds.php:512
+msgid "Featured Media"
+msgstr ""
+#: includes/register-kinds.php:109
+msgid "a reply to content typically on another site"
+msgstr ""
+#: includes/register-kinds.php:120
+#: includes/register-kinds.php:127
+msgid "Repost"
+msgstr ""
+#: includes/register-kinds.php:121
+msgid "Reposts"
+msgstr ""
 #: includes/register-kinds.php:122
+msgid "Reposted"
+msgstr ""
+#: includes/register-kinds.php:178
+msgid "a complete reposting of content from another site"
+msgstr ""
+#: includes/register-kinds.php:189
+#: includes/register-kinds.php:196
+msgid "Like"
+msgstr ""
+#: includes/register-kinds.php:190
+msgid "Likes"
+msgstr ""
 #: includes/register-kinds.php:191
+msgid "Liked"
+msgstr ""
+#: includes/register-kinds.php:247
+msgid "a way to pay compliments to the original post/poster of external content"
+msgstr ""
+#: includes/register-kinds.php:258
+msgid "Favorite"
+msgstr ""
+#: includes/register-kinds.php:259
+msgid "Favorites"
+msgstr ""
 #: includes/register-kinds.php:260
+#: includes/register-kinds.php:265
+msgid "Favorited"
+msgstr ""
+#: includes/register-kinds.php:316
+msgid "special to the author"
+msgstr ""
+#: includes/register-kinds.php:327
+#: includes/register-kinds.php:334
+msgid "Bookmark"
+msgstr ""
+#: includes/register-kinds.php:328
+msgid "Bookmarks"
+msgstr ""
 #: includes/register-kinds.php:329
+#: includes/register-kinds.php:472
+msgid "Bookmarked"
+msgstr ""
+#: includes/register-kinds.php:385
+msgid "storing a link/bookmark for personal use or sharing with others"
+msgstr ""
+#: includes/register-kinds.php:396
+msgid "Photo"
+msgstr ""
+#: includes/register-kinds.php:397
+msgid "Photos"
+msgstr ""
+#: includes/register-kinds.php:401
+msgid "a post with an embedded image/photo as its primary focus"
+msgstr ""
+#: includes/register-kinds.php:412
+msgid "Video"
+msgstr ""
+#: includes/register-kinds.php:413
+msgid "Videos"
+msgstr ""
+#: includes/register-kinds.php:417
+msgid "a post with an embedded video as its primary focus"
+msgstr ""
+#: includes/register-kinds.php:428
+msgid "Audio"
+msgstr ""
+#: includes/register-kinds.php:429
+msgid "Audios"
+msgstr ""
+#: includes/register-kinds.php:433
+msgid "a post with an embedded audio file as its primary focus"
+msgstr ""
+#: includes/register-kinds.php:444
+msgid "Tag"
+msgstr ""
+#: includes/register-kinds.php:446
+msgid "Tagged"
+msgstr ""
+#: includes/register-kinds.php:449
+msgid "allows you to tag a post as being of a specific category or tag, or for person tagging"
+msgstr ""
+#: includes/register-kinds.php:461
+msgid "RSVPs"
+msgstr ""
+#: includes/register-kinds.php:462
+msgid "RSVPed"
+msgstr ""
+#: includes/register-kinds.php:477
+msgid "Event Details"
+msgstr ""
+#: includes/register-kinds.php:497
+msgid "Start Date"
+msgstr ""
+#: includes/register-kinds.php:501
+msgid "End Date"
+msgstr ""
+#: includes/register-kinds.php:521
+msgid "a specific type of reply regarding attendance of an event"
+msgstr ""
+#: includes/register-kinds.php:532
+msgid "Listen"
+msgstr ""
+#: includes/register-kinds.php:533
+msgid "Listens"
+msgstr ""
 #: includes/register-kinds.php:534
+msgid "Listened"
+msgstr ""
+#: includes/register-kinds.php:539
+msgid "Listen To"
+msgstr ""
+#: includes/register-kinds.php:562
+msgid "Album"
+msgstr ""
+#: includes/register-kinds.php:566
+#: includes/register-kinds.php:631
+msgid "Release Date"
+msgstr ""
+#: includes/register-kinds.php:577
+msgid "Album Art"
+msgstr ""
+#: includes/register-kinds.php:586
+msgid "listening to audio; sometimes called a scrobble"
+msgstr ""
+#: includes/register-kinds.php:597
+msgid "Watch"
+msgstr ""
+#: includes/register-kinds.php:598
+msgid "Watches"
+msgstr ""
 #: includes/register-kinds.php:599
+msgid "Watched"
+msgstr ""
+#: includes/register-kinds.php:604
+msgid "Watching To"
+msgstr ""
+#: includes/register-kinds.php:627
+msgid "Series"
+msgstr ""
+#: includes/register-kinds.php:642
+msgid "Poster"
+msgstr ""
+#: includes/register-kinds.php:651
+msgid "watching a movie, television show, online video, play or other visual-based event"
+msgstr ""
+#: includes/register-kinds.php:662
+msgid "Checkin"
+msgstr ""
+#: includes/register-kinds.php:663
+msgid "Checkins"
+msgstr ""
 #: includes/register-kinds.php:664
-#: templates/reply-metabox.php:42
-msgid "Name"
-msgstr ""
-#: includes/register-kinds.php:57
-#: includes/register-kinds.php:126
-#: includes/register-kinds.php:195
-#: includes/register-kinds.php:264
-#: includes/register-kinds.php:333
-#: includes/register-kinds.php:476
-#: includes/register-kinds.php:538
-#: includes/register-kinds.php:603
-#: includes/register-kinds.php:668
-#: lib/parse-this/includes/class-rest-parse-this.php:49
-#: templates/reply-metabox.php:36
-msgid "URL"
-msgstr ""
-#: includes/register-kinds.php:61
-#: includes/register-kinds.php:130
-#: includes/register-kinds.php:199
-#: includes/register-kinds.php:268
-#: includes/register-kinds.php:337
-#: templates/reply-author.php:6
-#: templates/reply-metabox.php:31
-msgid "Author"
-msgstr ""
-#: includes/register-kinds.php:68
-#: includes/register-kinds.php:137
-#: includes/register-kinds.php:206
-#: includes/register-kinds.php:275
-#: includes/register-kinds.php:344
-#: includes/register-kinds.php:480
-#: includes/register-kinds.php:549
-#: includes/register-kinds.php:614
-msgid "Summary"
-msgstr ""
-#: includes/register-kinds.php:72
-#: includes/register-kinds.php:141
-#: includes/register-kinds.php:210
-#: includes/register-kinds.php:279
-#: includes/register-kinds.php:348
-#: includes/register-kinds.php:484
-msgid "Publication/Website"
-msgstr ""
-#: includes/register-kinds.php:76
-#: includes/register-kinds.php:145
-#: includes/register-kinds.php:214
-#: includes/register-kinds.php:283
-#: includes/register-kinds.php:352
-msgid "Publish Date"
-msgstr ""
-#: includes/register-kinds.php:80
-#: includes/register-kinds.php:149
-#: includes/register-kinds.php:218
-#: includes/register-kinds.php:287
-#: includes/register-kinds.php:356
-msgid "Updated Time"
-msgstr ""
-#: includes/register-kinds.php:84
-#: includes/register-kinds.php:153
-#: includes/register-kinds.php:222
-#: includes/register-kinds.php:291
-#: includes/register-kinds.php:360
-#: includes/register-kinds.php:436
-#: includes/register-kinds.php:496
-#: includes/register-kinds.php:561
-#: includes/register-kinds.php:626
-msgid "Tags"
-msgstr ""
-#: includes/register-kinds.php:91
-#: includes/register-kinds.php:160
-#: includes/register-kinds.php:229
-#: includes/register-kinds.php:298
-#: includes/register-kinds.php:367
-#: includes/register-kinds.php:503
-msgid "Featured Media"
-msgstr ""
-#: includes/register-kinds.php:100
-msgid "a reply to content typically on another site"
-msgstr ""
-#: includes/register-kinds.php:111
-#: includes/register-kinds.php:118
-msgid "Repost"
-msgstr ""
-#: includes/register-kinds.php:112
-msgid "Reposts"
-msgstr ""
-#: includes/register-kinds.php:113
-msgid "Reposted"
-msgstr ""
-#: includes/register-kinds.php:169
-msgid "a complete reposting of content from another site"
-msgstr ""
-#: includes/register-kinds.php:180
-#: includes/register-kinds.php:187
-msgid "Like"
-msgstr ""
-#: includes/register-kinds.php:181
-msgid "Likes"
-msgstr ""
-#: includes/register-kinds.php:182
-msgid "Liked"
-msgstr ""
-#: includes/register-kinds.php:238
-msgid "a way to pay compliments to the original post/poster of external content"
-msgstr ""
-#: includes/register-kinds.php:249
-msgid "Favorite"
-msgstr ""
-#: includes/register-kinds.php:250
-msgid "Favorites"
-msgstr ""
-#: includes/register-kinds.php:251
-#: includes/register-kinds.php:256
-msgid "Favorited"
-msgstr ""
-#: includes/register-kinds.php:307
-msgid "special to the author"
-msgstr ""
-#: includes/register-kinds.php:318
-#: includes/register-kinds.php:325
-msgid "Bookmark"
-msgstr ""
-#: includes/register-kinds.php:319
-msgid "Bookmarks"
-msgstr ""
-#: includes/register-kinds.php:320
-msgid "Bookmarked"
-msgstr ""
-#: includes/register-kinds.php:376
-msgid "storing a link/bookmark for personal use or sharing with others"
-msgstr ""
-#: includes/register-kinds.php:387
-msgid "Photo"
-msgstr ""
-#: includes/register-kinds.php:388
-msgid "Photos"
-msgstr ""
-#: includes/register-kinds.php:392
-msgid "a post with an embedded image/photo as its primary focus"
-msgstr ""
-#: includes/register-kinds.php:403
-msgid "Video"
-msgstr ""
-#: includes/register-kinds.php:404
-msgid "Videos"
-msgstr ""
-#: includes/register-kinds.php:408
-msgid "a post with an embedded video as its primary focus"
-msgstr ""
-#: includes/register-kinds.php:419
-msgid "Audio"
-msgstr ""
-#: includes/register-kinds.php:420
-msgid "Audios"
-msgstr ""
-#: includes/register-kinds.php:424
-msgid "a post with an embedded audio file as its primary focus"
-msgstr ""
-#: includes/register-kinds.php:435
-msgid "Tag"
-msgstr ""
-#: includes/register-kinds.php:437
-msgid "Tagged"
-msgstr ""
-#: includes/register-kinds.php:440
-msgid "allows you to tag a post as being of a specific category or tag, or for person tagging"
-msgstr ""
-#: includes/register-kinds.php:452
-msgid "RSVPs"
-msgstr ""
-#: includes/register-kinds.php:453
-msgid "RSVPed"
-msgstr ""
-#: includes/register-kinds.php:468
-msgid "Event Details"
-msgstr ""
-#: includes/register-kinds.php:488
-msgid "Start Date"
-msgstr ""
-#: includes/register-kinds.php:492
-msgid "End Date"
-msgstr ""
-#: includes/register-kinds.php:512
-msgid "a specific type of reply regarding attendance of an event"
-msgstr ""
-#: includes/register-kinds.php:523
-msgid "Listen"
-msgstr ""
-#: includes/register-kinds.php:524
-msgid "Listens"
-msgstr ""
-#: includes/register-kinds.php:525
-msgid "Listened"
-msgstr ""
-#: includes/register-kinds.php:530
-msgid "Listen To"
-msgstr ""
-#: includes/register-kinds.php:553
-msgid "Album"
-msgstr ""
-#: includes/register-kinds.php:557
-#: includes/register-kinds.php:622
-msgid "Release Date"
-msgstr ""
-#: includes/register-kinds.php:568
-msgid "Album Art"
-msgstr ""
-#: includes/register-kinds.php:577
-msgid "listening to audio; sometimes called a scrobble"
-msgstr ""
-#: includes/register-kinds.php:588
-msgid "Watch"
-msgstr ""
-#: includes/register-kinds.php:589
-msgid "Watches"
-msgstr ""
-#: includes/register-kinds.php:590
-msgid "Watched"
-msgstr ""
-#: includes/register-kinds.php:595
-msgid "Watching To"
-msgstr ""
-#: includes/register-kinds.php:618
-msgid "Series"
-msgstr ""
-#: includes/register-kinds.php:633
-msgid "Poster"
-msgstr ""
-#: includes/register-kinds.php:642
-msgid "watching a movie, television show, online video, play or other visual-based event"
-msgstr ""
-#: includes/register-kinds.php:653
-msgid "Checkin"
-msgstr ""
-#: includes/register-kinds.php:654
-msgid "Checkins"
-msgstr ""
-#: includes/register-kinds.php:655
 msgid "Checked into"
 msgstr ""
 #: includes/register-kinds.php:660
+#: includes/register-kinds.php:669
 msgid "Checked In"
 msgstr ""
 #: includes/register-kinds.php:672
+#: includes/register-kinds.php:681
 msgid "Latitude"
 msgstr ""
 #: includes/register-kinds.php:680
+#: includes/register-kinds.php:689
 msgid "Longitude"
 msgstr ""
 #: includes/register-kinds.php:688
+#: includes/register-kinds.php:697
 msgid "Street Address"
 msgstr ""
 #: includes/register-kinds.php:692
+#: includes/register-kinds.php:701
 msgid "Locality"
 msgstr ""
 #: includes/register-kinds.php:696
+#: includes/register-kinds.php:705
 msgid "Region"
 msgstr ""
 #: includes/register-kinds.php:700
+#: includes/register-kinds.php:709
 msgid "Country Name"
 msgstr ""
 #: includes/register-kinds.php:704
+#: includes/register-kinds.php:713
 msgid "Postal Code"
 msgstr ""
 #: includes/register-kinds.php:710
+#: includes/register-kinds.php:719
 msgid "identifying you are at a particular geographic location"
 msgstr ""
 #: includes/register-kinds.php:721
+#: includes/register-kinds.php:730
 msgid "Wish"
 msgstr ""
 #: includes/register-kinds.php:722
+#: includes/register-kinds.php:731
 msgid "Wishes"
 msgstr ""
 #: includes/register-kinds.php:723
+#: includes/register-kinds.php:732
 msgid "Wished"
 msgstr ""
 #: includes/register-kinds.php:726
+#: includes/register-kinds.php:735
 msgid "a post indicating a desire/wish. The archive of which would be a wishlist, such as a gift registry or similar"
 msgstr ""
 #: includes/register-kinds.php:737
+#: includes/register-kinds.php:746
 msgid "Play"
 msgstr ""
 #: includes/register-kinds.php:738
+#: includes/register-kinds.php:747
 msgid "Playing"
 msgstr ""
 #: includes/register-kinds.php:739
+#: includes/register-kinds.php:748
 msgid "Played"
 msgstr ""
 #: includes/register-kinds.php:742
+#: includes/register-kinds.php:751
 msgid "playing a game"
 msgstr ""
 #: includes/register-kinds.php:753
 #: includes/register-kinds.php:754
+#: includes/register-kinds.php:762
+#: includes/register-kinds.php:763
 msgid "Weather"
 msgstr ""
 #: includes/register-kinds.php:758
+#: includes/register-kinds.php:767
 msgid "current weather conditions"
 msgstr ""
 #: includes/register-kinds.php:769
 #: includes/register-kinds.php:770
+#: includes/register-kinds.php:778
+#: includes/register-kinds.php:779
 msgid "Exercise"
 msgstr ""
 #: includes/register-kinds.php:771
+#: includes/register-kinds.php:780
 msgid "Exercised"
 msgstr ""
 #: includes/register-kinds.php:774
+#: includes/register-kinds.php:783
 msgid "some form of physical activity or workout (examples: walk, run, cycle, hike, yoga, etc.)"
 msgstr ""
 #: includes/register-kinds.php:785
+#: includes/register-kinds.php:794
 msgid "Trip"
 msgstr ""
 #: includes/register-kinds.php:786
+#: includes/register-kinds.php:795
 msgid "Trips"
 msgstr ""
 #: includes/register-kinds.php:787
 #: includes/register-kinds.php:803
+#: includes/register-kinds.php:796
+#: includes/register-kinds.php:812
 msgid "Travelled"
 msgstr ""
 #: includes/register-kinds.php:790
+#: includes/register-kinds.php:799
 msgid "represents a geographic journey"
 msgstr ""
 #: includes/register-kinds.php:801
+#: includes/register-kinds.php:810
 msgid "Itinerary"
 msgstr ""
 #: includes/register-kinds.php:802
+#: includes/register-kinds.php:811
 msgid "Itineraries"
 msgstr ""
 #: includes/register-kinds.php:806
+#: includes/register-kinds.php:815
 msgid "parts of a scheduled trip including transit by car, plane, train, etc."
 msgstr ""
 #: includes/register-kinds.php:818
 #: includes/register-kinds.php:819
+#: includes/register-kinds.php:827
+#: includes/register-kinds.php:828
 msgid "Eat"
 msgstr ""
 #: includes/register-kinds.php:820
+#: includes/register-kinds.php:829
 msgid "Ate"
 msgstr ""
 #: includes/register-kinds.php:823
+#: includes/register-kinds.php:832
 msgid "what you are eating, perhaps for a food diary"
 msgstr ""
 #: includes/register-kinds.php:835
+#: includes/register-kinds.php:844
 msgid "Drink"
 msgstr ""
 #: includes/register-kinds.php:836
+#: includes/register-kinds.php:845
 msgid "Drinks"
 msgstr ""
 #: includes/register-kinds.php:837
+#: includes/register-kinds.php:846
 msgid "Drank"
 msgstr ""
 #: includes/register-kinds.php:840
+#: includes/register-kinds.php:849
 msgid "what you are drinking, perhaps for a food dairy"
 msgstr ""
 #: includes/register-kinds.php:852
+#: includes/register-kinds.php:861
 msgid "Follow"
 msgstr ""
 #: includes/register-kinds.php:853
+#: includes/register-kinds.php:862
 msgid "Follows"
 msgstr ""
 #: includes/register-kinds.php:854
+#: includes/register-kinds.php:863
 msgid "Followed"
 msgstr ""
 #: includes/register-kinds.php:857
+#: includes/register-kinds.php:866
 msgid "indicating you are now following or subscribing to another person`s activities online"
 msgstr ""
 #: includes/register-kinds.php:869
+#: includes/register-kinds.php:878
 msgid "Jam"
 msgstr ""
 #: includes/register-kinds.php:870
+#: includes/register-kinds.php:879
 msgid "Jams"
 msgstr ""
 #: includes/register-kinds.php:871
+#: includes/register-kinds.php:880
 msgid "Listened to"
 msgstr ""
 #: includes/register-kinds.php:874
+#: includes/register-kinds.php:883
 msgid "a particularly personally meaningful song (a listen with added emphasis)"
 msgstr ""
 #: includes/register-kinds.php:886
 #: includes/register-kinds.php:888
+#: includes/register-kinds.php:895
+#: includes/register-kinds.php:897
 msgid "Read"
 msgstr ""
 #: includes/register-kinds.php:887
+#: includes/register-kinds.php:896
 msgid "Reads"
 msgstr ""
 #: includes/register-kinds.php:891
+#: includes/register-kinds.php:900
 msgid "reading a book, magazine, newspaper, other physical document, or online post"
 msgstr ""
 #: includes/register-kinds.php:903
+#: includes/register-kinds.php:912
 msgid "Quote"
 msgstr ""
 #: includes/register-kinds.php:904
+#: includes/register-kinds.php:913
 msgid "Quotes"
 msgstr ""
 #: includes/register-kinds.php:905
+#: includes/register-kinds.php:914
 msgid "Quoted"
 msgstr ""
 #: includes/register-kinds.php:908
+#: includes/register-kinds.php:917
 msgid "quoted content"
 msgstr ""
 #: includes/register-kinds.php:920
+#: includes/register-kinds.php:929
 msgid "Mood"
 msgstr ""
 #: includes/register-kinds.php:921
+#: includes/register-kinds.php:930
 msgid "Moods"
 msgstr ""
 #: includes/register-kinds.php:922
+#: includes/register-kinds.php:931
 msgid "Felt"
 msgstr ""
 #: includes/register-kinds.php:925
+#: includes/register-kinds.php:934
 msgid "how you are feeling (example: happy, sad, indifferent, etc.)"
 msgstr ""
 #: includes/register-kinds.php:937
+#: includes/register-kinds.php:946
 msgid "Recipe"
 msgstr ""
 #: includes/register-kinds.php:938
+#: includes/register-kinds.php:947
 msgid "Recipes"
 msgstr ""
 #: includes/register-kinds.php:939
+#: includes/register-kinds.php:948
 msgid "Cooked"
 msgstr ""
 #: includes/register-kinds.php:942
+#: includes/register-kinds.php:951
 msgid "list of ingredients and directions for making food or drink"
 msgstr ""
 #: includes/register-kinds.php:954
+#: includes/register-kinds.php:963
 msgid "Issue"
 msgstr ""
 #: includes/register-kinds.php:955
+#: includes/register-kinds.php:964
 msgid "Issues"
 msgstr ""
 #: includes/register-kinds.php:956
+#: includes/register-kinds.php:965
 msgid "Filed an Issue"
 msgstr ""
 #: includes/register-kinds.php:959
+#: includes/register-kinds.php:968
 msgid "Issue is a special kind of article post that is a reply to typically some source code, though potentially anything at a source control repository."
 msgstr ""
 #: includes/register-kinds.php:971
+#: includes/register-kinds.php:980
 msgid "Question"
 msgstr ""
 #: includes/register-kinds.php:972
+#: includes/register-kinds.php:981
 msgid "Questions"
 msgstr ""
 #: includes/register-kinds.php:973
+#: includes/register-kinds.php:982
 msgid "Asked a question"
 msgstr ""
 #: includes/register-kinds.php:976
+#: includes/register-kinds.php:985
 msgid "Question is a post type for soliciting answer replies, which are then typically up/down voted by others and then displayed underneath the question post ordered by highest positive vote count rather than time ordered."
 msgstr ""
 #: includes/register-kinds.php:988
+#: includes/register-kinds.php:997
 msgid "Sleep"
 msgstr ""
 #: includes/register-kinds.php:989
+#: includes/register-kinds.php:998
 msgid "Sleeps"
 msgstr ""
 #: includes/register-kinds.php:990
+#: includes/register-kinds.php:999
 msgid "Slept"
 msgstr ""
 #: includes/register-kinds.php:993
+#: includes/register-kinds.php:1002
 msgid "Sleep is a passive metrics post type that indicates how much time (and often a graph of how deeply) a person has slept."
 msgstr ""
 #: includes/register-kinds.php:1005
+#: includes/register-kinds.php:1014
 msgid "Event"
 msgstr ""
 #: includes/register-kinds.php:1006
+#: includes/register-kinds.php:1015
 msgid "Events"
 msgstr ""
 #: includes/register-kinds.php:1007
+#: includes/register-kinds.php:1016
 msgid "Planned"
 msgstr ""
 #: includes/register-kinds.php:1010
+#: includes/register-kinds.php:1019
 msgid "An event is a type of post that in addition to a post name (event title) has a start datetime (likely end datetime), and a location."
 msgstr ""
 #: includes/register-kinds.php:1021
+#: includes/register-kinds.php:1030
 msgid "Review"
 msgstr ""
 #: includes/register-kinds.php:1022
+#: includes/register-kinds.php:1031
 msgid "Reviews"
 msgstr ""
 #: includes/register-kinds.php:1023
+#: includes/register-kinds.php:1032
 msgid "Reviewed"
 msgstr ""
 #: includes/register-kinds.php:1026
+#: includes/register-kinds.php:1035
 msgid "A review is a post evaluating a product or service, usually involving a written description, sometimes with summary numerical evaluations, also known as just a rating."
 msgstr ""
 #: includes/register-kinds.php:1038
+#: includes/register-kinds.php:1047
 msgid "Acquisition"
 msgstr ""
 #: includes/register-kinds.php:1039
+#: includes/register-kinds.php:1048
 msgid "Acquisitions"
 msgstr ""
 #: includes/register-kinds.php:1040
+#: includes/register-kinds.php:1049
 msgid "Acquired"
 msgstr ""
 #: includes/register-kinds.php:1043
+#: includes/register-kinds.php:1052
 msgid "Purchases, gifts, found things, or objects donated"
 msgstr ""
 #: includes/register-kinds.php:1054
+#: includes/register-kinds.php:1063
 msgid "Craft"
 msgstr ""
 #: includes/register-kinds.php:1055
+#: includes/register-kinds.php:1064
 msgid "Crafts"
 msgstr ""
 #: includes/register-kinds.php:1056
+#: includes/register-kinds.php:1065
 msgid "Crafted"
 msgstr ""
 #: includes/register-kinds.php:1059
+#: includes/register-kinds.php:1068
 msgid "Activities like knitting, crocheting, cross stitch, wood working, restoration, 3d printing...the activity of building something."
 msgstr ""
 #: indieweb-post-kinds.php:65
+#: indieweb-post-kinds.php:87
 msgid "Parse This is not installed. Please advise the developer"
 msgstr ""
+#: indieweb-post-kinds.php:98
+#. translators: %s: Name of the plugin, or path of the file, that loaded the older copy of Parse This.
+#: indieweb-post-kinds.php:109
+#, php-format
+msgid "Post Kinds: %s is loading a copy of Parse This older than version 2.0. Post Kinds will keep working, but URL lookups in the post editor use that older copy. Updating that plugin, or installing the Parse This plugin (version 2.0 or later), resolves this."
+msgstr ""
+#: indieweb-post-kinds.php:209
 msgid "Classic Editor or Disable Gutenberg Plugin is not active. The Post Kinds plugin will not function correctly at this time without using the Classic Editor."
 msgstr ""
 #: indieweb-post-kinds.php:211
+#: indieweb-post-kinds.php:353
 msgid "Settings"
 msgstr ""
 #: indieweb-post-kinds.php:233
+#: indieweb-post-kinds.php:384
 msgid "For responses to URLs, such as responding to a post or article, this site allows the storage of data around the post/article in order to generate a rich citation. Items such as author name and image, summary of the text, embed provided by third-party site, etc may be stored and are solely to provide this context. We will remove any of this on request."
 msgstr ""
+#: lib/parse-this/includes/class-parse-this-discovery.php:57
+#: lib/parse-this/includes/class-parse-this-opml.php:17
+#: lib/parse-this/includes/class-parse-this.php:231
+#: lib/parse-this/includes/class-parse-this.php:265
+msgid "A valid URL was not provided."
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:19
+#: lib/parse-this/includes/class-rest-parse-this.php:20
+msgid "Parse This"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:35
+msgid "Parse This Debugger"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:55
+msgid "MF2"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:63
+msgid "Feed Discovery"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:71
+msgid "References"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:79
+msgid "Clean up Location"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:87
+msgid "Return Type"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:91
+msgid "Single"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:92
+msgid "Feed"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:98
+msgid "Follow Author Links"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:107
+msgid "Parse"
+msgstr ""
+#: templates/reply-author.php:2
+#: templates/reply-author.php:16
 msgid "Information on the Author or Artist of the Piece"
 msgstr ""
 #: templates/reply-author.php:3
+#: templates/reply-author.php:17
 msgid "(Multiple Entries separated by semicolon)"
 msgstr ""
 #: templates/reply-author.php:18
+#: templates/reply-author.php:32
 msgid "Author Photo URL"
 msgstr ""
 #: templates/reply-details.php:2
+#: templates/reply-details.php:17
 msgid "Information on what you are responding to"
 msgstr ""
 #: templates/reply-details.php:4
+#: templates/reply-details.php:19
 msgid "Summary/Quote/Caption"
 msgstr ""
 #: templates/reply-details.php:9
+#: templates/reply-details.php:24
 msgid "Site Name/Publication/Album"
 msgstr ""
 #: templates/reply-details.php:14
+#: templates/reply-details.php:29
 msgid "Published/Released"
 msgstr ""
 #: templates/reply-details.php:15
+#: templates/reply-details.php:30
 msgid "Updated"
 msgstr ""
 #: templates/reply-details.php:18
+#: templates/reply-details.php:33
 msgid "Tags (semicolon separated)"
 msgstr ""
 #: templates/reply-details.php:23
+#: templates/reply-details.php:38
 msgid "Featured Image"
 msgstr ""
 #: templates/reply-metabox.php:30
+#: templates/reply-metabox.php:44
 msgid "Details"
 msgstr ""
+#: templates/reply-metabox.php:33
+#: templates/reply-metabox.php:46
+msgid "Upload or Attach Media"
+msgstr ""
+#: templates/reply-metabox.php:47
 msgid "Clear"
 msgstr ""
 #: templates/reply-time.php:4
+#: templates/reply-time.php:18
 msgid "Duration"
 msgstr ""
 #: templates/reply-time.php:7
+#: templates/reply-time.php:21
 msgid "Years"
 msgstr ""
 #: templates/reply-time.php:11
+#: templates/reply-time.php:25
 msgid "Months"
 msgstr ""
 #: templates/reply-time.php:15
+#: templates/reply-time.php:29
 msgid "Days"
 msgstr ""
 #: templates/reply-time.php:21
+#: templates/reply-time.php:35
 msgid "Hours"
 msgstr ""
 #: templates/reply-time.php:25
+#: templates/reply-time.php:39
 msgid "Minutes"
 msgstr ""
 #: templates/reply-time.php:29
+#: templates/reply-time.php:43
 msgid "Seconds"
 msgstr ""
 #: templates/reply-time.php:33
+#: templates/reply-time.php:47
 msgid "Start Time and End Time will be Used to Calculate Duration if Duration Not Set."
 msgstr ""
 #: templates/reply-time.php:35
+#: templates/reply-time.php:49
 msgid "Start Time"
 msgstr ""
 #: templates/reply-time.php:36
+#: templates/reply-time.php:50
 msgid "End Time"
 msgstr ""
 #: views/kind-bookmark.php:25
 #: views/kind-favorite.php:24
 #: views/kind-issue.php:24
 #: views/kind-jam.php:28
 #: views/kind-like.php:25
 #: views/kind-listen.php:30
 #: views/kind-read.php:28
 #: views/kind-video.php:45
 #: views/kind-watch.php:29
 #: views/kind.php:35
+#: views/kind-bookmark.php:39
+#: views/kind-favorite.php:38
+#: views/kind-issue.php:38
+#: views/kind-jam.php:46
+#: views/kind-like.php:39
+#: views/kind-listen.php:48
+#: views/kind-read.php:42
+#: views/kind-video.php:63
+#: views/kind-watch.php:47
+#: views/kind.php:53
 msgid "by"
 msgstr ""
 #: views/kind-event.php:22
+#: views/kind-event.php:39
 msgid "Start"
 msgstr ""
 #: views/kind-event.php:25
+#: views/kind-event.php:42
 msgid "End"
 msgstr ""
 #: views/kind-itinerary.php:33
+#: views/kind-itinerary.php:56
 msgid "Departs: "
 msgstr ""
 #: views/kind-itinerary.php:38
+#: views/kind-itinerary.php:61
 msgid "Arrives: "
 msgstr ""
 #: views/kind-jam.php:31
 #: views/kind-listen.php:33
 #: views/kind-watch.php:32
+#: views/kind-jam.php:49
+#: views/kind-listen.php:51
+#: views/kind-watch.php:50
 msgid " from "
 msgstr ""

indieweb-post-kinds/tags/4.0.0/lib/parse-this/includes/autoload.php

-              r2332001
+              r3738687
 <?php
+/**
+ * Class autoloader for Parse This.
+ *
+ * @package Parse_This
+ */
+// autoloader for Parse This
+defined( 'ABSPATH' ) || exit;
+/*
+ * Maps classes in the ParseThis namespace to files in this directory, for
+ * example ParseThis\MF2_Utils to class-mf2-utils.php.
+ */
 spl_autoload_register(
         function ( $class ) {
+                $base_dir = trailingslashit( __DIR__ );
+                $bases    = array( 'Parse_This' );
+                foreach ( $bases as $base ) {
+                        if ( strncmp( $class, $base, strlen( $base ) ) === 0 ) {
+                                $filename = 'class-' . strtolower( str_replace( '_', '-', $class ) );
+                                $file     = $base_dir . $filename . '.php';
+                                if ( file_exists( $file ) ) {
+                                        require $file;
+                                }
+                        }
+                $prefix = 'ParseThis\\';
+                if ( 0 !== strncmp( $class, $prefix, strlen( $prefix ) ) ) {
+                        return;
+                }
+                $name = substr( $class, strlen( $prefix ) );
+                $file = __DIR__ . '/class-' . strtolower( str_replace( '_', '-', $name ) ) . '.php';
+                if ( file_exists( $file ) ) {
+                        require $file;
+                }
+        }
 );
+// Deprecated global names still used by other plugins.
+require_once __DIR__ . '/aliases.php';

indieweb-post-kinds/tags/4.0.0/lib/parse-this/includes/functions.php

-              r2757240
+              r3738687
 <?php
+// Parse This Global Functions
+if ( ! function_exists( 'jf2_to_mf2' ) ) {
+/**
+ * Helper functions.
+ *
+ * All functions are in the ParseThis namespace. Each is wrapped in
+ * function_exists() because several plugins bundle their own copy of Parse
+ * This; the first copy loaded wins. Deprecated global names for some of them
+ * are defined in aliases.php.
+ *
+ * @package Parse_This
+ */
+namespace ParseThis;
+defined( 'ABSPATH' ) || exit;
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_to_mf2' ) ) {
+        /**
+         * Converts jf2 into microformats2 JSON.
+         *
+         * The inverse of mf2_to_jf2(). Empty values and the _raw key are dropped.
+         *
+         * @since 1.0.0
+         *
+         * @link https://jf2.spec.indieweb.org/
+         *
+         * @param array|mixed $jf2 jf2 object, or array( 'items' => ... ) for a list.
+         * @return array|mixed mf2 object with type and properties. Values that are not
+         *                     jf2 objects are returned unchanged.
+         */
         function jf2_to_mf2( $jf2 ) {
                 if ( ! $jf2 || ! is_array( $jf2 ) ) {
 …
                 if ( 1 === count( $jf2 ) && array_key_exists( 'items', $jf2 ) ) {
                         return array(
                                 'items' => array_map( 'jf2_to_mf2', $jf2['items'] ),
+                                'items' => array_map( __NAMESPACE__ . '\\jf2_to_mf2', $jf2['items'] ),
                         );
+                }
 …
+                }
                 if ( array_key_exists( 'children', $jf2 ) ) {
                         $mf2['children'] = array_map( 'jf2_to_mf2', $jf2['children'] );
+                        $mf2['children'] = array_map( __NAMESPACE__ . '\\jf2_to_mf2', $jf2['children'] );
                         unset( $jf2['children'] );
+                }
 …
                 foreach ( $jf2 as $key => $value ) {
                         // Exclude values
+                        // Exclude values.
                         if ( empty( $value ) || ( '_raw' === $key ) ) {
                                 continue;
 …
                                 $value = array( jf2_to_mf2( $value ) );
                         } elseif ( wp_is_numeric_array( $value ) ) {
                                 $value = array_map( 'jf2_to_mf2', $value );
+                                $value = array_map( __NAMESPACE__ . '\\jf2_to_mf2', $value );
                         } elseif ( ! wp_is_numeric_array( $value ) ) {
                                 $value = array( $value );
 …
+}
+if ( ! function_exists( 'mf2_to_jf2' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\mf2_to_jf2' ) ) {
+        /**
+         * Converts microformats2 JSON into jf2.
+         *
+         * Single-value property arrays are collapsed to the value, the h- prefix is
+         * removed from types, and nested microformats are converted recursively.
+         *
+         * @since 1.0.0
+         *
+         * @link https://jf2.spec.indieweb.org/
+         *
+         * @param array|mixed $mf2 mf2 object, a parsed mf2 document with items, or a
+         *                         list of mf2 objects.
+         * @return array|mixed jf2. A list of one is returned as the single item.
+         *                     Strings and objects are returned unchanged.
+         */
         function mf2_to_jf2( $mf2 ) {
                 if ( empty( $mf2 ) || is_string( $mf2 ) || is_object( $mf2 ) ) {
 …
                 $jf2 = array();
                 // If it is a numeric array, run this function through each item
+                // If it is a numeric array, run this function through each item.
                 if ( wp_is_numeric_array( $mf2 ) ) {
                         $jf2 = array_map( 'mf2_to_jf2', $mf2 );
+                        $jf2 = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $mf2 );
                         if ( 1 === count( $jf2 ) ) {
                                 return array_pop( $jf2 );
 …
                 if ( isset( $mf2['items'] ) ) {
                         $jf2['items'] = array_map( 'mf2_to_jf2', $mf2['items'] );
+                        $jf2['items'] = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $mf2['items'] );
+                }
                 if ( isset( $mf2['children'] ) ) {
                         $jf2['children'] = array_map( 'mf2_to_jf2', $mf2['children'] );
+                        $jf2['children'] = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $mf2['children'] );
+                }
 …
                                 if ( is_array( $value ) ) {
                                         if ( wp_is_numeric_array( $value ) ) {
                                                 $value = array_map( 'mf2_to_jf2', $value );
+                                                $value = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $value );
                                                 if ( is_countable( $value ) && 1 === count( $value ) ) {
                                                         $value = array_pop( $value );
 …
+if ( ! function_exists( 'jf2_location' ) ) {
+        /*
+         Flatten nested location properties.
+        */
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_location' ) ) {
+        /**
+         * Flattens a nested jf2 location.
+         *
+         * The latitude, longitude and altitude are copied onto the object, and location
+         * becomes the place's label or name (or is removed). Any check-in on the
+         * object also receives the location's properties.
+         *
+         * @since 1.0.1
+         *
+         * @param array $data jf2 object.
+         * @return array The updated object.
+         */
         function jf2_location( $data ) {
                 if ( ! array_key_exists( 'location', $data ) ) {
                         return $data;
+                }
+                $location = $data['location'];
+                if ( is_string( $location ) ) {
+                // jf2_references() may have moved the location or check-in to refs,
+                // leaving its URL (as a one-item list) in its place.
+                $from_refs = function ( $value ) use ( $data ) {
+                        if ( is_array( $value ) && wp_is_numeric_array( $value ) && 1 === count( $value ) ) {
+                                $value = $value[0];
+                        }
+                        if ( is_string( $value ) && isset( $data['refs'][ $value ] ) && is_array( $data['refs'][ $value ] ) ) {
+                                return $data['refs'][ $value ];
+                        }
+                        return $value;
+                };
+                $location  = $from_refs( $data['location'] );
+                if ( ! is_array( $location ) || wp_is_numeric_array( $location ) ) {
                         return $data;
+                }
 …
                         unset( $data['location'] );
+                }
+                if ( isset( $data['checkin'] ) ) {
+                        $data['checkin'] = $from_refs( $data['checkin'] );
+                }
                 if ( array_key_exists( 'checkin', $data ) && is_array( $data['checkin'] ) ) {
                         foreach ( $location as $key => $value ) {
 …
+if ( ! function_exists( 'jf2_references' ) ) {
+        /*
+         Turns nested properties into references per the jf2 spec
+        */
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_author_to_card' ) ) {
+        /**
+         * Converts an author value into a jf2 card.
+         *
+         * Microsub requires author to always be a card, and jf2 consumers generally
+         * expect one. A URL string becomes a card with that url, any other string a
+         * card with that name, and an object without a type gets type card. A list of
+         * authors is converted item by item; a list of one becomes that card.
+         *
+         * @since 2.0.0
+         *
+         * @param mixed $author Author: a string, an object or a list of either.
+         * @return array|null The card (or list of cards), or null if there is no author.
+         */
+        function jf2_author_to_card( $author ) {
+                if ( is_string( $author ) ) {
+                        $author = trim( $author );
+                        if ( '' === $author ) {
+                                return null;
+                        }
+                        $key = ( preg_match( '#^https?://#i', $author ) && filter_var( $author, FILTER_VALIDATE_URL ) ) ? 'url' : 'name';
+                        return array(
+                                'type' => 'card',
+                                $key   => $author,
+                        );
+                }
+                if ( ! is_array( $author ) || empty( $author ) ) {
+                        return null;
+                }
+                if ( wp_is_numeric_array( $author ) ) {
+                        $cards = array_values( array_filter( array_map( __NAMESPACE__ . '\\jf2_author_to_card', $author ) ) );
+                        if ( empty( $cards ) ) {
+                                return null;
+                        }
+                        return ( 1 === count( $cards ) ) ? $cards[0] : $cards;
+                }
+                if ( ! isset( $author['type'] ) ) {
+                        $author = array( 'type' => 'card' ) + $author;
+                }
+                return $author;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_references' ) ) {
+        /**
+         * Moves nested objects into refs, per the jf2 spec.
+         *
+         * Any nested typed object with an http or https URL (an h-cite, h-card,
+         * h-event, h-product or any other type) is replaced by its URL, and stored
+         * in refs keyed by that URL, so the result is one level deep. The property
+         * becomes a list of values, as before. Objects without such a URL stay in place, authors stay
+         * cards, and a feed's items are left alone. References that a nested object
+         * carries are merged into the same refs.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Moves any typed object with a URL, not only citations, and
+         *              merges nested refs.
+         *
+         * @link https://jf2.spec.indieweb.org/#references
+         *
+         * @param array $data jf2 object.
+         * @return array The updated object.
+         */
         function jf2_references( $data ) {
+                if ( ! is_array( $data ) ) {
+                        return $data;
+                }
+                // Authors stay cards, and a feed's entries are not references.
+                $skip = array( 'refs', 'author', 'items', 'children' );
                 foreach ( $data as $key => $val ) {
                         if ( ! is_array( $val ) ) {
+                        if ( ! is_array( $val ) || in_array( $key, $skip, true ) || ( is_string( $key ) && '_' === substr( $key, 0, 1 ) ) ) {
                                 continue;
+                        }
+                        if ( ! wp_is_numeric_array( $val ) ) {
+                                $val = array( $val );
+                        }
+                        if ( wp_is_numeric_array( $val ) ) {
+                                foreach ( $val as $value ) {
+                                        // Indicates nested type
+                                        if ( is_array( $value ) && array_key_exists( 'type', $value ) && 'cite' === $value['type'] ) {
+                                                if ( ! isset( $data['refs'] ) ) {
+                                                        $data['refs'] = array();
+                                                }
+                                                if ( isset( $value['url'] ) ) {
+                                                        $data['refs'][ $value['url'] ] = $value;
+                                                        $data[ $key ]                  = array( $value['url'] );
+                                                }
+                        $values  = wp_is_numeric_array( $val ) ? $val : array( $val );
+                        $changed = false;
+                        foreach ( $values as $i => $value ) {
+                                if ( ! is_array( $value ) ) {
+                                        continue;
+                                }
+                                // A nested object may carry references of its own: keep one flat refs.
+                                if ( isset( $value['refs'] ) && is_array( $value['refs'] ) ) {
+                                        foreach ( $value['refs'] as $ref_url => $ref ) {
+                                                $data['refs'][ $ref_url ] = isset( $data['refs'][ $ref_url ] ) ? $data['refs'][ $ref_url ] + $ref : $ref;
+                                        }
+                                        if ( 'category' === $key ) {
+                                                foreach ( $value as $k => $v ) {
+                                                        if ( is_array( $v ) && array_key_exists( 'type', $v ) ) {
+                                                                if ( ! isset( $data['refs'] ) ) {
+                                                                        $data['refs'] = array();
+                                                                }
+                                                                if ( isset( $v['url'] ) ) {
+                                                                        $data['refs'][ $v['url'] ] = $v;
+                                                                        $data['category'][ $k ]    = $v['url'];
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                                        unset( $value['refs'] );
+                                        $values[ $i ] = $value;
+                                        $changed      = true;
+                                }
+                                $url = $value['url'] ?? null;
+                                if ( is_array( $url ) ) {
+                                        $url = reset( $url );
+                                }
+                                // Any typed object with an http(s) URL is a reference. One without
+                                // stays in place, where sanitizing can drop a bad URL and keep the rest.
+                                if ( empty( $value['type'] ) || ! is_string( $value['type'] ) || ! is_string( $url ) || ! preg_match( '#^https?://#i', trim( $url ) ) ) {
+                                        continue;
+                                }
+                                $data['refs'][ $url ] = isset( $data['refs'][ $url ] ) ? $data['refs'][ $url ] + $value : $value;
+                                $values[ $i ]         = $url;
+                                $changed              = true;
+                        }
+                        if ( $changed ) {
+                                $data[ $key ] = $values;
+                        }
+                }
 …
+}
+if ( ! function_exists( 'url_to_author' ) ) {
+        /**
+         * Examine a url and try to determine the author ID it represents.
+         *
+         * @param string $url Permalink to check.
+         *
+         * @return WP_User, or null on failure.
+if ( ! function_exists( __NAMESPACE__ . '\\url_to_author' ) ) {
+        /**
+         * Returns the local user that an author archive URL belongs to.
+         *
+         * Handles ?author=N URLs and pretty author permalinks.
+         *
+         * @since 1.0.0
+         *
+         * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
+         *
+         * @param string $url URL to check.
+         * @return WP_User|false|null The user, false if no user has that ID or slug, or
+         *                            null if the URL is not on this site or not an
+         *                            author URL.
          */
         function url_to_author( $url ) {
                 global $wp_rewrite;
                 // check if url hase the same host
+                // check if url hase the same host.
                 if ( wp_parse_url( site_url(), PHP_URL_HOST ) !== wp_parse_url( $url, PHP_URL_HOST ) ) {
                         return null;
+                }
                 // first, check to see if there is a 'author=N' to match against
+                // first, check to see if there is a 'author=N' to match against.
                 if ( preg_match( '/[?&]author=(\d+)/i', $url, $values ) ) {
                         $id = absint( $values[1] );
 …
+                        }
+                }
                 // check to see if we are using rewrite rules
+                // check to see if we are using rewrite rules.
                 $rewrite = $wp_rewrite->wp_rewrite_rules();
                 // not using rewrite rules, and 'author=N' method failed, so we're out of options
+                // not using rewrite rules, and 'author=N' method failed, so we're out of options.
                 if ( empty( $rewrite ) ) {
                         return null;
+                }
                 // generate rewrite rule for the author url
+                // generate rewrite rule for the author url.
                 $author_rewrite = $wp_rewrite->get_author_permastruct();
                 $author_regexp  = str_replace( '%author%', '', $author_rewrite );
                 // match the rewrite rule with the passed url
+                // match the rewrite rule with the passed url.
                 if ( preg_match( '/https?:\/\/(.+)' . preg_quote( $author_regexp, '/' ) . '([^\/]+)/i', $url, $match ) ) {
                         $user = get_user_by( 'slug', $match[2] );
 …
+}
+if ( ! function_exists( 'url_to_user' ) ) {
+        /**
+         * Get the user associated with a URL.
+         *
+         * @param string $url url to match
+         * @return WP_User $user Associated user, or null if no associated user
+if ( ! function_exists( __NAMESPACE__ . '\\url_to_user' ) ) {
+        /**
+         * Returns the local user associated with a URL.
+         *
+         * The site's home URL maps to the IndieWeb plugin's default author when the
+         * IndieWeb plugin is active, otherwise to the only author if there is just
+         * one. Author archive URLs map to their author, and other URLs are matched
+         * against users' website field.
+         *
+         * @since 1.0.0
+         *
+         * @param string $url URL to check.
+         * @return WP_User|false|null The user, or null (or false) if none matches.
          */
         function url_to_user( $url ) {
 …
                         return null;
+                }
                 // Ensure has trailing slash
+                // Ensure has trailing slash.
                 $url = trailingslashit( $url );
                 if ( ( 'https' === wp_parse_url( home_url(), PHP_URL_SCHEME ) ) && ( wp_parse_url( home_url(), PHP_URL_HOST ) === wp_parse_url( $url, PHP_URL_HOST ) ) ) {
                         $url = set_url_scheme( $url, 'https' );
+                }
                 // Try to save the expense of a search query if the URL is the site URL
+                // Try to save the expense of a search query if the URL is the site URL.
                 if ( home_url( '/' ) === $url ) {
                         // Use the Indieweb settings to set the default author
+                        // Use the Indieweb settings to set the default author.
                         if ( class_exists( 'Indieweb_Plugin' ) && ( get_option( 'iw_single_author' ) || ! is_multi_author() ) ) {
                                 return get_user_by( 'id', get_option( 'iw_default_author' ) );
+                        }
                         $users = get_users( array( 'who' => 'authors' ) );
+                        $users = get_users( array( 'capability' => array( 'edit_posts' ) ) );
                         if ( 1 === count( $users ) ) {
                                 return $users[0];
 …
                         return null;
+                }
                 // Check if this is a author post URL
+                // Check if this is a author post URL.
                 $user = url_to_author( $url );
                 if ( $user instanceof WP_User ) {
+                if ( $user instanceof \WP_User ) {
                         return $user;
+                }
 …
                 );
                 $users = get_users( $args );
                 // check result
+                // check result.
                 if ( ! empty( $users ) ) {
                         return $users[0];
 …
+}
+if ( ! function_exists( 'ifset' ) ) {
+                /**
+                 * If set, return otherwise false.
+                 *
+                 * @param type $var Check if set.
+                 * @return $var|false Return either $var or $return.
+                 */
+        function ifset( &$var, $return = false ) {
+                        return isset( $var ) ? $var : $return;
+        }
+}
+/*
+ Inverse of wp_parse_url
+ *
+ * Slightly modified from p3k-utils (https://github.com/aaronpk/p3k-utils)
+ * Copyright 2017 Aaron Parecki, used with permission under MIT License
+ *
+ * @link http://php.net/parse_url
+ * @param  string $parsed_url the parsed URL (wp_parse_url)
+ * @return string             the final URL
+ */
+if ( ! function_exists( 'build_url' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\build_url' ) ) {
+        /**
+         * Builds a URL from its parts; the inverse of wp_parse_url().
+         *
+         * Slightly modified from p3k-utils. Copyright 2017 Aaron Parecki, used with
+         * permission under the MIT License.
+         *
+         * @since 1.0.0
+         *
+         * @link https://github.com/aaronpk/p3k-utils
+         * @link https://www.php.net/parse_url
+         *
+         * @param array $parsed_url URL components as returned by wp_parse_url().
+         * @return string The URL.
+         */
         function build_url( $parsed_url ) {
                         $scheme   = ! empty( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
 …
+if ( ! function_exists( 'normalize_url' ) ) {
+        // Adds slash if no path is in the URL, and convert hostname to lowercase
+if ( ! function_exists( __NAMESPACE__ . '\\normalize_url' ) ) {
+        /**
+         * Normalizes a URL for comparison.
+         *
+         * Lowercases the host and adds a / path if there is none.
+         *
+         * @since 1.0.0
+         *
+         * @param string $url   URL to normalize.
+         * @param bool   $strip Optional. Whether to remove the query string. Default false.
+         * @return string|null The normalized URL, or null if it has no host.
+         */
         function normalize_url( $url, $strip = false ) {
                 $parts = wp_parse_url( $url );
 …
+}
+if ( ! function_exists( 'normalize_iso8601' ) ) {
+        // Tries to normalizes dates to a standard iso8601 string
+if ( ! function_exists( __NAMESPACE__ . '\\normalize_iso8601' ) ) {
+        /**
+         * Normalizes a date string to W3C (ISO 8601) format.
+         *
+         * @since 1.0.0
+         *
+         * @param string|mixed $string Date string.
+         * @return string|null The date in W3C format, the original string if it cannot
+         *                     be parsed, or null if it is empty or not a string.
+         */
         function normalize_iso8601( $string ) {
+                $date = new DateTime( $string );
+                if ( $date ) {
+                        return $date->format( DATE_W3C );
+                }
+                return $string;
+        }
+}
+if ( ! function_exists( 'post_type_discovery' ) ) {
+                if ( empty( $string ) || ! is_string( $string ) ) {
+                        return null;
+                }
+                try {
+                        $date = new \DateTime( $string );
+                } catch ( \Exception $e ) {
+                        return $string;
+                }
+                return $date->format( DATE_W3C );
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_find_fragment_element' ) ) {
+        /**
+         * Finds the element a URL fragment points to.
+         *
+         * @since 2.0.0
+         *
+         * @param DOMDocument $doc Parsed page.
+         * @param string      $id  Fragment, without the #.
+         * @return DOMElement|null The element with that id, or null.
+         */
+        function pt_find_fragment_element( $doc, $id ) {
+                if ( ! $doc instanceof \DOMDocument || ! is_string( $id ) || '' === $id ) {
+                        return null;
+                }
+                $id = rawurldecode( $id );
+                foreach ( $doc->getElementsByTagName( '*' ) as $element ) {
+                        if ( $element->getAttribute( 'id' ) === $id ) {
+                                return $element;
+                        }
+                }
+                return null;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_effective_url' ) ) {
+        /**
+         * Returns the URL a response finally came from, after any redirects.
+         *
+         * A fragment on the requested URL (which is never sent to the server) is
+         * kept, so that it can still pick out part of the page.
+         *
+         * @since 2.0.0
+         *
+         * @param string $url      Requested URL.
+         * @param array  $response Response from pt_remote_get().
+         * @return string The final URL, or $url if it isn't known.
+         */
+        function pt_effective_url( $url, $response ) {
+                $object = ( is_array( $response ) && isset( $response['http_response'] ) && is_object( $response['http_response'] ) && method_exists( $response['http_response'], 'get_response_object' ) ) ? $response['http_response']->get_response_object() : null;
+                if ( ! $object || empty( $object->url ) || ! is_string( $object->url ) || ! wp_http_validate_url( $object->url ) ) {
+                        return $url;
+                }
+                $final    = $object->url;
+                $fragment = wp_parse_url( $url, PHP_URL_FRAGMENT );
+                if ( $fragment && ! wp_parse_url( $final, PHP_URL_FRAGMENT ) ) {
+                        $final .= '#' . $fragment;
+                }
+                return $final;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_sniff_content_type' ) ) {
+        /**
+         * Works out a response's real format when its content type is missing,
+         * generic or wrong.
+         *
+         * Feeds are often served as text/plain or text/html, and JSON as
+         * text/plain or application/octet-stream. A body whose root element is
+         * <rss>, <rdf:RDF> or <feed> is a feed whatever the header says (an HTML
+         * page can't have those roots). A body that is a JSON object is checked
+         * for JSON Feed and mf2 JSON when the header is missing or generic.
+         *
+         * @since 2.0.0
+         *
+         * @param string $content_type Content type from the response, without
+         *                             parameters.
+         * @param string $body         Response body.
+         * @return string The content type to use: application/rss+xml,
+         *                application/atom+xml, application/feed+json or
+         *                application/mf2+json when sniffed, otherwise
+         *                $content_type unchanged.
+         */
+        function pt_sniff_content_type( $content_type, $body ) {
+                if ( ! is_string( $body ) || '' === $body ) {
+                        return $content_type;
+                }
+                $known = array( 'application/rss+xml', 'application/atom+xml', 'application/feed+json', 'application/mf2+json', 'application/jf2+json', 'application/jf2feed+json' );
+                if ( in_array( $content_type, $known, true ) ) {
+                        return $content_type;
+                }
+                // Skip a byte order mark, the XML declaration, processing instructions, comments and a doctype.
+                $start = ltrim( substr( $body, 0, 4096 ), "\xEF\xBB\xBF \t\r\n" );
+                $start = preg_replace( '/^(\s*(<\?[^>]*\?>|<!--.*?-->|<!DOCTYPE[^>]*>))+\s*/is', '', $start );
+                if ( preg_match( '/^<(rss|rdf:RDF)[\s>]/i', $start ) ) {
+                        return 'application/rss+xml';
+                }
+                if ( preg_match( '/^<feed[\s>]/i', $start ) ) {
+                        return 'application/atom+xml';
+                }
+                $generic = array( '', 'text/plain', 'application/octet-stream', 'text/html' );
+                if ( in_array( $content_type, $generic, true ) && '{' === substr( $start, 0, 1 ) ) {
+                        $json = json_decode( $body, true );
+                        if ( is_array( $json ) && isset( $json['version'] ) && is_string( $json['version'] ) && 0 === strpos( $json['version'], 'https://jsonfeed.org/version/' ) ) {
+                                return 'application/feed+json';
+                        }
+                        if ( is_array( $json ) && isset( $json['items'][0]['type'], $json['items'][0]['properties'] ) ) {
+                                return 'application/mf2+json';
+                        }
+                }
+                return $content_type;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\name_is_content_prefix' ) ) {
+        /**
+         * Checks whether a name only repeats the start of the content.
+         *
+         * Ignores a trailing ellipsis (... or …) on the name, as on truncated
+         * titles, and ignores whitespace in both.
+         *
+         * @since 2.0.0
+         *
+         * @param mixed $name    Name.
+         * @param mixed $content Content text.
+         * @return bool True if both are non-empty strings and the content starts
+         *              with the name.
+         */
+        function name_is_content_prefix( $name, $content ) {
+                if ( ! is_string( $name ) || ! is_string( $content ) ) {
+                        return false;
+                }
+                $name    = preg_replace( '/\\s+/u', '', preg_replace( '/\\s*(\\.\\.\\.|…)\\s*$/u', '', $name ) );
+                $content = preg_replace( '/\\s+/u', '', $content );
+                return '' !== $name && '' !== $content && 0 === strpos( $content, $name );
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\post_type_discovery' ) ) {
+        /**
+         * Determines the IndieWeb post type of a jf2 or mf2 entry.
+         *
+         * Events, reviews and recipes are their own type. For an entry, response
+         * properties decide the type first (review-of, rsvp, checkin, like-of,
+         * in-reply-to, ...), then media (video, photo, audio). An entry with a name
+         * that is not a prefix of its content (or summary) is an article; anything
+         * else is a note.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Adds review (from review-of, or the review type) and recipe,
+         *              and follows the spec for a name without content.
+         *
+         * @link https://indieweb.org/post-type-discovery
+         *
+         * @param array|mixed $jf2 jf2 object, or an mf2 object (converted first).
+         * @return string The post type, or an empty string for other types.
+         */
         function post_type_discovery( $jf2 ) {
                 if ( ! is_array( $jf2 ) ) {
 …
                         return '';
+                }
+                if ( 'event' === $jf2['type'] ) {
+                        return 'event';
+                // Events (as in the spec), and reviews and recipes (as XRay does), are their own type.
+                if ( in_array( $jf2['type'], array( 'event', 'review', 'recipe' ), true ) ) {
+                        return $jf2['type'];
+                }
                 if ( 'entry' === $jf2['type'] ) {
                         $map = array(
+                                'review'    => array( 'review-of' ),
                                 'rsvp'      => array( 'rsvp' ),
                                 'checkin'   => array( 'checkin' ),
 …
+                                }
+                        }
+                        if ( isset( $jf2['name'] ) && ! empty( $jf2['name'] ) ) {
+                                $jf2['name'] = $jf2['name'];
+                                $content     = ifset( $jf2['content'] );
+                                if ( ! $content ) {
+                                        $content = ifset( $jf2['summary'] );
+                                }
+                                if ( is_array( $content ) && array_key_exists( 'text', $content ) ) {
+                                        $content = $content['text'];
+                                }
+                                if ( is_string( $content ) ) {
+                                        $content = trim( $content );
+                                        if ( 0 !== strpos( $content, $jf2['name'] ) ) {
+                                                return 'article';
+                                        }
+                                }
+                        }
+                                return 'note';
+                        // https://www.w3.org/TR/post-type-discovery/#algorithm: a name that is not
+                        // a prefix of the content (or summary, or nothing) makes an article. A
+                        // truncated name (ending in an ellipsis) is compared without it.
+                        $name = ( isset( $jf2['name'] ) && is_string( $jf2['name'] ) ) ? trim( preg_replace( '/\s+/u', ' ', $jf2['name'] ) ) : '';
+                        if ( '' !== $name ) {
+                                $content = $jf2['content'] ?? null;
+                                if ( is_array( $content ) ) {
+                                        $content = $content['text'] ?? ( $content['value'] ?? null );
+                                }
+                                if ( ! is_string( $content ) || '' === trim( $content ) ) {
+                                        $content = $jf2['summary'] ?? '';
+                                }
+                                $content = is_string( $content ) ? trim( preg_replace( '/\s+/u', ' ', $content ) ) : '';
+                                if ( ! name_is_content_prefix( $name, $content ) ) {
+                                        return 'article';
+                                }
+                        }
+                        return 'note';
+                }
                 return '';
 …
+}
+if ( ! function_exists( 'seconds_to_iso8601' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\seconds_to_iso8601' ) ) {
+        /**
+         * Converts a number of seconds into an ISO 8601 duration.
+         *
+         * For example 3725 becomes PT1H2M5S.
+         *
+         * @since 1.0.0
+         *
+         * @param int|float $second Duration in seconds.
+         * @return string ISO 8601 duration.
+         */
         function seconds_to_iso8601( $second ) {
                 $h   = intval( $second / 3600 );
 …
+}
+if ( ! function_exists( 'pt_load_domdocument' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_load_domdocument' ) ) {
+        /**
+         * Parses HTML into a DOMDocument.
+         *
+         * On PHP 8.4 and later, uses PHP's own HTML5 parser (Dom\HTMLDocument),
+         * which builds the same tree a browser does and is several times faster
+         * than masterminds/html5 (see pt_native_html_document()). It can be turned
+         * off with the parse_this_native_html_parser filter. Otherwise, or if that
+         * fails, uses the bundled masterminds/html5 parser, and failing that PHP's
+         * DOMDocument with errors suppressed.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Uses PHP's HTML5 parser when available.
+         *
+         * @param string $content HTML.
+         * @return DOMDocument The parsed document.
+         */
         function pt_load_domdocument( $content ) {
+                $content = (string) $content;
+                /**
+                 * Filters whether to parse HTML with PHP's own HTML5 parser (PHP 8.4+).
+                 *
+                 * Return false to use masterminds/html5 even when PHP's parser is
+                 * available. The two can differ on invalid markup, where PHP's parser
+                 * follows the HTML5 algorithm (as browsers do).
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param bool $enabled Whether to use it. Default true.
+                 */
+                if ( class_exists( 'Dom\HTMLDocument' ) && apply_filters( 'parse_this_native_html_parser', true ) ) {
+                        $doc = pt_native_html_document( $content );
+                        if ( $doc ) {
+                                return $doc;
+                        }
+                }
                 if ( ! class_exists( '\Masterminds\HTML5', false ) ) {
                         $file = plugin_dir_path( __DIR__ ) . 'lib/html5/autoloader.php';
 …
                         $doc = $doc->loadHTML( $content );
                 } else {
+                        $doc = new DOMDocument();
+                        $doc = new \DOMDocument();
+                        // DOMDocument::loadHTML() throws on an empty string in PHP 8.
+                        if ( '' === trim( $content ) ) {
+                                return $doc;
+                        }
                         libxml_use_internal_errors( true );
+                        if ( function_exists( 'mb_convert_encoding' ) ) {
+                                $content = mb_convert_encoding( $content, 'HTML-ENTITIES', mb_detect_encoding( $content ) );
+                        if ( function_exists( 'mb_encode_numericentity' ) ) {
+                                // DOMDocument assumes ISO-8859-1, so convert to UTF-8 and encode non-ASCII characters as entities.
+                                $encoding = mb_detect_encoding( $content, array( 'UTF-8', 'ISO-8859-1' ), true );
+                                if ( $encoding && 'UTF-8' !== $encoding ) {
+                                        $content = mb_convert_encoding( $content, 'UTF-8', $encoding );
+                                }
+                                $content = mb_encode_numericentity( $content, array( 0x80, 0x10FFFF, 0, 0x1FFFFF ), 'UTF-8' );
+                        }
                         $doc->loadHTML( $content );
 …
+        }
+}
+if ( ! function_exists( 'pt_secure_rewrite' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_native_html_document' ) ) {
+        /**
+         * Parses HTML with PHP's HTML5 parser and returns it as a DOMDocument.
+         *
+         * Dom\HTMLDocument (PHP 8.4+) belongs to PHP's new DOM API, while php-mf2
+         * and the rest of Parse This work with DOMDocument. The parsed tree is
+         * passed across as XML, which reproduces it exactly without parsing the
+         * HTML twice. Comments (which may contain "--") and attributes whose names
+         * aren't valid XML (@click, x-on:click, :class) are removed first, since
+         * XML can't hold them and nothing here reads them. Elements are kept out of
+         * the XHTML namespace, so XPath queries such as //meta work as before.
+         *
+         * @since 2.0.0
+         *
+         * @param string $content HTML.
+         * @return DOMDocument|null The parsed document, or null if PHP's parser
+         *                          isn't available or the document can't be
+         *                          passed across.
+         */
+        function pt_native_html_document( $content ) {
+                if ( ! class_exists( 'Dom\HTMLDocument' ) ) {
+                        return null;
+                }
+                try {
+                        $html  = \Dom\HTMLDocument::createFromString( (string) $content, LIBXML_NOERROR | \Dom\HTML_NO_DEFAULT_NS );
+                        $xpath = new \Dom\XPath( $html );
+                        foreach ( iterator_to_array( $xpath->query( '//comment()' ) ) as $comment ) {
+                                $comment->remove();
+                        }
+                        foreach ( iterator_to_array( $xpath->query( '//@*' ) ) as $attribute ) {
+                                if ( ! preg_match( '/^[A-Za-z_][A-Za-z0-9_.\-]*$/', $attribute->name ) ) {
+                                        $attribute->ownerElement->removeAttribute( $attribute->name ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- PHP DOM property.
+                                }
+                        }
+                        $xml = $html->saveXml();
+                } catch ( \Throwable $e ) {
+                        return null;
+                }
+                $doc    = new \DOMDocument();
+                $errors = libxml_use_internal_errors( true );
+                $loaded = $doc->loadXML( $xml, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING | LIBXML_PARSEHUGE );
+                libxml_clear_errors();
+                libxml_use_internal_errors( $errors );
+                return $loaded ? $doc : null;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_remote_get' ) ) {
+        /**
+         * Retrieves a remote URL, retrying once with a browser user agent if the site rejects the request.
+         *
+         * Fetched documents decide which further URLs are requested (author pages,
+         * alternates, REST API links), so this must stay on wp_safe_remote_get(),
+         * which refuses local and private addresses. Don't switch it to
+         * wp_remote_get().
+         *
+         * @param string $url         URL to retrieve.
+         * @param array  $args        Optional. Arguments passed to wp_safe_remote_get().
+         * @param array  $retry_codes Optional. Response codes that trigger the retry.
+         * @return array|WP_Error The response, or WP_Error on failure.
+         */
+        function pt_remote_get( $url, $args = array(), $retry_codes = array( 403, 415 ) ) {
+                $args = wp_parse_args(
+                        $args,
+                        array(
+                                'timeout'             => 15,
+                                'limit_response_size' => 1048576,
+                                'redirection'         => 5,
+                        )
+                );
+                $response = wp_safe_remote_get( $url, $args );
+                if ( is_wp_error( $response ) ) {
+                        return $response;
+                }
+                if ( ! in_array( (int) wp_remote_retrieve_response_code( $response ), $retry_codes, true ) ) {
+                        return $response;
+                }
+                $args['user-agent'] = 'Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:57.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Parse This/WP';
+                $response           = wp_safe_remote_get( $url, $args );
+                if ( is_wp_error( $response ) ) {
+                        return $response;
+                }
+                $code = (int) wp_remote_retrieve_response_code( $response );
+                if ( in_array( $code, $retry_codes, true ) ) {
+                        return new \WP_Error( 'source_error', __( 'Unable to retrieve the URL.', 'parse-this' ), array( 'response_code' => $code ) );
+                }
+                return $response;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_secure_rewrite' ) ) {
+        /**
+         * Upgrades http:// URLs to https:// for hosts known to support HTTPS.
+         *
+         * @since 1.0.1
+         *
+         * @param string $url URL.
+         * @return string The URL, with https:// if its domain is on the list.
+         */
         function pt_secure_rewrite( $url ) {
                 $host   = wp_parse_url( $url, PHP_URL_HOST );
 …
                         'google.com',
                         'gravatar.com',
                         'gstatic.com',
+                        'gstatic.com', // phpcs:ignore PluginCheck.CodeAnalysis.Offloading.OffloadedContent -- A domain to rewrite to https, not content loaded from it.
                         'kernel.org',
                         'lwn.net',
                         'tumblr.com',
                         'twitter.com',
+                        'x.com',
                         'vimeo.com',
                         'wikipedia.org',
 …
                         'youtube.com',
                 );
+                /**
+                 * Filters the domains whose http:// URLs are upgraded to https://.
+                 *
+                 * Matching is on the registrable domain, so listing example.com also
+                 * covers www.example.com.
+                 *
+                 * @since 1.0.1
+                 *
+                 * @param string[] $secure Domains known to support HTTPS.
+                 */
                 $secure = apply_filters( 'pt_rewrite_secure', $secure );
                 if ( in_array( $host, $secure, true ) ) {
 …
+/**
+ * Parses Link Headers
+ *
+ *
+ * @return array
+ */
+if ( ! function_exists( 'pt_parse_header_links' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_parse_header_links' ) ) {
+        /**
+         * Parses HTTP Link headers.
+         *
+         * @since 2.0.0
+         *
+         * @link https://www.rfc-editor.org/rfc/rfc8288
+         *
+         * @param string|string[] $links One Link header value, or several. A value may
+         *                               hold multiple comma-separated links.
+         * @return array[] One entry per link and rel value, with 'uri', 'rel' and any
+         *                 other parameters (type, title, ...).
+         */
         function pt_parse_header_links( $links ) {
                 $items = array();
+                if ( is_string( $links ) ) {
+                        $links = array( $links );
+                }
                 if ( is_array( $links ) && 1 <= count( $links ) ) {
+                        // A header may hold several comma-separated links. Only split on commas that start a new <uri>, as URIs may contain commas.
+                        $split = array();
                         foreach ( $links as $link ) {
+                                $item   = array();
+                                $pieces = explode( ';', $link );
+                                $uri    = array_shift( $pieces );
+                                $split = array_merge( $split, preg_split( '/,(?=\s*<)/', $link ) );
+                        }
+                        foreach ( $split as $link ) {
+                                $item = array();
+                                if ( preg_match( '/^\s*<([^>]*)>(.*)$/s', $link, $match ) ) {
+                                        $uri    = $match[1];
+                                        $pieces = explode( ';', $match[2] );
+                                } else {
+                                        $pieces = explode( ';', $link );
+                                        $uri    = array_shift( $pieces );
+                                }
                                 foreach ( $pieces as $p ) {
+                                        $elements = explode( '=', $p );
+                                        $item[ trim( $elements[0] ) ] = trim( $elements[1], '"\'' );
+                                        $elements = explode( '=', $p, 2 );
+                                        $name     = trim( $elements[0] );
+                                        if ( '' === $name ) {
+                                                continue;
+                                        }
+                                        $item[ $name ] = isset( $elements[1] ) ? trim( $elements[1], " \t\"'" ) : '';
+                                }
 …
+}
+/**
+ * Find WordPress REST Alternate
+ *
+ *
+ * @return string|false
+ */
+if ( ! function_exists( 'pt_find_rest_alternate' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_find_rest_alternate' ) ) {
+        /**
+         * Finds the application/json alternate link among parsed Link headers.
+         *
+         * WordPress sends this for each post, pointing at its REST API URL.
+         *
+         * @since 2.0.0
+         *
+         * @param array[] $links Links from pt_parse_header_links().
+         * @return string|false The URL, or false if there is none.
+         */
         function pt_find_rest_alternate( $links ) {
                 foreach ( $links as $link ) {
                         if ( 'alternate' === ifset( $link['rel'] ) && 'application/json' === ifset( $link['type'] ) ) {
+                        if ( 'alternate' === ( $link['rel'] ?? null ) && 'application/json' === ( $link['type'] ?? null ) ) {
                                 return $link['uri'];
+                        }
 …
+}
+/**
+ * Find WordPress REST Endpoint
+ *
+ *
+ * @return string|false
+ */
+if ( ! function_exists( 'pt_find_rest_endpoint' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_find_rest_endpoint' ) ) {
+        /**
+         * Finds the WordPress REST API root among parsed Link headers.
+         *
+         * @since 2.0.0
+         *
+         * @param array[] $links Links from pt_parse_header_links().
+         * @return string|false The REST API root URL, or false if there is none.
+         */
         function pt_find_rest_endpoint( $links ) {
                 foreach ( $links as $link ) {
                         if ( 'https://api.w.org/' === ifset( $link['rel'] ) ) {
+                        if ( 'https://api.w.org/' === ( $link['rel'] ?? null ) ) {
                                 return $link['uri'];
+                        }
 …
+}
+if ( ! function_exists( 'pt_make_absolute_url' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_absolute_urls_in_html' ) ) {
+        /**
+         * Makes the links and media URLs in an HTML fragment absolute.
+         *
+         * Resolves href, src and poster attributes against a base URL, for content
+         * taken from a document (such as a JSON Feed item) whose own URL differs
+         * from where it will be shown.
+         *
+         * @since 2.0.0
+         *
+         * @param string $html HTML fragment.
+         * @param string $base Base URL.
+         * @return string The HTML with absolute URLs, or $html unchanged if it has
+         *                none to resolve or $base is not a URL.
+         */
+        function pt_absolute_urls_in_html( $html, $base ) {
+                if ( ! is_string( $html ) || '' === trim( $html ) || ! wp_http_validate_url( $base ) || ! preg_match( '/\s(href|src|poster)\s*=/i', $html ) ) {
+                        return $html;
+                }
+                $doc  = pt_load_domdocument( '<!DOCTYPE html><html><head><meta charset="utf-8"></head><body>' . $html . '</body></html>' );
+                $body = $doc->getElementsByTagName( 'body' )->item( 0 );
+                if ( ! $body ) {
+                        return $html;
+                }
+                foreach ( ( new \DOMXPath( $doc ) )->query( '//body//*[@href or @src or @poster]' ) as $element ) {
+                        foreach ( array( 'href', 'src', 'poster' ) as $attribute ) {
+                                $value = $element->getAttribute( $attribute );
+                                if ( '' !== $value && '#' !== $value[0] ) {
+                                        $element->setAttribute( $attribute, pt_make_absolute_url( $value, $base ) );
+                                }
+                        }
+                }
+                $out = '';
+                foreach ( $body->childNodes as $node ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- PHP DOM property.
+                        $out .= $doc->saveHTML( $node );
+                }
+                return $out;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_make_absolute_url' ) ) {
+        /**
+         * Resolves a relative URL against a base URL.
+         *
+         * @since 2.0.0
+         *
+         * @param string $maybe_relative_path URL or path to resolve.
+         * @param string $url                 Base URL.
+         * @return string The absolute URL, or $maybe_relative_path unchanged if it is
+         *                already absolute or either value cannot be parsed.
+         */
         function pt_make_absolute_url( $maybe_relative_path, $url ) {
                 if ( empty( $url ) ) {
 …
+                        }
+                }
                 // Start off with the absolute URL path.
                 $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
 …
                         $path = $relative_url_parts['path'];
                 // Else it's a relative path.
+                        // Else it's a relative path.
                 } elseif ( ! empty( $relative_url_parts['path'] ) ) {
                         // Strip off any file components from the absolute path.
 …
+                }
                 return $absolute_path . '/' . ltrim( $path, '/' );
+        }

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5.php

r2351228	r3738687
147	147	*
148	148	* @param string $input
149		* @param array $options
150	149	*
151	150	* @return \DOMDocument

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Elements.php

-              r2110745
+              r3738687
      */
     const BLOCK_ONLY_INLINE = 128;
+    /**
+     * Elements with optional end tags that cause auto-closing of previous and parent tags,
+     * as example most of the table related tags, see https://www.w3.org/TR/html401/struct/tables.html
+     * Structure is as follows:
+     * TAG-NAME => [PARENT-TAG-NAME-TO-CLOSE1, PARENT-TAG-NAME-TO-CLOSE2, ...].
+     *
+     * Order is important, after auto-closing one parent with might have to close also their parent.
+     *
+     * @var array<string, string[]>
+     */
+    public static $optionalEndElementsParentsToClose = array(
+        'tr' => array('td', 'tr'),
+        'td' => array('td', 'th'),
+        'th' => array('td', 'th'),
+        'tfoot' => array('td', 'th', 'tr', 'tbody', 'thead'),
+        'tbody' => array('td', 'th', 'tr', 'thead'),
+    );
     /**
 …
         'ul' => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
         'var' => 1,
         'video' => 65, // NORMAL | BLOCK_TAG
+        'video' => 1,
         'wbr' => 9, // NORMAL | VOID_TAG
 …
         'feDisplacementMap' => 1,
         'feDistantLight' => 1,
+        'feDropShadow' => 1,
         'feFlood' => 1,
         'feFuncA' => 1,
 …
         'fedisplacementmap' => 'feDisplacementMap',
         'fedistantlight' => 'feDistantLight',
+        'fedropshadow' => 'feDropShadow',
         'feflood' => 'feFlood',
         'fefunca' => 'feFuncA',

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Parser/CharacterReference.php

r2110745	r3738687
49	49
50	50	/**
51		* Given a hexidecimal number, return the UTF-8 character.
	51	* Given a hexadecimal number, return the UTF-8 character.
52	52	*
53	53	* @param $hexdec

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Parser/DOMTreeBuilder.php

-              r2623705
+              r3738687
      * This is used for handling Processor Instructions as they are
      * inserted. If omitted, PI's are inserted directly into the DOM tree.
+     *
-     * @param InstructionProcessor $proc
      */
     public function setInstructionProcessor(InstructionProcessor $proc)
 …
+        }
+        // some elements as table related tags might have optional end tags that force us to auto close multiple tags
+        // https://www.w3.org/TR/html401/struct/tables.html
+        if ($this->current instanceof \DOMElement && isset(Elements::$optionalEndElementsParentsToClose[$lname])) {
+            foreach (Elements::$optionalEndElementsParentsToClose[$lname] as $parentElName) {
+                if ($this->current instanceof \DOMElement && $this->current->tagName === $parentElName) {
+                    $this->autoclose($parentElName);
+                }
+            }
+        }
         try {
             $prefix = ($pos = strpos($lname, ':')) ? substr($lname, 0, $pos) : '';
 …
         if ($pushes > 0 && !Elements::isA($name, Elements::VOID_TAG)) {
             // PHP tends to free the memory used by DOM,
             // to avoid spl_object_hash collisions whe have to avoid garbage collection of $ele storing it into $pushes
+            // to avoid spl_object_id collisions we have to avoid garbage collection of $ele storing it into $pushes
             // see https://bugs.php.net/bug.php?id=67459
             $this->pushes[spl_object_hash($ele)] = array($pushes, $ele);
+            $this->pushes[spl_object_id($ele)] = array($pushes, $ele);
+        }
 …
+        }
         $cid = spl_object_hash($this->current);
+        $cid = spl_object_id($this->current);
         // XXX: HTML has no parent. What do we do, though,

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Parser/StringInputStream.php

r2110745	r3738687
184	184	* @return string The current character.
185	185	*/
	186	#[\ReturnTypeWillChange]
186	187	public function current()
187	188	{
…	…
193	194	* This is part of the Iterator interface.
194	195	*/
	196	#[\ReturnTypeWillChange]
195	197	public function next()
196	198	{
…	…
201	203	* Rewind to the start of the string.
202	204	*/
	205	#[\ReturnTypeWillChange]
203	206	public function rewind()
204	207	{
…	…
211	214	* @return bool Whether the current pointer location is valid.
212	215	*/
	216	#[\ReturnTypeWillChange]
213	217	public function valid()
214	218	{
…	…
325	329	}
326	330
	331	#[\ReturnTypeWillChange]
327	332	public function key()
328	333	{

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Parser/Tokenizer.php

-              r2839509
+              r3738687
             $tok = $this->scanner->next();
+            if ('!' === $tok) {
+            if (false === $tok) {
+                // end of string
+                $this->parseError('Illegal tag opening');
+            } elseif ('!' === $tok) {
                 $this->markupDeclaration();
             } elseif ('/' === $tok) {
 …
             } elseif ('?' === $tok) {
                 $this->processingInstruction();
             } elseif (ctype_alpha($tok)) {
+            } elseif ($this->is_alpha($tok)) {
                 $this->tagName();
             } else {
 …
         // EOF -> parse error
         // -> parse error
         if (!ctype_alpha($tok)) {
+        if (!$this->is_alpha($tok)) {
             $this->parseError("Expected tag name, got '%s'", $tok);
             if ("\0" == $tok || false === $tok) {
 …
         $val = $this->attributeValue();
         if ($isValidAttribute) {
+        if ($isValidAttribute && !array_key_exists($name, $attributes)) {
             $attributes[$name] = $val;
+        }
 …
         if ('!' == $this->scanner->current() && '>' == $this->scanner->peek()) {
             $this->scanner->consume(); // Consume the last '>'
             return true;
+        }
 …
+            }
             // Hexidecimal encoding.
+            // Hexadecimal encoding.
             // X[0-9a-fA-F]+;
             // x[0-9a-fA-F]+;
 …
         return '&';
+    }
+    /**
+     * Checks whether a (single-byte) character is an ASCII letter or not.
+     *
+     * @param string $input A single-byte string
+     *
+     * @return bool True if it is a letter, False otherwise
+     */
+    protected function is_alpha($input)
+    {
+        if (!is_string($input) || 1 !== strlen($input)) {
+            return false;
+        }
+        $code = ord($input);
+        return ($code >= 97 && $code <= 122) || ($code >= 65 && $code <= 90);
+    }
+}

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Parser/TreeBuildingRules.php

r2110745	r3738687
81	81	case 'tfoot':
82	82	case 'table': // Spec isn't explicit about this, but it's necessary.
83
84	83	return $this->closeIfCurrentMatches($new, $current, array(
85	84	'thead',

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Parser/UTF8Utils.php

-              r2110745
+              r3738687
     /**
      * Count the number of characters in a string.
      * UTF-8 aware. This will try (in order) iconv, MB, libxml, and finally a custom counter.
+     * UTF-8 aware. This will try (in order) iconv, MB, and finally a custom counter.
+     *
      * @param string $string
 …
         if (function_exists('iconv_strlen')) {
             return iconv_strlen($string, 'utf-8');
+        }
-        if (function_exists('utf8_decode')) {
-            // MPB: Will this work? Won't certain decodes lead to two chars
-            // extrapolated out of 2-byte chars?
-            return strlen(utf8_decode($string));
+        }

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/html5/HTML5/Serializer/OutputRules.php

-              r2351228
+              r3738687
 class OutputRules implements RulesInterface
+{
-    /**
-     * Defined in http://www.w3.org/TR/html51/infrastructure.html#html-namespace-0.
-     */
     const NAMESPACE_HTML = 'http://www.w3.org/1999/xhtml';
 …
     const IM_IN_MATHML = 3;
-    /**
-     * Used as cache to detect if is available ENT_HTML5.
+     *
-     * @var bool
-     */
-    private $hasHTML5 = false;
     protected $traverser;
 …
         $this->outputMode = static::IM_IN_HTML;
         $this->out = $output;
-        $this->hasHTML5 = defined('ENT_HTML5');
+    }
 …
+    }
+    /**
+     * @param \DOMElement $ele
+     */
     public function element($ele)
+    {
 …
         $this->openTag($ele);
+        // The tag is already self-closed (`<svg />` or `<math />`) in `openTag` if there are no child nodes.
+        $handledAsVoidTag = $this->outputMode !== static::IM_IN_HTML && !$ele->hasChildNodes();
         if (Elements::isA($name, Elements::TEXT_RAW)) {
             foreach ($ele->childNodes as $child) {
 …
         // If not unary, add a closing tag.
         if (!Elements::isA($name, Elements::VOID_TAG)) {
+        if (!$handledAsVoidTag && !Elements::isA($name, Elements::VOID_TAG)) {
             $this->closeTag($ele);
+        }
 …
     protected function wr($text)
+    {
         fwrite($this->out, $text);
+        fwrite($this->out, (string) $text);
         return $this;
 …
      *      encoding here will just escape &'<>".
+     *
-     *      Note, PHP 5.4+ has better html5 encoding.
+     *
-     * @todo Use the Entities class in php 5.3 to have html5 entities.
+     *
      * @param string $text      Text to encode.
      * @param bool   $attribute True if we are encoding an attrubute, false otherwise.
+     * @param bool   $attribute True if we are encoding an attribute, false otherwise.
+     *
      * @return string The encoded text.
 …
+        }
+        // If we are in PHP 5.4+ we can use the native html5 entity functionality to
+        // convert the named character references.
+        if ($this->hasHTML5) {
+            return htmlentities($text, ENT_HTML5 | ENT_SUBSTITUTE | ENT_QUOTES, 'UTF-8', false);
+        }         // If a version earlier than 5.4 html5 entities are not entirely handled.
+        // This manually handles them.
+        else {
+            return strtr($text, HTML5Entities::$map);
+        }
+        return htmlentities($text, ENT_HTML5 | ENT_SUBSTITUTE | ENT_QUOTES, 'UTF-8', false);
+    }

indieweb-post-kinds/tags/4.0.0/lib/parse-this/lib/mf2/Parser.php

-              r2839509
+              r3738687
 /**
- * Registered with the XPath object and used within XPaths for finding root elements.
- * @param string $class
- * @return bool
- */
-function classHasMf2RootClassname($class) {
-        return count(mfNamesFromClass($class, 'h-')) > 0;
+}
-/**
  * Get Nested µf Property Name From Class
+ *
 …
          */
         public function __construct($input, $url = null, $jsonMode = false) {
-                $emptyDocDefault = '<html><body></body></html>';
                 libxml_use_internal_errors(true);
                 if (is_string($input)) {
-                        if (empty($input)) {
-                                        $input = $emptyDocDefault;
+                        }
                         if (class_exists('Masterminds\\HTML5')) {
                                         $doc = new \Masterminds\HTML5(array('disable_html_ns' => true));
 …
                 } else {
                         $doc = new DOMDocument();
+                        @$doc->loadHTML($emptyDocDefault);
+                }
+                // Create an XPath object and allow some PHP functions to be used within XPath queries.
+                        @$doc->loadHTML('');
+                }
                 $this->xpath = new DOMXPath($doc);
-                $this->xpath->registerNamespace('php', 'http://php.net/xpath');
-                $this->xpath->registerPhpFunctions('\\Mf2\\classHasMf2RootClassname');
                 $baseurl = $url;
 …
                         'properties' => $return
                 );
                 if(trim($e->getAttribute('id')) !== '') {
                         $parsed['id'] = trim($e->getAttribute("id"));
 …
                 // start with mf2 root class name xpath
                 $xpaths = array(
                         '(php:function("\\Mf2\\classHasMf2RootClassname", normalize-space(@class)))'
+                        'contains(concat(" ",normalize-space(@class)), " h-")'
                 );
 …
                                 break;
-                                case 'hfeed':
-                                        $this->upgradeRelTagToCategory($el);
-                                break;
-                                case 'hproduct':
-                                        $review_and_hreview_aggregate = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " review ") and contains(concat(" ", normalize-space(@class), " "), " hreview-aggregate ")]', $el);
-                                        if ( $review_and_hreview_aggregate->length ) {
-                                                foreach ( $review_and_hreview_aggregate as $tempEl ) {
-                                                        if ( !$this->hasRootMf2($tempEl) ) {
-                                                                $this->backcompat($tempEl, 'hreview-aggregate');
-                                                                $this->addMfClasses($tempEl, 'p-review h-review-aggregate');
-                                                                $this->addUpgraded($tempEl, array('review hreview-aggregate'));
+                                                        }
+                                                }
+                                        }
-                                        $review_and_hreview = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " review ") and contains(concat(" ", normalize-space(@class), " "), " hreview ")]', $el);
-                                        if ( $review_and_hreview->length ) {
-                                                foreach ( $review_and_hreview as $tempEl ) {
-                                                        if ( !$this->hasRootMf2($tempEl) ) {
-                                                                $this->backcompat($tempEl, 'hreview');
-                                                                $this->addMfClasses($tempEl, 'p-review h-review');
-                                                                $this->addUpgraded($tempEl, array('review hreview'));
+                                                        }
+                                                }
+                                        }
-                                break;
-                                case 'hreview-aggregate':
                                 case 'hreview':
                                         $item_and_vcard = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " vcard ")]', $el);
 …
                                 case 'vevent':
                                         $location_and_vcard = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " location ") and contains(concat(" ", normalize-space(@class), " "), " vcard ")]', $el);
                                         if ( $location_and_vcard->length ) {
                                                 foreach ( $location_and_vcard as $tempEl ) {
+                                        $location = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " location ")]', $el);
+                                        if ( $location->length ) {
+                                                foreach ( $location as $tempEl ) {
                                                         if ( !$this->hasRootMf2($tempEl) ) {
                                                                 $this->addMfClasses($tempEl, 'p-location h-card');
+                                                                $this->addMfClasses($tempEl, 'h-card');
                                                                 $this->backcompat($tempEl, 'vcard');
+                                                        }
 …
         public function hasRootMf2(\DOMElement $el) {
                 $class = str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
+                // Check for valid mf2 root classnames, not just any classname with a h- prefix.
+                return count(mfNamesFromClass($class, 'h-')) > 0;
+                $classes = array_filter(explode(' ', $class));
+                foreach ( $classes as $classname ) {
+                        if ( strpos($classname, 'h-') === 0 ) {
+                                return true;
+                        }
+                }
+                return false;
+        }
 …
                 'vevent' => 'h-event',
                 'hreview' => 'h-review',
-                'hreview-aggregate' => 'h-review-aggregate',
                 'hproduct' => 'h-product',
                 'adr' => 'h-adr',
-                'geo' => 'h-geo'
         );
 …
                 ),
                 'hfeed' => array(
+                        'author' => array(
+                                'replace' => 'p-author h-card',
+                                'context' => 'vcard'
+                        ),
+                        'url' => array(
+                                'replace' => 'u-url'
+                        ),
+                        'photo' => array(
+                                'replace' => 'u-photo'
+                        ),
+                        'category' => array(
+                                'replace' => 'p-category'
+                        ),
+                        # nothing currently
                 ),
                 'hentry' => array(
 …
                         ),
                         'location' => array(
+                                'replace' => 'p-location',
+                                'replace' => 'h-card',
+                                'context' => 'vcard'
                         ),
                         'geo' => array(
                                 'replace' => 'p-location h-geo'
                         ),
-                        'attendee' => array(
-                                'replace' => 'p-attendee h-card',
-                                'context' => 'vcard'
+                        )
                 ),
                 'hreview' => array(
 …
                         ),
                 ),
-                'hreview-aggregate' => array(
-                        'summary' => array(
-                                'replace' => 'p-name'
-                        ),
-                        # fn: see item.fn below
-                        # photo: see item.photo below
-                        # url: see item.url below
-                        'item' => array(
-                                'replace' => 'p-item h-item',
-                                'context' => 'item'
-                        ),
-                        'rating' => array(
-                                'replace' => 'p-rating'
-                        ),
-                        'best' => array(
-                                'replace' => 'p-best'
-                        ),
-                        'worst' => array(
-                                'replace' => 'p-worst'
-                        ),
-                        'average' => array(
-                                'replace' => 'p-average'
-                        ),
-                        'count' => array(
-                                'replace' => 'p-count'
-                        ),
-                        'votes' => array(
-                                'replace' => 'p-votes'
-                        ),
-                ),
                 'hproduct' => array(
                         'fn' => array(
 …
                                 'replace' => 'u-url',
                         ),
+                        // review is handled in the special processing section to allow for 'review hreview-aggregate'
+                        'review' => array(
+                                'replace' => 'p-review h-review',
+                        ),
                         'price' => array(
                                 'replace' => 'p-price'

indieweb-post-kinds/tags/4.0.0/lib/parse-this/parse-this.php

-              r2507837
+              r3738687
  * Plugin Name: Parse This
  * Plugin URI: https://github.com/dshanske/parse-this
  * Description:
  * Version: 1.0.1
+ * Description: Turns URLs into structured jf2 data from microformats2, JSON-LD, meta tags and RSS, Atom and JSON feeds.
+ * Version: 2.0.0
  * Author: David Shanske
  * Author URI: https://david.shanske.com
+ * Requires at least: 6.2
+ * Requires PHP: 7.4
+ * License: GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: parse-this
+ * Domain Path:  /languages
+ *
+ * @package Parse_This
  */
+/*
+ Parse This Load
+ */
+defined( 'ABSPATH' ) || exit;
 if ( ! function_exists( 'parse_this_loader' ) ) {
+        /**
+         * Loads Parse This.
+         *
+         * Runs on plugins_loaded at priority 9, so that the standalone plugin loads
+         * ahead of copies bundled in other plugins (Post Kinds loads its copy at
+         * priority 11). Functions are guarded by function_exists() and the first
+         * autoloader registered serves the classes, so whichever copy loads first
+         * wins. It also registers the deprecated global names in aliases.php, so
+         * that plugins bundling an older copy use this one.
+         *
+         * Defines PARSE_THIS_VERSION for the copy that loads, and fires
+         * parse_this_loaded once everything is available. A copy older than 2.0.0
+         * defines neither, so a plugin can tell when an older bundled copy won.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Defines PARSE_THIS_VERSION and fires parse_this_loaded.
+         */
         function parse_this_loader() {
+                if ( ! defined( 'PARSE_THIS_VERSION' ) ) {
+                        /**
+                         * Version of the copy of Parse This that loaded. Keep in step with the
+                         * Version header.
+                         *
+                         * @since 2.0.0
+                         * @var string
+                         */
+                        define( 'PARSE_THIS_VERSION', '2.0.0' );
+                }
                 require_once plugin_dir_path( __FILE__ ) . 'includes/autoload.php';
+                require_once plugin_dir_path( __FILE__ ) . 'includes/functions.php';
+                // Functions Not Available in Earlier Versions of WordPress
+                require_once plugin_dir_path( __FILE__ ) . 'includes/compat-functions.php';
+                new ParseThis\REST_Endpoint();
+                require_once plugin_dir_path( __FILE__ ) . 'includes/functions.php';
+                // Parse This REST Endpoint
+                require_once plugin_dir_path( __FILE__ ) . 'includes/class-rest-parse-this.php';
+                /**
+                 * Fires once Parse This has loaded: its classes, functions and REST route
+                 * are available.
+                 *
+                 * Plugins that use Parse This can hook here, or check PARSE_THIS_VERSION,
+                 * rather than depend on load order.
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param string $version Version of the copy of Parse This that loaded.
+                 */
+                do_action( 'parse_this_loaded', PARSE_THIS_VERSION );
+        }
         add_action( 'plugins_loaded', 'parse_this_loader', 9 );
+}

indieweb-post-kinds/tags/4.0.0/lib/parse-this/readme.txt

-              r2507837
+              r3738687
 === Parse This ===
 Contributors: dshanske
 Tags: indieweb
 Stable tag: trunk
 Requires at least: 4.9
 Requires PHP: 5.6
 Tested up to: 5.6
+Tags: indieweb, microformats, jf2, json-ld, feeds
+Stable tag: 2.0.0
+Requires at least: 6.2
+Requires PHP: 7.4
+Tested up to: 7.1
 License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Parse This turns URLs into structured jf2 data
+== Description ==
+Parse This is based on a variety of projects including the parsing code from Press This, which was removed from WordPress.
+* It supports parsing from MF2 if present
+* For sites that are not marked up with Microformats 2(MF2) it will fall back onto parsing JSON-LD, then HTML/OpenGraph/Dublin Core Tags/etc.
+* It supports parsing of JSONFeed and RSS/Atom feeds
+* It supports parsing of  WordPress REST API endpoints to generate a site feed
+The goal is to produce structured jf2 data that can be used for previewing links as well as feed readers and other options. It is also bundled in the Post Kinds and Yarns Microsub plugins as a library.
+It can be installed as a standalone plugin which will provide the necessary libraries and functionality as well as the REST API endpoint for getting JF2 data from an arbitrary URL or a WordPress Post.
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
+Parse This turns URLs into structured jf2 data.
+== Description ==
+Parse This fetches a URL and turns it into [jf2](https://jf2.spec.indieweb.org/), a simple JSON format for posts, people and feeds. The result can be used for link previews, feed readers, replies and likes, and similar features.
+It started from the parsing code in Press This, which was removed from WordPress, and has grown from there. It runs as a standalone plugin that other plugins, such as Post Kinds and Yarns Microsub, can require or bundle.
+It also runs on ClassicPress 2.x.
+= What it parses =
+* **Microformats2.** When a page is marked up with microformats, they are used first: entries, cards, events, reviews (including h-entry reviews with `review-of`), recipes, products and any other type. On a busy page it picks the item the page is about, and it follows the IndieWeb authorship algorithm.
+* **Other metadata.** Other sources only fill in what microformats don't provide: a site-specific parser for YouTube or X (Twitter), then JSON-LD (articles, events, reviews, products, recipes, media and people) and Open Graph, Dublin Core and other meta tags. If there is still no content, the page's WordPress REST API version is fetched, when the site advertises one.
+* **Parts of pages.** A link with a fragment (`#comment-12`) is parsed as just that part of the page. A WordPress comment link whose page has no microformats for it is read from the site's REST API as a reply.
+* **Feeds.** RSS and Atom (through WordPress's SimplePie), JSON Feed 1 and 1.1, jf2 and mf2 JSON, and WordPress REST API post collections, including feeds served with the wrong content type.
+* **Feed discovery.** It lists the feeds a page offers: alternates, `rel=feed` links, h-feeds and the WordPress REST API.
+On PHP 8.4 and later, HTML is parsed with PHP's own HTML5 parser; on older PHP, with the bundled masterminds/html5 parser.
+= Using it from PHP =
+    $parse = new ParseThis\Parser( 'https://example.com/a-post/' );
+    $result = $parse->fetch();
+    if ( ! is_wp_error( $result ) ) {
+        $parse->parse( array( 'return' => 'single' ) );
+        $jf2 = $parse->get();          // jf2 array.
+        $mf2 = $parse->get( 'mf2' );   // Or the same result as mf2.
+    }
+`ParseThis\Parser::parse()` accepts these arguments:
+* `return`: `single` for one item (default) or `feed` for a list of items.
+* `follow`: fetch and parse external author pages. Default false.
+* `limit`: maximum number of feed items. Default 150.
+* `jsonld`: try JSON-LD. Default true.
+* `html`: fall back to meta tags. Default true.
+* `references`: move nested objects with a URL (citations, cards, events, ...) into `refs`, as the jf2 spec describes. Default true.
+* `location`: flatten a nested location into `latitude`, `longitude` and `altitude` properties, with `location` as a plain string. Default false.
+* `alternate`: use a `rel=alternate` jf2 or mf2 version of the page if it has one. Default false.
+* `require_content`: whether a summary alone isn't enough, so the page's WordPress REST API version is fetched for full content. Default: true for feeds, false otherwise.
+* `always_arrays`: always return `category`, `photo`, `video`, `audio`, `syndication`, `like-of`, `repost-of`, `bookmark-of` and `in-reply-to` as arrays, as Microsub does. Default false, which follows jf2: a single value is not wrapped in an array.
+* `debug`: include the raw data each source was read from (`_meta`, `_jsonld`, `_json`, `_yt`, `_ombed`, `_rest`). Default false. Before 2.0.0 this was added whenever `WP_DEBUG` was on.
+To list a page's feeds instead, use `( new ParseThis\Discovery() )->fetch( $url )`.
+= Output format =
+Results follow [jf2](https://jf2.spec.indieweb.org/), with a few deliberate differences:
+* A feed's entries are in `items`, as in Microsub timelines, rather than the JF2 Feed profile's `children`.
+* Nested objects with a URL (citations, cards, events, products and any other type) are stored in `refs`, keyed by URL, as XRay does, rather than jf2's `references`. The property holds the URL. Authors stay cards.
+* Microformats properties that Parse This doesn't know are passed through as they are.
+* Entries get a `post-type` property from [Post Type Discovery](https://www.w3.org/TR/post-type-discovery/).
+* Reviews can be an h-review, or an h-entry with `review-of` (a URL, or a nested h-cite, h-card, h-event, h-item or h-product) and `rating`, `best` and `worst`, as proposed in [microformats/h-entry#32](https://github.com/microformats/h-entry/issues/32) and published by Post Kinds. Both, and an h-entry that is also an h-review, get the post type `review`.
+* `author` is always a card (or a list of cards), never a plain string.
+* Properties starting with an underscore (`_links`, `_rest`, ...) are internal or debugging data.
+* A fetched result has `_code`, the HTTP status (or the status the page declares with `<meta http-equiv="Status">`, such as 410 for a deleted post's stub), and `_source_format`, what it was read from: `mf2+html` (microformats), `html` (meta tags only), `mf2+json`, `jf2+json`, `feed+json` (JSON Feed), `xml` (RSS or Atom) or `wordpress` (REST API). After redirects, the document is read from, and relative links resolve against, the address it ended up at.
+* When a URL can't be parsed, `fetch()` returns a `WP_Error`: `invalid-url`, `not_found` (404), `unauthorized` (401), `forbidden` (403), `http_error` (any other 4xx or 5xx, with the status as `response_code` in the error data), `content-type` (a format Parse This doesn't read), or the request error itself (a timeout, for example).
+Values from fetched pages are sanitized: URL properties only contain `http` and `https` URLs, plain-text properties (`name`, `summary`, `category`, `content`'s `text`) have no HTML tags, and `content`'s `html` is limited to a safe set of tags. Escape values when you output them all the same, as with any remote data. Debugging data (`_jsonld`, `_meta`, ...) is not sanitized.
+= REST API =
+`GET /wp-json/parse-this/1.0/parse?url=https://example.com/`
+* `url` (required): the URL to parse.
+* `return`, `follow`, `references`, `location`, `require_content`, `always_arrays`, `debug`: as for `parse()` above.
+* `mf2`: return mf2 instead of jf2.
+* `discovery`: list the URL's feeds instead of parsing it.
+* `nocache`: fetch the URL again instead of using a cached result.
+Results are cached for 15 minutes per URL and set of parameters, so pasting the same link again doesn't fetch it again. Requests with `debug` are never cached.
+The endpoint requires the `edit_posts` capability (Contributors and above); the `parse_this_rest_capability` filter changes it. Anyone who can use it can also try it from **Tools > Parse This**.
+= Filters =
+* `pt_rewrite_secure`: the list of domains whose `http://` URLs are upgraded to `https://` before fetching.
+* `parse_this_img_filters`: an image URL found in a page, after the built-in exclusions (ads, spinners, tracking pixels and so on). Return an empty string to drop it.
+* `parse_this_url_shorteners`: the hosts treated as link shorteners. Links to them in a summary are expanded to where they redirect; other links are left as they are, without a request.
+* `parse_this_native_html_parser`: whether to parse HTML with PHP's own HTML5 parser on PHP 8.4 and later. Default true. Return false to use the bundled masterminds/html5 parser instead; the two only differ on invalid markup, where PHP's parser does what browsers do.
+* `parse_this_max_requests`: how many further requests one parse may make for followed author pages and short-link expansion. Default 10. Receives the URL.
+* `parse_this_cache_lifetime`: how long REST endpoint results are cached, in seconds. Default 15 minutes. Return 0 to turn caching off. Receives the URL.
+* `parse_this_rest_api_jf2_type`: the jf2 type for a post read through a site's WordPress REST API. Default `entry`. Receives the REST API post object, which includes its WordPress post type, and the site's REST API root URL.
+= Helper functions =
+All classes and functions are in the `ParseThis` namespace.
+* `ParseThis\mf2_to_jf2()` and `ParseThis\jf2_to_mf2()` convert between the two formats.
+* `ParseThis\post_type_discovery()` returns the IndieWeb post type (note, article, reply, like, photo, ...) of a jf2 or mf2 entry.
+* `ParseThis\jf2_references()` and `ParseThis\jf2_location()` apply the `references` and `location` transformations to any jf2 object.
+Every function and class is documented in the source.
+= Upgrading from 1.x =
+Version 2.0.0 moved everything into the `ParseThis` namespace and dropped the `Parse_This_` prefix from class names (for example `Parse_This_MF2` is now `ParseThis\MF2`, and `Parse_This` is `ParseThis\Parser`). The old names that Post Kinds and Yarns use still work for now, as deprecated aliases:
+* Classes: `Parse_This`, `Parse_This_Discovery`, `Parse_This_MF2`, `Parse_This_MF2_Utils` and `REST_Parse_This`.
+* Functions: `mf2_to_jf2()`, `jf2_to_mf2()`, `post_type_discovery()`, `pt_load_domdocument()` and `seconds_to_iso8601()`.
+Other old global names are no longer defined. Please switch to the namespaced names.
+= Using Parse This from another plugin =
+The recommended way is to require the Parse This plugin rather than bundle a copy. On WordPress 6.5 and later, add `Requires Plugins: parse-this` to your plugin's header. On older WordPress and ClassicPress, which don't read that header, check that Parse This is loaded and new enough before using it:
+    add_action( 'plugins_loaded', function () {
+        if ( ! defined( 'PARSE_THIS_VERSION' ) || version_compare( PARSE_THIS_VERSION, '2.0.0', '<' ) ) {
+            // Show a notice asking for Parse This 2.0.0 or later, and skip the features that need it.
+            return;
+        }
+        // Use ParseThis\Parser and the rest here.
+    }, 11 );
+`PARSE_THIS_VERSION` is the version of the copy of Parse This that loaded. It isn't defined by copies older than 2.0.0, so an older copy bundled in another plugin shows up as missing. The `parse_this_loaded` action fires, with the version, once Parse This has loaded.
+= Bundling Parse This in another plugin =
+If you do bundle it, copy the plugin into your plugin (for example under `lib/parse-this/`) and load it only if the standalone plugin hasn't already, from `plugins_loaded` at priority 10 or later:
+    add_action( 'plugins_loaded', function () {
+        if ( ! function_exists( 'parse_this_loader' ) ) {
+            require_once __DIR__ . '/lib/parse-this/parse-this.php';
+            parse_this_loader();
+        }
+    }, 11 );
+The standalone plugin loads at priority 9, so when it is active it is used instead of your copy. Every function is also wrapped in `function_exists()` and classes are loaded by an autoloader, so if two copies do load, the first one wins.
+Copies of Parse This 1.x bundled in other plugins keep working alongside 2.0: when the standalone plugin is active, their calls to the old names listed under "Upgrading from 1.x" are served by the standalone plugin.
 == Frequently Asked Questions ==
+= What is jf2? =
+jf2 is a JSON format derived from microformats2, but simpler: single values aren't wrapped in arrays, and types drop the `h-` prefix. See the [jf2 specification](https://jf2.spec.indieweb.org/).
+= Why does a page return only a title and a URL? =
+That page has no microformats, JSON-LD or useful meta tags, or it blocks automated requests. The **Tools > Parse This** page shows exactly what was parsed for a URL.
+= Which copy is used when several plugins bundle Parse This? =
+The first one loaded. If the standalone plugin is active, it is that one. See "Bundling Parse This in another plugin" above.
+= Does it work with ClassicPress? =
+Yes. It is tested with ClassicPress 2.7 on PHP 7.4 to 8.3.
 == Changelog ==
+= 2.0.0 ( 2026-10-03 ) =
+A major update. Please read "Upgrading from 1.x" if another plugin of yours uses Parse This.
+Requirements:
+* Requires PHP 7.4 and WordPress 6.2, or ClassicPress 2.x. Tested up to WordPress 7.1 and PHP 8.5.
+Changes to be aware of:
+* Everything is in the `ParseThis` namespace, and class names drop the `Parse_This_` prefix (`Parse_This` is now `ParseThis\Parser`). The old names Post Kinds and Yarns use still work, as deprecated aliases.
+* Output: nested objects with a URL move to `refs`; authors are always cards; RSS and Atom items use `post-type` (not `post_type`); unknown microformats properties are kept; and fetched results carry `_code` and `_source_format`.
+* `fetch()` returns a `WP_Error` for HTTP error pages (`not_found`, `unauthorized`, `forbidden`, `http_error`) instead of parsing them; a 410 Gone page is still parsed.
+* The REST endpoint and the Tools > Parse This page require the `edit_posts` capability (filterable with `parse_this_rest_capability`), and its parameters are validated.
+* Raw source data (`_meta`, `_jsonld` and so on) is only included with the new `debug` argument, not whenever `WP_DEBUG` is on.
+* Plugins that use Parse This should require it rather than bundle it: see "Using Parse This from another plugin". `PARSE_THIS_VERSION` and the `parse_this_loaded` action help with that.
+* The Instagram parser and the `ifset()` helper are removed.
+New:
+* Microformats always come first; JSON-LD, meta tags and the REST API only fill gaps. The `require_content` argument controls when a summary is enough.
+* Microformats: choose the item a busy page is about; the full authorship algorithm, with feed entries inheriting the feed's author; reviews as an h-entry with `review-of`, `rating`, `best` and `worst` (as Post Kinds publishes them); complete h-event, h-review and h-recipe parsing; `follow-of`; and every value of repeated properties.
+* Links with a fragment parse just that element; WordPress comment links fall back to the site's REST API.
+* JSON-LD: reviews, products, recipes, and Article and Event subtypes, preferred over the WebPage node SEO plugins add.
+* Feeds and JSON served with the wrong content type are recognized. JSON Feed items get plain text, a `post-type` and absolute URLs.
+* Discovery finds mf2 JSON alternates, `rel=feed` links, RSS 1.0, multi-value `rel` attributes and JSON Feeds advertised as `application/json`, and follows permanent redirects.
+* PHP's own HTML5 parser is used on PHP 8.4 and later: several times faster, and it handles invalid markup as browsers do (`parse_this_native_html_parser` turns it off).
+* The `always_arrays` argument returns Microsub-style arrays.
+* New filters: `parse_this_rest_api_jf2_type`, `parse_this_url_shorteners`, `parse_this_max_requests`, `parse_this_cache_lifetime`, `parse_this_rest_capability` and `parse_this_native_html_parser`.
+Fixes:
+* More than 50 bugs, many of them fatal errors on PHP 8, across RSS and Atom, the WordPress REST API, JSON-LD, meta tags, microformats, JSON Feed, X (Twitter), YouTube and feed discovery.
+* Content HTML no longer loses the text before its first tag, and escaped text (`&lt;code&gt;`) no longer turns into markup.
+* REST API posts are dated from their GMT dates; YouTube pages are read in full; titles that only repeat the content are dropped; names and ratings of "0" are kept; post types follow Post Type Discovery.
+Performance:
+* Feeds are downloaded once rather than twice; only link-shortener URLs in summaries are expanded; REST API tags and site details need far fewer requests; followed author pages are fetched once per request; REST endpoint results are cached for 15 minutes (`nocache` and `parse_this_cache_lifetime`).
+Security:
+* Output from fetched pages is sanitized (URLs limited to http and https, tags stripped from plain text, a safe set of HTML tags in content); one parse makes at most 10 further requests; the debug page sends its nonce in a header; plugin files exit when loaded outside WordPress; the OPML class handles invalid input safely.
+Developers:
+* Core's `fetch_feed()` is used for RSS and Atom; all requests go through `ParseThis\pt_remote_get()`.
+* The bundled php-mf2 (0.5.0) and masterminds/html5 (2.11.0) are updated, and polyfills WordPress 6.2 provides are removed.
+* Every function, class and hook is documented, and the plugin is tested on WordPress 6.2, the latest WordPress and ClassicPress 2.7 with PHP 7.4 to 8.5.
 = 1.0.1 ( 2021-04-02 ) =
 …
 = 1.0.0 ( 2020-12-15 ) =
 * First Official Release. Prior to this point it was in a point release.
+== Upgrade Notice ==
+= 2.0.0 =
+A major update: classes and functions move to the ParseThis namespace (the old names Post Kinds and Yarns use still work), the output format changes in places, and the REST endpoint now requires the edit_posts capability. Requires PHP 7.4 and WordPress 6.2.

indieweb-post-kinds/tags/4.0.0/readme.txt

-              r3067251
+              r3738687
 Contributors: dshanske
 Tags: indieweb, interaction, posts, webmention, share, like, scrobble
 Stable tag: 3.7.3
 Requires at least: 4.9.9
 Requires PHP: 7.0
 Tested up to: 6.5
+Stable tag: 4.0.0
+Requires at least: 6.2
+Requires PHP: 7.4
+Tested up to: 7.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 Many sites will not need all of the kinds set up. What kinds of posts you wish to publish are specific to your needs.
+Post Kinds requires PHP 7.4 or later and WordPress 6.2 or later. It also supports ClassicPress 2.7.3 or later.
 == Screenshots ==
 …
 == Upgrade Notice ==
+= 4.0.0 =
+Requires PHP 7.4 and WordPress 6.2 or ClassicPress 2.7.3. Response data is now escaped, changing some display helpers; stored post data upgrades in the background. Posts from apps and the REST API now get the Default Kind (Note unless changed), not Article. See the changelog.
 = 3.7.0 =
 …
 either a response to something, such as a URL, or a more passive type of post where you are recording/logging something you did, for
 example, watched a movie.
+When you write a post in the Classic Editor, choose its kind in the Kind box. For kinds that respond to something, fill in the Response Properties box:
+ * **URL** - the page you are responding to. When you leave this field, the plugin fetches the page and fills in the other fields from it where it can. You can edit or clear anything it fills in.
+ * **Name** - the title of what you are responding to.
+ * **RSVP** and **Rating** - shown only for the kinds that use them: RSVP for RSVPs, and a rating for reviews, listens, watches, reads, plays and similar.
+ * **Details** - more about what you are responding to: a summary, quote or caption (plain text), the site name, publication or album, when it was published and updated, its tags (separated by semicolons) and a featured image URL. For listens, watches, photos and similar, it also has the duration, or a start and end time.
+ * **Author** - the name, URL and photo of the author or artist. Separate several authors with semicolons.
+ * **Upload or Attach Media** - for photo, video and audio posts, attaches a file from the media library.
+ * **Clear** - empties every field.
+The plugin uses these fields to display the response above your post's content, marked up with [microformats](https://microformats.org/wiki/h-entry) so other sites can read it.
 = How do I interact with other sites? =
 …
 However if you are interested in creating your own there is functionality around it.
 register_post_kind(
         'reply',
+        register_post_kind(
+                'reply',
                 array(
+                        'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ), // Name for one instance of the kind
+                        'name'            => __( 'Replies', 'indieweb-post-kinds' ), // General name for the kind plural
+                        'verb'            => __( 'Replied to', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
+                        'property'        => 'in-reply-to', // microformats 2 property
+                        'format'          => 'link', // Post Format that maps to this
+                        'description'     => __( 'a reply to content typically on another site', 'indieweb-post-kinds' ),
+                        'description-url' => 'http://indieweb.org/reply',
+                        'title'           => false, // Should this kind have an explicit title
+                        'show'            => true, // Show in Settings
+                        )
+                        'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ), // Name for one instance of the kind.
+                        'name'            => __( 'Replies', 'indieweb-post-kinds' ), // General name for the kind, plural.
+                        'verb'            => __( 'Replied to', 'indieweb-post-kinds' ), // The verb or action, such as "Liked".
+                        'property'        => 'in-reply-to', // Microformats 2 property.
+                        'format'          => 'link', // Post format that maps to this kind.
+                        'description'     => __( 'a reply to content typically on another site', 'indieweb-post-kinds' ),
+                        'description_url' => 'http://indieweb.org/reply',
+                        'title'           => false, // Whether this kind should have an explicit title.
+                        'show'            => true, // Whether to show the kind in Settings.
+                )
 );
 Add a function with your kind in the above format, hooking it in the init hook and it will add the Kind to the system.
+        );
+Call it from a function hooked to `init` and it will add the Kind to the system. The [developer notes](https://github.com/dshanske/indieweb-post-kinds/blob/trunk/develop.txt) list the other arguments.
 = Can I enable one of the Kinds you plan to offer in future? =
 …
 `set_post_kind_visibility( $slug, $show = true )` - If you add this function in early on, it will change the visibility of a kind.
 = Can I create archives for each kind? ==
+= Can I create archives for each kind? =
 Post Kinds automatically handles the display of archives of individual types. So to view all the posts marked as "note", for example, one could visit the URL http://www.YOURSITE.COM/kind/note/.
 Simply replace YOURSITE.COM with your particular site name and the particular post kind name to access the others.
+To use another word than "kind" in these URLs, for example in your own language, set the Kind base on Settings > Permalinks. Links to the old URLs then stop working, as when the category base changes.
 You can also add the date /kind/note/2018/12/24 to see date-based archives.
+For archives if you add exclude_kind as a query variable it will exclude specific kinds from the query `?exclude=kind&exclude_terms=note`. You can also do this as /exclude/kind/note,checkin as it accepts multiple values
 There is also a special photo photo included, using ?kind_photos=1 or /photos or /photos/yyyy or /photos/yyyy/mm or /photos/kind/note or any other taxonomy. This will use the photo enhancements introduced in 3.4.0 to only show photos from
+To leave specific kinds out of an archive, use `?exclude=kind&exclude_terms=note` or /exclude/kind/note,checkin, which accepts several kinds.
+There is also a special photo archive, using ?kind_photos=1 or /photos or /photos/yyyy or /photos/yyyy/mm or /photos/kind/note or any other taxonomy. This will use the photo enhancements introduced in 3.4.0 to only show photos from
 all types of posts.
 …
 == Theme Support ==
+Post Kinds automatically adds information to `the_content` and `the_excerpt` filter. Being as this is inside the content block, which may or may not be desirable, you may remove these filters as noted
+below and call `kind_display` directly. This will allow it to appear outside the content block. To remove the automatic display, add the following to your theme.
+        * `add_filter( 'kind_content_display', '__return_false' );`
+The functions `has_post_kind`, `set_post_kind`, and `set_post_kind` will allow you to manipulate the kind settings in a post. `get_post_kind_string` will return the display name of a kind.
+If you want to customize the look of the display, you can create a directory in your theme called `kind_views`, copy the file from the views directory of the plugin, and modify it. This will persist
+through future plugin updates.
+Post Kinds works with most themes without changes. It adds the response (what you replied to, liked, listened to and so on) to the post's content and excerpt, and to feeds.
+To place the response somewhere else in your theme, turn off the automatic display and call `kind_display()` in your template where you want it:
+        add_filter( 'kind_content_display', '__return_false' );
+Many kinds have no title. In templates that list posts, `kind_get_the_title()` returns the post's title, or generates one from the kind and what it responds to.
+To change how a kind looks, create a `kind_views` folder in your theme, copy the view from the plugin's `views` folder into it, and edit the copy. It persists through plugin updates, but it doesn't receive fixes: compare it with the plugin's views after upgrading.
+To style responses, target the `.response` wrapper that each view uses, and `.kind-embed` around embedded content.
+The template functions, hooks and view variables are listed in the [developer notes](https://github.com/dshanske/indieweb-post-kinds/blob/trunk/develop.txt).
 == Changelog ==
+* 3.7.3 ( 2024-04-09 ) =
+= 4.0.0 ( 2026-10-10 ) =
+* Raise the minimum requirements to PHP 7.4 and WordPress 6.2, and declare ClassicPress 2.7.3 support
+* The `kind` field in the REST API now has a description and lists the valid kinds; an unknown kind is rejected with `rest_invalid_param`
+* When the old IndieWeb Taxonomy plugin is active, activation now stops with a translatable message and deactivates Post Kinds itself, instead of a file that isn't a plugin
+* The Default Kind setting applies to every new post without a kind, including posts from apps, the REST API, Quick Draft and scheduled drafts, which used to get Article. Set Default Kind to Article to keep the old behaviour. A translated site no longer gets a stray copy of the Article kind
+* Escape response data in views, the editor, widgets and settings; summaries are displayed as plain text
+* Sanitize input from the editor, the media modal's artist fields, settings and widgets; citation summaries are saved as plain text
+* An RSVP can now be cleared in the editor
+* Fix the Response Properties box disappearing for every kind after another box was collapsed while editing a note or article; it can no longer be hidden through Screen Options, since the editor shows it only for kinds that use it
+* Kind icons can be resized from a theme with any rule, such as `.svg-icon { width: 1rem; height: 1rem; }`. The inline style is gone, the plugin's styles have no specificity, and icons have a default size where the stylesheet doesn't load, such as feed readers
+* Deleting the plugin removes its settings and scheduled events, on every site of a multisite network. Posts, their kinds and their response data are kept
+* Several authors are saved as one h-card each, pairing the semicolon-separated names, URLs and photos by position, and every author is displayed. Lists of authors from Micropub or link previews are shown and filled in too. Authors saved by earlier versions are read the same way. An author with a URL but no photo is linked, and clearing the author fields removes the authors
+* Add a Kind base setting to Settings > Permalinks, to change the `kind` in kind archive URLs such as /kind/like/, and the `kind_base_slug` filter
+* Fix durations calculated from the start and end times never being shown; `calculate_duration()` now also accepts date objects
+* Require the edit_posts capability for the post-kinds/1.0/fields REST route; an unknown kind returns a 404
+* Add a background upgrade that moves and repairs stored citations and records the media in each post; `wp post-kinds upgrade` runs it on demand (`--dry-run`, `--post=<id>`)
+* Fix citations losing their type when viewed (a checkin lost its h-card, for example) and nesting inside themselves when saved again; the upgrade repairs existing posts
+* Fix old citations stored as a plain URL being lost when viewed, and a PHP 8 fatal error when MF2_Post read very old response data
+* Reading a post no longer writes to the database or downloads remote photos
+* Performance: the media scan on save covers posts only and reads the content once; attachment lookups are cached; the photos archive and the home page kind filter use simpler queries; the settings page only writes kind terms that changed; icons, time zone offsets and permalink kinds are cached; the media fragment script loads only where there is audio or video, deferred
+* The Kind Post widget prints nothing when it has no posts, instead of an unclosed wrapper
+* New kind terms are named after the kind rather than its slug
+* Feed change: The RSS and Atom feeds use WordPress's own templates instead of copies, and other plugins' feed handlers are no longer removed. Posts without a title have an empty title element instead of none, so the Atom feed is valid; turn on "Automatically add the Kind to the Title" to fill it in. Dates are written in UTC. In comment feeds, comments on untitled posts name the post.
+* Deprecated: The global functions `display_formatted_datetime()`, `divide_datetime()`, `build_datetime()`, `get_datetime_offset()`, `divide_interval()` and `build_interval()`. Use the `Kind_Time` methods of the same names. The global names still work but report a deprecation notice when debugging is on, and they will be removed in the next major release (5.0.0). Custom views copied into a theme may call them, so update those to the `Kind_Time` methods.
+* Display change: Custom views copied into a theme's `kind_views` folder keep their old code. Copy them again from the plugin's `views` folder, or escape their output.
+* Display change: Citation summaries are plain text, marked up as `p-summary` instead of `e-summary`. `Kind_View::get_summary()` returns the summary markup.
+* Display change: `Kind_View::get_hcard()`, `get_cite_title()`, `get_site_name()`, `get_embed()`, `get_url_link()` and `display_duration()` return escaped markup; HTML passed as a name is shown as text.
+* Display change: `kind_get_the_title()` escapes the content before the `kind_get_the_title_content` filter.
+* Display change: `Kind_View::rsvp_text()` takes optional URL and name arguments and returns the full sentence. Called with only a type, it still returns a printf-ready string. The RSVP strings have changed, so translations need updating.
+* Display change: `Kind_View::rating_text()` ignores non-numeric ratings and shows at most 10 stars.
+* Upgrade change: Published posts with no kind are given one, based on their stored response properties, or Article. If the home page shows only selected kinds, Article is added to them so those posts stay; posts given another kind, such as Like, follow the selection.
+* Upgrade change: Until the background upgrade reaches them, older posts may be missing from the photos archive; `wp post-kinds upgrade` finishes it at once.
+* Removed: The `kind_photo_shortcode_exclude` filter, which never ran.
+* Behaviour change: `MF2_Post::get_images()` no longer imports remote photos into the media library; it returns media library attachments only.
+* Deprecated: The `MF2_Post` class. Use `Kind_Post`. Creating an `MF2_Post` reports a deprecation notice when debugging is on; the class will be removed in a future major version.
+= 3.7.3 ( 2024-04-09 ) =
 * Ensure widget array is instantiated

indieweb-post-kinds/tags/4.0.0/templates/reply-author.php

-              r2399112
+              r3738687
+<?php
+/**
+ * Author tab of the Post Kinds metabox.
+ *
+ * Included by reply-metabox.php.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ *
+ * @var array $cite The citation, normalized by Kind_Post::normalize_cite().
+ */
+defined( 'ABSPATH' ) || exit;
+?>
         <div id="kind-author" class="hide-if-js">
         <h4> <?php _e( 'Information on the Author or Artist of the Piece', 'indieweb-post-kinds' ); ?></h4>
                 <?php _e( '(Multiple Entries separated by semicolon)', 'indieweb-post-kinds' ); ?><BR />
+        <h4> <?php esc_html_e( 'Information on the Author or Artist of the Piece', 'indieweb-post-kinds' ); ?></h4>
+                <?php esc_html_e( '(Multiple Entries separated by semicolon)', 'indieweb-post-kinds' ); ?><BR />
         <p class="field-row">
         <label for="cite_author_name" class="three-quarters">
                 <?php _e( 'Author', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_author_name" id="cite_author_name" class="widefat" value="<?php echo $cite['author']['name']; ?>" />
+                <?php esc_html_e( 'Author', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_author_name" id="cite_author_name" class="widefat" value="<?php echo esc_attr( $cite['author']['name'] ); ?>" />
         </label>
         </p>
         <p class="field-row">
         <label for="cite_author_url" class="three-quarters">
                 <?php _e( 'Author URL', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_author_url" id="cite_author_url" class="widefat" value="<?php echo $cite['author']['url']; ?>" />
+                <?php esc_html_e( 'Author URL', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_author_url" id="cite_author_url" class="widefat" value="<?php echo esc_attr( $cite['author']['url'] ); ?>" />
         </label>
         </p>
         <p class="field-row">
         <label for="cite_author_photo" class="three-quarters">
                 <?php _e( 'Author Photo URL', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_author_photo" id="cite_author_photo" class="widefat" value="<?php echo $cite['author']['photo']; ?>" />
+                <?php esc_html_e( 'Author Photo URL', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_author_photo" id="cite_author_photo" class="widefat" value="<?php echo esc_attr( $cite['author']['photo'] ); ?>" />
         </label>
         </p>

indieweb-post-kinds/tags/4.0.0/templates/reply-details.php

-              r2399112
+              r3738687
+<?php
+/**
+ * Details tab of the Post Kinds metabox.
+ *
+ * Included by reply-metabox.php; includes reply-time.php.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ *
+ * @var Kind_Post $kind_post The post being edited.
+ * @var array     $cite      The citation, normalized by Kind_Post::normalize_cite().
+ */
+defined( 'ABSPATH' ) || exit;
+?>
 <div id="kind-details" class="hide-if-js">
         <h4><?php _e( 'Information on what you are responding to', 'indieweb-post-kinds' ); ?></h4>
+                <h4><?php esc_html_e( 'Information on what you are responding to', 'indieweb-post-kinds' ); ?></h4>
         <label for="cite_summary">
                 <?php _e( 'Summary/Quote/Caption', 'indieweb-post-kinds' ); ?>
         <textarea name="cite_summary" id="cite_summary" data-role="none" class="widefat"><?php echo $cite['summary']; ?></textarea>
+                <?php esc_html_e( 'Summary/Quote/Caption', 'indieweb-post-kinds' ); ?>
+        <textarea name="cite_summary" id="cite_summary" data-role="none" class="widefat"><?php echo esc_textarea( html_entity_decode( wp_strip_all_tags( (string) $cite['summary'] ), ENT_QUOTES, get_bloginfo( 'charset' ) ) ); ?></textarea>
         </label>
         <p class="field-row">
         <label for="cite_publication" class="three-quarters">
                 <?php _e( 'Site Name/Publication/Album', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_publication" id="cite_publication" class="widefat" value="<?php echo $cite['publication']; ?>" />
+                <?php esc_html_e( 'Site Name/Publication/Album', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_publication" id="cite_publication" class="widefat" value="<?php echo esc_attr( $cite['publication'] ); ?>" />
         </label>
         </p>
         <p class="field-row">
                         <?php echo Kind_Metabox::kind_the_time( 'cite_published', __( 'Published/Released', 'indieweb-post-kinds' ), $cite['published'], 'published' ); ?>
                 <?php echo Kind_Metabox::kind_the_time( 'cite_updated', __( 'Updated', 'indieweb-post-kinds' ), $cite['updated'], 'updated' ); ?>
+                        <?php echo Kind_Metabox::kind_the_time( 'cite_published', __( 'Published/Released', 'indieweb-post-kinds' ), $cite['published'], 'published' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
+                <?php echo Kind_Metabox::kind_the_time( 'cite_updated', __( 'Updated', 'indieweb-post-kinds' ), $cite['updated'], 'updated' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
         </p>
         <label for="cite_tags">
                 <?php _e( 'Tags (semicolon separated)', 'indieweb-post-kinds' ); ?>
         <textarea name="cite_tags" id="cite_tags" data-role="none" class="widefat"><?php echo $cite['category'] ?></textarea>
+                <?php esc_html_e( 'Tags (semicolon separated)', 'indieweb-post-kinds' ); ?>
+        <textarea name="cite_tags" id="cite_tags" data-role="none" class="widefat"><?php echo esc_textarea( $cite['category'] ); ?></textarea>
         </label>
         <p class="field-row">
         <label for="cite_featured" class="three-quarters">
                 <?php _e( 'Featured Image', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_featured" id="cite_featured" class="widefat" value="<?php echo $cite['featured']; ?>" />
+                <?php esc_html_e( 'Featured Image', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_featured" id="cite_featured" class="widefat" value="<?php echo esc_attr( $cite['featured'] ); ?>" />
         </label>
         </p>

indieweb-post-kinds/tags/4.0.0/templates/reply-metabox.php

-              r3001401
+              r3738687
 <?php
+/**
+ * Post Kinds metabox for the Classic Editor.
+ *
+ * Loaded by Kind_Metabox::reply_metabox(). It sets up $kind_post, $kind, $type
+ * and $cite, then includes reply-details.php and reply-author.php, which use them.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ */
+defined( 'ABSPATH' ) || exit;
 wp_nonce_field( 'replykind_metabox', 'replykind_metabox_nonce' );
 $kind_post = new Kind_Post( get_the_ID() );
 …
+}
+if ( empty( $cite['url'] ) && array_key_exists( 'kindurl', $_GET ) ) {
+        $cite['url'] = esc_url_raw( $_GET['kindurl'] );
+// phpcs:disable WordPress.Security.NonceVerification.Recommended -- Prefills the URL on the new post screen; nothing is saved.
+if ( empty( $cite['url'] ) && isset( $_GET['kindurl'] ) && is_string( $_GET['kindurl'] ) ) {
+        $cite['url'] = sanitize_url( wp_unslash( $_GET['kindurl'] ) );
+}
+// phpcs:enable WordPress.Security.NonceVerification.Recommended
 $attachment = 0;
 …
 if ( in_array( $kind, array( 'audio', 'video', 'photo' ) ) ) {
         $attachment = attachment_url_to_postid( $cite['url'] );
+        $attachment = empty( $cite['url'] ) ? 0 : Kind_Post::get_attachment_id( $cite['url'] );
         if ( $attachment ) {
                 $attachment_post = new Kind_Post( $attachment );
 …
 ?>
 <a href="#kind-details" class="show-kind-details button hide-if-no-js"><?php _e( 'Details', 'indieweb-post-kinds' ); ?></a>
 <a href="#kind-author" class="show-kind-author-details button hide-if-no-js"><?php _e( 'Author', 'indieweb-post-kinds' ); ?></a>
 <a id="add-kind-media" class="button hide-if-no-js hidden" href="javascript:;">Upload or Attach Media</a>
 <button class="clear-kindmeta-button button hide-if-no-js"><?php _e( 'Clear', 'indieweb-post-kinds' ); ?></button>
+<a href="#kind-details" class="show-kind-details button hide-if-no-js"><?php esc_html_e( 'Details', 'indieweb-post-kinds' ); ?></a>
+<a href="#kind-author" class="show-kind-author-details button hide-if-no-js"><?php esc_html_e( 'Author', 'indieweb-post-kinds' ); ?></a>
+<a id="add-kind-media" class="button hide-if-no-js hidden" href="javascript:;"><?php esc_html_e( 'Upload or Attach Media', 'indieweb-post-kinds' ); ?></a>
+<button class="clear-kindmeta-button button hide-if-no-js"><?php esc_html_e( 'Clear', 'indieweb-post-kinds' ); ?></button>
 <p class="field-row">
         <label for="cite_url" class="three-quarters">
                 <?php _e( 'URL', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_url" id="cite_url" class="widefat" value="<?php echo $cite['url']; ?>" />
+                <?php esc_html_e( 'URL', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_url" id="cite_url" class="widefat" value="<?php echo esc_attr( $cite['url'] ); ?>" />
         </label>
 </p>
 <p class="field-row">
         <label for="cite_name" class="three-quarters">
                 <?php _e( 'Name', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_name" id="cite_name" class="widefat" value="<?php echo $cite['name']; ?>" />
+                <?php esc_html_e( 'Name', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_name" id="cite_name" class="widefat" value="<?php echo esc_attr( $cite['name'] ); ?>" />
         </label>
 </p>
 <p class="field-row hide-if-js" id="rsvp-option">
         <?php echo Kind_Metabox::rsvp_select( $kind_post->get( 'rsvp' ) ); ?>
+        <?php echo Kind_Metabox::rsvp_select( $kind_post->get( 'rsvp' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::rsvp_select() escapes its output. ?>
 </p>
 <p class="field-row hide-if-js" id="rating-option">
         <?php echo Kind_Metabox::rating_select( $kind_post->get( 'rating' ) ); ?>
+        <?php echo Kind_Metabox::rating_select( $kind_post->get( 'rating' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::rating_select() escapes its output. ?>
 </p>
 <p id="kind-media hide-if-no-js">
 …
         } elseif ( wp_attachment_is( 'audio', $attachment ) ) {
                 $view = new Kind_Media_View( $attachment, 'audio' );
                 echo $view->get();
+                echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
         } elseif ( wp_attachment_is( 'video', $attachment ) ) {
                 $view = new Kind_Media_View( $attachment, 'video' );
                 echo $view->get();
+                echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+        }
+}
 ?>
         </div>
         <input type="hidden" id="cite_media" name="cite_media" value="<?php echo $attachment; ?>" >
+        <input type="hidden" id="cite_media" name="cite_media" value="<?php echo absint( $attachment ); ?>" >
 </p>

indieweb-post-kinds/tags/4.0.0/templates/reply-time.php

-              r2399112
+              r3738687
+<?php $duration = divide_interval( $kind_post->get_duration() ); ?>
+<?php
+/**
+ * Duration fields of the Post Kinds metabox.
+ *
+ * Included by reply-details.php.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ *
+ * @var Kind_Post $kind_post The post being edited.
+ */
+defined( 'ABSPATH' ) || exit;
+$duration = Kind_Time::divide_interval( $kind_post->get_duration() ); ?>
 <div id="kind-time" class="hide-if-js">
         <h4><?php _e( 'Duration', 'indieweb-post-kinds' ); ?></h4>
+        <h4><?php esc_html_e( 'Duration', 'indieweb-post-kinds' ); ?></h4>
         <p class="field-row">
         <label for="duration" class="eighth">
                 <?php _e( 'Years', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_years" id="duration_years" size="3" value="<?php echo $duration['Y']; ?>" />
+                <?php esc_html_e( 'Years', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_years" id="duration_years" size="3" value="<?php echo absint( $duration['Y'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Months', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_months" id="duration_months" size="2" min="0" max="12" value="<?php echo $duration['M']; ?>" />
+                <?php esc_html_e( 'Months', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_months" id="duration_months" size="2" min="0" max="12" value="<?php echo absint( $duration['M'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Days', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_days" id="duration_days" size="2" min="0" max="30" value="<?php echo $duration['D']; ?>" />
+                <?php esc_html_e( 'Days', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_days" id="duration_days" size="2" min="0" max="30" value="<?php echo absint( $duration['D'] ); ?>" />
         </label>
         <p>
         <p class="field-row">
         <label for="duration" class="eighth">
                 <?php _e( 'Hours', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_hours" id="duration_hours" size="2" min="0" max="12" value="<?php echo $duration['H']; ?>" />
+                <?php esc_html_e( 'Hours', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_hours" id="duration_hours" size="2" min="0" max="12" value="<?php echo absint( $duration['H'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Minutes', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_minutes" id="duration_minutes" size="2" min="0" max="60" value="<?php echo $duration['I']; ?>" />
+                <?php esc_html_e( 'Minutes', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_minutes" id="duration_minutes" size="2" min="0" max="60" value="<?php echo absint( $duration['I'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Seconds', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_seconds" id="duration_seconds" size="2" min="0" max="60" value="<?php echo $duration['S']; ?>" />
+                <?php esc_html_e( 'Seconds', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_seconds" id="duration_seconds" size="2" min="0" max="60" value="<?php echo absint( $duration['S'] ); ?>" />
         </label>
         </p>
         <h4> <?php _e( 'Start Time and End Time will be Used to Calculate Duration if Duration Not Set.', 'indieweb-post-kinds' ); ?> </h4>
+        <h4> <?php esc_html_e( 'Start Time and End Time will be Used to Calculate Duration if Duration Not Set.', 'indieweb-post-kinds' ); ?> </h4>
         <p class="field-row">
                 <?php echo Kind_Metabox::kind_the_time( 'mf2_start', __( 'Start Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'start' ), 'start' ); ?>
                 <?php echo Kind_Metabox::kind_the_time( 'mf2_end', __( 'End Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'end' ), 'end' ); ?>
         </p>
+                                <?php echo Kind_Metabox::kind_the_time( 'mf2_start', __( 'Start Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'start' ), 'start' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
+                                <?php echo Kind_Metabox::kind_the_time( 'mf2_end', __( 'End Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'end' ), 'end' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
+                </p>
 </div>

indieweb-post-kinds/tags/4.0.0/views/kind-article.php

-              r1828595
+              r3738687
 <?php
 /*
  * Article Template
+/**
+ * Article view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.4.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;

indieweb-post-kinds/tags/4.0.0/views/kind-audio.php

-              r2406063
+              r3738687
 <?php
 /*
  * Audio Template
+/**
+ * Audio view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+$audios = $kind_post->get_audio();
+$duration = null;
+defined( 'ABSPATH' ) || exit;
+$audios      = $kind_post->get_audio();
+$duration    = null;
 $publication = null;
 …
         if ( 1 === count( $audios ) && 0 !== $audios[0] ) {
                 $audio_attachment = new Kind_Post( $audios[0] );
                 $cite = mf2_to_jf2( $audio_attachment->get_cite() );
+                $cite             = \ParseThis\mf2_to_jf2( $audio_attachment->get_cite() );
                 if ( ! $cite ) {
                         $cite = array();
 …
                         $author = Kind_View::get_hcard( $cite['author'] );
                 } else {
                         $author    = null;
+                        $author = null;
+                }
                 if ( array_key_exists( 'duration', $cite ) ) {
 …
 <section class="response">
 <header>
+<?php echo Kind_Taxonomy::get_before_kind( 'audio' );
+<?php
+echo Kind_Taxonomy::get_before_kind( 'audio' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( isset( $cite['name'] ) ) {
         echo sprintf( '<span>%1s</a>', $cite['name'] );
+        printf( '<span class="p-name">%1$s</span>', esc_html( $cite['name'] ) );
+}
 if ( $duration ) {
         printf( '(%1$s)', $duration );
+        printf( '(%1$s)', $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+}
 ?>
 …
 <?php
 if ( $embed ) {
         printf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
 } elseif ( $audios ) {
         $view = new Kind_Media_View( $audios, 'audio' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}

indieweb-post-kinds/tags/4.0.0/views/kind-bookmark.php

-              r2467905
+              r3738687
 <?php
 /*
  * Bookmark Template
+/**
+ * Bookmark view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'bookmark' );
+echo Kind_Taxonomy::get_before_kind( 'bookmark' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $cite['url'] ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $cite['url'], $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', esc_html( $cite['name'] ) );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', esc_html( $cite['publication'] ) );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 <?php
 if ( ! empty( $embed ) ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
 } elseif ( ! empty( $cite['summary'] ) ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+} else {
+        echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-checkin.php

-              r2459401
+              r3738687
 <?php
 /*
  * Checkin Template
+/**
+ * Checkin view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'checkin' );
+echo Kind_Taxonomy::get_before_kind( 'checkin' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( empty( $cite['name'] ) ) {
 …
+        }
         if ( ! empty( $url ) ) {
                 echo sprintf( '<a href="%1s" class="u-checkin h-card">%2s</a>', $url, $cite['name'] );
+                printf( '<a href="%1$s" class="u-checkin h-card">%2$s</a>', esc_url( $url ), esc_html( $cite['name'] ) );
         } else {
                 echo sprintf( '<span class="h-card p-checkin">%1s</span>', $cite['name'] );
+                printf( '<span class="h-card p-checkin">%1$s</span>', esc_html( $cite['name'] ) );
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        }
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-drink.php

-              r2459401
+              r3738687
 <?php
 /*
  * Drink Template
+/**
+ * Drink view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'drink' );
+echo Kind_Taxonomy::get_before_kind( 'drink' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        }
+        if ( array_key_exists( 'publication', $cite ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-eat.php

-              r3001401
+              r3738687
 <?php
 /*
  * Eat Template
+/**
+ * Eat view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
+}
 $rating  = $kind_post->get( 'rating', true );
+$rating = $kind_post->get( 'rating', true );
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'eat' );
+echo Kind_Taxonomy::get_before_kind( 'eat' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 if ( $rating ) {
         echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+}
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-event.php

-              r2459401
+              r3738687
 <?php
 /*
  * Event Template
+/**
+ * Event view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   3.2.0
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'event' );
 echo get_the_title();
+echo Kind_Taxonomy::get_before_kind( 'event' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
+the_title();
 ?>
 </header>
 <?php
 $start = $kind_post->get( 'start' );
+$end = $kind_post->get( 'end' );
+$timestring = '<p>%1$s: <time class="%2$s" datetime="%3$s">%4$s</time></p>';
+$end   = $kind_post->get( 'end' );
 if ( $start ) {
         printf( $timestring, __( 'Start', 'indieweb-post-kinds' ), 'dt-start', $start->format( DATE_W3C ), display_formatted_datetime( $start ) );
+}
+        printf( '<p>%1$s: <time class="dt-start" datetime="%2$s">%3$s</time></p>', esc_html__( 'Start', 'indieweb-post-kinds' ), esc_attr( $start->format( DATE_W3C ) ), esc_html( Kind_Time::display_formatted_datetime( $start ) ) );
+}
 if ( $end ) {
         printf( $timestring, __( 'End', 'indieweb-post-kinds' ), 'dt-end', $end->format( DATE_W3C ), display_formatted_datetime( $end ) );
+}
+        printf( '<p>%1$s: <time class="dt-end" datetime="%2$s">%3$s</time></p>', esc_html__( 'End', 'indieweb-post-kinds' ), esc_attr( $end->format( DATE_W3C ) ), esc_html( Kind_Time::display_formatted_datetime( $end ) ) );
+}
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-favorite.php

-              r2455262
+              r3738687
 <?php
 /*
  * Favorite Template
+/**
+ * Favorite view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'favorite' );
+echo Kind_Taxonomy::get_before_kind( 'favorite' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-issue.php

-              r2467905
+              r3738687
 <?php
 /*
  * Issue Template
+/**
+ * Issue view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'issue' );
+echo Kind_Taxonomy::get_before_kind( 'issue' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-itinerary.php

-              r2387393
+              r3738687
 <?php
 /*
  * Event Template
+/**
+ * Itinerary view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   3.2.0
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 $itineraries = $kind_post->get( 'itinerary', false );
+$itineraries = is_array( $itineraries ) ? $itineraries : array();
+foreach( $itineraries as $key => $value ) {
+        $itineraries [ $key ] = mf2_to_jf2( $value );
+foreach ( $itineraries as $key => $value ) {
+        $leg = \ParseThis\mf2_to_jf2( $value );
+        // Each field is shown as text; fill in any that are missing.
+        foreach ( array( 'operator', 'number', 'transit-type', 'origin', 'destination', 'departure', 'arrival' ) as $field ) {
+                $leg[ $field ] = ( isset( $leg[ $field ] ) && is_scalar( $leg[ $field ] ) ) ? (string) $leg[ $field ] : '';
+        }
+        $itineraries[ $key ] = $leg;
+}
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'itinerary' );
 echo get_the_title();
+echo Kind_Taxonomy::get_before_kind( 'itinerary' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
+the_title();
 ?>
 </header>
 <?php
 foreach( $itineraries as $itinerary ) {
 ?>
    <div class="h-leg p-itinerary">
                 <h3><span class="p-operator"><?php echo $itinerary['operator']; ?></span>
                 <span class="p-number"><?php echo $itinerary['number']; ?></span></h3>
                 <data class="p-transit-type" value="<?php echo $itinerary['transit-type']; ?>">
    <ul>
+foreach ( $itineraries as $itinerary ) {
+        ?>
+        <div class="h-leg p-itinerary">
+                <h3><span class="p-operator"><?php echo esc_html( $itinerary['operator'] ); ?></span>
+                <span class="p-number"><?php echo esc_html( $itinerary['number'] ); ?></span></h3>
+                <data class="p-transit-type" value="<?php echo esc_attr( $itinerary['transit-type'] ); ?>"></data>
+        <ul>
         <li>
                 <?php _e( 'Departs: ', 'indieweb-post-kinds' ); ?>
                 <span class="p-origin"><?php echo $itinerary['origin']; ?></span>
                 <time class="dt-departure" datetime="<?php echo $itinerary['departure']; ?>"><?php echo display_formatted_datetime( $itinerary['departure'] ); ?></time>
+                <?php esc_html_e( 'Departs: ', 'indieweb-post-kinds' ); ?>
+                <span class="p-origin"><?php echo esc_html( $itinerary['origin'] ); ?></span>
+                <time class="dt-departure" datetime="<?php echo esc_attr( $itinerary['departure'] ); ?>"><?php echo esc_html( Kind_Time::display_formatted_datetime( $itinerary['departure'] ) ); ?></time>
         </li>
         <li>
                 <?php _e( 'Arrives: ', 'indieweb-post-kinds' ); ?>
                 <span class="p-destination"><?php echo $itinerary['destination']; ?></span>
                 <time class="dt-arrival" datetime="<?php echo $itinerary['arrival']; ?>"><?php echo display_formatted_datetime( $itinerary['arrival'] ); ?></time>
+                <?php esc_html_e( 'Arrives: ', 'indieweb-post-kinds' ); ?>
+                <span class="p-destination"><?php echo esc_html( $itinerary['destination'] ); ?></span>
+                <time class="dt-arrival" datetime="<?php echo esc_attr( $itinerary['arrival'] ); ?>"><?php echo esc_html( Kind_Time::display_formatted_datetime( $itinerary['arrival'] ) ); ?></time>
         </li>
    </ul>
    </div>
 <?php
+        </ul>
+        </div>
+        <?php
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-jam.php

-              r2467905
+              r3738687
 <?php
 /*
   Jam Template
+/**
+ * Jam view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'jam' );
+echo Kind_Taxonomy::get_before_kind( 'jam' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( $author ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo __( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>';
+                echo esc_html__( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( $duration ) {
                 echo Kind_View::display_duration( $duration );
+                echo Kind_View::display_duration( $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-like.php

-              r2467905
+              r3738687
 <?php
 /*
  * Like Template
+/**
+ * Like view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'like' );
+echo Kind_Taxonomy::get_before_kind( 'like' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-listen.php

-              r3001401
+              r3738687
 <?php
 /*
   Listen Template
+/**
+ * Listen view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 $title     = Kind_View::get_cite_title( $cite );
 $duration  = $kind_post->get( 'duration', true );
 $rating  = $kind_post->get( 'rating', true );
+$rating    = $kind_post->get( 'rating', true );
 if ( ! $duration ) {
                 $duration = calculate_duration( $kind_post->get( 'start' ), $kind_post->get( 'end' ) );
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'listen' );
+echo Kind_Taxonomy::get_before_kind( 'listen' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( $author ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo __( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>';
+                echo esc_html__( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( $duration ) {
                 echo '(' . Kind_View::display_duration( $duration ) . ')';
+                echo '(' . Kind_View::display_duration( $duration ) . ')'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>
+<?php if ( $rating ) {
+        echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+} ?>
+<?php
+if ( $rating ) {
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
+?>
 <?php
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 ?>

indieweb-post-kinds/tags/4.0.0/views/kind-note.php

-              r1828595
+              r3738687
 <?php
 /*
  * Note Template
+/**
+ * Note view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.4.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;

indieweb-post-kinds/tags/4.0.0/views/kind-photo.php

-              r2459401
+              r3738687
 <?php
 /*
  * Photo Template
+/**
+ * Photo view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( $photos ) {
         $embed = null;
 …
         if ( 1 === count( $photos ) ) {
                 $photos_attachment = new Kind_Post( $photos[0] );
                 $cite = $photos_attachment->get_cite();
                 $cite = $photos_attachment->normalize_cite( $cite );
                 $author = Kind_View::get_hcard( $cite['author'] );
+                $cite              = $photos_attachment->get_cite();
+                $cite              = $photos_attachment->normalize_cite( $cite );
+                $author            = Kind_View::get_hcard( $cite['author'] );
+        }
+}
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'photo' );
+echo Kind_Taxonomy::get_before_kind( 'photo' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! empty( $cite['name'] ) ) {
         echo sprintf( '<span>%1s</span>', $cite['name'] );
+        printf( '<span class="p-name">%1$s</span>', esc_html( $cite['name'] ) );
+}
 ?>
 …
 <?php
 if ( $embed ) {
         printf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
 } elseif ( $photos ) {
         $view = new Kind_Media_View( $photos, 'photo' );
+        echo $view->get();
+} ?>
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
+?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-read.php

-              r3001401
+              r3738687
 <?php
 /*
  * Read Template
+/**
+ * Read view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
+}
 $read   = $kind_post->get( 'read-status', true );
 $rating  = $kind_post->get( 'rating', true );
+$rating = $kind_post->get( 'rating', true );
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'read' );
+echo Kind_Taxonomy::get_before_kind( 'read' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $read ) {
                 echo sprintf( ' - <span class="p-read-status">%1s</span>', Kind_View::read_text( $read ) );
+                printf( ' - <span class="p-read-status">%1$s</span>', esc_html( Kind_View::read_text( $read ) ) );
+        }
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) && ! empty( $cite['summary'] ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 if ( $rating ) {
         echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-rsvp.php

-              r2394107
+              r3738687
 <?php
 /*
  * RSVP Template
+/**
+ * RSVP view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
         return;
+}
 $title  = isset( $cite['name'] ) ? $cite['name'] : $url;
 $rsvp   = $kind_post->get( 'rsvp', true );
+$title = isset( $cite['name'] ) ? $cite['name'] : $url;
+$rsvp  = $kind_post->get( 'rsvp', true );
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'rsvp' );
+echo Kind_Taxonomy::get_before_kind( 'rsvp' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $rsvp ) {
                 echo '<data class="p-rsvp" value="' . $rsvp . '">' . sprintf( Kind_View::rsvp_text( $rsvp ), $url, $title ) . '</data>';
+                echo '<data class="p-rsvp" value="' . esc_attr( $rsvp ) . '">' . Kind_View::rsvp_text( $rsvp, $url, $title ) . '</data>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::rsvp_text() escapes the URL and name.
+        }
+}
 …
 <?php
 if ( $embed ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
 } elseif ( array_key_exists( 'summary', $cite ) ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+} else {
+        echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/tags/4.0.0/views/kind-video.php

-              r2459401
+              r3738687
 <?php
 /*
  * Video Template
+/**
+ * Video view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+$videos = $kind_post->get_video();
+defined( 'ABSPATH' ) || exit;
+$videos   = $kind_post->get_video();
 $duration = null;
 if ( is_array( $videos ) ) {
         if ( 1 === count( $videos ) && 0 !== $videos[0] ) {
                 $video_attachment = new Kind_Post( $videos[0] );
                 $cite = $video_attachment->get_cite();
                 $cite = $video_attachment->normalize_cite( $cite );
                 $author = Kind_View::get_hcard( $cite['author'] );
+                $cite             = $video_attachment->get_cite();
+                $cite             = $video_attachment->normalize_cite( $cite );
+                $author           = Kind_View::get_hcard( $cite['author'] );
                 if ( array_key_exists( 'duration', $cite ) ) {
                         $duration = Kind_View::display_duration( $cite['duration'] );
 …
+}
 $first_photo = null;
 if ( is_countable( $photos ) ) {
+if ( is_array( $photos ) && ! empty( $photos ) ) {
         $first_photo = $photos[0];
+}
 if ( is_array( $cite ) && ! $videos ) {
         if ( ! $embed ) {
                 $view = new Kind_Media_View( $url, 'video' );
+                $view  = new Kind_Media_View( $url, 'video' );
                 $embed = $view->get();
+        }
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'video' );
+echo Kind_Taxonomy::get_before_kind( 'video' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( isset( $cite['name'] ) ) {
         echo sprintf( '<span>%1s</a>', $cite['name'] );
+        printf( '<span class="p-name">%1$s</span>', esc_html( $cite['name'] ) );
+}
 if ( $author ) {
         echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+}
 if ( $duration ) {
         printf( '(%1$s)', $duration );
+        printf( '(%1$s)', $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+}
 …
 <?php
 if ( $embed ) {
         printf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
 } elseif ( $videos ) {
         $poster = wp_get_attachment_image_url( $first_photo, 'full' );
         $view = new Kind_Media_View( $videos, 'video' );
         echo $view->get();
+        $view   = new Kind_Media_View( $videos, 'video' );
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 ?>

indieweb-post-kinds/tags/4.0.0/views/kind-watch.php

-              r3001401
+              r3738687
 <?php
 /*
   Watch Template
+/**
+ * Watch view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 $title     = Kind_View::get_cite_title( $cite, $url );
 $duration  = $kind_post->get( 'duration', true );
 $rating  = $kind_post->get( 'rating', true );
+$rating    = $kind_post->get( 'rating', true );
 if ( ! $duration ) {
         $duration = calculate_duration( $kind_post->get( 'start' ), $kind_post->get( 'end' ) );
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'watch' );
+echo Kind_Taxonomy::get_before_kind( 'watch' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( $author ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo __( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>';
+                echo esc_html__( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( $duration ) {
                 echo Kind_View::display_duration( $duration );
+                echo Kind_View::display_duration( $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>
+<?php if ( $rating ) {
+        echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+} ?>
+<?php
+if ( $rating ) {
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
+?>

indieweb-post-kinds/tags/4.0.0/views/kind.php

-              r3001401
+              r3738687
 <?php
+/*
+  Default Template
+ *      The Goal of this Template is to be a general all-purpose model that will be replaced by customization in other templates
+/**
+ * Default view, used for any kind without its own view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.3.0
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 $site_name = Kind_View::get_site_name( $cite );
 …
                 $duration = calculate_duration( $kind_post->get( 'start' ), $kind_post->get( 'end' ) );
+}
 $rsvp = $kind_post->get( 'rsvp', true );
+$rsvp   = $kind_post->get( 'rsvp', true );
 $rating = $kind_post->get( 'rating', true );
 …
+}
 // Add in the appropriate type
+// Add in the appropriate type.
 if ( ! empty( $type ) ) {
         $type = ( empty( $url ) ? 'p-' : 'u-' ) . $type;
 …
 ?>
 <section class="h-cite response <?php echo $type; ?> ">
+<section class="h-cite response <?php echo esc_attr( $type ); ?>">
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( $kind );
+echo Kind_Taxonomy::get_before_kind( $kind ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( ! empty( $author ) ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo '<em> (' . $site_name . ')</em>';
+                echo '<em> (' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( in_array( $kind, array( 'jam', 'listen', 'play', 'read', 'watch', 'audio', 'video' ) ) ) {
                 if ( $duration ) {
                         echo ' ' . Kind_View::display_duration( $duration );
+                        echo ' ' . Kind_View::display_duration( $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+                }
+        }
 …
 if ( $cite && is_array( $cite ) ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>
+<?php if ( $rsvp && in_array( $kind, array( 'rsvp' ) ) ) {
+        echo 'RSVP <span class="p-rsvp">' . $rsvp . '</span>';
+<?php
+if ( $rsvp && in_array( $kind, array( 'rsvp' ) ) ) {
+        echo esc_html__( 'RSVP', 'indieweb-post-kinds' ) . ' <span class="p-rsvp">' . esc_html( $rsvp ) . '</span>';
+}
 if ( $rating ) {
+        echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+} ?>
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
+?>
 <?php

indieweb-post-kinds/trunk/.gitattributes

-              r2491232
+              r3738687
 /tests export-ignore
 /bin export-ignore
 /node-modules export-ignore
+/node_modules export-ignore
 /sass export-ignore
 …
 /readme.md export-ignore
 /phpcs.xml export-ignore
+/phpcs-templates.xml export-ignore
 /phpunit.xml export-ignore
+/Gruntfile.js export-ignore
+/gruntlint.js export-ignore
+/eslint.config.js export-ignore

indieweb-post-kinds/trunk/css/kind.admin.min.css

r2572705	r3738687
1		.svg-icon svg{fill:currentColor;padding:2px;vertical-align:middle;top:-0.0625em}#kind-all svg{width:1rem;height:1rem;color:gray}#kind-menu svg,#kind-posts svg,#tempus-onthisday svg,#tempus-thisweek svg,.kind-titles svg{width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}.response svg{width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}#replybox-meta.is-loading .loading{visibility:visible}#replybox-meta label{display:block}#replybox-meta .field-row{overflow:auto;height:100%}#replybox-meta .half{float:left;width:46%;margin:0 1%}#replybox-meta .half:first-of-type{margin-left:0;width:48%}#replybox-meta .half:last-of-type{margin-right:0;width:49%}#replybox-meta .quarter{float:left;margin-left:2%;width:12%}#replybox-meta .eighth{float:left;margin-left:2%;margin-right:1%;width:6%}#replybox-meta input[type=number]{width:100%}#replybox-meta .three-quarters{float:left;width:85%}#replybox-meta .is-loading .loading{visibility:visible}#replybox-meta .loading{visibility:hidden;position:absolute;top:0;bottom:0;left:0;right:0;z-index:10;background-color:#000;background-color:rgba(0,0,0,.4)}#replybox-meta .loading-spinner{margin:0 auto;display:block;position:relative;top:2em}/# sourceMappingURL=kind.admin.min.css.map /
	1	:where(.svg-icon){display:inline-block;width:1em;height:1em;margin-right:.5rem;vertical-align:middle}:where(.svg-icon>span,.svg-icon svg){display:block;width:100%;height:100%}:where(.svg-icon svg){fill:currentColor}:where(#kind-all .svg-icon){width:1rem;height:1rem;color:gray}:where(#kind-menu,#kind-posts,#tempus-onthisday,#tempus-thisweek,.kind-titles) :where(.svg-icon){width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}:where(.response) :where(.svg-icon){width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}#replybox-meta.is-loading .loading{visibility:visible}#replybox-meta label{display:block}#replybox-meta .field-row{overflow:auto;height:100%}#replybox-meta .half{float:left;width:46%;margin:0 1%}#replybox-meta .half:first-of-type{margin-left:0;width:48%}#replybox-meta .half:last-of-type{margin-right:0;width:49%}#replybox-meta .quarter{float:left;margin-left:2%;width:12%}#replybox-meta .eighth{float:left;margin-left:2%;margin-right:1%;width:6%}#replybox-meta input[type=number]{width:100%}#replybox-meta .three-quarters{float:left;width:85%}#replybox-meta .is-loading .loading{visibility:visible}#replybox-meta .loading{visibility:hidden;position:absolute;top:0;bottom:0;left:0;right:0;z-index:10;background-color:#000;background-color:rgba(0,0,0,.4)}#replybox-meta .loading-spinner{margin:0 auto;display:block;position:relative;top:2em}/# sourceMappingURL=kind.admin.min.css.map /

indieweb-post-kinds/trunk/css/kind.admin.min.css.map

r2572705	r3738687
1		{"version":3,"sourceRoot":"","sources":["../sass/_kinds.scss","../sass/_meta-box.scss"],"names":[],"mappings":"AAAA,cACC,kBACA,YACA,sBACA,cAIA,cACC,WACA,YACA,WAKD,2FACC,aACA,cACA,WACA,0BAED,sFACC,qBAKM,cACQ,WACA,YACd,WACc,0BAEf,iBACC,YCnCF,mCACC,mBAIA,qBACC,cAED,0BACC,cACA,YAED,qBACC,WACA,UACA,YAED,mCACC,cACA,UAED,kCACC,eACA,UAED,wBACC,WACA,eACA,UAED,uBACC,WACA,eACA,gBACA,SAED,kCACC,WAED,+BACC,WACA,UAED,oCACC,mBAED,wBACC,kBACA,kBACA,MACA,SACA,OACA,QACA,WACA,sBACA,gCAED,gCACC,cACA,cACA,kBACA","file":"kind.admin.min.css"}
	1	{"version":3,"sourceRoot":"..\/","sources":["sass\/_kinds.scss","sass\/_meta-box.scss"],"names":[],"mappings":"AAGA,kBACC,qBACA,UACA,WACA,mBACA,sBAGD,qCACC,cACA,WACA,YAGD,sBACC,kBAGD,4BACC,WACA,YACA,WAGD,iGACC,aACA,cACA,WACA,0BAIA,sFACC,qBAIF,oCACC,WACA,YACA,WACA,0BAIA,iBACC,YCjDF,mCACC,mBAIA,qBACC,cAED,0BACC,cACA,YAED,qBACC,WACA,UACA,YAED,mCACC,cACA,UAED,kCACC,eACA,UAED,wBACC,WACA,eACA,UAED,uBACC,WACA,eACA,gBACA,SAED,kCACC,WAED,+BACC,WACA,UAED,oCACC,mBAED,wBACC,kBACA,kBACA,MACA,SACA,OACA,QACA,WACA,sBACA,gCAED,gCACC,cACA,cACA,kBACA","file":"kind.admin.min.css"}

indieweb-post-kinds/trunk/css/kind.min.css

r2588189	r3738687
1		.svg-icon svg{fill:currentColor;padding:2px;vertical-align:middle;top:-0.0625em}#kind-all svg{width:1rem;height:1rem;color:gray}#kind-menu svg,#kind-posts svg,#tempus-onthisday svg,#tempus-thisweek svg,.kind-titles svg{width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}.response svg{width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}.response{margin-bottom:10px;margin-top:10px;margin-left:20px;padding:5px;font-size:16px;border-bottom:inset #d6d6d6}.response .kind-icon{margin-right:3px}.response blockquote{margin-left:25px}.response a:link{text-decoration:none}.response a:hover{text-decoration:none}.response img{padding:0;margin:2px}ul.cites{list-style:none;display:inline}.kind-embeds{text-align:center;position:relative;width:100%;margin-top:5px}.kind-photo-thumbnail{margin-bottom:5px}/# sourceMappingURL=kind.min.css.map /
	1	:where(.svg-icon){display:inline-block;width:1em;height:1em;margin-right:.5rem;vertical-align:middle}:where(.svg-icon>span,.svg-icon svg){display:block;width:100%;height:100%}:where(.svg-icon svg){fill:currentColor}:where(#kind-all .svg-icon){width:1rem;height:1rem;color:gray}:where(#kind-menu,#kind-posts,#tempus-onthisday,#tempus-thisweek,.kind-titles) :where(.svg-icon){width:1.5rem;height:1.5rem;color:#fff;mix-blend-mode:difference}#kind-menu ul,#kind-posts ul,#tempus-onthisday ul,#tempus-thisweek ul,.kind-titles ul{list-style-type:none}:where(.response) :where(.svg-icon){width:2rem;height:2rem;color:#fff;mix-blend-mode:difference}.response figure{margin:auto}.response{margin-bottom:10px;margin-top:10px;margin-left:20px;padding:5px;font-size:16px;border-bottom:inset #d6d6d6}.response .kind-icon{margin-right:3px}.response blockquote{margin-left:25px}.response a:link{text-decoration:none}.response a:hover{text-decoration:none}.response img{padding:0;margin:2px}ul.cites{list-style:none;display:inline}.kind-embeds{text-align:center;position:relative;width:100%;margin-top:5px}.kind-photo-thumbnail{margin-bottom:5px}/# sourceMappingURL=kind.min.css.map /

indieweb-post-kinds/trunk/css/kind.min.css.map

r2588189	r3738687
1		{"version":3,"sourceRoot":"","sources":["../sass/_kinds.scss","../sass/_frontend.scss"],"names":[],"mappings":"AAAA,cACC,kBACA,YACA,sBACA,cAIA,cACC,WACA,YACA,WAKD,2FACC,aACA,cACA,WACA,0BAED,sFACC,qBAKM,cACQ,WACA,YACd,WACc,0BAEf,iBACC,YCnCF,UACI,mBACA,gBACA,iBACA,YACA,eACA,4BACF,qBACC,iBAED,qBACC,iBAGF,iBACC,qBAGD,kBACC,qBAGD,cACE,UACA,WAIH,SACI,gBACA,eAGJ,aACI,kBACA,kBACA,WACA,eAGJ,sBACI","file":"kind.min.css"}
	1	{"version":3,"sourceRoot":"..\/","sources":["sass\/_kinds.scss","sass\/_frontend.scss"],"names":[],"mappings":"AAGA,kBACC,qBACA,UACA,WACA,mBACA,sBAGD,qCACC,cACA,WACA,YAGD,sBACC,kBAGD,4BACC,WACA,YACA,WAGD,iGACC,aACA,cACA,WACA,0BAIA,sFACC,qBAIF,oCACC,WACA,YACA,WACA,0BAIA,iBACC,YCjDF,UACI,mBACA,gBACA,iBACA,YACA,eACA,4BACF,qBACC,iBAED,qBACC,iBAGF,iBACC,qBAGD,kBACC,qBAGD,cACE,UACA,WAIH,SACI,gBACA,eAGJ,aACI,kBACA,kBACA,WACA,eAGJ,sBACI","file":"kind.min.css"}

indieweb-post-kinds/trunk/develop.txt

-              r1787314
+              r3738687
+== Functions ==
+Developer notes for Post Kinds 4.0.0. Every function, method and hook listed here has a docblock in the code with its full parameters and return values.
+`get_post_kind_slug($id)` - Return the kind slug for a given post. If `$id` is not specified, use current post.
+`get_post_kind($id)` - Return the kind string for a given post. If `$id` is not specified, use current post.
+== Template functions ==
+`has_post_kind($kind, $post)` - Returns true/false if kind is in post. If post is empty, then use current post
+These global functions are loaded on `plugins_loaded`, from `includes/kind-functions.php`.
+`get_kind_context_class( $class, $classtype )` - Returns the CSS class to be applied to the response/context if the kind is one for which there is context. Classtype defaults to u, other option is usually p. Sets the class to the kind slug and for specially specified slugs, sets appropriate mf2 classes as well. $class specifies any additional classes to be added.
+`get_post_kind_slug( $post = null )` - Returns the kind slug of a post, or false if it has no kind. Defaults to the current post.
+`get_post_kind( $post = null )` - Returns the translated kind name of a post, or false if it has no kind. Defaults to the current post.
+`has_post_kind( $kinds = array(), $post = null )` - Returns whether a post has any of the given kinds, or any kind at all if `$kinds` is empty.
+`set_post_kind( $post, $kind )` - Gives a post a kind. Returns a WP_Error if the post or the kind is not valid.
+`get_post_kind_slugs()` - Returns the slugs of every registered kind.
+`get_post_kind_string( $slug )` - Returns the translated name of a kind, or an empty string if it is not registered.
+`get_post_kind_link( $kind )` - Returns the URL of a kind's archive.
+`kind_display( $post_id = null )` - Prints the response markup for a post. Use it with the `kind_content_display` filter to place the markup in the theme.
+`get_kind_view_part( $slug, $name = null, $args = null )` - Returns a rendered view. See Kind_View::get_view_part().
+`kind_get_the_title( $post = null, $args = array() )` - Returns a post's title, or a generated one (the kind's icon or name and a cited name or excerpt) for a post without one.
+`kind_get_the_link( $post = null, $cls = null, $date_cls = null )` - Returns a link to a post, using kind_get_the_title(), followed by its date.
+`kind_flatten_array( $a )` - Removes empty values from an array and unwraps single-item lists, recursively.
+`kind_src_url_in_content( $content )` - Returns every src attribute value in some markup, or 0 if there are none.
+== Registering kinds ==
+`register_post_kind( $slug, $args )` - Registers a kind. Call it on `init`. `includes/register-kinds.php` registers the built-in kinds the same way, and Kind_Taxonomy::register_post_kind() documents every argument.
+`set_post_kind_visibility( $slug, $show = true )` - Shows or hides a kind in Settings, including the kinds reserved for future use.
 ==  Filters ==
+== Time functions ==
+`get_the_kind` - Filter get_the_kinds
+Also global, from `includes/time-functions.php`.
+`the_kinds` - Filter get_the_kinds_list
+`kind_safe_datetime( $value, $timezone = null, $immutable = true )` - Since 4.0.0. Creates a date from a value, returning false instead of throwing on invalid input.
+`kind_safe_interval( $value )` - Since 4.0.0. Creates a DateInterval from an ISO 8601 duration such as `PT3M30S`, returning false instead of throwing on invalid input.
+`calculate_duration( $start_string, $end_string )` - Returns the DateInterval between two dates, or false.
+`date_interval_to_iso8601( $interval )` - Converts a DateInterval to an ISO 8601 duration string.
+`build_iso8601_time( $date, $time, $offset )` - Joins a date, time and offset into an ISO 8601 string.
+`build_iso8601_duration( $values )` - Builds an ISO 8601 duration from its pieces (Y, M, D, H, I, S).
+`get_gmt_offsets()` - Returns the UTC offsets in use by any time zone, sorted.
+`get_default_offset()` - Returns the site's UTC offset, such as `-05:00`.
+`tz_seconds_to_offset( $seconds )`, `tz_offset_to_seconds( $offset )` - Convert between a UTC offset in seconds and an offset string.
+`tz_seconds_to_timezone( $seconds )`, `tz_timezone_to_seconds( $timezone )` - Convert between a UTC offset in seconds and a DateTimeZone.
+`kind_classes` - Filter get_kind_class
+== Classes ==
 `kind_verb` - Filter get_kind_verbs
+`Kind_Post` reads and writes a post's response data. Create one with a post ID or WP_Post. Its main methods:
+`kind-response-display` - Filters the output being added to the_content or to custom location in theme
+* `get_kind()`, `get_cite( $key = null )`, `get_author()`, `get_photo()`, `get_audio()`, `get_video()`, `get_duration()`, `get_datetime_property( $property )` and `get( $key )` read data.
+* `set( $key, $value )`, `set_duration( $value )`, `set_datetime_property( $key, $value )` and `delete( $key )` write it. Response data is stored as post meta prefixed `mf2_`.
+* `get_cite_type()` - Since 4.0.0. Returns the jf2 type of the post's citation: `card` for a checkin, `food` for eat and drink, and `cite` for every other kind.
+* `Kind_Post::get_attachment_id( $url )` - Since 4.0.0. Static. A cached wrapper for attachment_url_to_postid().
+`Kind_Time` - Since 4.0.0. Static helpers for the editor's date, time and duration fields: `display_formatted_datetime()`, `divide_datetime()`, `build_datetime()`, `get_datetime_offset()`, `divide_interval()` and `build_interval()`.
+`Kind_View` builds the response markup. `Kind_View::get_display( $post_id = null )` returns it for a post, `Kind_View::get_view_part( $slug, $name, $args = null )` renders one view, and `Kind_View::get_hcard( $author, $args = null )` returns an author's h-card. Since 4.0.0, its helpers return escaped markup; the 4.0.0 changelog lists the ones that changed.
+`Kind_Media_Metadata::has_media( $post )` - Since 4.0.0. Returns whether a post may show audio or video. The media fragment script loads only for these posts.
+`Kind_Upgrade` - Since 4.0.0. Upgrades stored post data in the background, in batches, after the plugin is updated. It gives published posts without a kind one, moves citations out of older storage locations, repairs citations that earlier versions damaged, and records the media in each post.
+== WP-CLI ==
+`wp post-kinds upgrade` - Since 4.0.0. Runs the upgrade now instead of in the background. It is safe to run more than once.
+* `--dry-run` - Report what would change without saving.
+* `--post=<id>` - Upgrade only this post.
+== REST API ==
+* The `kind` field on posts reads and sets a post's kind slug.
+* `GET /wp-json/post-kinds/1.0/fields?kind={slug}` returns a kind's registration, including its field schema. An unknown kind returns a 404. It requires the `edit_posts` capability.
+* The editor fetches details for a cited URL from the bundled Parse This library's `parse-this/1.0/parse` route.
+== Filters ==
+Display:
+`kind_content_display` - Whether to add response markup to post content, excerpts and feeds automatically. Return false to place it with kind_display() instead. Default true.
+`kind_response_display` - The response markup for a post. Receives the markup and the post ID.
+`kind_view_paths` - The folders searched for views before the plugin's `views` folder. Default the theme's `kind_views` folder.
+`kind_icon_display` - Whether to show the kind's icon or name before the response. Return false to hide it and remove the option from Settings.
+`post_kinds_icon_attributes` - The HTML attributes on the span that wraps a kind icon. Output as-is, so it must be escaped. Default empty since 4.0.0; before that, an inline style.
+`kind_get_the_title_content` - The text of a generated title. Receives escaped text and the post.
+`kind_get_the_title_before` - The markup before a generated title, the kind's icon or name by default. Output as-is, so it must be escaped.
+`get_hcard_data` - The author data before it becomes an h-card.
+`get_hcard` - The h-card markup for an author. Return non-empty, escaped markup to replace the plugin's own.
+`post_kind_embed_approvelist` - The domains whose cited URLs are embedded with oEmbed.
+`kind_post_type_string` - The phrase for what a known site's URL points to, such as "a video" for YouTube.
+Kinds and archives:
+`kind_include` - The kinds offered in the editor and listed by the Kind Menu widget. Default the kinds selected in Settings, plus note, reply and article.
+`kind_base_slug` - Since 4.0.0. The start of kind archive URLs, as in `/kind/like/`. Default the Kind base on Settings > Permalinks, or `kind`.
+`kind_rewrite_taxonomies` - The taxonomies that get `/kind/{kind}/{taxonomy}/{term}/` archives. Default post_tag, category and series.
+`kind_exclude_slug` - The slug for archives that exclude kinds, as in `/exclude/kind/note,like/`. Default `exclude`.
+`kind_photos_slug` - The slug for the archive of posts with photos. Default `photos`.
+`kind_firehose_slug` - The slug for the feed that includes every kind. Default `firehose`.
+After changing a slug or the rewrite taxonomies, flush rewrite rules: visit Settings > Permalinks and save.
+Upgrade:
+`kind_upgrade_batch_size` - Since 4.0.0. The number of posts the background upgrade processes per batch. Default 50.
+Micropub (these run only when the Micropub plugin is active):
+`post_kinds_micropub_enrich` - Since 4.0.0. Whether to fill in citation URLs from Micropub requests with data parsed from the cited page. Return false to store citations exactly as the client sent them. Default true.
+`post_kinds_micropub_parse_timeout` - Since 4.0.0. The timeout, in seconds, for parsing a citation while the client waits. Citations that time out are retried in the background. Default 5.
+`post_kinds_micropub_unavailable_retry_delay` - Since 4.0.0. How long to wait before retrying, once, a citation whose page returned 404, 401 or 403. Default 6 hours.
+`post_kinds_micropub_post_types` - Since 4.0.0. The post types advertised to Micropub clients in `q=config`.
+== Actions ==
+`change_kind` - Fires when a post's kind changes. Receives the post ID and the old and new kind slugs; either slug can be an empty string.
+`post_kinds_citation_enrichment` - Since 4.0.0. Fires after each attempt to parse a Micropub citation. Receives the log entry and the post ID.
+== Deprecated ==
+These still work, but report a deprecation notice when WP_DEBUG is on.
+* Since 4.0.0, the global functions `display_formatted_datetime()`, `divide_datetime()`, `build_datetime()`, `get_datetime_offset()`, `divide_interval()` and `build_interval()`. Use the Kind_Time methods of the same names. They will be removed in 5.0.0.
+* Since 4.0.0, the `MF2_Post` class. Use Kind_Post. It will be removed in a future major version.
+== Styling icons ==
+Kind icons are `<span class="svg-icon svg-{kind}">` elements wrapping an SVG. The plugin's stylesheet sizes the span, and the SVG fills it. Its rules use `:where()`, so they have no specificity and any theme rule wins. For example, `.svg-icon { width: 1rem; height: 1rem; }` resizes every icon, and `#kind-menu .svg-icon` only those in the Kind Menu widget. Icons take their colour from the `color` property.
+== Overriding views ==
+The markup added to each post comes from a view file in the plugin's `views` folder: `kind-{slug}.php` for a kind (for example `kind-like.php`), or `kind.php` for a kind without its own view.
+To change a view, copy it into a `kind_views` folder in your theme and edit the copy. If a child theme has a `kind_views` folder, it is used instead of the parent theme's; the two aren't combined. For each post, the plugin looks for `kind-{slug}.php` in your theme and then in the plugin, and only then for `kind.php` in the same order. So a theme `kind.php` replaces only the kinds that have no view of their own. The `kind_view_paths` filter changes which folders are searched before the plugin's.
+Copies don't receive updates. After upgrading, compare them with the plugin's views. Since 4.0.0, views escape everything they print, and the `Kind_View` helpers return escaped markup.
+Each view is rendered by `Kind_View::get_view_part()` with these variables in scope:
+* `$kind_post` (Kind_Post) - the post being displayed.
+* `$kind` (string) - the kind's slug, such as `like`.
+* `$type` (string) - the kind's microformats property, such as `like-of`.
+* `$cite` (array) - the citation, normalized by `Kind_Post::normalize_cite()`, so every key is present. `name` falls back to the URL.
+* `$url` (string) - the cited URL.
+* `$author` (string|false) - the cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none. `$cite['authors']` lists each author as a card with `name`, `url` and `photo`.
+* `$embed` (string) - embed markup for the cited URL, or an empty string.
+* `$photos` (int[]|false) - attachment IDs of the post's photos, from `Kind_Post::get_photo()`.
+* `$args` (array) - the arguments passed to `Kind_View::get_view_part()`; `post_id` is the post's ID.

indieweb-post-kinds/trunk/includes/class-kind-config.php

-              r2973430
+              r3738687
 <?php
 /**
  * Post Kind Configuration Class
+ * Kind_Config class.
+ *
  * @package Post Kinds
  * Sets Up Configuration Options for the Plugin.
+ * @package Post_Kinds
+ * @since   2.0.2
  */
+defined( 'ABSPATH' ) || exit;
 /**
  * Static Class to Configure Admin Options.
+ * Registers the plugin settings and builds the settings page.
+ *
  * @package Post Kinds
+ * @since 2.0.2
  */
 class Kind_Config {
 …
         /**
          * Function to Initialize the Configuration.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 add_action( 'admin_init', array( static::class, 'admin_init' ) );
                 add_action( 'admin_menu', array( static::class, 'admin_menu' ), 11 );
                 // Add post help tab
+                // Add post help tab.
                 add_action( 'load-post.php', array( static::class, 'add_post_help_tab' ), 20 );
+                $args = array(
+                        'type'         => 'array',
+                        'description'  => 'Kinds Enabled on This Site',
+                        'show_in_rest' => false,
+                        'default'      => array( 'article', 'reply', 'bookmark' ),
+                add_action( 'load-options-permalink.php', array( static::class, 'save_kind_base' ) );
+                $args = array(
+                        'type'              => 'array',
+                        'description'       => 'Kinds Enabled on This Site',
+                        'show_in_rest'      => false,
+                        'default'           => array( 'article', 'reply', 'bookmark' ),
+                        'sanitize_callback' => array( static::class, 'sanitize_kind_list' ),
                 );
                 register_setting( 'iwt_options', 'kind_termslist', $args );
                 $args = array(
+                        'type'         => 'string',
+                        'description'  => 'Default Kind',
+                        'show_in_rest' => false,
+                        'default'      => 'note',
+                        'type'              => 'string',
+                        'description'       => 'Default Kind',
+                        'show_in_rest'      => false,
+                        'default'           => 'note',
+                        'sanitize_callback' => array( static::class, 'sanitize_default_kind' ),
                 );
                 register_setting( 'iwt_options', 'kind_default', $args );
                 $args = array(
+                        'type'         => 'boolean',
+                        'description'  => 'Rich Embed Support for Whitelisted Sites',
+                        'show_in_rest' => false,
+                        'default'      => 1,
+                        'type'              => 'boolean',
+                        'description'       => 'Rich Embed Support for Whitelisted Sites',
+                        'show_in_rest'      => false,
+                        'default'           => 1,
+                        'sanitize_callback' => array( static::class, 'sanitize_checkbox' ),
                 );
                 register_setting( 'iwt_options', 'kind_embeds', $args );
                 $args = array(
+                        'type'         => 'array',
+                        'description'  => 'Kinds Showing in Main Archive',
+                        'show_in_rest' => false,
+                        'default'      => array(),
+                        'type'              => 'array',
+                        'description'       => 'Kinds Showing in Main Archive',
+                        'show_in_rest'      => false,
+                        'default'           => array(),
+                        'sanitize_callback' => array( static::class, 'sanitize_kind_list' ),
                 );
                 register_setting( 'iwt_options', 'kind_firehose', $args );
                 $args = array(
+                        'type'         => 'boolean',
+                        'description'  => 'Response Information Should Be After Content',
+                        'show_in_rest' => false,
+                        'default'      => 0,
+                        'type'              => 'boolean',
+                        'description'       => 'Response Information Should Be After Content',
+                        'show_in_rest'      => false,
+                        'default'           => 0,
+                        'sanitize_callback' => array( static::class, 'sanitize_checkbox' ),
                 );
                 register_setting( 'iwt_options', 'kind_bottom', $args );
                 $args = array(
+                        'type'         => 'string',
+                        'description'  => 'Display Preferences for Before Kind',
+                        'show_in_rest' => false,
+                        'default'      => 'icon',
+                        'type'              => 'string',
+                        'description'       => 'Display Preferences for Before Kind',
+                        'show_in_rest'      => false,
+                        'default'           => 'icon',
+                        'sanitize_callback' => array( static::class, 'sanitize_display' ),
                 );
                 register_setting( 'iwt_options', 'kind_display', $args );
                 $args = array(
+                        'type'         => 'string',
+                        'description'  => 'KSES Content Protection on Responses',
+                        'show_in_rest' => false,
+                        'default'      => str_replace( '},"', "},\r\n\"", wp_json_encode( wp_kses_allowed_html( 'post' ), 128 ) ),
+                        'type'              => 'string',
+                        'description'       => 'KSES Content Protection on Responses',
+                        'show_in_rest'      => false,
+                        'default'           => str_replace( '},"', "},\r\n\"", wp_json_encode( wp_kses_allowed_html( 'post' ), 128 ) ),
+                        'sanitize_callback' => array( static::class, 'sanitize_kses' ),
                 );
                 register_setting( 'iwt_options', 'kind_kses', $args );
                 $args = array(
+                        'type'         => 'boolean',
+                        'description'  => 'Automatically add the Kind to the Title',
+                        'show_in_rest' => false,
+                        'default'      => 0,
+                        'type'              => 'boolean',
+                        'description'       => 'Automatically add the Kind to the Title',
+                        'show_in_rest'      => false,
+                        'default'           => 0,
+                        'sanitize_callback' => array( static::class, 'sanitize_checkbox' ),
                 );
                 register_setting( 'iwt_options', 'kind_title', $args );
+                $args = array(
+                        'type'              => 'string',
+                        'description'       => 'Kind Base',
+                        'show_in_rest'      => false,
+                        'default'           => '',
+                        'sanitize_callback' => array( static::class, 'sanitize_kind_base' ),
+                );
+                register_setting( 'permalink', 'kind_base', $args );
+        }
+        /**
+         * Sanitizes the kind_base setting.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string The base, such as 'type' or 'blog/type', or an empty string for the default.
+         */
+        public static function sanitize_kind_base( $value ) {
+                if ( ! is_string( $value ) ) {
+                        return '';
+                }
+                $segments = array_filter( array_map( 'sanitize_title', explode( '/', $value ) ) );
+                $base     = implode( '/', $segments );
+                return 'kind' === $base ? '' : $base;
+        }
+        /**
+         * Saves the Kind base field on Settings > Permalinks.
+         *
+         * Core's permalink page doesn't save fields that plugins add, so this runs
+         * before it, with its nonce. Core flushes the rewrite rules when the page
+         * reloads.
+         *
+         * @since 4.0.0
+         */
+        public static function save_kind_base() {
+                if ( ! isset( $_POST['kind_base'] ) || ! is_string( $_POST['kind_base'] ) || ! current_user_can( 'manage_options' ) ) {
+                        return;
+                }
+                check_admin_referer( 'update-permalink' );
+                // Sanitized by sanitize_kind_base(), the setting's sanitize callback.
+                update_option( 'kind_base', wp_unslash( $_POST['kind_base'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+        }
+        /**
+         * Outputs the Kind base field on Settings > Permalinks.
+         *
+         * @since 4.0.0
+         */
+        public static function kind_base_callback() {
+                printf(
+                        '<input name="kind_base" id="kind_base" type="text" value="%1$s" class="regular-text code" placeholder="kind" />',
+                        esc_attr( get_option( 'kind_base', '' ) )
+                );
+        }
+        /**
+         * Sanitizes a list of kinds: the kind_termslist and kind_firehose settings.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string[] Registered kind slugs.
+         */
+        public static function sanitize_kind_list( $value ) {
+                if ( ! is_array( $value ) ) {
+                        return array();
+                }
+                $value = array_map( 'sanitize_key', array_filter( $value, 'is_string' ) );
+                return array_values( array_unique( array_intersect( $value, Kind_Taxonomy::get_kind_list() ) ) );
+        }
+        /**
+         * Sanitizes the default kind setting.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string A registered kind slug, or note.
+         */
+        public static function sanitize_default_kind( $value ) {
+                $value = is_string( $value ) ? sanitize_key( $value ) : '';
+                return in_array( $value, Kind_Taxonomy::get_kind_list(), true ) ? $value : 'note';
+        }
+        /**
+         * Sanitizes the display setting for the text before a kind.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string icon, text, both or hide. Defaults to icon.
+         */
+        public static function sanitize_display( $value ) {
+                return in_array( $value, array( 'icon', 'text', 'both', 'hide' ), true ) ? $value : 'icon';
+        }
+        /**
+         * Sanitizes a checkbox setting.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return int 1 if checked, otherwise 0.
+         */
+        public static function sanitize_checkbox( $value ) {
+                return empty( $value ) ? 0 : 1;
+        }
+        /**
+         * Sanitizes the allowed HTML setting, a JSON object as wp_kses() expects.
+         *
+         * Invalid JSON is rejected and the previous value kept.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $value Submitted value.
+         * @return string JSON-encoded allowed HTML.
+         */
+        public static function sanitize_kses( $value ) {
+                $decoded = is_string( $value ) ? json_decode( $value, true ) : null;
+                if ( is_array( $decoded ) ) {
+                        return $value;
+                }
+                // The settings error API is only loaded in the admin.
+                if ( function_exists( 'add_settings_error' ) ) {
+                        add_settings_error( 'kind_kses', 'kind_kses_invalid', __( 'The allowed HTML must be a valid JSON object. The previous value has been kept.', 'indieweb-post-kinds' ) );
+                }
+                $previous = get_option( 'kind_kses' );
+                return is_string( $previous ) ? $previous : '';
+        }
+        /**
+         * Returns the kinds enabled in settings (the kind_termslist option).
+         *
+         * Always returns an array of registered kind slugs, whatever is stored: the
+         * option can be missing, false or hold kinds that are no longer registered.
+         * Note, which is always available, is not included unless it was saved.
+         *
+         * @since 4.0.0
+         *
+         * @return string[] Kind slugs.
+         */
+        public static function get_termslist() {
+                $termslist = get_option( 'kind_termslist' );
+                if ( ! is_array( $termslist ) ) {
+                        return array();
+                }
+                return array_values( array_intersect( $termslist, Kind_Taxonomy::get_kind_list() ) );
+        }
         /**
          * Function to Set up Settings.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 add_action( 'admin_bar_menu', array( static::class, 'dashbar_links' ), 20 );
                 add_action( 'admin_bar_menu', array( static::class, 'remove_dashbar_post' ), 200 );
+                add_settings_field(
+                        'kind_base',
+                        __( 'Kind base', 'indieweb-post-kinds' ),
+                        array( static::class, 'kind_base_callback' ),
+                        'permalink',
+                        'optional',
+                        array( 'label_for' => 'kind_base' )
+                );
                 add_settings_section(
                         'iwt-content',
 …
+                        )
                 );
                 // Add Query Var to Admin
+                // Add Query Var to Admin.
                 add_filter( 'query_vars', array( static::class, 'query_var' ) );
+        }
 …
         /**
          * Function to add our kindurl query var.
+         *
+         * @since 2.3.3
+         *
          * @access public
 …
          * Function to remove "post" from the "New" admin bar section.
+         *
+         * @access public
+         *
+         * @param WP_Admin_Bar $wp_admin_bar
+         * @since 3.0.7
+         *
+         * @access public
+         *
+         * @param WP_Admin_Bar $wp_admin_bar The admin bar.
          */
         public static function remove_dashbar_post( $wp_admin_bar ) {
 …
          * Function to add our Post Kind post links to the "New" admin bar section.
+         *
+         * @access public
+         * @param WP_Admin_Bar $wp_admin_bar
+         * @since 3.0.7
+         *
+         * @access public
+         *
+         * @param WP_Admin_Bar $wp_admin_bar The admin bar.
          */
         public static function dashbar_links( $wp_admin_bar ) {
                 $termslist = get_option( 'kind_termslist' );
                 // Note can never be removed
+                $termslist = self::get_termslist();
+                // Note can never be removed.
                 array_unshift( $termslist, 'note' );
                 foreach ( $termslist as $term ) {
+                foreach ( array_unique( $termslist ) as $term ) {
                         $wp_admin_bar->add_menu(
                                 array(
 …
          * Adds Options Page for Plugin Options.
+         *
+         * @since 2.0.2
+         *
          * @access public
          */
 …
                         add_submenu_page(
                                 'indieweb',
                                 __( 'Post Kinds', 'indieweb-post-kinds' ), // page title
                                 __( 'Post Kinds', 'indieweb-post-kinds' ), // menu title
                                 'manage_options', // access capability
+                                __( 'Post Kinds', 'indieweb-post-kinds' ), // page title.
+                                __( 'Post Kinds', 'indieweb-post-kinds' ), // menu title.
+                                'manage_options', // access capability.
                                 'kind_options',
                                 array( static::class, 'options_form' )
 …
          * Callback for Options on Options Page.
+         *
+         * @since 2.0.2
+         *
          * @access public
          */
 …
         /**
          * Generate a Checkbox.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 $option  = get_option( $args['name'] );
                 $checked = intval( $option ?? 0 );
                 printf( '<input name="%1$s" type="hidden" value="0" />', esc_attr( $args['name'] ) ); // phpcs:ignore
                 printf( '<input name="%1$s" type="checkbox" value="1" %2$s />', esc_attr( $args['name'] ), checked( 1, $checked, false) ); // phpcs:ignore
+                printf( '<input name="%1$s" type="hidden" value="0" />', esc_attr( $args['name'] ) );
+                printf( '<input name="%1$s" type="checkbox" value="1" %2$s />', esc_attr( $args['name'] ), checked( 1, $checked, false ) );
+        }
         /**
          * Generate a Textbox.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
                 $option = get_option( $args['name'] );
                 if ( is_array( $option ) ) {
                         $option = print_r( $option, true );
+                }
                 echo "<textarea rows='10' cols='50' class='large-text code' name='" . esc_attr( $args['name'] ) . "'>" . $option . '</textarea> '; // phpcs:ignore
+                        $option = wp_json_encode( $option, JSON_PRETTY_PRINT );
+                }
+                echo "<textarea rows='10' cols='50' class='large-text code' name='" . esc_attr( $args['name'] ) . "'>" . esc_textarea( (string) $option ) . '</textarea> ';
+        }
         /**
          * Generate a Term List.
+         *
+         * @since 2.5.0
+         *
          * @access public
 …
                 $terms = Kind_Taxonomy::get_kind_list();
                 // Hide these terms until ready for use for now.
                 $termslist = get_option( 'kind_termslist' );
+                $termslist = self::get_termslist();
                 echo '<div id="kind-all">';
                 foreach ( $terms as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         if ( $value->show ) {
                                 printf( '<input name="kind_termslist[]" type="checkbox" value="%1$s" %2$s />', esc_attr( $term ), checked( in_array( $term, $termslist, true ), true, false ) ); // phpcs:ignore
                                 printf( '%1$s<strong>%2$s</strong> - %3$s<br />', Kind_Taxonomy::get_icon( $term ), sanitize_text_field( $value->singular_name ), sanitize_text_field( $value->description ) );  // phpcs:ignore
+                                printf( '<input name="kind_termslist[]" type="checkbox" value="%1$s" %2$s />', esc_attr( $term ), checked( in_array( $term, $termslist, true ), true, false ) );
+                                printf( '%1$s<strong>%2$s</strong> - %3$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ), esc_html( $value->description ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
+                        }
+                }
 …
         /**
+         * Generate a Term List.
+         *
+         * @access public
+         * Outputs a multiple select of kinds for a setting.
+         *
+         * @since 3.6.0
+         *
+         * @access public
+         *
+         * @param array $args Field arguments. 'name' is the option name.
          */
         public static function kindmultiselect_callback( array $args ) {
                 $terms   = get_option( 'kind_termslist' );
+                $terms   = self::get_termslist();
                 $terms[] = 'note';
+                $terms   = array_unique( $terms );
                 $kindlist = get_option( $args['name'] );
 …
                 foreach ( $terms as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         printf( '<option value="%1$s" %2$s />%3$s</option>', esc_attr($term), selected( in_array( $term, $kindlist ), true, false ), sanitize_text_field( $value->singular_name ) );  // phpcs:ignore
+                        printf( '<option value="%1$s" %2$s>%3$s</option>', esc_attr( $term ), selected( in_array( $term, $kindlist, true ), true, false ), esc_html( $value->singular_name ) );
+                }
                 echo '</select>';
 …
          * Generate a Kind Select List.
+         *
+         * @since 2.3.3
+         *
          * @access public
          */
         public static function defaultkind_callback() {
                 $terms   = get_option( 'kind_termslist' );
+                $terms   = self::get_termslist();
                 $terms[] = 'note';
+                $terms   = array_unique( $terms );
                 sort( $terms, SORT_STRING );
 …
                 foreach ( $terms as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         printf( '<option value="%1$s" %2$s />%3$s</option>', esc_attr($term), selected( $term, $defaultkind, false ), sanitize_text_field( $value->singular_name ) );  // phpcs:ignore
+                        printf( '<option value="%1$s" %2$s>%3$s</option>', esc_attr( $term ), selected( $term, $defaultkind, false ), esc_html( $value->singular_name ) );
+                }
                 echo '</select>';
 …
         /**
          * Generate Radio Options.
+         *
+         * @since 2.6.6
+         *
          * @access public
 …
                 $display = get_option( 'kind_display' );
                 foreach ( $args['options'] as $key => $value ) {
                         printf( '<input id="%1$s" name="%1$s" type="radio" value="%2$s" class="%3$s" %4$s />%5$s<br />', esc_attr( $args['name'] ), esc_attr( $key ), esc_attr( $args['class'] ), checked( $key, $display, false ), sanitize_text_field( $value ) ); // phpcs:ignore
+                        printf( '<input id="%1$s" name="%1$s" type="radio" value="%2$s" class="%3$s" %4$s />%5$s<br />', esc_attr( $args['name'] ), esc_attr( $key ), esc_attr( $args['class'] ), checked( $key, $display, false ), esc_html( $value ) );
+                }
+        }
 …
         /**
          * Generate Options Form.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
         /**
          * Function to generate a help tab in the WordPress admin help tab.
+         *
+         * @since 2.3.0
+         *
          * @access public

indieweb-post-kinds/trunk/includes/class-kind-fields.php

-              r2973430
+              r3738687
 <?php
 /**
  * Kind Fields Class
+ * Kind_Fields class.
+ *
+ * @package Post Kind
+ * Used to Generate Form Fields for a Post UI
+ * @package Post_Kinds
+ * @since   3.3.4
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Generates form fields for the posting UI from a kind's property schema.
+ *
  * Fields currently supported and their options{
         * datetime
         * duration
+        * author - is a representation of an author and consists of name, url, and photo by default
+        * select
+                * options - associative array of values for the select. Key being the value and the value being the description
+        * url
         * text
+        * list
+        * textarea
+        * number
+        * cite - is a representation of an h-cite object
+* }
+ * Supported field types and their options:
+ * - datetime
+ * - duration
+ * - author: a name, URL and photo by default.
+ * - select: `options` is an associative array of value => label.
+ * - url
+ * - text
+ * - list
+ * - textarea
+ * - number
+ * - cite: an h-cite object.
+ *
+ * @since 3.3.4
  */
 class Kind_Fields {
+        /**
+         * Returns a list of time zones with translated labels.
+         *
+         * @since 3.3.4
+         *
+         * @return string[] Labels, keyed by time zone identifier.
+         */
         public static function timezone_list() {
                 return array(
 …
+        }
+        /**
+         * Returns the UTC offsets in use by any time zone, sorted.
+         *
+         * @since 3.3.4
+         *
+         * @return string[] Offsets such as '-05:00'.
+         */
         public static function get_offset_list() {
                 $o = wp_cache_get( 'kind_offset_list' );
 …
                 foreach ( $t_zones as $a ) {
                         $datetime = new DateTime( 'now', new DateTimeZone( $a ) );
                         $o[]      = get_datetime_offset( $datetime );
+                        $o[]      = Kind_Time::get_datetime_offset( $datetime );
+                }
                 $o = array_unique( $o );
 …
         /**
+         * Function to render date/time field inputs.
+         *
+         * @access public
+         *
+         * @param string|DateTime $time   Date/time value.
+         * @param string $name Property name
+         * @param array $args
+         * @param string|array $class  Class to use for fields.
+         * @return string
+         * Renders date, time and offset inputs.
+         *
+         * @since 3.3.4
+         *
+         * @param array                 $args     Field arguments, as returned by validate(): 'name', 'label' and 'class'.
+         * @param DateTime|string|false $datetime Date, or a date string. Default now.
+         * @return string The inputs.
          */
         public static function field_datetime( $args, $datetime ) {
 …
+                }
                 $return   = array();
                 $time     = divide_datetime( $datetime );
+                $time     = Kind_Time::divide_datetime( $datetime );
                 $return[] = sprintf( '<label for="mf2_%1$s" class="%2$s">%3$s', $args['name'], $args['class'], $args['label'] );
                 $return[] = sprintf( '<input type="date" name="mf2_%1$s_date" id="mf2_%1$s_date" value="%2$s"/>', $args['name'], ( $time['date'] ?? '' ) );
 …
         /**
+         * Function to render dateinterval field inputs.
+         *
+         * @access public
+         *
+         * @param string|Kind_DateTime $time   Date/time value.
+         * @param string $name Property name
+         * @param array $args
+         * @param string|array $class  Class to use for fields.
+         * @return string
+         * Renders duration inputs.
+         *
+         * @since 3.3.4
+         *
+         * @param array               $args     Field arguments, as returned by validate(), including 'pieces'.
+         * @param DateInterval|string $interval Duration, or an ISO 8601 duration. Default 0.
+         * @return string The inputs.
          */
         public static function field_duration( $args, $interval ) {
 …
+                }
                 $return   = array();
                 $duration = divide_interval( $interval );
+                $duration = Kind_Time::divide_interval( $interval );
                 $max      = array(
                         'Y' => 1000,
 …
         /**
+         * Function to render author inputs.
+         *
+         * @access public
+         *
+         * @param string $prefix Field prefix.
+         * @param string|array $author Defautl values. If string, considered to be the name property below. {
+                 * @param string $name Author Name
+                 * @param string $url Author URL
+                 * @param string $photo Author Photo
+         * }
+         * @return string
+         * Renders author name, URL and photo inputs.
+         *
+         * @since 3.3.4
+         *
+         * @param array       $args   Field arguments, as returned by validate().
+         * @param array|false $author Values, with 'name', 'url' and 'photo' keys.
+         * @return string The inputs.
          */
         public static function field_author( $args, $author ) {
 …
                         ),
                 );
                 // Ensure all props are set for values
+                // Ensure all props are set for values.
                 foreach ( array_keys( $props ) as $prop ) {
                         if ( ! array_key_exists( $prop, $author ) ) {
 …
         /**
          * Function to render a select.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $selected Selected field type.
          * @return string
+         * Renders a select. The options are in $args['options'].
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args     Field arguments, as returned by validate().
+         * @param string $selected Value of the selected option.
+         * @return string The input.
          */
         public static function field_select( $args, $selected ) {
 …
         /**
          * Function to render a url.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $url
          * @return string
+         * Renders a URL input.
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args Field arguments, as returned by validate().
+         * @param string $url  Value.
+         * @return string The input.
          */
         public static function field_url( $args, $url ) {
 …
         /**
          * Function to render a number.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $value
          * @return string
+         * Renders a number input. The step is in $args['step'].
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args  Field arguments, as returned by validate().
+         * @param string $value Value.
+         * @return string The input.
          */
         public static function field_number( $args, $value ) {
 …
         /**
          * Function to render a text.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $value
          * @return string
+         * Renders a text input.
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args  Field arguments, as returned by validate().
+         * @param string $value Value.
+         * @return string The input.
          */
         public static function field_text( $args, $value ) {
 …
         /**
          * Function to render a textarea.
+         *
          * @access public
+         *
          * @param string $name
          * @param string $value
          * @return string
+         * Renders a textarea.
+         *
+         * @since 3.3.4
+         *
+         * @param array  $args  Field arguments, as returned by validate().
+         * @param string $value Value.
+         * @return string The input.
          */
         public static function field_textarea( $args, $value ) {
 …
+        }
+        /**
+         * Renders a textarea for a list, with items separated by semicolons.
+         *
+         * @since 3.3.4
+         *
+         * @param array        $args  Field arguments, as returned by validate().
+         * @param string|array $value Value, or a list of values.
+         * @return string The input.
+         */
         public static function field_list( $args, $value ) {
                 if ( is_array( $value ) ) {
 …
+        }
+        /**
+         * Renders the inputs for a venue's properties.
+         *
+         * @since 3.3.4
+         *
+         * @param array $args  Field arguments, as returned by validate(), including 'properties'.
+         * @param array $value Values, keyed by property.
+         * @return string The inputs.
+         */
         public static function field_venue( $args, $value ) {
                 return self::render( $args['properties'], $value );
+        }
+        /**
+         * Renders the inputs for a citation's properties.
+         *
+         * @since 3.3.4
+         *
+         * @param array $args  Field arguments, as returned by validate(), including 'properties'.
+         * @param array $value Values, keyed by property.
+         * @return string The inputs.
+         */
         public static function field_cite( $args, $value ) {
                 return self::render( $args['properties'], $value );
+        }
+        /**
+         * Checks whether a string starts with a prefix.
+         *
+         * @since 3.3.4
+         *
+         * @param string $source The source string.
+         * @param string $prefix The prefix to look for.
+         * @return bool True if the source starts with the prefix.
+         */
         public static function str_prefix( $source, $prefix ) {
                 return strncmp( $source, $prefix, strlen( $prefix ) ) === 0;
+        }
+        /**
+         * Returns a value from an array.
+         *
+         * @since 3.3.4
+         *
+         * @param string $key   Key.
+         * @param array  $array The array.
+         * @return mixed The value, or false if it is not set.
+         */
         private static function get( $key, $array ) {
                 if ( ! is_array( $array ) ) {
 …
+        }
+        /**
+         * Checks a field definition and fills in defaults.
+         *
+         * @since 3.3.4
+         *
+         * @param array $element Field definition.
+         * @return array|false The field definition, or false if it is not valid.
+         */
         private static function validate( $element ) {
                 // Everything must have a type
+                // Everything must have a type.
                 if ( ! self::get( 'type', $element ) ) {
                         return false;
+                }
                 // Everything must have a label
+                // Everything must have a label.
                 if ( ! self::get( 'label', $element ) ) {
                         return false;
+                }
                 // If no name property then the label property copies over
+                // If no name property then the label property copies over.
                 if ( ! self::get( 'name', $element ) ) {
                         $element['name'] = sanitize_title( $element['label'] );
+                }
                 // If no label property then the name property copies over
+                // If no label property then the name property copies over.
                 if ( ! self::get( 'label', $element ) ) {
                         $element['label'] = $element['name'];
+                }
                 // If no class property then the class property is set to empty
+                // If no class property then the class property is set to empty.
                 if ( ! self::get( 'class', $element ) ) {
                         $element['class'] = '';
+                }
                 // Class can be an array
+                // Class can be an array.
                 if ( is_array( $element['class'] ) ) {
                         $element['class'] = implode( ' ', $element['class'] );
+                }
                 $type = self::get( 'type', $element );
                 // Any non supported type should be considered to be text
+                // Any non supported type should be considered to be text.
                 if ( ! self::supported_type( $type ) ) {
                         $type = 'text';
+                }
                 // Type Specific Conditions
+                // Type Specific Conditions.
                 switch ( $type ) {
                         case 'cite':
 …
                         case 'number':
                                 if ( ! array_key_exists( 'step', $element ) ) {
                                         $element['step'] = 1; // Defaults to Even Numbers
+                                        $element['step'] = 1; // Defaults to Even Numbers.
+                                }
                                 break;
                         case 'select':
                                 if ( ! array_key_exists( 'options', $elements ) ) {
+                                if ( ! array_key_exists( 'options', $element ) ) {
                                         return false;
+                                }
                                 break;
                         case 'duration':
                                 if ( array_key_exists( 'pieces', $elements ) ) {
                                         // Ensure only valid options
                                         $element['pieces'] = array_intersect( array( 'Y', 'M', 'D', 'H', 'I', 'S' ), $elements['pieces'] );
+                                if ( array_key_exists( 'pieces', $element ) ) {
+                                        // Ensure only valid options.
+                                        $element['pieces'] = array_intersect( array( 'Y', 'M', 'D', 'H', 'I', 'S' ), $element['pieces'] );
                                 } else {
                                         // By default only show hours, minutes, seconds
+                                        // By default only show hours, minutes, seconds.
                                         $element['pieces'] = array( 'H', 'I', 'S' );
+                                }
 …
                 return $element;
+        }
+        /**
+         * Whether a field type is supported.
+         *
+         * @since 3.3.4
+         *
+         * @param string $type Field type.
+         * @return bool
+         */
         public static function supported_type( $type ) {
                 return in_array( $type, array( 'cite', 'venue', 'coordinate', 'author', 'datetime', 'duration', 'text', 'url', 'textarea', 'list', 'section' ), true );
 …
         /**
+         * Sets an array with only the mf2 prefixed meta.
+         *
+         * Returns the properties stored in mf2_ prefixed post meta, without the prefix.
+         *
+         * Reads the current post; the $post argument is not used.
+         *
+         * @since 3.3.4
+         *
+         * @param int|WP_Post $post Not used.
+         * @return array|false The properties, or false if there is no current post.
          */
         private function get_mf2meta( $post ) {
 …
                                 unset( $meta[ $key ] );
                                 $key = str_replace( 'mf2_', '', $key );
                                 // Do not save microput prefixed instructions
+                                // Do not save microput prefixed instructions.
                                 if ( self::str_prefix( $key, 'mp-' ) ) {
                                         continue;
 …
         /**
          * Function to render a form from a schema array
+         *
          * @access public
+         *
          * @param array $schema
+         *
          * @return string Form
+         * Renders a form from a field schema.
+         *
+         * @since 3.3.4
+         *
+         * @param array $schema Field definitions, keyed by property.
+         * @param array $values Optional. Values, keyed by property. Default empty array.
+         * @return string The form.
          */
         public static function render( $schema, $values = array() ) {
 …
+        }
+        /* Extracts microformats elements from post data.
+         * Microformats elements are prefixed by mf2_
+         * After that, underscore would indicate properties that need to be reconstituted
+        */
+        /**
+         * Extracts microformats properties from submitted form data.
+         *
+         * Properties are prefixed by mf2_. After that, an underscore marks the
+         * pieces of a property that need to be put back together.
+         *
+         * @since 3.3.4
+         *
+         * @param array $data Form data, such as $_POST.
+         * @return array The properties.
+         */
         public static function rebuild_data( $data ) {
                 $raw = array();
 …
                                 $raw[ $pieces[0] ] = $pieces[1];
                                 unset( $raw[ $key ] );
                                 // If this has the elements of a duration
+                                // If this has the elements of a duration.
                                 if ( ! empty( array_intersect( array( 'Y', 'M', 'D', 'H', 'I', 'S' ), $raw[ $pieces[0] ] ) ) ) {
                                         $interval          = build_interval( $raw[ $pieces[0] ] );
+                                        $interval          = Kind_Time::build_interval( $raw[ $pieces[0] ] );
                                         $raw[ $pieces[0] ] = date_interval_to_iso8601( $interval );
+                                }
                                 // If this has the elements of a datetime
+                                // If this has the elements of a datetime.
                                 if ( ! empty( array_intersect( array( 'date', 'time', 'offset' ), $raw[ $pieces[0] ] ) ) ) {
                                         $datetime          = build_datetime( $raw[ $pieces[0] ] );
+                                        $datetime          = Kind_Time::build_datetime( $raw[ $pieces[0] ] );
                                         $raw[ $pieces[0] ] = $datetime->format( DATE_W3C );
+                                }

indieweb-post-kinds/trunk/includes/class-kind-media-metadata.php

-              r3001401
+              r3738687
 <?php
 /**
+ * Kind_Media_Metadata class.
+ *
+ * Enhances Metadata for Media
+ * @package Post_Kinds
+ * @since   3.1.0
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Enhances the metadata stored for media attachments, and records the media a post uses.
+ *
+ * @since 3.1.0
  */
 class Kind_Media_Metadata {
 …
          * Function to Initialize the Configuration.
+         *
+         * @since 3.1.0
+         *
          * @access public
          */
         public static function init() {
-                $wp_version = get_bloginfo( 'version' );
                 add_filter( 'wp_generate_attachment_metadata', array( static::class, 'wp_generate_attachment_metadata' ), 33, 2 );
+                if ( version_compare( $wp_version, '5.3', '>' ) ) {
+                        add_filter( 'wp_update_attachment_metadata', array( static::class, 'wp_sanitize_media_metadata' ), 9, 2 );
+                }
+                add_filter( 'wp_update_attachment_metadata', array( static::class, 'wp_sanitize_media_metadata' ), 9, 2 );
                 add_action( 'wp_enqueue_scripts', array( static::class, 'enqueue' ) );
+                add_action( 'save_post', array( static::class, 'save_post' ), 20 );
+                // Kinds apply to posts only; revisions and autosaves have their own post type.
+                add_action( 'save_post_post', array( static::class, 'save_post' ), 20 );
+                // The photo property can change outside a save, for example from Micropub.
+                foreach ( array( 'added_post_meta', 'updated_post_meta', 'deleted_post_meta' ) as $hook ) {
+                        add_action( $hook, array( static::class, 'photo_meta_changed' ), 10, 3 );
+                }
                 add_filter( 'attachment_fields_to_edit', array( static::class, 'attachment_fields_to_edit' ), 10, 2 );
 …
+        }
+        /**
+         * Whether the request is for an AMP page, according to the AMP plugin.
+         *
+         * @since 3.5.1
+         *
+         * @return bool
+         */
         public static function is_amp_endpoint() {
                 if ( function_exists( 'is_amp_endpoint' ) ) {
 …
+        }
+        /**
+         * Enqueues the media fragment script on single posts that have media.
+         *
+         * @since 3.3.0
+         */
         public static function enqueue() {
+                if ( ! is_front_page() && is_singular() && ! self::is_amp_endpoint() ) {
+                        wp_enqueue_script(
+                                'media-fragment',
+                                plugins_url( 'js/clone-media-fragment.js', __DIR__ ),
+                                array(),
+                                '1.0',
+                                true
+                        );
+                }
+                if ( is_front_page() || ! is_singular() || self::is_amp_endpoint() || ! self::has_media( get_queried_object() ) ) {
+                        return;
+                }
+                wp_enqueue_script(
+                        'media-fragment',
+                        plugins_url( 'js/clone-media-fragment.js', __DIR__ ),
+                        array(),
+                        '1.0',
+                        // WordPress 6.2 reads the array as a true $in_footer; 6.3 and later also defer it.
+                        array(
+                                'in_footer' => true,
+                                'strategy'  => 'defer',
+                        )
+                );
+        }
+        /**
+         * Returns whether a post may show audio or video, which the media
+         * fragment script links to.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $post Post object, usually the queried object.
+         * @return bool True if the post has an audio or video kind or property, or
+         *              audio or video in its content.
+         */
+        public static function has_media( $post ) {
+                if ( ! $post instanceof WP_Post ) {
+                        return false;
+                }
+                if ( 'post' === $post->post_type ) {
+                        if ( has_post_kind( array( 'audio', 'video', 'listen', 'watch', 'jam' ), $post ) ) {
+                                return true;
+                        }
+                        if ( get_post_meta( $post->ID, 'mf2_audio', true ) || get_post_meta( $post->ID, 'mf2_video', true ) ) {
+                                return true;
+                        }
+                }
+                return (bool) preg_match( '/<(audio|video)[\s>]|\[(audio|video|playlist)[\s\]]/i', $post->post_content );
+        }
 …
         /**
          * Displays the Media Creator Description on the Attachment Page.
+         *
+         * @since 3.4.0
+         *
          * @param array   $form_fields See attachment_fields_to_edit filter in WordPress.
 …
                 $author = get_post_meta( $post->ID, 'mf2_author', true );
                 if ( Parse_This_MF2_Utils::is_microformat( $author ) ) {
                         $author = mf2_to_jf2( $author );
+                if ( \ParseThis\MF2_Utils::is_microformat( $author ) ) {
+                        $author = \ParseThis\mf2_to_jf2( $author );
                 } else {
                         $author = array();
 …
          * Saves Extra Fields.
+         *
+         * @param array $post Attachment post data.
+         * @param array   $attachment data.
+         * @since 3.4.0
+         *
+         * @param array $post       Attachment post data.
+         * @param array $attachment Attachment fields submitted.
          */
         public static function attachment_fields_to_save( $post, $attachment ) {
+                // Core checks this before saving; check again as the filter can be applied elsewhere.
+                if ( empty( $post['ID'] ) || ! current_user_can( 'edit_post', $post['ID'] ) ) {
+                        return $post;
+                }
+                // Core passes the request data slashed.
                 $author = array();
                 if ( isset( $attachment['author_name'] ) && ! empty( $attachment['author_name'] ) ) {
                         $author['name'] = $attachment['author_name'];
+                }
                 if ( isset( $attachment['author_url'] ) && ! empty( $attachment['author_url'] ) ) {
                         $author['url'] = $attachment['author_url'];
+                if ( isset( $attachment['author_name'] ) && is_string( $attachment['author_name'] ) ) {
+                        $author['name'] = sanitize_text_field( wp_unslash( $attachment['author_name'] ) );
+                }
+                if ( isset( $attachment['author_url'] ) && is_string( $attachment['author_url'] ) ) {
+                        $author['url'] = sanitize_url( trim( wp_unslash( $attachment['author_url'] ) ), array( 'http', 'https' ) );
+                }
                 $author = array_filter( $author );
 …
                 } else {
                         $author['type'] = 'card';
+                        update_post_meta( $post['ID'], 'mf2_author', jf2_to_mf2( $author ) );
+                        // The metadata API unslashes, so slash the sanitized values.
+                        update_post_meta( $post['ID'], 'mf2_author', wp_slash( \ParseThis\jf2_to_mf2( $author ) ) );
+                }
                 return $post;
+        }
+        /*
+        /**
+         * Finds the media library attachments used in a content block.
+         *
+         * The content is parsed once for images, audio and video. An image's ID
+         * is taken from its wp-image-{id} class when it has one; otherwise, and
+         * for audio and video sources, the URL is looked up.
+         *
+         * @since 4.0.0
+         *
+         * @param string $content Content.
+         * @return array {
+         *     Attachment IDs found, each list without duplicates or zeros.
+         *
+         *     @type int[] $img   Image attachment IDs.
+         *     @type int[] $audio Audio attachment IDs.
+         *     @type int[] $video Video attachment IDs.
+         * }
+         */
+        private static function get_media_from_content( $content ) {
+                $return = array(
+                        'img'   => array(),
+                        'audio' => array(),
+                        'video' => array(),
+                );
+                $content = wp_unslash( (string) $content );
+                // Most content has no media; skip parsing it.
+                if ( false === stripos( $content, '<img' ) && false === stripos( $content, '<audio' ) && false === stripos( $content, '<video' ) ) {
+                        return $return;
+                }
+                $doc = \ParseThis\pt_load_domdocument( $content );
+                foreach ( $doc->getElementsByTagName( 'img' ) as $image ) {
+                        $id = 0;
+                        foreach ( explode( ' ', $image->getAttribute( 'class' ) ) as $class ) {
+                                if ( 0 === strpos( $class, 'wp-image-' ) ) {
+                                        $id = (int) substr( $class, strlen( 'wp-image-' ) );
+                                        break;
+                                }
+                        }
+                        if ( ! $id ) {
+                                $id = attachment_url_to_postid( $image->getAttribute( 'src' ) );
+                        }
+                        $return['img'][] = $id;
+                }
+                foreach ( array( 'audio', 'video' ) as $tag ) {
+                        foreach ( $doc->getElementsByTagName( $tag ) as $media ) {
+                                foreach ( $media->getElementsByTagName( 'source' ) as $source ) {
+                                        $return[ $tag ][] = attachment_url_to_postid( remove_query_arg( '_', $source->getAttribute( 'src' ) ) );
+                                }
+                        }
+                }
+                foreach ( $return as $type => $ids ) {
+                        $return[ $type ] = array_values( array_unique( array_filter( array_map( 'intval', $ids ) ) ) );
+                }
+                return $return;
+        }
+        /**
          * Determine Attached Images from a Content Block.
+         *
+         * @since 3.4.0
+         *
          * @param string $content Content.
          * @return array Array of Attachment IDs.
         */
+         */
         public static function get_img_from_content( $content ) {
+                $content = wp_unslash( $content );
+                $return  = array();
+                $doc     = pt_load_domdocument( $content );
+                $images  = $doc->getElementsByTagName( 'img' );
+                foreach ( $images as $image ) {
+                        $classes = $image->getAttribute( 'class' );
+                        $classes = explode( ' ', $classes );
+                        foreach ( $classes as $class ) {
+                                if ( 0 === strpos( $class, 'wp-image-' ) ) {
+                                        $id = (int) str_replace( 'wp-image-', '', $class );
+                                        if ( 0 !== $id ) {
+                                                $return[] = $id;
+                                        }
+                                        break;
+                                }
+                        }
+                        $url = $image->getAttribute( 'src' );
+                        $id  = attachment_url_to_postid( $url );
+                        if ( 0 !== $id ) {
+                                $return[] = $id;
+                        }
+                }
+                return array_unique( $return );
+        }
+        /*
+                return self::get_media_from_content( $content )['img'];
+        }
+        /**
          * Determine Attached Audio from a Content Block.
+         *
+         * @since 3.4.0
+         *
          * @param string $content Content.
          * @return array Array of Attachment IDs.
         */
+         */
         public static function get_audio_from_content( $content ) {
+                $content = wp_unslash( $content );
+                $return  = array();
+                $doc     = pt_load_domdocument( $content );
+                $audios  = $doc->getElementsByTagName( 'audio' );
+                foreach ( $audios as $audio ) {
+                        $sources = $audio->getElementsByTagName( 'source' );
+                        foreach ( $sources as $source ) {
+                                $url      = remove_query_arg( '_', $source->getAttribute( 'src' ) );
+                                $id       = attachment_url_to_postid( $url );
+                                $return[] = $id;
+                        }
+                }
+                return array_unique( $return );
+        }
+        /*
+                return self::get_media_from_content( $content )['audio'];
+        }
+        /**
          * Determine Attached Videos from a Content Block.
+         *
+         * @since 3.4.0
+         *
          * @param string $content Content.
          * @return array Array of Attachment IDs.
         */
+         */
         public static function get_video_from_content( $content ) {
+                $content = wp_unslash( $content );
+                $return  = array();
+                $doc     = pt_load_domdocument( $content );
+                $videos  = $doc->getElementsByTagName( 'video' );
+                foreach ( $videos as $video ) {
+                        $sources = $video->getElementsByTagName( 'source' );
+                        foreach ( $sources as $source ) {
+                                $url      = remove_query_arg( '_', $source->getAttribute( 'src' ) );
+                                $id       = attachment_url_to_postid( $url );
+                                $return[] = $id;
+                        }
+                }
+                return array_unique( $return );
+        }
+        private function media_sideload_image( $url, $post_id, $description = null ) {
+                // To prevent sideloading the same URL multiple times check for the original URL which will now be stored
+                $ids = get_posts(
+                        array(
+                                'post_type'        => 'attachment',
+                                'suppress_filters' => false,
+                                'nopaging'         => true,
+                                'meta_key'         => '_source_url',
+                                'meta_value'       => $url,
+                                'fields'           => 'ids',
+                        )
+                );
+                if ( ! empty( $ids ) ) {
+                        return $ids[0];
+                }
+                $id = media_sideload_image( $url, $post_id, $description, 'id' );
+                // Version 5.4 adds this automatically.
+                if ( $id && version_compare( $wp_version, '5.3', '>' ) ) {
+                        update_post_meta( $id, '_source_url', $url );
+                }
+                return $id;
+        }
+        /**
+         * Every time the post is saved check for media embedded in content and save a list of attachment IDs.
+        */
+                return self::get_media_from_content( $content )['video'];
+        }
+        /**
+         * Every time a post is saved, stores the attachment IDs of the media in its content.
+         *
+         * The lists are kept in the _content_img_ids, _content_audio_ids and
+         * _content_video_ids meta; a key is deleted when there is no media of that
+         * type, so the photos archive can select posts by whether the key exists.
+         *
+         * @since 3.4.0
+         *
+         * @param int $post_id Post ID.
+         */
         public static function save_post( $post_id ) {
+                $post    = get_post( $post_id );
+                $content = do_shortcode( $post->post_content );
+                $gallery_ids = array();
+                $gallery     = get_post_gallery( $post_id, false );
+                if ( is_array( $gallery ) ) {
+                        if ( array_key_exists( 'ids', $gallery ) ) {
+                                $gallery_ids = explode( ',', $gallery['ids'] );
+                        }
+                }
+                $ids = self::get_img_from_content( $content );
+                if ( is_array( $ids ) && is_array( $gallery_ids ) ) {
+                        $ids = array_merge( $ids, $gallery_ids );
+                }
+                if ( ! $ids ) {
+                        delete_post_meta( $post_id, '_content_img_ids' );
+                // The classic editor's draft autosave; the next save will record the media.
+                if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+                        return;
+                }
+                $post = get_post( $post_id );
+                if ( ! $post ) {
+                        return;
+                }
+                $content = $post->post_content;
+                // Shortcodes such as [gallery], [audio] and [video] produce the media markup.
+                if ( false !== strpos( $content, '[' ) ) {
+                        $content = do_shortcode( $content );
+                }
+                $media = self::get_media_from_content( $content );
+                $gallery = get_post_gallery( $post_id, false );
+                if ( is_array( $gallery ) && ! empty( $gallery['ids'] ) ) {
+                        $media['img'] = array_values( array_unique( array_merge( $media['img'], array_filter( array_map( 'intval', explode( ',', $gallery['ids'] ) ) ) ) ) );
+                }
+                foreach ( $media as $type => $ids ) {
+                        $key = '_content_' . $type . '_ids';
+                        if ( empty( $ids ) ) {
+                                delete_post_meta( $post_id, $key );
+                        } else {
+                                update_post_meta( $post_id, $key, $ids );
+                        }
+                }
+                self::update_photo_flag( $post_id );
+        }
+        /**
+         * Updates the photo flag when a post's photo property changes.
+         *
+         * @since 4.0.0
+         *
+         * @param int|int[] $meta_id   Meta ID, or IDs when deleting.
+         * @param int       $object_id Post ID.
+         * @param string    $meta_key  Meta key.
+         */
+        public static function photo_meta_changed( $meta_id, $object_id, $meta_key ) {
+                if ( 'mf2_photo' === $meta_key && 'post' === get_post_type( $object_id ) ) {
+                        self::update_photo_flag( $object_id );
+                }
+        }
+        /**
+         * Records whether a post has photos, for the photos archive.
+         *
+         * A post has photos when it has images in its content or a photo
+         * property. The _kind_has_photo meta exists only for those posts, so the
+         * archive can select them with one indexed meta key.
+         *
+         * @since 4.0.0
+         *
+         * @param int $post_id Post ID.
+         */
+        public static function update_photo_flag( $post_id ) {
+                if ( get_post_meta( $post_id, '_content_img_ids', true ) || get_post_meta( $post_id, 'mf2_photo', true ) ) {
+                        update_post_meta( $post_id, '_kind_has_photo', 1 );
                 } else {
+                        update_post_meta( $post_id, '_content_img_ids', $ids );
+                }
+                $ids = self::get_video_from_content( $content );
+                if ( ! $ids ) {
+                        delete_post_meta( $post_id, '_content_video_ids' );
+                } else {
+                        update_post_meta( $post_id, '_content_video_ids', $ids );
+                }
+                $ids = self::get_audio_from_content( $content );
+                if ( ! $ids ) {
+                        delete_post_meta( $post_id, '_content_audio_ids' );
+                } else {
+                        update_post_meta( $post_id, '_content_audio_ids', $ids );
+                        delete_post_meta( $post_id, '_kind_has_photo' );
+                }
+        }
 …
          * bad character encodings from causing database calls and API endpoints to fail.
+         *
+         * @param array $metadata An existing array with data
+         * @since 3.3.0
+         *
+         * @param array $metadata An existing array with data.
+         *
          * @return array Returns array of sanitized metadata.
 …
+        }
+        /**
+         * Stores an attachment's author, album and duration from its file metadata.
+         *
+         * The image credit, or the artist of audio or video, becomes the author;
+         * the album becomes the publication.
+         *
+         * @since 3.3.4
+         *
+         * @param array|mixed $data          Attachment metadata.
+         * @param int         $attachment_id Attachment ID.
+         * @return array|mixed The metadata, with empty values removed.
+         */
         public static function wp_generate_attachment_metadata( $data, $attachment_id ) {
                 if ( ! is_array( $data ) ) {
                         return $data;
+                }
+                $data       = array_filter( $data );
+                $attachment = get_post( $attachment_id, ARRAY_A );
+                $data = array_filter( $data );
                 if ( isset( $data['image_meta'] ) ) {
                         $meta = $data['image_meta'];
 …
                                         $attachment_id,
                                         'mf2_author',
                                         jf2_to_mf2(
+                                        \ParseThis\jf2_to_mf2(
                                                 array(
                                                         'name' => $meta['credit'],
 …
                                 $attachment_id,
                                 'mf2_author',
                                 jf2_to_mf2(
+                                \ParseThis\jf2_to_mf2(
                                         array(
                                                 'name' => $data['artist'],
 …
+                }
                 if ( isset( $data['length'] ) ) {
                         update_post_meta( $attachment_id, 'mf2_duration', array( seconds_to_iso8601( $data['length'] ) ) );
+                        update_post_meta( $attachment_id, 'mf2_duration', array( \ParseThis\seconds_to_iso8601( $data['length'] ) ) );
+                }
                 return $data;

indieweb-post-kinds/trunk/includes/class-kind-media-view.php

-              r2973430
+              r3738687
 <?php
 /**
  * Kind Media View Class
+ * Kind_Media_View class.
+ *
  * @package Post Kind
  * Used to Display Media
+ * @package Post_Kinds
+ * @since   3.3.0
  */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Builds the markup for images, audio and video in kind views.
+ *
+ * @since 3.3.0
+ */
 class Kind_Media_View {
+        /**
+         * Attachment IDs or media URLs.
+         *
+         * @since 3.3.0
+         * @var int[]|string[]|int|string
+         */
         private $ids;
+        /**
+         * Media type: 'photo', 'audio' or 'video'.
+         *
+         * @since 3.3.0
+         * @var string
+         */
         private $type;
+        /**
+         * Sets up the media to display.
+         *
+         * @since 3.3.0
+         *
+         * @param int[]|string[]|int|string $ids  Attachment IDs or media URLs.
+         * @param string                    $type Media type: 'photo', 'audio' or 'video'.
+         */
         public function __construct( $ids, $type ) {
                 $this->ids  = $ids;
 …
+        }
+        /**
+         * Returns the markup for the media.
+         *
+         * @since 3.3.0
+         *
+         * @return string The markup, or an empty string if the type is not supported.
+         */
         public function get() {
                 switch ( $this->type ) {
 …
+        }
+        /**
+         * Returns a one-column gallery of photos.
+         *
+         * @since 3.3.0
+         *
+         * @param int[] $photos Attachment IDs.
+         * @return string The gallery markup.
+         */
         private function photo( $photos ) {
                 return gallery_shortcode(
 …
          * Return a media view for the audio post kind.
+         *
+         * @since 3.3.0
+         *
          * @access private
+         * @param int|string   $id   Audio attachment ID or audio URL
+         * @param mixed $args Arguments for the audio media view.
+         *
+         * @param int|string|array $id   Audio attachment ID or audio URL, or a list of them.
+         * @param array|null       $args Arguments for the audio media view.
+         *
          * @return array|string|void
 …
                 $return = '';
                 if ( $args['src'] ) {
+                        $args   = wp_parse_args( $args, $default );
                         $return = wp_audio_shortcode( $args );
+                }
 …
          * Return a media view for the video post kind.
+         *
+         * @since 3.3.0
+         *
          * @access private
+         * @param int|string   $id   Video attachment ID or URL.
+         * @param mixed $args Arguments for the video media view.
+         *
+         * @param int|string|array $id   Video attachment ID or URL, or a list of them.
+         * @param array|null       $args Arguments for the video media view.
+         *
          * @return array|string|void
 …
                 } elseif ( wp_http_validate_url( $id ) ) {
                         $args['src'] = $id;
                 } if ( 0 === $id ) {
+                } elseif ( 0 === $id ) {
                         return '';
                 } else {

indieweb-post-kinds/trunk/includes/class-kind-menu-widget.php

-              r3067251
+              r3738687
 <?php
+/**
+ * Kind_Menu_Widget class.
+ *
+ * @package Post_Kinds
+ * @since   3.1.3
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Widget that lists links to the archive of each kind.
+ *
+ * @since 3.1.3
+ */
 class Kind_Menu_Widget extends WP_Widget {
         /**
          * Register widget with WordPress.
+         *
+         * @since 3.1.3
          */
         public function __construct() {
                 parent::__construct(
                         'Kind_Menu_Widget',                // Base ID
                         __( 'Kind Menu Widget', 'indieweb-post-kinds' ),        // Name
+                        'Kind_Menu_Widget',                // Base ID.
+                        __( 'Kind Menu Widget', 'indieweb-post-kinds' ),        // Name.
                         array(
                                 'classname'             => 'kind_menu_widget',
 …
         /**
          * Front-end display of widget.
+         *
+         * @since 3.1.3
+         *
          * @see WP_Widget::widget()
 …
+                }
                 $include = array_merge( $include, array( 'note', 'reply', 'article' ) );
+                // Filter Kinds
+                /**
+                 * This filter is documented in includes/class-kind-taxonomy.php
+                 */
                 $include = array_unique( apply_filters( 'kind_include', $include ) );
                 // Note cannot be removed or disabled without hacking the code
+                // Note cannot be removed or disabled without hacking the code.
                 if ( ! in_array( 'note', $include, true ) ) {
                         $include[] = 'note';
+                }
+                // phpcs:ignore
+                echo $args['before_widget'];
+                echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
                 if ( $title ) {
                         echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore
+                        echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Wrapper markup is the theme's; the title is escaped by core's widget_title filter.
+                }
                 ?>
 …
                 <ul>
                 <?php
                 $feed = is_front_page() ? 'rel="feed"' : '';
+                $feed = is_front_page() ? ' rel="feed"' : '';
                 foreach ( $include as $i ) {
                         $count = Kind_Taxonomy::get_post_kind_count( $i );
 …
                         $name = ( 1 === $count ) ? Kind_Taxonomy::get_kind_info( $i, 'singular_name' ) : Kind_Taxonomy::get_kind_info( $i, 'name' );
                         /* translators: 1. Blog Title 2. Kind Singular Name */
                         $title = sprintf( __( 'title="%1$s %2$s Feed"', 'indieweb-post-kinds' ), esc_attr( get_bloginfo( 'name' ) ), esc_attR( Kind_Taxonomy::get_kind_info( $i, 'singular_name' ) ) );
                         if ( 1 === (int) $instance['count'] ) {
                                 $count = sprintf( '%1$s (%2$s)', $name, $count );
+                        $feed_title = sprintf( __( '%1$s %2$s Feed', 'indieweb-post-kinds' ), get_bloginfo( 'name' ), Kind_Taxonomy::get_kind_info( $i, 'singular_name' ) );
+                        if ( 1 === (int) ( $instance['count'] ?? 0 ) ) {
+                                $label = sprintf( '%1$s (%2$s)', $name, number_format_i18n( $count ) );
                         } else {
                                 $count = $name;
+                                $label = $name;
+                        }
                         printf(
                                 '<li><a %4$s %5$s type="text/html" href="%2$s">%1$s%3$s</a></li>',
                                 Kind_Taxonomy::get_icon( $i ), // phpcs:ignore
+                                '<li><a%4$s title="%5$s" type="text/html" href="%2$s">%1$s%3$s</a></li>',
+                                Kind_Taxonomy::get_icon( $i ), // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
                                 esc_url( Kind_Taxonomy::get_post_kind_link( $i ) ),
                                 $count, // phpcs:ignore
                                 $feed, // phpcs:ignore
                                 $title  // phpcs:ignore
                         ); // phpcs:ignore
+                                esc_html( $label ),
+                                $feed, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- A fixed attribute string.
+                                esc_attr( $feed_title )
+                        );
+                }
                 if ( 1 === (int) $instance['all'] ) {
                         printf( '<li><a type="text/html" href="%2$s">%1$s%3$s</a></li>', Kind_Taxonomy::get_icon( 'firehose' ), esc_url( get_post_type_archive_link( 'post' ) ), esc_html__( 'All Posts', 'indieweb-post-kinds' ) ); // phpcs:ignore
+                if ( 1 === (int) ( $instance['all'] ?? 0 ) ) {
+                        printf( '<li><a type="text/html" href="%2$s">%1$s%3$s</a></li>', Kind_Taxonomy::get_icon( 'firehose' ), esc_url( get_post_type_archive_link( 'post' ) ), esc_html__( 'All Posts', 'indieweb-post-kinds' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
+                }
                 ?>
 …
                 <?php
+                // phpcs:ignore
+                echo $args['after_widget'];
+                echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
+        }
 …
         /**
          * Sanitize widget form values as they are saved.
+         *
+         * @since 3.1.3
+         *
          * @see WP_Widget::update()
 …
          */
         public function update( $new_instance, $old_instance ) {
+                array_walk_recursive( $new_instance, 'sanitize_text_field' );
+                return $new_instance;
+                $termslist = isset( $new_instance['termslist'] ) && is_array( $new_instance['termslist'] ) ? array_filter( $new_instance['termslist'], 'is_string' ) : array();
+                $termslist = array_values( array_unique( array_intersect( array_map( 'sanitize_key', $termslist ), Kind_Taxonomy::get_kind_list() ) ) );
+                return array(
+                        'title'     => isset( $new_instance['title'] ) && is_string( $new_instance['title'] ) ? sanitize_text_field( $new_instance['title'] ) : '',
+                        'termslist' => $termslist,
+                        'count'     => empty( $new_instance['count'] ) ? 0 : 1,
+                        'all'       => empty( $new_instance['all'] ) ? 0 : 1,
+                );
+        }
 …
         /**
          * Create the form for the Widget admin
+         *
+         * @since 3.1.3
+         *
          * @see WP_Widget::form()
 …
                 $termslist = (array) $instance['termslist'];
                 ?>
+                                <p><label for="title"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
+                                <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?> id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" value="
+                <?php echo esc_html( ( $instance['title'] ?? '' ) ); ?>" /></p>
+                                <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
+                                <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" value="<?php echo esc_attr( $instance['title'] ?? '' ); ?>" /></p>
                 <div id="kind-all">
                 <?php
                 foreach ( get_option( 'kind_termslist', Kind_Taxonomy::get_kind_list() ) as $term ) {
+                foreach ( Kind_Config::get_termslist() as $term ) {
                         $value = Kind_Taxonomy::get_post_kind_info( $term );
                         if ( $value->show ) {
 …
                                         checked( in_array( $term, $termslist, true ), true, false )
                                 );
                                 printf( '%1$s %2$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ) ); //phpcs:ignore
+                                printf( '%1$s %2$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon markup.
+                        }
+                }

indieweb-post-kinds/trunk/includes/class-kind-metabox.php

-              r3001401
+              r3738687
 <?php
 /**
  * Post Kind Post MetaBox Class
+ * Kind_Metabox class.
+ *
+ * Sets Up Tabbed Metabox in the Posting UI for Kind data.
+ * @package Post_Kinds
+ * @since   2.2.0
  */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Adds the tabbed Post Kinds metabox to the Classic Editor and saves its fields.
+ *
+ * @since 2.2.0
+ */
 class Kind_Metabox {
         /**
+         * Plugin version, used to version enqueued assets.
+         *
          * @var string $version
          */
 …
         /**
          * Function to initiate our metabox.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
                 self::$version = Post_Kinds_Plugin::$version;
                 add_action( 'edit_form_after_title', array( static::class, 'after_title_metabox' ) );
                 // Add meta box to new post/post pages only
+                // Add meta box to new post/post pages only.
                 add_action( 'load-post.php', array( static::class, 'kindbox_setup' ) );
                 add_action( 'load-post-new.php', array( static::class, 'kindbox_setup' ) );
 …
          * Function to change our post kind.
+         *
+         * @since 3.1.0
+         *
          * @access public
+         *
 …
         /**
+         * Function to change if a new post should be considered empty.
+         * Filters whether a post should be considered empty.
+         *
+         * Many kinds (likes, bookmarks, reposts, and so on) legitimately have no
+         * content, title or excerpt, which core would otherwise reject as empty.
+         *
+         * @since 3.0.0
+         *
          * @access public
+         *
          * @param bool  $maybe_empty Whether or not the post should be considered empty.
          * @param array $postarr     Data for the post to be inserted.
+         * @param array $postarr     Data for the post to be inserted or updated.
+         *
          * @return bool
          */
         public static function wp_insert_post_empty_content( $maybe_empty, $postarr ) {
                 // Always let updates to trash posts through
                 if ( 'trash' === $postarr['post_status'] ) {
+                // Always let updates to trash posts through.
+                if ( isset( $postarr['post_status'] ) && 'trash' === $postarr['post_status'] ) {
                         return false;
+                }
                 // Let All Micropub Posts through
                 if ( isset( $postarr['meta_input'] ) && isset( $postarr['meta_input']['micropub_auth_response'] ) ) {
+                // Let all Micropub creates through.
+                if ( isset( $postarr['meta_input']['micropub_auth_response'] ) ) {
                         return false;
+                }
+                if ( ! isset( $postarr['tax_input'] ) && ! isset( $postarr['tax_input']['kind'] ) ) {
+                        return $maybe_empty;
+                }
+                $kind = get_term_by( 'id', $postarr['tax_input']['kind'][0], 'kind' );
+                $kind = ( $kind instanceof WP_Term ) ? $kind->slug : '';
+                // Use traditional rules for articles
+                $kind = self::kind_from_postarr( $postarr );
+                // Use traditional rules for articles, and for posts without a kind.
                 if ( 'article' === $kind || ! $kind ) {
                         return $maybe_empty;
+                }
+                $keys = array( 'cite_url', 'cite_name', 'cite_summary' );
+                $keys = array_flip( $keys );
+                $diff = array_filter( array_intersect_key( $_POST, $keys ) );
+                if ( ! empty( $diff ) ) {
+                // An existing post of a kind other than article may have no content,
+                // for example when Micropub updates a like.
+                if ( ! empty( $postarr['ID'] ) ) {
                         return false;
+                }
+                // A new post from the metabox needs something to respond to.
+                foreach ( array( 'cite_url', 'cite_name', 'cite_summary' ) as $key ) {
+                        // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Only checks whether a field was filled in; save_post() verifies the nonce before saving.
+                        if ( isset( $_POST[ $key ] ) && is_string( $_POST[ $key ] ) && '' !== sanitize_text_field( wp_unslash( $_POST[ $key ] ) ) ) {
+                                return false;
+                        }
+                }
                 return $maybe_empty;
+        }
         /**
+         * Returns the kind slug for post data being inserted or updated.
+         *
+         * The kind comes from tax_input, which the kind metabox submits as a slug and
+         * other callers may pass as term IDs, or failing that from the existing post.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param array $postarr Data for the post to be inserted or updated.
+         * @return string Kind slug, or an empty string if none.
+         */
+        public static function kind_from_postarr( $postarr ) {
+                if ( isset( $postarr['tax_input']['kind'] ) ) {
+                        $kind = $postarr['tax_input']['kind'];
+                        if ( is_array( $kind ) ) {
+                                $kind = reset( $kind );
+                        }
+                        $term = is_numeric( $kind ) ? get_term_by( 'id', (int) $kind, 'kind' ) : get_term_by( 'slug', (string) $kind, 'kind' );
+                        return ( $term instanceof WP_Term ) ? $term->slug : '';
+                }
+                if ( ! empty( $postarr['ID'] ) ) {
+                        $kind = get_post_kind_slug( $postarr['ID'] );
+                        return $kind ? $kind : '';
+                }
+                return '';
+        }
+        /**
          * Execute metaboxes for the current screen, after the post title.
+         *
+         * @since 3.0.0
+         *
          * @access public
          * @param WP_Post $post Post object for the current screen.
 …
         /**
          * Metabox setup.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
                 /* Add meta boxes on the 'add_meta_boxes' hook. */
                 add_action( 'add_meta_boxes', array( $cls, 'add_meta_boxes' ) );
+                add_filter( 'hidden_meta_boxes', array( $cls, 'hidden_meta_boxes' ), 10, 2 );
                 add_action( 'admin_enqueue_scripts', array( $cls, 'enqueue_admin_scripts' ) );
+        }
 …
         /**
          * Enqueue our needed assets.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
                         // Provide a global object to our JS file containing our REST API endpoint, and API nonce
                         // Nonce must be 'wp_rest'
+                        // Nonce must be 'wp_rest'.
                         wp_localize_script(
                                 'kindmeta',
 …
                                         'success_message' => __( 'Your URL has been successfully retrieved and parsed', 'indieweb-post-kinds' ),
                                         'clear_message'   => __( 'Are you sure you want to clear post properties?', 'indieweb-post-kinds' ),
+                                        'error_message'   => __( 'Error: Unable to Retrieve', 'indieweb-post-kinds' ),
+                                        'invalid_url'     => __( 'Invalid URL', 'indieweb-post-kinds' ),
+                                        'media_title'     => __( 'Attach', 'indieweb-post-kinds' ),
+                                        'media_button'    => __( 'Use this media', 'indieweb-post-kinds' ),
+                                )
                         );
 …
         /**
          * Utility function to concatenate a list of post kinds.
+         *
+         * @since 2.7.5
+         *
          * @access public
 …
          * Utility function to separate out a list of post kinds.
+         *
+         * @since 2.7.5
+         *
          * @access public
+         *
 …
         /**
          * Function to render date/time field inputs.
+         *
+         * @since 2.5.0
+         *
          * @access public
 …
                 $tz_seconds = get_option( 'gmt_offset' ) * 3600;
                 $offset     = tz_seconds_to_offset( $tz_seconds );
                 $time       = divide_datetime( $datetime );
+                $time       = Kind_Time::divide_datetime( $datetime );
                 if ( ! is_array( $time ) ) {
                         $time = array();
 …
                         $offset = $time['offset'];
+                }
+                $string  = '<label class="half ' . $class . '" for="' . $prefix . '">' . $label . '<br/>';
+                $string .= '<input class="date" type="date" name="' . $prefix . '_date" id="' . $prefix . '_date" value="' . ( $time['date'] ?? '' ) . '"/>';
+                $string .= '<input class="time" type="time" name="' . $prefix . '_time" id="' . $prefix . '_time" step="1" value="' . ( $time['time'] ?? '' ) . '"/>';
+                $prefix  = esc_attr( $prefix );
+                $string  = '<label class="half ' . esc_attr( $class ) . '" for="' . $prefix . '">' . esc_html( $label ) . '<br/>';
+                $string .= '<input class="date" type="date" name="' . $prefix . '_date" id="' . $prefix . '_date" value="' . esc_attr( $time['date'] ?? '' ) . '"/>';
+                $string .= '<input class="time" type="time" name="' . $prefix . '_time" id="' . $prefix . '_time" step="1" value="' . esc_attr( $time['time'] ?? '' ) . '"/>';
                 $string .= self::select_offset( $prefix, $offset );
                 $string .= '</label>';
 …
          * Function to render our timezone choices.
+         *
+         * @since 2.5.0
+         *
          * @access public
+         *
 …
          */
         public static function select_offset( $prefix, $select ) {
                 $string  = '<select name="' . $prefix . '_offset" id="' . $prefix . '_offset">';
+                $string  = '<select name="' . esc_attr( $prefix ) . '_offset" id="' . esc_attr( $prefix ) . '_offset">';
                 $string .= self::timezone_offset_choice( $select );
                 $string .= '</select>';
 …
          * Function to render options for a chosen timezone select field.
+         *
+         * @since 3.0.0
+         *
          * @access public
+         *
 …
                 $tzlist = get_gmt_offsets();
                 $string = '';
                 foreach ( $tzlist as $key => $value ) {
                         $string .= '<option value="' . $value . '"';
+                foreach ( $tzlist as $value ) {
+                        $string .= '<option value="' . esc_attr( $value ) . '"';
                         if ( $select === $value ) {
                                 $string .= ' selected';
+                        }
                         $string .= '>GMT' . $value . '</option>';
+                        $string .= '>GMT' . esc_html( $value ) . '</option>';
+                }
                 return $string;
 …
          * Render the options for the rating select field.
+         *
+         * @access public
+         *
+         * @param string $selected Selected Rating choice
+         * @since 3.7.0
+         *
+         * @access public
+         *
+         * @param string $selected Selected Rating choice.
          * @return string
          */
 …
                 $ret      = '';
                 foreach ( $ratings as $key => $value ) {
                         $ret .= '<option value="' . $key . '"';
+                        $ret .= '<option value="' . esc_attr( $key ) . '"';
                         if ( $selected === $key ) {
                                 $ret .= ' selected';
+                        }
                         $ret .= '>' . $value . '</option>';
+                        $ret .= '>' . esc_html( (string) $value ) . '</option>';
+                }
                 return $ret;
 …
          * Render the options for the RSVP select field.
+         *
+         * @access public
+         *
+         * @param string $selected Selected RSVP choice
+         * @since 3.0.0
+         *
+         * @access public
+         *
+         * @param string $selected Selected RSVP choice.
          * @return string
          */
 …
                 $string = '';
                 foreach ( $rsvps as $key => $value ) {
                         $string .= '<option value="' . $key . '"';
+                        $string .= '<option value="' . esc_attr( $key ) . '"';
                         if ( $selected === $key ) {
                                 $string .= ' selected';
+                        }
                         $string .= '>' . $value . '</option>';
+                        $string .= '>' . esc_html( (string) $value ) . '</option>';
+                }
                 return $string;
 …
         /**
          * Render our RSVP select input.
+         *
+         * @since 2.5.0
+         *
          * @access public
 …
          */
         public static function rsvp_select( $selected ) {
                 $string  = '<label for="mf2_rsvp">' . __( 'RSVP', 'indieweb-post-kinds' ) . '</label><br/>';
+                $string  = '<label for="mf2_rsvp">' . esc_html__( 'RSVP', 'indieweb-post-kinds' ) . '</label><br/>';
                 $string .= '<select name="mf2_rsvp" id="mf2_rsvp">';
                 $string .= self::rsvp_choice( $selected );
 …
          * Render our rating select input.
+         *
+         * @since 3.7.0
+         *
          * @access public
+         *
 …
          */
         public static function rating_select( $selected ) {
                 $string  = '<label for="mf2_rating">' . __( 'Rating', 'indieweb-post-kinds' ) . '</label><br/>';
+                $string  = '<label for="mf2_rating">' . esc_html__( 'Rating', 'indieweb-post-kinds' ) . '</label><br/>';
                 $string .= '<select name="mf2_rating" id="mf2_rating">';
                 $string .= self::rating_choice( $selected );
 …
         /**
+         * Keeps the Response Properties box from being saved as hidden.
+         *
+         * The editor script hides the box for kinds without a response, such as
+         * note. WordPress saves every hidden box as unticked in Screen Options
+         * whenever any box is collapsed or any Screen Options box is toggled, so
+         * the box would stay hidden for every kind afterwards. The script shows
+         * and hides it by kind instead.
+         *
+         * @since 4.0.0
+         *
+         * @param string[]  $hidden IDs of the hidden meta boxes.
+         * @param WP_Screen $screen The current screen.
+         * @return string[] IDs of the hidden meta boxes.
+         */
+        public static function hidden_meta_boxes( $hidden, $screen ) {
+                if ( ! is_array( $hidden ) || ! $screen instanceof WP_Screen || 'post' !== $screen->id ) {
+                        return $hidden;
+                }
+                return array_values( array_diff( $hidden, array( 'replybox-meta' ) ) );
+        }
+        /**
          * Create one or more meta boxes to be displayed on the post editor screen.
+         *
+         * @since 2.2.0
+         *
          * @access public
 …
         public static function add_meta_boxes() {
                 add_meta_box(
                         'replybox-meta', // Unique ID
                         esc_html__( 'Response Properties', 'indieweb-post-kinds' ), // Title
                         array( static::class, 'reply_metabox' ), // Callback function
+                        'replybox-meta', // Unique ID.
+                        esc_html__( 'Response Properties', 'indieweb-post-kinds' ), // Title.
+                        array( static::class, 'reply_metabox' ), // Callback function.
                         'post',
                         'kind_after_title', // Context
                         'default', // Priority
+                        'kind_after_title', // Context.
+                        'default', // Priority.
                         array(
                                 '__block_editor_compatible_meta_box' => false,
 …
          * Render our reply meta box.
+         *
+         * @since 3.0.0
+         *
          * @access public
+         *
 …
          * Process and save meta box data.
+         *
+         * @access public
+         *
+         * @param int    $post_id Saved post ID.
+         * @param WP_Pos $post    Saved post object.
+         * @since 2.2.0
+         *
+         * @access public
+         *
+         * @param int     $post_id Saved post ID.
+         * @param WP_Post $post    Saved post object.
          */
         public static function save_post( $post_id, $post ) {
 …
                 // Verify that the nonce is valid.
                 if ( ! wp_verify_nonce( $_POST['replykind_metabox_nonce'], 'replykind_metabox' ) ) {
+                if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['replykind_metabox_nonce'] ) ), 'replykind_metabox' ) ) {
                         return;
+                }
 …
                 // Check the user's permissions.
                 if ( isset( $_POST['post_type'] ) && 'page' === $_POST['post_type'] ) {
+                if ( 'page' === self::posted_text( 'post_type' ) ) {
                         if ( ! current_user_can( 'edit_page', $post_id ) ) {
                                 return;
 …
                 if ( isset( $_POST['mf2_start_date'] ) || isset( $_POST['mf2_start_time'] ) ) {
                         $start = build_iso8601_time( sanitize_text_field( $_POST['mf2_start_date'] ), sanitize_text_field( $_POST['mf2_start_time'] ), sanitize_text_field( $_POST['mf2_start_offset'] ) );
+                        $start = build_iso8601_time( self::posted_text( 'mf2_start_date' ), self::posted_text( 'mf2_start_time' ), self::posted_text( 'mf2_start_offset' ) );
                         if ( ! $start ) {
                                 $kind_post->delete( 'start' );
 …
+                }
                 if ( isset( $_POST['mf2_end_date'] ) || isset( $_POST['mf2_end_time'] ) ) {
                         $end = build_iso8601_time( sanitize_text_field( $_POST['mf2_end_date'] ), sanitize_text_field( $_POST['mf2_end_time'] ), sanitize_text_field( $_POST['mf2_end_offset'] ) );
+                        $end = build_iso8601_time( self::posted_text( 'mf2_end_date' ), self::posted_text( 'mf2_end_time' ), self::posted_text( 'mf2_end_offset' ) );
                         if ( ! $end ) {
                                 $kind_post->delete( 'end' );
 …
                 $durations = array(
                         'Y' => intval( $_POST['duration_years'] ?? '' ),
                         'M' => intval( $_POST['duration_months'] ?? '' ),
                         'D' => intval( $_POST['duration_days'] ?? '' ),
                         'H' => intval( $_POST['duration_hours'] ?? '' ),
                         'I' => intval( $_POST['duration_minutes'] ?? '' ),
                         'S' => intval( $_POST['duration_seconds'] ?? '' ),
+                        'Y' => absint( self::posted_text( 'duration_years' ) ),
+                        'M' => absint( self::posted_text( 'duration_months' ) ),
+                        'D' => absint( self::posted_text( 'duration_days' ) ),
+                        'H' => absint( self::posted_text( 'duration_hours' ) ),
+                        'I' => absint( self::posted_text( 'duration_minutes' ) ),
+                        'S' => absint( self::posted_text( 'duration_seconds' ) ),
                 );
                 $duration  = build_iso8601_duration( $durations );
 …
                         if ( $duration instanceof DateInterval ) {
                                 $duration = date_interval_to_iso8601( $duration );
-                                error_log( wp_json_encode( $duration ) );
+                        }
+                }
 …
+                }
+                $kind_post->set( 'rsvp', $_POST['mf2_rsvp'] );
+                if ( array_key_exists( 'mf2_rating', $_POST ) && is_numeric( $_POST['mf2_rating'] ) ) {
+                        $kind_post->set( 'rating', intval( $_POST['mf2_rating'] ) );
+                }
+                if ( isset( $_POST['cite_published_date'] ) || isset( $_POST['published_time'] ) ) {
+                        $cite['published'] = build_iso8601_time( sanitize_text_field( $_POST['cite_published_date'] ), sanitize_text_field( $_POST['cite_published_time'] ), sanitize_text_field( $_POST['cite_published_offset'] ) );
+                if ( isset( $_POST['mf2_rsvp'] ) ) {
+                        $rsvp = self::posted_text( 'mf2_rsvp' );
+                        if ( in_array( $rsvp, array( 'yes', 'no', 'maybe', 'interested', 'remote' ), true ) ) {
+                                $kind_post->set( 'rsvp', $rsvp );
+                        } else {
+                                $kind_post->delete( 'rsvp' );
+                        }
+                }
+                $rating = self::posted_text( 'mf2_rating' );
+                if ( is_numeric( $rating ) ) {
+                        $kind_post->set( 'rating', intval( $rating ) );
+                }
+                if ( isset( $_POST['cite_published_date'] ) || isset( $_POST['cite_published_time'] ) ) {
+                        $cite['published'] = build_iso8601_time( self::posted_text( 'cite_published_date' ), self::posted_text( 'cite_published_time' ), self::posted_text( 'cite_published_offset' ) );
+                }
                 if ( isset( $_POST['cite_updated_date'] ) || isset( $_POST['cite_updated_time'] ) ) {
+                        $cite['updated'] = build_iso8601_time( sanitize_text_field( $_POST['cite_updated_date'] ), sanitize_text_field( $_POST['cite_updated_time'] ), sanitize_text_field( $_POST['cite_updated_offset'] ) );
+                }
+                $cite['summary'] = wp_kses_post( $_POST['cite_summary'] ?? '' );
+                $cite['name']    = sanitize_text_field( $_POST['cite_name'] ?? '' );
+                $cite['url']     = esc_url( $_POST['cite_url'] ?? '' );
+                        $cite['updated'] = build_iso8601_time( self::posted_text( 'cite_updated_date' ), self::posted_text( 'cite_updated_time' ), self::posted_text( 'cite_updated_offset' ) );
+                }
+                // Summaries are plain text; line breaks are kept.
+                $cite['summary'] = isset( $_POST['cite_summary'] ) && is_string( $_POST['cite_summary'] ) ? sanitize_textarea_field( wp_unslash( $_POST['cite_summary'] ) ) : '';
+                $cite['name']    = self::posted_text( 'cite_name' );
+                $cite['url']     = self::posted_urls( 'cite_url' );
                 if ( isset( $_POST['cite_tags'] ) ) {
+                        $cite['category'] = array_filter( explode( ';', sanitize_text_field( $_POST['cite_tags'] ) ) );
+                }
+                $cite['publication'] = sanitize_text_field( $_POST['cite_publication'] ?? '' );
+                $cite['featured']    = esc_url( $_POST['cite_featured'] ?? '' );
+                $author         = array();
+                $author['name'] = self::explode( sanitize_text_field( $_POST['cite_author_name'] ?? '' ) );
+                $author['url']  = self::explode( $_POST['cite_author_url'] ?? '' );
+                if ( is_array( $author['url'] ) ) {
+                        $author['url'] = array_map( 'esc_url', $author['url'] );
+                        $cite['category'] = array_values( array_filter( array_map( 'trim', explode( ';', self::posted_text( 'cite_tags' ) ) ) ) );
+                }
+                $cite['publication'] = self::posted_text( 'cite_publication' );
+                $cite['featured']    = self::posted_urls( 'cite_featured' );
+                // One h-card per author. Like the other fields, an empty value clears what was stored.
+                $authors = array_map( '\ParseThis\jf2_to_mf2', self::posted_authors() );
+                if ( empty( $authors ) ) {
+                        $cite['author'] = '';
                 } else {
+                        $author['url'] = esc_url( $author['url'] );
+                }
+                $author['photo'] = self::explode( $_POST['cite_author_photo'] ?? '' );
+                if ( is_array( $author['photo'] ) ) {
+                        $author['photo'] = array_map( 'esc_url', $author['photo'] );
+                } else {
+                        $author['photo'] = esc_url( $author['photo'] );
+                }
+                $author = array_filter( $author );
+                if ( ! empty( $author ) ) {
+                        $author['type'] = 'card';
+                        $cite['author'] = jf2_to_mf2( $author );
+                }
+                        $cite['author'] = 1 === count( $authors ) ? $authors[0] : $authors;
+                }
                 $kind = $kind_post->get_kind();
                 $type = Kind_Taxonomy::get_kind_info( $kind, 'property' );
+                // Make sure there is no overwrite of properties that might not be handled by the plugin
+                $fetch = $kind_post->get_cite();
+                if ( ! $fetch ) {
+                        $fetch = array();
+                } else {
+                        $fetch = array_filter( $fetch );
+                }
+                // Make sure there is no overwrite of properties that might not be handled by the plugin.
+                $fetch = self::stored_cite_properties( $kind_post->get_cite() );
                 if ( empty( $_POST['cite_media'] ) ) {
                         $cite = array_merge( $fetch, $cite );
 …
+                                }
                                 $cite = array( 'properties' => $build );
                                 // Temporary code which assumes everything except a checkin is a citation
+                                // Temporary code which assumes everything except a checkin is a citation.
                                 if ( 'checkin' === $kind ) {
                                         $cite['type'] = array( 'h-card' );
 …
+                        }
+                }
+                $kind_post->set( $type, $cite );
+                // Values are unslashed for sanitizing; the metadata API expects them slashed.
+                $kind_post->set( $type, wp_slash( $cite ) );
+        }
+        /**
+         * Returns a posted metabox field as sanitized text.
+         *
+         * Only called from save_post(), after the nonce is verified.
+         *
+         * @since 4.0.0
+         *
+         * @param string $key Field name.
+         * @return string The unslashed, sanitized value, or an empty string if it is missing.
+         */
+        private static function posted_text( $key ) {
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Verified in save_post().
+                if ( ! isset( $_POST[ $key ] ) || ! is_string( $_POST[ $key ] ) ) {
+                        return '';
+                }
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Verified in save_post().
+                return sanitize_text_field( wp_unslash( $_POST[ $key ] ) );
+        }
+        /**
+         * Returns the properties of a stored citation, keyed by property name.
+         *
+         * Saving merges these with the posted fields, so properties the metabox
+         * does not edit are kept. A citation stored as a plain URL has none.
+         * Before 4.0.0, saving merged the whole stored microformat instead, nesting
+         * it inside its own properties one level deeper on each save; those levels
+         * are flattened here, newer values winning.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $cite Citation as returned by Kind_Post::get_cite().
+         * @return array Property values, each a list.
+         */
+        private static function stored_cite_properties( $cite ) {
+                if ( wp_is_numeric_array( $cite ) && 1 === count( $cite ) ) {
+                        $cite = $cite[0];
+                }
+                if ( ! is_array( $cite ) || empty( $cite['properties'] ) || ! is_array( $cite['properties'] ) ) {
+                        return array();
+                }
+                return array_filter( Kind_Upgrade::flatten_properties( $cite['properties'] ) );
+        }
+        /**
+         * Returns a posted metabox URL field, sanitized.
+         *
+         * Only called from save_post(), after the nonce is verified.
+         *
+         * @since 4.0.0
+         *
+         * @param string $key Field name.
+         * @return string The URL, or an empty string if it is not valid.
+         */
+        private static function posted_urls( $key ) {
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Verified in save_post().
+                if ( ! isset( $_POST[ $key ] ) || ! is_string( $_POST[ $key ] ) ) {
+                        return '';
+                }
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Verified in save_post(); sanitized with sanitize_url() (sanitize_text_field() would alter %-encoding).
+                return sanitize_url( trim( wp_unslash( $_POST[ $key ] ) ) );
+        }
+        /**
+         * Returns the authors posted in the metabox's Author tab, as jf2 h-cards.
+         *
+         * Each field holds one value per author, separated by semicolons, so the
+         * first name goes with the first URL and the first photo, and so on. An
+         * author without a URL leaves that position empty, as in "Ann; Bob" and
+         * "; https://example.com/bob".
+         *
+         * Only called from save_post(), after the nonce is verified.
+         *
+         * @since 4.0.0
+         *
+         * @return array[] The authors, each with type 'card' and any of name, url and photo.
+         */
+        private static function posted_authors() {
+                $fields = array();
+                foreach ( array(
+                        'name'  => 'cite_author_name',
+                        'url'   => 'cite_author_url',
+                        'photo' => 'cite_author_photo',
+                ) as $property => $key ) {
+                        // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Verified in save_post(); each value is sanitized below.
+                        $value  = isset( $_POST[ $key ] ) && is_string( $_POST[ $key ] ) ? wp_unslash( $_POST[ $key ] ) : '';
+                        $values = array_map( 'trim', explode( ';', $value ) );
+                        $fields[ $property ] = array_map( 'name' === $property ? 'sanitize_text_field' : 'sanitize_url', $values );
+                }
+                $authors = array();
+                $count   = max( array_map( 'count', $fields ) );
+                for ( $i = 0; $i < $count; $i++ ) {
+                        $author = array();
+                        foreach ( $fields as $property => $values ) {
+                                if ( isset( $values[ $i ] ) && '' !== $values[ $i ] ) {
+                                        $author[ $property ] = $values[ $i ];
+                                }
+                        }
+                        if ( $author ) {
+                                $authors[] = array_merge( array( 'type' => 'card' ), $author );
+                        }
+                }
+                return $authors;
+        }
         /**
          * Function to handle saving our kind data upon post status transition.
+         *
+         * @since 2.2.0
+         *
          * @access public

indieweb-post-kinds/trunk/includes/class-kind-plugins.php

-              r2973430
+              r3738687
 <?php
 /**
  * Post Kind Plugins Class
+ * Kind_Plugins class.
+ *
+ * Custom Functions for Specific Other Pugins
+ * @package Post_Kinds
+ * @since   2.5.2
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Integrations with other plugins, such as Micropub and ActivityPub.
+ *
  * @package Post Kinds
+ * @since 2.5.2
  */
 class Kind_Plugins {
         /**
+         * WP-Cron hook that retries parsing a Micropub citation in the background.
+         *
+         * @var string
+         */
+        const ENRICH_EVENT = 'post_kinds_enrich_citation';
+        /**
+         * How many times a citation is parsed after temporary failures, counting the
+         * attempt during the request.
+         *
+         * @var int
+         */
+        const ENRICH_ATTEMPTS = 3;
+        /**
+         * Post meta holding the log of citation parsing outcomes for a post.
+         *
+         * @var string
+         */
+        const LOG_META = '_kind_citation_log';
+        /**
+         * Post meta holding the post's citation status: retrying or failed. It is
+         * removed when no citation is retrying or failed.
+         *
+         * @var string
+         */
+        const STATUS_META = '_kind_citation_status';
+        /**
+         * How many log entries are kept per post.
+         *
+         * @var int
+         */
+        const LOG_LIMIT = 20;
+        /**
+         * Citation URLs from the current Micropub request that could not be parsed,
+         * as arrays of property, URL and WP_Error, waiting for the post ID.
+         *
+         * @var array[]
+         */
+        private static $pending = array();
+        /**
          * Initialize our plugin integrations.
+         *
+         * @since 2.5.2
+         *
          * @access public
          */
         public static function init() {
+                // Set Post Kind for Micropub Inputs.
+                // Set the post kind for Micropub posts before they are inserted (Micropub 2.1.0
+                // and later), with after_micropub as a fallback.
+                add_filter( 'micropub_tax_input', array( static::class, 'micropub_tax_input' ), 10, 2 );
                 add_action( 'after_micropub', array( static::class, 'micropub_set_kind' ), 9, 2 );
                 add_action( 'after_micropub', array( static::class, 'post_formats' ), 11, 2 );
                 add_filter( 'before_micropub', array( static::class, 'micropub_parse' ), 11 );
+                add_action( 'after_micropub', array( static::class, 'schedule_enrichment' ), 20, 2 );
+                add_action( self::ENRICH_EVENT, array( static::class, 'enrich_citation' ), 10, 4 );
+                // Advertise the enabled kinds to Micropub clients (Micropub 1.4 and later).
+                add_filter( 'micropub_query', array( static::class, 'micropub_query' ), 10, 2 );
                 add_filter( 'tempus_widget_post_title', array( static::class, 'tempus_widget_post_title' ), 10, 2 );
                 // Override Post Type in Semantic Linkbacks.
                 add_filter( 'semantic_linkbacks_post_type', array( static::class, 'semantic_post_type' ), 11, 2 );
+                // Remove the Automatic Post Generation that the Micropub Plugin Offers
+                if ( class_exists( 'Micropub_Render' ) ) {
+                        if ( has_filter( 'micropub_post_content', array( 'Micropub_Render', 'generate_post_content' ) ) ) {
+                                remove_filter( 'micropub_post_content', array( 'Micropub_Render', 'generate_post_content' ), 1, 2 );
+                        }
+                } elseif ( class_exists( 'Micropub_Plugin' ) ) {
+                        if ( has_filter( 'micropub_post_content', array( 'Micropub_Plugin', 'generate_post_content' ) ) ) {
+                                remove_filter( 'micropub_post_content', array( 'Micropub_Plugin', 'generate_post_content' ), 1, 2 );
+                        }
+                }
+                // Hum Compatibility Filters
+                // Post Kinds displays the response itself, so turn off Micropub's dynamic
+                // rendering of Micropub posts (Micropub 2.4.0 and later).
+                add_filter( 'micropub_dynamic_render', '__return_false' );
+                // Hum Compatibility Filters.
                 add_action( 'hum_local_types', array( static::class, 'hum_local_types' ), 11 );
                 add_action( 'hum_type_prefix', array( static::class, 'hum_type_prefix' ), 11, 2 );
                 // ActivityPub Filters
+                // ActivityPub Filters.
                 add_filter( 'activitypub_post', array( static::class, 'activitypub_post' ), 12 );
+        }
 …
          * Construct a title for the Tempus Widget link.
+         *
+         * @since 3.5.4
+         *
          * @access public
+         *
          * @param string $title The Original Title.
          * @param WP_Post $post Post object.
+         * @param string  $title The Original Title.
+         * @param WP_Post $post  Post object.
          * @return string
          */
 …
         /**
+         *
+         * @param array $post_array
+         * Sets the ActivityPub object type based on the post kind.
+         *
+         * @since 3.6.2
+         *
+         * @param array $post_array ActivityPub object array.
+         *
          * @return array
 …
+        }
+        /**
+         * Adds the kinds' shortlink type codes to the Hum plugin.
+         *
+         * @since 3.4.0
+         *
+         * @param string[] $types Local type codes.
+         * @return string[] Local type codes.
+         */
         public static function hum_local_types( $types ) {
                 // http://tantek.pbworks.com/w/page/21743973/Whistle#design - Some of the uses are modified based on design considerations noted.
                 $types[] = 'f'; // Favorited, Likes, etc
                 $types[] = 'e'; // Events
                 $types[] = 'g'; // Geo Checkin
                 $types[] = 'h'; // Link
                 $types[] = 'm'; // Metric
                 $types[] = 'q'; // Question
                 $types[] = 'r'; // Review
                 $types[] = 'x'; // Experience
                 $types[] = 'u'; // Status Update
+                $types[] = 'f'; // Favorited, Likes, etc.
+                $types[] = 'e'; // Events.
+                $types[] = 'g'; // Geo Checkin.
+                $types[] = 'h'; // Link.
+                $types[] = 'm'; // Metric.
+                $types[] = 'q'; // Question.
+                $types[] = 'r'; // Review.
+                $types[] = 'x'; // Experience.
+                $types[] = 'u'; // Status Update.
                 return $types;
+        }
+        /**
+         * Uses the kind's shortlink code as a post's Hum type prefix.
+         *
+         * @since 3.4.0
+         *
+         * @param string $prefix  Type prefix.
+         * @param int    $post_id Post ID.
+         * @return string The kind's shortlink code, or the prefix if it has none.
+         */
         public static function hum_type_prefix( $prefix, $post_id ) {
                 $post_type = get_post_type( $post_id );
 …
          * Replaces need for replacing the entire excerpt.
+         *
+         * @since 2.5.2
+         *
          * @access public
+         *
 …
         /**
+         * Take mf2 properties and set a post kind.
+         * Implements Post Type Discovery https://www.w3.org/TR/post-type-discovery/
+         *
+         * @param array $input   Micropub Request in JSON.
+         * @param array $wp_args Arguments passed to insert or update posts.
+         * Returns the post kind for an mf2 object, using Post Type Discovery.
+         * Implements https://www.w3.org/TR/post-type-discovery/ via Parse This.
+         *
+         * @since 4.0.0
+         *
+         * @param array $mf2 mf2 object, such as a Micropub request.
+         * @return string Registered kind slug, or an empty string if none applies.
+         */
+        public static function discover_kind( $mf2 ) {
+                if ( ! is_array( $mf2 ) || empty( $mf2['properties'] ) || ! function_exists( '\\ParseThis\\post_type_discovery' ) ) {
+                        return '';
+                }
+                $type = \ParseThis\post_type_discovery( \ParseThis\mf2_to_jf2( $mf2 ) );
+                return ( $type && Kind_Taxonomy::get_post_kind_info( $type ) ) ? $type : '';
+        }
+        /**
+         * Sets the kind of a Micropub post in the taxonomy input, so the post is
+         * inserted with its kind rather than the default term. Everything that runs
+         * during the insert, such as the publish transition, post formats and other
+         * plugins' publish hooks, then sees the right kind.
+         *
+         * Hooked to Micropub's micropub_tax_input filter (Micropub 2.1.0 and later),
+         * which is applied when a post is created.
+         *
+         * @since 4.0.0
+         *
+         * @param array|null $tax_input Taxonomy input for the new post.
+         * @param array      $input     Micropub request.
+         * @return array|null Taxonomy input, with the kind added.
+         */
+        public static function micropub_tax_input( $tax_input, $input ) {
+                $kind = self::discover_kind( $input );
+                if ( ! $kind ) {
+                        return $tax_input;
+                }
+                if ( ! is_array( $tax_input ) ) {
+                        $tax_input = array();
+                }
+                if ( empty( $tax_input['kind'] ) ) {
+                        $tax_input['kind'] = array( $kind );
+                }
+                return $tax_input;
+        }
+        /**
+         * Sets the kind of a Micropub post after it is created, if it does not
+         * already have it.
+         *
+         * The kind is normally set before the insert (see micropub_tax_input()). This
+         * covers Micropub versions before 2.1.0, and users who cannot assign kind
+         * terms, for whom WordPress ignores the taxonomy input.
+         *
+         * @since 2.5.2
+         *
+         * @param array      $input   Micropub request.
+         * @param array|null $wp_args Arguments of the created or updated post; null for queries.
          */
         public static function micropub_set_kind( $input, $wp_args ) {
+                // Only continue if create or update
+                if ( ! $wp_args ) {
+                if ( empty( $wp_args['ID'] ) ) {
                         return;
+                }
+                $type = post_type_discovery( mf2_to_jf2( $input ) );
+                if ( ! empty( $type ) ) {
+                        set_post_kind( $wp_args['ID'], $type );
+                }
+        }
+        /**
+         * Set our post formats.
+                $post_id = (int) $wp_args['ID'];
+                if ( isset( $input['action'] ) && 'update' === $input['action'] ) {
+                        // Only recalculate when the update changed a property that decides the
+                        // kind, so a kind chosen in the editor survives unrelated updates.
+                        if ( ! self::update_changes_kind( $input ) ) {
+                                return;
+                        }
+                        $kind = self::discover_kind( self::stored_mf2( $post_id ) );
+                } else {
+                        $kind = self::discover_kind( $input );
+                }
+                if ( $kind && get_post_kind_slug( $post_id ) !== $kind ) {
+                        self::set_kind_without_moving_properties( $post_id, $kind );
+                }
+        }
+        /**
+         * Returns the properties that decide a post's kind: each registered kind's
+         * property, plus rsvp, which Post Type Discovery checks first.
+         *
+         * @since 4.0.0
+         *
+         * @return string[] Property names.
+         */
+        public static function kind_properties() {
+                $properties = array( 'rsvp' );
+                foreach ( Kind_Taxonomy::get_kind_list() as $kind ) {
+                        $property = Kind_Taxonomy::get_kind_info( $kind, 'property' );
+                        if ( $property ) {
+                                $properties[] = $property;
+                        }
+                }
+                return array_values( array_unique( $properties ) );
+        }
+        /**
+         * Whether a Micropub update request replaces, adds or deletes a property
+         * that decides the kind.
+         *
+         * @since 4.0.0
+         *
+         * @param array $input Micropub update request.
+         * @return bool
+         */
+        public static function update_changes_kind( $input ) {
+                $changed = array();
+                foreach ( array( 'replace', 'add' ) as $operation ) {
+                        if ( isset( $input[ $operation ] ) && is_array( $input[ $operation ] ) ) {
+                                $changed = array_merge( $changed, array_keys( $input[ $operation ] ) );
+                        }
+                }
+                if ( isset( $input['delete'] ) && is_array( $input['delete'] ) ) {
+                        // Either a list of property names, or an object of property => values.
+                        $changed = array_merge( $changed, wp_is_numeric_array( $input['delete'] ) ? $input['delete'] : array_keys( $input['delete'] ) );
+                }
+                return (bool) array_intersect( $changed, self::kind_properties() );
+        }
+        /**
+         * Builds the mf2 for a post from what is stored: the mf2_ post meta, plus the
+         * title and content, which Post Type Discovery uses to tell articles from notes.
+         *
+         * @since 4.0.0
+         *
+         * @param int $post_id Post ID.
+         * @return array mf2 object.
+         */
+        public static function stored_mf2( $post_id ) {
+                $properties = array();
+                foreach ( get_post_meta( $post_id ) as $key => $values ) {
+                        if ( 0 !== strpos( $key, 'mf2_' ) || 'mf2_type' === $key ) {
+                                continue;
+                        }
+                        $value = maybe_unserialize( $values[0] );
+                        if ( '' === $value || array() === $value ) {
+                                continue;
+                        }
+                        $properties[ substr( $key, 4 ) ] = is_array( $value ) ? $value : array( $value );
+                }
+                $post = get_post( $post_id );
+                if ( $post && '' !== $post->post_title ) {
+                        $properties['name'] = array( $post->post_title );
+                }
+                if ( $post && '' !== $post->post_content ) {
+                        $properties['content'] = array( $post->post_content );
+                }
+                return array(
+                        'type'       => array( 'h-entry' ),
+                        'properties' => $properties,
+                );
+        }
+        /**
+         * Sets a post's kind without moving property values between properties.
+         *
+         * When the kind changes in the editor, Kind_Metabox::change_kind() moves the
+         * old kind's property to the new one (a like-of becomes an in-reply-to, for
+         * example). After a Micropub update the properties are already where the
+         * client put them, so that is suspended here.
+         *
+         * @since 4.0.0
+         *
+         * @param int    $post_id Post ID.
+         * @param string $kind    Kind slug.
+         */
+        private static function set_kind_without_moving_properties( $post_id, $kind ) {
+                $moving = has_action( 'change_kind', array( 'Kind_Metabox', 'change_kind' ) );
+                if ( false !== $moving ) {
+                        remove_action( 'change_kind', array( 'Kind_Metabox', 'change_kind' ), $moving );
+                }
+                set_post_kind( $post_id, $kind );
+                if ( false !== $moving ) {
+                        add_action( 'change_kind', array( 'Kind_Metabox', 'change_kind' ), $moving, 3 );
+                }
+        }
+        /**
+         * Sets the post format of a post created or updated by Micropub to match its kind.
+         *
+         * @since 2.5.2
+         *
          * @access public
+         *
          * @param $input
          * @param $wp_args
+         * @param array $input   The Micropub request.
+         * @param array $wp_args Arguments passed to wp_insert_post() or wp_update_post().
          */
         public static function post_formats( $input, $wp_args ) {
 …
         /**
+         * Parse our micropub values.
+         * Returns the Micropub properties whose URL values are enriched into citations.
+         *
+         * @since 4.0.0
+         *
+         * @return string[] Property names.
+         */
+        public static function citation_properties() {
+                return array( 'bookmark-of', 'like-of', 'favorite-of', 'in-reply-to', 'read-of', 'listen-of', 'watch-of' );
+        }
+        /**
+         * Enriches the URLs in citation properties of a Micropub create request, or
+         * of the replace part of an update request, into h-cite objects parsed from
+         * the cited page.
+         *
+         * Follows the Micropub spec: property values are arrays, so a property whose
+         * value is not an array is left for Micropub to handle, and only string URLs
+         * inside the array are enriched. Values the client already sent as objects,
+         * such as an h-cite, are kept as sent.
+         *
+         * @since 2.7.5
+         *
          * @access public
+         *
          * @param array $input Array of inputs to parse.
          * @return mixed
+         * @param array $input Micropub request, in mf2 JSON.
+         * @return array The request, with citation URLs enriched where possible.
          */
         public static function micropub_parse( $input ) {
+                if ( ! $input ) {
+                self::$pending = array();
+                // Queries (q) are left as is.
+                if ( ! is_array( $input ) || isset( $input['q'] ) ) {
                         return $input;
+                }
+                // q indicates a get query
+                if ( isset( $input['q'] ) ) {
+                if ( ! class_exists( '\\ParseThis\\Parser' ) || ! self::enrichment_enabled( $input ) ) {
                         return $input;
+                }
+                if ( ! isset( $input['properties'] ) ) {
+                        return $input;
+                }
+                $parsed = array( 'bookmark-of', 'like-of', 'favorite-of', 'in-reply-to', 'read-of', 'listen-of', 'watch-of' );
+                foreach ( $input['properties'] as $property => $value ) {
+                        if ( in_array( $property, $parsed, true ) ) {
+                                if ( wp_is_numeric_array( $value ) ) {
+                                        foreach ( $value as $i => $v ) {
+                                                if ( wp_http_validate_url( $v ) ) {
+                                                        $parse = new Parse_This( $v );
+                                                        $fetch = $parse->fetch();
+                                                        if ( ! is_wp_error( $fetch ) ) {
+                                                                $parse->parse();
+                                                                $jf2 = $parse->get();
+                                                                // Entries become citations
+                                                                if ( 'entry' === $jf2['type'] ) {
+                                                                        $jf2['type'] = 'cite';
+                                                                }
+                                                                $mf2                                    = jf2_to_mf2( $jf2 );
+                                                                $input['properties'][ $property ][ $i ] = $mf2;
+                                                        } else {
+                                                                error_log( wp_json_encode( $fetch ) ); // phpcs:ignore
+                                                        }
+                                                }
+                                        }
+                                } elseif ( isset( $value['url'] ) && wp_http_validate_url( $value['url'] ) ) {
+                                        $parse = new Parse_This( $value['url'] );
+                                        $fetch = $parse - fetch();
+                                        if ( ! is_wp_error( $fetch ) ) {
+                                                $parse->parse();
+                                                $input['properties'][ $property ] = array_merge( $value, jf2_to_mf2( $parse->get() ) );
+                // Create requests carry properties. Update requests can replace citation
+                // properties; Micropub only allows adding categories, syndication and media.
+                if ( isset( $input['properties'] ) && is_array( $input['properties'] ) ) {
+                        $input['properties'] = self::enrich_properties( $input['properties'] );
+                }
+                if ( isset( $input['action'] ) && 'update' === $input['action'] && isset( $input['replace'] ) && is_array( $input['replace'] ) ) {
+                        $input['replace'] = self::enrich_properties( $input['replace'] );
+                }
+                return $input;
+        }
+        /**
+         * Enriches the citation URLs in a set of Micropub properties.
+         *
+         * @since 4.0.0
+         *
+         * @param array $properties Properties, keyed by name, each an array of values.
+         * @return array The properties, with citation URLs enriched where possible.
+         */
+        private static function enrich_properties( $properties ) {
+                foreach ( self::citation_properties() as $property ) {
+                        if ( empty( $properties[ $property ] ) || ! wp_is_numeric_array( $properties[ $property ] ) ) {
+                                continue;
+                        }
+                        foreach ( $properties[ $property ] as $i => $value ) {
+                                if ( ! is_string( $value ) || ! wp_http_validate_url( $value ) ) {
+                                        continue;
+                                }
+                                // Keep the client waiting only briefly: a short timeout and no follow-up
+                                // requests. Failures are logged, and retried in the background where
+                                // worthwhile, once the post exists (see schedule_enrichment()).
+                                $cite = self::parse_citation( $value, self::request_parse_args() );
+                                if ( is_wp_error( $cite ) ) {
+                                        self::report_failure( $value, $cite );
+                                        self::$pending[] = array( $property, $value, $cite );
+                                        continue;
+                                }
+                                $properties[ $property ][ $i ] = $cite;
+                        }
+                }
+                return $properties;
+        }
+        /**
+         * Fetches and parses a URL into an mf2 citation.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param string $url  URL of the cited page.
+         * @param array  $args {
+         *     Optional. Limits for this parse.
+         *
+         *     @type int $timeout      HTTP timeout in seconds. Default: Parse This's own (15).
+         *     @type int $max_requests Follow-up requests allowed. Default: Parse This's own (10).
+         * }
+         * @return array|WP_Error mf2 citation, or WP_Error if the page could not be fetched or parsed.
+         */
+        public static function parse_citation( $url, $args = array() ) {
+                $timeout       = isset( $args['timeout'] ) ? (int) $args['timeout'] : 0;
+                $max_requests  = isset( $args['max_requests'] ) ? (int) $args['max_requests'] : null;
+                $limit_timeout = static function ( $request ) use ( $timeout ) {
+                        $request['timeout'] = isset( $request['timeout'] ) ? min( (float) $request['timeout'], $timeout ) : $timeout;
+                        return $request;
+                };
+                $limit_budget  = static function () use ( $max_requests ) {
+                        return $max_requests;
+                };
+                if ( $timeout > 0 ) {
+                        add_filter( 'http_request_args', $limit_timeout, 99 );
+                }
+                if ( null !== $max_requests ) {
+                        add_filter( 'parse_this_max_requests', $limit_budget, 99 );
+                }
+                try {
+                        $parse = new \ParseThis\Parser( $url );
+                        $fetch = $parse->fetch();
+                        if ( is_wp_error( $fetch ) ) {
+                                return $fetch;
+                        }
+                        // Keep nested objects in place rather than moving them to refs.
+                        $parse->parse( array( 'references' => false ) );
+                        $jf2 = $parse->get();
+                } finally {
+                        remove_filter( 'http_request_args', $limit_timeout, 99 );
+                        remove_filter( 'parse_this_max_requests', $limit_budget, 99 );
+                }
+                if ( ! is_array( $jf2 ) || empty( $jf2 ) ) {
+                        return new WP_Error( 'empty', __( 'Nothing could be parsed from the URL.', 'indieweb-post-kinds' ) );
+                }
+                // Content Parse This did not recognize is returned whole under raw.
+                unset( $jf2['raw'] );
+                $type = isset( $jf2['type'] ) ? $jf2['type'] : '';
+                // A page that parses as a feed (a home page, for example) is cited as the
+                // page itself, not its entries.
+                if ( 'feed' === $type ) {
+                        $jf2 = array_intersect_key( $jf2, array_flip( array( 'name', 'url', 'author', 'summary', 'photo' ) ) );
+                }
+                $jf2 = self::clean_citation( $jf2 );
+                // Entries and feeds become citations. Other types, such as an h-event for
+                // an RSVP, are kept.
+                $jf2['type'] = in_array( $type, array( '', 'entry', 'feed' ), true ) ? 'cite' : $type;
+                return \ParseThis\jf2_to_mf2( $jf2 );
+        }
+        /**
+         * Whether to enrich citation URLs in Micropub requests.
+         *
+         * @since 4.0.0
+         *
+         * @param array|null $input Micropub request, or null outside a request.
+         * @return bool
+         */
+        public static function enrichment_enabled( $input = null ) {
+                /**
+                 * Filters whether Post Kinds enriches citation URLs in Micropub requests
+                 * (in-reply-to, like-of, and so on) with data parsed from the cited page.
+                 *
+                 * Return false to store citations exactly as the client sent them.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param bool       $enabled Whether to enrich citations. Default true.
+                 * @param array|null $input   Micropub request, or null when a background retry runs.
+                 */
+                return (bool) apply_filters( 'post_kinds_micropub_enrich', true, $input );
+        }
+        /**
+         * Returns the limits for parsing citations during a Micropub request.
+         *
+         * @since 4.0.0
+         *
+         * @return array Arguments for parse_citation().
+         */
+        public static function request_parse_args() {
+                /**
+                 * Filters the HTTP timeout, in seconds, for parsing a citation while a
+                 * Micropub client waits. Citations that time out are retried in the
+                 * background.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param int $timeout Timeout in seconds. Default 5.
+                 */
+                $timeout = (int) apply_filters( 'post_kinds_micropub_parse_timeout', 5 );
+                return array(
+                        'timeout'      => max( 1, $timeout ),
+                        'max_requests' => 0,
+                );
+        }
+        /**
+         * Classifies a parse failure to decide whether to retry it.
+         *
+         * @since 4.0.0
+         *
+         * @param WP_Error $error Parse failure.
+         * @return string One of:
+         *                'temporary'   A connection problem or timeout, a server error or rate limiting.
+         *                'unavailable' The page was missing or refused (HTTP 404, 401 or 403), which
+         *                              may be an outage or a configuration problem on the cited site.
+         *                'permanent'   Anything else, such as content that cannot be parsed.
+         */
+        public static function failure_type( $error ) {
+                if ( 'http_request_failed' === $error->get_error_code() ) {
+                        return 'temporary';
+                }
+                $code = self::failure_response_code( $error );
+                if ( 429 === $code || $code >= 500 ) {
+                        return 'temporary';
+                }
+                if ( in_array( $code, array( 401, 403, 404 ), true ) ) {
+                        return 'unavailable';
+                }
+                return 'permanent';
+        }
+        /**
+         * Returns the HTTP status code of a parse failure, if there was one.
+         *
+         * @since 4.0.0
+         *
+         * @param WP_Error $error Parse failure.
+         * @return int HTTP status code, or 0.
+         */
+        private static function failure_response_code( $error ) {
+                $data = $error->get_error_data();
+                return is_array( $data ) && isset( $data['response_code'] ) ? (int) $data['response_code'] : 0;
+        }
+        /**
+         * Returns how long to wait before retrying a failed citation, if at all.
+         *
+         * Temporary failures are retried after a minute, then after 15 minutes, up
+         * to ENRICH_ATTEMPTS attempts in all. A missing or refused page is retried
+         * once, after some hours, in case the cited site was down or misconfigured.
+         * Other failures are not retried.
+         *
+         * @since 4.0.0
+         *
+         * @param int      $post_id Post ID.
+         * @param string   $url     Cited URL.
+         * @param WP_Error $error   The failure.
+         * @param int      $attempt Which attempt failed.
+         * @return int Seconds to wait, or 0 for no retry.
+         */
+        public static function retry_delay( $post_id, $url, $error, $attempt ) {
+                switch ( self::failure_type( $error ) ) {
+                        case 'temporary':
+                                if ( $attempt >= self::ENRICH_ATTEMPTS ) {
+                                        return 0;
+                                }
+                                return 1 === $attempt ? MINUTE_IN_SECONDS : 15 * MINUTE_IN_SECONDS;
+                        case 'unavailable':
+                                // Only once per citation.
+                                foreach ( self::get_citation_log( $post_id ) as $entry ) {
+                                        if ( $url === $entry['url'] && 'unavailable' === $entry['type'] ) {
+                                                return 0;
+                                        }
+                                }
+                        }
+                }
+                return $input;
+                                /**
+                                 * Filters how long to wait before retrying, once, a citation whose page
+                                 * was missing or refused (HTTP 404, 401 or 403).
+                                 *
+                                 * @since 4.0.0
+                                 *
+                                 * @param int      $delay Delay in seconds. Default 6 hours.
+                                 * @param string   $url   Cited URL.
+                                 * @param WP_Error $error The failure.
+                                 */
+                                return max( 0, (int) apply_filters( 'post_kinds_micropub_unavailable_retry_delay', 6 * HOUR_IN_SECONDS, $url, $error ) );
+                        default:
+                                return 0;
+                }
+        }
+        /**
+         * Reports a citation that could not be parsed. Only shown when WP_DEBUG is on.
+         *
+         * @since 4.0.0
+         *
+         * @param string   $url   Cited URL.
+         * @param WP_Error $error Parse failure.
+         */
+        public static function report_failure( $url, $error ) {
+                wp_trigger_error(
+                        __METHOD__,
+                        sprintf( 'Could not parse %1$s for a Micropub citation: %2$s', esc_url( $url ), esc_html( $error->get_error_message() ) )
+                );
+        }
+        /**
+         * Logs and, where worthwhile, schedules a retry for citations that could not
+         * be parsed during a Micropub create or update request, once the post ID is known.
+         *
+         * @since 4.0.0
+         *
+         * @param array      $input   Micropub request.
+         * @param array|null $wp_args Arguments of the created or updated post.
+         */
+        public static function schedule_enrichment( $input, $wp_args ) {
+                $pending       = self::$pending;
+                self::$pending = array();
+                if ( empty( $pending ) || empty( $wp_args['ID'] ) ) {
+                        return;
+                }
+                foreach ( $pending as $citation ) {
+                        self::handle_failure( (int) $wp_args['ID'], $citation[0], $citation[1], 1, $citation[2] );
+                }
+        }
+        /**
+         * Logs a failed attempt and schedules a retry if one is worthwhile.
+         *
+         * @since 4.0.0
+         *
+         * @param int      $post_id  Post ID.
+         * @param string   $property Micropub property, such as in-reply-to.
+         * @param string   $url      Cited URL.
+         * @param int      $attempt  Which attempt failed.
+         * @param WP_Error $error    The failure.
+         */
+        private static function handle_failure( $post_id, $property, $url, $attempt, $error ) {
+                // Work out the delay before logging, so the log holds only earlier failures.
+                $delay    = self::retry_delay( $post_id, $url, $error, $attempt );
+                $retry_at = $delay ? time() + $delay : 0;
+                self::log_outcome( $post_id, $property, $url, $attempt, $error, $retry_at );
+                if ( $retry_at ) {
+                        $args = array( $post_id, $property, $url, $attempt + 1 );
+                        if ( ! wp_next_scheduled( self::ENRICH_EVENT, $args ) ) {
+                                wp_schedule_single_event( $retry_at, self::ENRICH_EVENT, $args );
+                        }
+                }
+        }
+        /**
+         * Parses a Micropub citation in the background and stores the result.
+         *
+         * The citation is only replaced if the post still holds the URL as it was
+         * stored, so later edits are not overwritten.
+         *
+         * @since 4.0.0
+         *
+         * @param int    $post_id  Post ID.
+         * @param string $property Micropub property, such as in-reply-to.
+         * @param string $url      Cited URL.
+         * @param int    $attempt  Which attempt this is.
+         */
+        public static function enrich_citation( $post_id, $property, $url, $attempt ) {
+                if ( ! get_post( $post_id ) || ! class_exists( '\\ParseThis\\Parser' ) || ! self::enrichment_enabled() ) {
+                        return;
+                }
+                $key    = 'mf2_' . $property;
+                $values = get_post_meta( $post_id, $key, true );
+                $index  = is_array( $values ) ? array_search( $url, $values, true ) : false;
+                if ( false === $index ) {
+                        self::log_outcome( $post_id, $property, $url, $attempt, 'skipped', 0 );
+                        return;
+                }
+                $cite = self::parse_citation( $url );
+                if ( is_wp_error( $cite ) ) {
+                        self::report_failure( $url, $cite );
+                        self::handle_failure( $post_id, $property, $url, $attempt, $cite );
+                        return;
+                }
+                $values[ $index ] = $cite;
+                update_post_meta( $post_id, $key, $values );
+                self::log_outcome( $post_id, $property, $url, $attempt, 'enriched', 0 );
+        }
+        /**
+         * Returns the log of citation parsing outcomes for a post, oldest first.
+         *
+         * Each entry is an array with these keys:
+         * - time          Unix timestamp of the attempt.
+         * - property      Micropub property, such as in-reply-to.
+         * - url           Cited URL.
+         * - attempt       Attempt number; 1 is the attempt during the Micropub request.
+         * - result        'enriched', 'failed', or 'skipped' (the citation was edited since).
+         * - type          For failures: 'temporary', 'unavailable' or 'permanent'. Otherwise empty.
+         * - code          For failures: the WP_Error code. Otherwise empty.
+         * - response_code For failures: the HTTP status code, or 0.
+         * - message       For failures: the error message. Otherwise empty.
+         * - retry         Unix timestamp of the scheduled retry, or 0 if none.
+         *
+         * @since 4.0.0
+         *
+         * @param int $post_id Post ID.
+         * @return array[] Log entries.
+         */
+        public static function get_citation_log( $post_id ) {
+                $log = get_post_meta( $post_id, self::LOG_META, true );
+                return is_array( $log ) ? $log : array();
+        }
+        /**
+         * Adds an outcome to a post's citation log and updates its citation status.
+         *
+         * @since 4.0.0
+         *
+         * @param int             $post_id  Post ID.
+         * @param string          $property Micropub property.
+         * @param string          $url      Cited URL.
+         * @param int             $attempt  Attempt number.
+         * @param WP_Error|string $result   The failure, or 'enriched' or 'skipped'.
+         * @param int             $retry_at Timestamp of the scheduled retry, or 0.
+         */
+        private static function log_outcome( $post_id, $property, $url, $attempt, $result, $retry_at ) {
+                $failed = is_wp_error( $result );
+                $entry  = array(
+                        'time'          => time(),
+                        'property'      => $property,
+                        'url'           => $url,
+                        'attempt'       => (int) $attempt,
+                        'result'        => $failed ? 'failed' : $result,
+                        'type'          => $failed ? self::failure_type( $result ) : '',
+                        'code'          => $failed ? $result->get_error_code() : '',
+                        'response_code' => $failed ? self::failure_response_code( $result ) : 0,
+                        'message'       => $failed ? $result->get_error_message() : '',
+                        'retry'         => (int) $retry_at,
+                );
+                $log    = self::get_citation_log( $post_id );
+                $log[]  = $entry;
+                $log    = array_slice( $log, -self::LOG_LIMIT );
+                update_post_meta( $post_id, self::LOG_META, $log );
+                // The status reflects the latest outcome for each cited URL.
+                $latest = array();
+                foreach ( $log as $item ) {
+                        $latest[ $item['url'] ] = $item;
+                }
+                $status = '';
+                foreach ( $latest as $item ) {
+                        if ( 'failed' !== $item['result'] ) {
+                                continue;
+                        }
+                        if ( ! $item['retry'] ) {
+                                $status = 'failed';
+                                break;
+                        }
+                        $status = 'retrying';
+                }
+                if ( $status ) {
+                        update_post_meta( $post_id, self::STATUS_META, $status );
+                } else {
+                        delete_post_meta( $post_id, self::STATUS_META );
+                }
+                /**
+                 * Fires after each attempt to parse a Micropub citation.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param array $entry   The log entry. See Kind_Plugins::get_citation_log().
+                 * @param int   $post_id Post ID.
+                 */
+                do_action( 'post_kinds_citation_enrichment', $entry, $post_id );
+        }
+        /**
+         * Removes Parse This bookkeeping from parsed jf2, recursively.
+         *
+         * Keys starting with an underscore (_code, _links, _alternate,
+         * _source_format, ...), post-type and refs are not microformats properties,
+         * and would otherwise be stored in post meta and returned by Micropub's
+         * q=source.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param mixed $jf2 Parsed jf2, or any value within it.
+         * @return mixed The value without bookkeeping keys.
+         */
+        public static function clean_citation( $jf2 ) {
+                if ( ! is_array( $jf2 ) ) {
+                        return $jf2;
+                }
+                foreach ( array_keys( $jf2 ) as $key ) {
+                        if ( is_string( $key ) && ( 0 === strpos( $key, '_' ) || in_array( $key, array( 'post-type', 'refs' ), true ) ) ) {
+                                unset( $jf2[ $key ] );
+                        } elseif ( is_array( $jf2[ $key ] ) ) {
+                                $jf2[ $key ] = self::clean_citation( $jf2[ $key ] );
+                        }
+                }
+                return $jf2;
+        }
+        /**
+         * Adds the enabled kinds to Micropub's configuration query, using the
+         * post-types extension (Query for Supported Vocabulary), so clients only
+         * offer the kinds this site uses.
+         *
+         * @since 4.0.0
+         *
+         * @see https://indieweb.org/Micropub-extensions#Query_for_Supported_Vocabulary
+         *
+         * @param array|mixed $response Micropub query response.
+         * @param array       $input    Micropub query.
+         * @return array|mixed The response, with post-types added for q=config.
+         */
+        public static function micropub_query( $response, $input ) {
+                if ( ! is_array( $response ) || ! isset( $input['q'] ) || 'config' !== $input['q'] ) {
+                        return $response;
+                }
+                $types = isset( $response['post-types'] ) && is_array( $response['post-types'] ) ? $response['post-types'] : array();
+                $known = wp_list_pluck( $types, 'type' );
+                foreach ( self::micropub_post_types() as $type ) {
+                        if ( ! in_array( $type['type'], $known, true ) ) {
+                                $types[] = $type;
+                        }
+                }
+                $response['post-types'] = $types;
+                return $response;
+        }
+        /**
+         * Returns the enabled kinds as Micropub post types.
+         *
+         * @since 4.0.0
+         *
+         * @return array[] Arrays with the keys type (the kind slug, which is its Post
+         *                 Type Discovery type) and name (the kind's singular name).
+         */
+        public static function micropub_post_types() {
+                // The kinds offered in the editor: those enabled in settings, plus note,
+                // which is always available.
+                $kinds = Kind_Config::get_termslist();
+                array_unshift( $kinds, 'note' );
+                $types = array();
+                foreach ( array_unique( $kinds ) as $kind ) {
+                        $name = Kind_Taxonomy::get_kind_info( $kind, 'singular_name' );
+                        if ( $name ) {
+                                $types[] = array(
+                                        'type' => $kind,
+                                        'name' => $name,
+                                );
+                        }
+                }
+                /**
+                 * Filters the post types advertised to Micropub clients in q=config.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param array[] $types Arrays with the keys type and name.
+                 */
+                return apply_filters( 'post_kinds_micropub_post_types', $types );
+        }
 } // End Class Kind_Plugins

indieweb-post-kinds/trunk/includes/class-kind-post-widget.php

-              r3001401
+              r3738687
 <?php
+/**
+ * Kind_Post_Widget class.
+ *
+ * @package Post_Kinds
+ * @since   3.1.5
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Widget that lists recent posts of selected kinds.
+ *
+ * @since 3.1.5
+ */
 class Kind_Post_Widget extends WP_Widget {
         /**
          * Register widget with WordPress.
+         *
+         * @since 3.1.5
          */
         public function __construct() {
                 parent::__construct(
                         'Kind_Post_Widget',                // Base ID
                         __( 'Kind Post Widget', 'indieweb-post-kinds' ),        // Name
+                        'Kind_Post_Widget',                // Base ID.
+                        __( 'Kind Post Widget', 'indieweb-post-kinds' ),        // Name.
                         array(
                                 'classname'             => 'kind_post_widget',
 …
          * Front-end display of widget.
+         *
+         * @since 3.1.5
+         *
          * @see WP_Widget::widget()
+         *
 …
          */
         public function widget( $args, $instance ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+                $kind = $instance['kind'] ?? 'note';
+                // phpcs:ignore
+                echo $args['before_widget'];
+                if ( ! empty( $instance['title'] ) ) {
+                        echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore
+                }
+                $transient = get_transient( 'kind_post_widget' );
+                if ( false === $transient ) {
+                                $query = array(
+                                        'tax_query'   => array(
+                                                array(
+                                                        'taxonomy' => 'kind',
+                                                        'field'    => 'slug',
+                                                        'terms'    => $kind,
+                                                ),
+                $kind   = $instance['kind'] ?? 'note';
+                $number = absint( $instance['number'] ?? 5 );
+                $posts  = get_posts(
+                        array(
+                                // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query -- Kinds are a taxonomy; this is the indexed way to select them.
+                                'tax_query'           => array(
+                                        array(
+                                                'taxonomy' => 'kind',
+                                                'field'    => 'slug',
+                                                'terms'    => $kind,
                                         ),
+                                        'numberposts' => $instance['number'] ?? 5,
+                                );
+                                $posts = get_posts( $query );
+                                ),
+                                'numberposts'         => $number ? $number : 5,
+                                'no_found_rows'       => true,
+                                'ignore_sticky_posts' => true,
+                        )
+                );
+                // Like core's Recent Posts widget, show nothing when there are no posts.
+                // WP_Query caches the result in the object cache, so no transient is needed.
+                if ( empty( $posts ) ) {
+                        return;
+                }
+                if ( 0 === count( $posts ) ) {
+                        return;
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title = apply_filters( 'widget_title', $instance['title'] ?? '', $instance, $this->id_base );
+                echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
+                if ( $title ) {
+                        echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Wrapper markup is the theme's; the title is escaped by core's widget_title filter.
+                }
+                echo '<div id="kind-posts">';
+                if ( 0 !== count( $posts ) ) {
+                        echo '<ul>';
+                        foreach ( $posts as $post ) {
+                                printf( '<li>%1$s</li>', kind_get_the_link( $post ) ); // phpcs:ignore
+                        }
+                        echo '</ul>';
+                } else {
+                        esc_html_e( 'No Posts Found', 'indieweb-post-kinds' );
+                echo '<div id="kind-posts"><ul>';
+                foreach ( $posts as $post ) {
+                        printf( '<li>%1$s</li>', kind_get_the_link( $post ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- kind_get_the_link() escapes its parts.
+                }
                 echo '</div>';
                 echo $args['after_widget']; // phpcs:ignore
+                echo '</ul></div>';
+                echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget wrapper markup registered by the theme.
+        }
         /**
          * Sanitize widget form values as they are saved.
+         *
+         * @since 3.1.5
+         *
          * @see WP_Widget::update()
 …
          */
         public function update( $new_instance, $old_instance ) {
+                array_walk_recursive( $new_instance, 'sanitize_text_field' );
+                return $new_instance;
+                $kind   = isset( $new_instance['kind'] ) && is_string( $new_instance['kind'] ) ? sanitize_key( $new_instance['kind'] ) : '';
+                $number = isset( $new_instance['number'] ) ? absint( $new_instance['number'] ) : 0;
+                return array(
+                        'title'  => isset( $new_instance['title'] ) && is_string( $new_instance['title'] ) ? sanitize_text_field( $new_instance['title'] ) : '',
+                        'kind'   => in_array( $kind, Kind_Taxonomy::get_kind_list(), true ) ? $kind : 'note',
+                        'number' => $number > 0 ? $number : 5,
+                );
+        }
 …
         /**
          * Create the form for the Widget admin
+         *
+         * @since 3.1.5
+         *
          * @see WP_Widget::form()
 …
                 $instance['kind'] = ( $instance['kind'] ?? 'note' );
                 ?>
                                 <p><label for="title"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
                                 <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?> id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"
                                 value="<?php echo esc_html( $instance['title'] ?? '' ); ?>" /></p>
+                                <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php esc_html_e( 'Title: ', 'indieweb-post-kinds' ); ?></label>
+                                <input type="text" size="30" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"
+                                value="<?php echo esc_attr( $instance['title'] ?? '' ); ?>" /></p>
                 <select name="<?php echo esc_attr( $this->get_field_name( 'kind' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'kind' ) ); ?>">
                 <?php
                 $list   = get_option( 'kind_termslist', Kind_Taxonomy::get_kind_list() );
+                $list   = Kind_Config::get_termslist();
                 $list[] = 'note';
+                $list   = array_unique( $list );
                 foreach ( $list as $term ) {
-                        $value = Kind_Taxonomy::get_post_kind_info( $term );
                         printf(
                                 '<option value="%1$s" %3$s>%2$s</option>',
                                 esc_attr( $term ),
                                 Kind_Taxonomy::get_kind_info( $term, 'singular_name' ), // phpcs:ignore
                                 selected( $instance['kind'], $term )
+                                esc_html( Kind_Taxonomy::get_kind_info( $term, 'singular_name' ) ),
+                                selected( $instance['kind'], $term, false )
                         );
-                                printf( '%1$s %2$s<br />', Kind_Taxonomy::get_icon( $term ), esc_html( $value->singular_name ) ); //phpcs:ignore
+                }
                 ?>

indieweb-post-kinds/trunk/includes/class-kind-post.php

-              r2973430
+              r3738687
 <?php
 /**
  * Kind Post Class
+ * Kind_Post class.
+ *
+ * @package Post Kinds
+ * Assists in retrieving/saving properties from a Post. Replaces MF2_Post by only looking for Items on Demand instead of Parsing Them initially.
+ * @package Post_Kinds
+ * @since   3.4.0
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Reads and writes the kind properties of a post.
+ *
+ * Replaces MF2_Post by looking up each property on demand instead of parsing
+ * all of them up front.
+ *
+ * @since 3.4.0
  */
 class Kind_Post {
+        /**
+         * Post ID.
+         *
+         * @since 3.4.0
+         * @var int
+         */
         public $id;
+        /**
+         * Sets up the post to read and write.
+         *
+         * @since 3.4.0
+         *
+         * @param int|WP_Post|string $post Post ID, post object, or the URL of a post or attachment.
+         */
         public function __construct( $post ) {
                 if ( is_numeric( $post ) ) {
 …
                                 $post     = $id;
                         } else {
                                 $id       = attachment_url_to_postid( $post );
+                                $id       = self::get_attachment_id( $post );
                                 $this->id = $id;
                                 $post     = $id;
 …
+        }
+        /*
+         * Check is post is attachment.
+         *
+         * @param WP_Post $post Post Object.
+         * @return boolean True if attachment.
+        /**
+         * Checks whether a post is an attachment.
+         *
+         * @since 3.4.10
+         *
+         * @param int|WP_Post $post Post ID or post object.
+         * @return bool True if the post is an attachment.
          */
         private function is_attachment( $post ) {
 …
+        /*
+         * Returns WP_Post Object
+         *
+         * @return WP_Post Post Object.
+         *
+        /**
+         * Returns the post object.
+         *
+         * @since 3.4.0
+         *
+         * @return WP_Post|null The post, or null if it does not exist.
          */
         public function get_post() {
 …
+        }
+        /*
+         * Returns the Post Kind. For Attachments will return the media type.
+         *
+         * @return string Post Kind.
+         *
+        /**
+         * Returns the post kind. For an attachment, returns its media type instead.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false|null The kind slug ('photo', 'video' or 'audio' for an attachment),
+         *                           false if a post has no kind, or null for an attachment of another type.
          */
         public function get_kind() {
 …
+        }
+        /*
+         * Get Name.
+         *
+         * @return string Return name.
+        /**
+         * Returns the post's name (title).
+         *
+         * A title that is just the post ID, or an attachment title that is just its
+         * file name, does not count as a name.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false The name, or false if there is none.
          */
         public function get_name() {
 …
+        }
+        /*
+         * Get Content.
+         *
+         * @return array with HTML and Plaintext Version of Content or Summary
+        /**
+         * Returns the post's content or summary (excerpt).
+         *
+         * @since 3.4.0
+         *
+         * @param string $property Either 'content' or 'summary'.
+         * @return array|false Array with the HTML ('html') and plain text ('value') versions,
+         *                     or false if the property is empty or not supported.
          */
         public function get_html( $property ) {
 …
+        }
+        /*
+         * Get Permalink URL
+         *
+         * @return string $url
+        /**
+         * Returns the post's permalink, or the file URL for an attachment.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false The URL, or false if there is none.
          */
         public function get_url() {
 …
+        }
+        /*
+         * Get Featured Image Permalink
+         *
+         * @return string $url
+        /**
+         * Returns the URL of the post's featured image.
+         *
+         * @since 3.4.0
+         *
+         * @return string|false The URL, or false if the post has no featured image.
          */
         public function get_featured() {
 …
+        /*
+         * Return datetime property as a DateTime Object.
+         *
+         * @param string $property Property You Wish to Return.
+         * @return DateTimeImmutable Published Time in Local Timezone.
+         *
+        /**
+         * Returns a date property as a date object.
+         *
+         * For posts other than attachments, 'published' and 'updated' come from the
+         * post's own dates. Everything else comes from post meta.
+         *
+         * @since 3.4.0
+         *
+         * @param string $property Property to return, such as 'published' or 'start'.
+         * @return DateTimeImmutable|false The date, or false if it is missing or not a valid date.
          */
         public function get_datetime_property( $property ) {
 …
                         $datetime = $datetime[0];
+                }
+                return new DateTimeImmutable( $datetime );
+        }
+        /*
+         * Returns Publication.
+         *
+         * @return string
+         *
+                return kind_safe_datetime( $datetime );
+        }
+        /**
+         * Returns the publication the post appeared in.
+         *
+         * For posts other than attachments, this is the site title.
+         *
+         * @since 3.4.0
+         *
+         * @return string|null The publication, or null if an attachment has none.
          */
         public function get_publication() {
 …
+        }
+        /**
+         * Returns the post's stored duration.
+         *
+         * @since 3.4.0
+         *
+         * @return DateInterval|false The duration, or false if it is missing or not valid.
+         */
         public function get_duration() {
                 $duration = get_post_meta( $this->id, 'mf2_duration', true );
 …
                         $duration = $duration[0];
+                }
                 if ( $duration ) {
                         return new DateInterval( $duration );
+                }
                 return false;
+        }
         /*
          * Return Categories which are a combination of Tags and Categories.
+         *
          * @return array Array of the names of Categories and Tag names.
+         *
+                return kind_safe_interval( $duration );
+        }
+        /**
+         * Returns the names of the post's categories and tags, combined.
+         *
+         * 'Uncategorized' is left out.
+         *
+         * @since 3.4.0
+         *
+         * @return string[] Category and tag names.
          */
         public function get_categories() {
                 $category = array();
                 // Get a list of categories and extract their names
+                // Get a list of categories and extract their names.
                 $post_categories = get_the_terms( $this->id, 'category' );
                 if ( ! empty( $post_categories ) && ! is_wp_error( $post_categories ) ) {
 …
+                }
                 // Get a list of tags and extract their names
+                // Get a list of tags and extract their names.
                 $post_tags = get_the_terms( $this->id, 'post_tag' );
                 if ( ! empty( $post_tags ) && ! is_wp_error( $post_tags ) ) {
                         $category = array_merge( $this->category, wp_list_pluck( $post_tags, 'name' ) );
+                        $category = array_merge( $category, wp_list_pluck( $post_tags, 'name' ) );
+                }
                 if ( in_array( 'Uncategorized', $category, true ) ) {
 …
         /**
+         * Is prefix in string.
+         *
+         * @param  string $source The source string.
+         * @param  string $prefix The prefix you wish to check for in source.
+         * @return boolean The result.
+         * Checks whether a string starts with a prefix.
+         *
+         * @since 3.4.0
+         *
+         * @param string $source The source string.
+         * @param string $prefix The prefix to look for.
+         * @return bool True if the source starts with the prefix.
          */
         protected static function str_prefix( $source, $prefix ) {
 …
         /**
+         * Returns True if Array is Multidimensional.
+         *
+         * @param array $arr array.
+         *
+         * @return boolean result
+         * Checks whether an array is multidimensional.
+         *
+         * @since 3.4.0
+         *
+         * @param array $arr The array to check.
+         * @return bool True if any element is an array.
          */
         protected static function is_multi_array( $arr ) {
 …
+        }
+        /**
+         * Unwraps single-item arrays, recursively.
+         *
+         * @since 3.4.0
+         *
+         * @param mixed $value   The value to unwrap.
+         * @param bool  $discard Optional. Whether to keep only the first item of a list
+         *                       with more than one item. Default false.
+         * @return mixed The value, with single-item arrays replaced by their item.
+         */
         protected function single_array( $value, $discard = false ) {
                 if ( ! is_array( $value ) ) {
 …
         /**
+         * Retrieve author
+         *
+         * @return boolean|array The result or false if does not exist.
+         * Returns the post's author as an h-card.
+         *
+         * For an attachment, or a post with no WordPress author, this is the author
+         * stored in post meta.
+         *
+         * @since 3.4.0
+         *
+         * @return array|string|false The author as mf2, the stored value, or false if there is none.
          */
         public function get_author() {
 …
                         return ( $author ?? false );
+                }
                 // Attachments may have been uploaded by a user but may have metadata for original author
+                // Attachments may have been uploaded by a user but may have metadata for original author.
                 if ( 'attachment' === get_post_type( $this->id ) ) {
                         $author = get_post_meta( $post->ID, 'mf2_author', true );
 …
                                 'name'  => array( get_the_author_meta( 'display_name', $post->post_author ) ),
                                 'url'   => array( get_the_author_meta( 'user_url', $post->post_author ) ? get_the_author_meta( 'user_url', $post->post_author ) : get_author_posts_url( $post->post_author ) ),
                                 'photo' => array( get_avatar_url( $this->post_author ) ),
+                                'photo' => array( get_avatar_url( $post->post_author ) ),
                         ),
                 );
+        }
+        /*
+         * Return Attached Media IDs.
+         *
+         * @param string $type audio, video, or photo.
+         * @return array Array of Media IDs.
+         *
+        /**
+         * Returns the IDs of media attached to the post.
+         *
+         * @since 3.4.0
+         *
+         * @param string $type 'audio', 'video' or 'photo'.
+         * @return int[]|false Attachment IDs, or false if the type is not supported.
          */
         public function get_attached_media( $type ) {
 …
+        }
+        /*
+         * Return Attached Photos.
+         *
+         * Looks in both attached media and the photo property.
+         *
+         * @param boolean $content If true then return empty if there are any images in content.
+         * @return array Array of Media IDs.
+         *
+        /**
+         * Returns the post's photos.
+         *
+         * Looks in attached media, the photo property and images in the content.
+         * Returns an empty array if the post has a featured image.
+         *
+         * @since 3.4.0
+         *
+         * @param bool $content Optional. Whether to return an empty array if the content
+         *                      has any images. Default true.
+         * @return int[]|false Attachment IDs, or false if there are none.
          */
         public function get_photo( $content = true ) {
+                if ( ! $this->get_post() ) {
+                        return false;
+                }
                 // Check if the post itself is an image attachment.
                 if ( wp_attachment_is( 'image', $this->id ) ) {
 …
+                }
+                // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                 $content_ids = get_post_meta( $this->id, '_content_img_ids', true );
-                if ( false === $content_ids ) {
-                        // Check for a gallery first.
-                        $gallery = get_post_gallery( $this->id, false );
-                        if ( $gallery & array_key_exists( 'ids', $gallery ) ) {
-                                $content_ids = explode( ',', $gallery['ids'] );
+                        }
-                        $content_ids = array();
-                        $post        = $this->get_post();
-                        $shortcode   = false;
-                        $shortcodes  = apply_filter( 'kind_photo_shortcode_exclude', array( 'vr', '360' ) );
-                        if ( $post->post_content ) {
-                                foreach ( $shortcodes as $code ) {
-                                        if ( has_shortcode( $post->post_content, $code ) ) {
-                                                $shortcode = true;
+                                        }
+                                }
-                                if ( $shortcode ) {
-                                        $content_ids = array();
-                                } else {
-                                        $content_ids = array_merge( $content_ids, Kind_Media_Metadata::get_img_from_content( $post->post_content ) );
+                                }
-                                update_post_meta( $this->id, '_content_img_ids', $content_ids );
+                        }
+                }
                 // If there are photos in the content then end here if this is true.
 …
+        }
+        /*
+         * Return Attached Audio.
+         *
+         * Looks in both attached media and the audio property.
+         *
+         * @param boolean $content If true then return empty if there are any audio files in content.
+         * @return array Array of Media IDs or URLs.
+         *
+        /**
+         * Returns the post's audio.
+         *
+         * Looks in attached media, the audio property and audio in the content.
+         *
+         * @since 3.4.0
+         *
+         * @param bool $content Optional. Whether to return an empty array if the content
+         *                      has any audio. Default true.
+         * @return array|false Attachment IDs, external URLs if no attachments were found,
+         *                     or false if there is no audio.
          */
         public function get_audio( $content = true ) {
 …
+                }
+                // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                 $content_ids = get_post_meta( $this->id, '_content_audio_ids', true );
-                if ( false === $content_ids ) {
-                        $post = get_post();
-                        if ( $post->post_content ) {
-                                $content_ids = Kind_Media_Metadata::get_audio_from_content( $post->post_content );
-                                update_post_meta( $this->id, '_content_audio_ids', $content_ids );
+                        }
+                }
                 // If there are ids in the content then end here if this is true.
 …
                 $audio_ids = is_array( $audios ) ? $this->get_attachments_from_urls( $audios ) : array();
                 // If there are ids found return them
+                // If there are ids found return them.
                 if ( ! empty( $audio_ids ) || ! empty( $att_ids ) || ! empty( $content_ids ) ) {
                         return array_unique( array_merge( $att_ids, $this->get_attachments_from_urls( $audios ), $content_ids ) );
+                        return array_unique( array_merge( $att_ids, $audio_ids, $content_ids ) );
+                }
 …
+        }
+        /*
+         * Return Attached Video.
+         *
+         * Looks in both attached media and the audio property.
+         *
+         * @param boolean $content If true then return empty if there are any video files in content.
+         * @return array Array of Media IDs.
+         *
+        /**
+         * Returns the post's videos.
+         *
+         * Looks in attached media, the video property and videos in the content.
+         *
+         * @since 3.4.0
+         *
+         * @param bool $content Optional. Whether to return an empty array if the content
+         *                      has any videos. Default true.
+         * @return int[]|false Attachment IDs, or false if there are none.
          */
         public function get_video( $content = true ) {
 …
                         return array( $this->id );
+                }
+                // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                 $content_ids = get_post_meta( $this->id, '_content_video_ids', true );
-                if ( false === $content_ids ) {
-                        $post = get_post();
-                        if ( $post->post_content ) {
-                                $content_ids = Kind_Media_Metadata::get_video_from_content( $post->post_content );
-                                update_post_meta( $this->id, '_content_video_ids', $content_ids );
+                        }
+                }
                 // If there are ids in the content then end here if this is true.
 …
+        }
+        /**
+         * Look up the attachment ID for a URL, with caching.
+         *
+         * Wraps attachment_url_to_postid(), which runs an uncached query, in the
+         * object cache. The key includes the posts last_changed value, so adding,
+         * changing or deleting any post or attachment invalidates it. Without a
+         * persistent object cache this still avoids repeat lookups in a request.
+         *
+         * @since 4.0.0
+         *
+         * @param string $url Media URL.
+         * @return int Attachment ID, or 0 if there is none.
+         */
+        public static function get_attachment_id( $url ) {
+                if ( ! is_string( $url ) || '' === $url ) {
+                        return 0;
+                }
+                $key = 'attachment_id:' . md5( $url ) . ':' . wp_cache_get_last_changed( 'posts' );
+                $id  = wp_cache_get( $key, 'post-kinds' );
+                if ( false === $id ) {
+                        $id = attachment_url_to_postid( $url );
+                        wp_cache_set( $key, $id, 'post-kinds' );
+                }
+                return (int) $id;
+        }
+        /**
+         * Looks up the attachment IDs for media URLs.
+         *
+         * @since 3.4.0
+         *
+         * @param string|array $urls A URL, or a list of URLs, attachment IDs or arrays with a 'url' key.
+         * @return int[] Attachment IDs found. URLs with no attachment are left out.
+         */
         public function get_attachments_from_urls( $urls ) {
                 if ( is_string( $urls ) ) {
                         $attachment = attachment_url_to_postid( $urls );
+                        $attachment = self::get_attachment_id( $urls );
                         if ( $attachment ) {
                                 return array( $attachment );
 …
                                 if ( is_array( $url ) ) {
                                         if ( isset( $url['url'] ) ) {
                                                 $att_ids[] = attachment_url_to_postid( $url['url'] );
+                                                $att_ids[] = self::get_attachment_id( $url['url'] );
+                                        }
                                 } elseif ( is_numeric( $url ) ) {
                                         $att_ids[] = $url;
                                 } else {
                                         $att_ids[] = attachment_url_to_postid( $url );
+                                        $att_ids[] = self::get_attachment_id( $url );
+                                }
+                        }
 …
         /**
+         * Retrieve value
+         *
+         * @param  string $key The key to retrieve.
+         * @param  boolean $single Whether to return a a single value or array if there is only one value.
+         * @return mixed The result or false if does not exist.
+         * Returns a property of the post.
+         *
+         * @since 3.4.0
+         *
+         * @param string $key    The property to return.
+         * @param bool   $single Optional. Whether to unwrap a single value from its array. Default true.
+         * @return mixed The value, or false if the key is empty.
          */
         public function get( $key, $single = true ) {
 …
+        }
+        /**
+         * Returns the post's citation, or one property of it.
+         *
+         * For an attachment, the citation is built from the attachment itself.
+         * Citations stored as jf2 are returned as mf2.
+         *
+         * @since 3.4.0
+         *
+         * @param string|null $key Optional. Citation property to return. Default null, for the whole citation.
+         * @return mixed The citation as mf2 or a string, the property, or false if there is none.
+         */
         public function get_cite( $key = null ) {
                 if ( 'attachment' === get_post_type( $this->id ) ) {
 …
                                 $duration = date_interval_to_iso8601( $duration );
+                        }
                         $cite = jf2_to_mf2(
+                        $cite = \ParseThis\jf2_to_mf2(
                                 array_filter(
                                         array(
 …
                                         $cite = $cite[0];
+                                }
+                                $this->delete( 'cite' );
+                        }
+                }
+                // If this is formatted as JF2 try to convert it to MF2 and update.
+                if ( is_array( $cite ) && ! wp_is_numeric_array( $cite ) ) {
+                        $cite['type'] = 'cite';
+                        $cite         = jf2_to_mf2( $cite );
+                        $property     = Kind_Taxonomy::get_kind_info( $this->get_kind(), 'property' );
+                        $this->set( $property, $cite );
+                        }
+                        // Citations stored as jf2 are returned as mf2.
+                        if ( is_array( $cite ) && ! wp_is_numeric_array( $cite ) ) {
+                                if ( ! isset( $cite['properties'] ) ) {
+                                        if ( empty( $cite['type'] ) ) {
+                                                $cite['type'] = $this->get_cite_type();
+                                        }
+                                        $cite = \ParseThis\jf2_to_mf2( $cite );
+                                } elseif ( empty( $cite['type'] ) || ! is_array( $cite['type'] ) ) {
+                                        // Reads before 4.0.0 stored the type as 'cite'.
+                                        $cite['type'] = array( 'h-' . $this->get_cite_type() );
+                                }
+                        }
+                }
 …
+        }
+        /* Returns a normalized cite with all possible parameters present to reduce isset checks and to ensure everything is formatted correctly
+         * For Display and Metabox purposes only.
+        /**
+         * Returns the jf2 type of the post's citation, based on its kind.
+         *
+         * Matches the type Kind_Metabox::save_post() stores: a checkin cites a
+         * place (card), eat and drink cite food, and every other kind a citation.
+         *
+         * @since 4.0.0
+         *
+         * @return string The jf2 type: 'card', 'food' or 'cite'.
+         */
+        public function get_cite_type() {
+                $kind = $this->get_kind();
+                if ( 'checkin' === $kind ) {
+                        return 'card';
+                }
+                if ( in_array( $kind, array( 'drink', 'eat' ), true ) ) {
+                        return 'food';
+                }
+                return 'cite';
+        }
+        /**
+         * Returns a citation as jf2 with every key present and formatted for display.
+         *
+         * Missing keys are set to empty strings, which saves isset checks. For
+         * display and the metabox only.
+         *
+         * 'authors' lists every author as a card with name, url and photo. 'author'
+         * is the single author, or for several authors one card whose fields hold
+         * each author's value in turn, separated by semicolons, as the metabox
+         * shows them.
+         *
+         * @since 3.4.9
+         * @since 4.0.0 Added 'authors'. 'author' joins several authors' photos too.
+         *
+         * @param array|string|false $cite The citation, as mf2, jf2 or a URL or name.
+         * @return array The normalized citation.
          */
         public function normalize_cite( $cite ) {
                 // Ensures that an empty string is always present in the cite
+                // Ensures that an empty string is always present in the cite.
                 $author_defaults = array(
                         'type'  => 'card',
 …
                         'summary'     => '',
                         'author'      => $author_defaults,
+                        'authors'     => array(),
                         'category'    => '',
                 );
 …
                         $cite = $cite[0];
+                }
                 if ( Parse_This_MF2_Utils::is_microformat( $cite ) ) {
                         $cite = mf2_to_jf2( $cite );
+                if ( \ParseThis\MF2_Utils::is_microformat( $cite ) ) {
+                        $cite = \ParseThis\mf2_to_jf2( $cite );
+                }
 …
+                }
+                if ( wp_is_numeric_array( $cite['author'] ) ) {
+                        if ( 1 === count( $cite['author'] ) ) {
+                                $cite['author'] = array_pop( $cite['author'] );
+                        }
+                }
+                if ( is_string( $cite['author'] ) ) {
+                        $cite['author'] = wp_http_validate_url( $cite['author'] ) ? array( 'url' => $cite['author'] ) : array( 'name' => $cite['author'] );
+                }
+                $cite['author'] = wp_parse_args( $cite['author'], $author_defaults );
+                $cite['authors'] = self::normalize_authors( $cite['author'] );
+                if ( 1 === count( $cite['authors'] ) ) {
+                        $cite['author'] = $cite['authors'][0];
+                } else {
+                        $cite['author'] = $author_defaults;
+                        foreach ( array( 'name', 'url', 'photo' ) as $key ) {
+                                $values = wp_list_pluck( $cite['authors'], $key );
+                                if ( array_filter( $values ) ) {
+                                        $cite['author'][ $key ] = implode( '; ', $values );
+                                }
+                        }
+                }
                 if ( is_array( $cite['publication'] ) ) {
                         $cite['publication'] = $cite['publication']['name'];
+                }
-                if ( is_array( $cite['author']['name'] ) ) {
-                        $cite['author']['name'] = implode( ';', $cite['author']['name'] );
+                }
-                if ( is_array( $cite['author']['url'] ) ) {
-                        $cite['author']['url'] = implode( ';', $cite['author']['url'] );
+                }
 …
+        }
+        /**
+         * Returns a citation's authors as a list of cards.
+         *
+         * Accepts one author or a list, each as a jf2 or mf2 h-card, a URL or a
+         * name. Before 4.0.0 the metabox saved several authors as one card whose
+         * name, url and photo were lists; the values are paired up by position.
+         *
+         * @since 4.0.0
+         *
+         * @param mixed $author The author or authors.
+         * @return array[] Cards with string type, name, url and photo, leaving out empty ones.
+         */
+        public static function normalize_authors( $author ) {
+                if ( wp_is_numeric_array( $author ) ) {
+                        $authors = array();
+                        foreach ( $author as $item ) {
+                                $authors = array_merge( $authors, self::normalize_authors( $item ) );
+                        }
+                        return $authors;
+                }
+                if ( is_string( $author ) ) {
+                        $author = wp_http_validate_url( $author ) ? array( 'url' => $author ) : array( 'name' => $author );
+                }
+                if ( ! is_array( $author ) ) {
+                        return array();
+                }
+                if ( \ParseThis\MF2_Utils::is_microformat( $author ) ) {
+                        $author = \ParseThis\mf2_to_jf2( $author );
+                }
+                $fields = array();
+                foreach ( array( 'name', 'url', 'photo' ) as $key ) {
+                        $value = isset( $author[ $key ] ) ? $author[ $key ] : '';
+                        if ( is_array( $value ) && isset( $value['value'] ) ) {
+                                // A jf2 photo with alt text.
+                                $value = $value['value'];
+                        }
+                        $fields[ $key ] = array_values( array_filter( (array) $value, 'is_scalar' ) );
+                }
+                $authors = array();
+                $count   = max( array_map( 'count', $fields ) );
+                for ( $i = 0; $i < $count; $i++ ) {
+                        $card = array( 'type' => 'card' );
+                        foreach ( $fields as $key => $values ) {
+                                $card[ $key ] = isset( $values[ $i ] ) ? trim( (string) $values[ $i ] ) : '';
+                        }
+                        if ( '' !== $card['name'] . $card['url'] . $card['photo'] ) {
+                                $authors[] = $card;
+                        }
+                }
+                return $authors;
+        }
+        /**
+         * Stores a date property.
+         *
+         * For posts other than attachments, 'published' and 'updated' set the
+         * post's own dates. Everything else is stored in post meta.
+         *
+         * @since 3.4.0
+         *
+         * @param string $key   Property to set, such as 'published' or 'start'.
+         * @param mixed  $value A date, in any form kind_safe_datetime() accepts.
+         * @return int|bool|WP_Error The result of updating the post or its meta,
+         *                           or false if the value is not a valid date.
+         */
         public function set_datetime_property( $key, $value ) {
                 // In an attachment the post date properties reflect when the item was uploaded not when the piece was created.
+                if ( ! $value instanceof DateTime ) {
+                        $value = new DateTime( $value );
+                }
+                // A mutable copy, as the timezone is changed below.
+                $value = kind_safe_datetime( $value, null, false );
                 if ( ! $value ) {
                         return false;
 …
+        }
+        /**
+         * Stores the post's duration as an ISO 8601 duration.
+         *
+         * @since 3.4.0
+         *
+         * @param mixed $value A duration, in any form kind_safe_interval() accepts.
+         * @return int|bool The result of updating the meta, or false if the value is not a valid duration.
+         */
         public function set_duration( $value ) {
+                if ( ! $value instanceof DateInterval ) {
+                        $value = new DateInterval( $value );
+                }
+                $value = kind_safe_interval( $value );
                 if ( ! $value ) {
                         return false;
 …
         /**
+         * Set author
+         *
+         * @param array $value Author microformat.
+         * @return boolean|WP_Error
+         * Stores the author of an attachment.
+         *
+         * Other posts use their WordPress author, so nothing is stored for them.
+         *
+         * @since 3.4.0
+         *
+         * @param array $value Author, as mf2.
+         * @return int|bool|null The result of updating the meta, or null if the post is not an attachment.
          */
         public function set_author( $value ) {
                 // Attachments may have been uploaded by a user but may have metadata for original author
+                // Attachments may have been uploaded by a user but may have metadata for original author.
                 if ( 'attachment' === get_post_type( $this->id ) ) {
                         return update_post_meta( $this->id, 'mf2_author', $value );
 …
+        }
+        /**
+         * Stores a property, or several.
+         *
+         * @since 3.4.0
+         *
+         * @param string|array $key   Property to set, or an array of property => value pairs.
+         * @param mixed        $value Optional. The value. Default null.
+         * @return mixed The result of storing the value. True when setting an array,
+         *               and null if the key or value is empty.
+         */
         public function set( $key, $value = null ) {
                 if ( is_array( $key ) ) {
 …
                         case 'featured':
                                 if ( wp_http_validate_url( $value ) ) {
                                         $featured = attachment_url_to_postid( $value );
+                                        $featured = self::get_attachment_id( $value );
                                         if ( $featured ) {
                                                 $value = $featured;
 …
                                 return wp_update_post( $args, true );
                         case 'audio':
+                                /* All media is handled identically.
+                                */
+                                // All media is handled identically.
                         case 'video':
+                                /* All Media is handled identically.
+                                */
+                                // All media is handled identically.
                         case 'photo':
                                 if ( Parse_This_MF2::is_microformat( $value ) ) {
                                         $url = Parse_This_MF2::get_plaintext( $value, 'url' );
                                         $id  = attachment_url_to_postid( $url );
+                                if ( \ParseThis\MF2_Utils::is_microformat( $value ) ) {
+                                        $url = \ParseThis\MF2_Utils::get_plaintext( $value, 'url' );
+                                        $id  = self::get_attachment_id( $url );
                                         if ( $id ) {
                                                 $value = mf2_to_jf2( $value );
+                                                $value = \ParseThis\mf2_to_jf2( $value );
                                                 unset( $value['type'] );
                                                 $attachment = new Kind_Post( $id );
 …
                                         return update_post_meta( $this->id, 'mf2_' . $key, array( $url ) );
+                                }
+                                /* If it is not a microformat handle as default.
+                                */
+                                // If it is not a microformat handle as default.
                         default:
                                 return update_post_meta( $this->id, 'mf2_' . $key, $value );
 …
+        }
+        /**
+         * Deletes a property stored in post meta.
+         *
+         * @since 3.4.0
+         *
+         * @param string $key Property to delete.
+         * @return bool True on success, false on failure.
+         */
         public function delete( $key ) {
                 return delete_post_meta( $this->id, 'mf2_' . $key );

indieweb-post-kinds/trunk/includes/class-kind-taxonomy.php

-              r3011061
+              r3738687
 <?php
 /**
  * Post Kind Taxonomy Class
+ * Kind_Taxonomy class.
+ *
+ * Registers the taxonomy and sets its behavior.
+ * @package Post_Kinds
+ * @since   2.0.2
+ */
+defined( 'ABSPATH' ) || exit;
+/**
+ * Registers the kind taxonomy and sets its behavior.
+ *
  * @package Post Kinds
+ * @since 2.0.2
  */
 final class Kind_Taxonomy {
+        private static $kinds = array(); // Store a Post_Kind class which is a definition of a specific kind
+        /**
+         * Registered kinds, keyed by slug.
+         *
+         * @since 3.1.0
+         * @var Post_Kind[]
+         */
+        private static $kinds = array();
+        /**
+         * Whether the built-in kinds have been registered.
+         *
+         * @since 4.0.0
+         * @var bool
+         */
+        private static $builtins_loaded = false;
+        /**
+         * Loads the built-in kinds and adds the taxonomy's hooks.
+         *
+         * @since 2.0.2
+         */
         public static function init() {
+                $wp_version = get_bloginfo( 'version' );
+                require_once plugin_dir_path( __FILE__ ) . '/register-kinds.php';
+                self::load_kinds();
                 // Add the Correct Archive Title to Kind Archives.
+                if ( version_compare( $wp_version, '5.5', '>' ) ) {
+                        add_filter( 'get_the_archive_title', array( self::class, 'kind_archive_title' ), 10 );
+                } else {
+                        add_filter( 'get_the_archive_title', array( self::class, 'kind_archive_title' ), 10, 3 );
+                }
+                add_filter( 'get_the_archive_title', array( self::class, 'kind_archive_title' ), 10 );
                 add_filter( 'get_the_archive_title_prefix', array( self::class, 'kind_archive_prefix' ), 10 );
 …
                 add_filter( 'document_title_parts', array( self::class, 'document_title_parts' ), 10 );
+                // Keep the taxonomy's default term in step with the Default Kind setting.
+                add_action( 'add_option_kind_default', array( self::class, 'sync_default_term' ) );
+                add_action( 'update_option_kind_default', array( self::class, 'sync_default_term' ) );
                 // Add Kind Permalinks.
                 add_filter( 'post_link', array( self::class, 'kind_permalink' ), 10, 3 );
                 add_filter( 'post_type_link', array( self::class, 'kind_permalink' ), 10, 3 );
                 // Query Variable to Exclude Kinds from Feed
+                // Query Variable to Exclude Kinds from Feed.
                 add_filter( 'query_vars', array( self::class, 'query_vars' ) );
                 add_action( 'pre_get_posts', array( self::class, 'kind_filter_query' ) );
 …
                 add_action( 'pre_get_posts', array( self::class, 'kind_firehose_query' ), 99 );
                 // Add Dropdown
+                // Add Dropdown.
                 add_action( 'restrict_manage_posts', array( self::class, 'kind_dropdown' ), 10, 2 );
 …
                 add_filter( 'webmention_links', array( self::class, 'webmention_links' ), 11, 2 );
                 // Add Links to Enclosures if Appropriate
+                // Add Links to Enclosures if Appropriate.
                 add_filter( 'enclosure_links', array( self::class, 'enclosure_links' ), 11, 2 );
 …
                 // Trigger Webmention on Change in Post Status.
                 add_filter( 'transition_post_status', array( self::class, 'transition' ), 10, 3 );
                 // On Post Save Set Post Format
+                // On Post Save Set Post Format.
                 add_action( 'save_post', array( self::class, 'post_formats' ), 99, 3 );
                 // Create hook triggered by change of kind
+                // Create hook triggered by change of kind.
                 add_action( 'set_object_terms', array( self::class, 'set_object_terms' ), 10, 6 );
 …
+        }
+        /** Template Redirect
+         *
+        /**
+         * Uses the kind photos template for photo archives, if the theme has one.
+         *
+         * @since 3.4.14
+         *
+         * @param string $template Path of the template to include.
+         * @return string Path of the template to include.
          */
         public static function template_include( $template ) {
                 global $wp_query;
                 // Only use this template for archive pages
+                // Only use this template for archive pages.
                 if ( is_singular() ) {
                         return $template;
 …
         /**
          * Register the Route.
+         *
+         * @since 3.3.4
          */
         public static function register_routes() {
 …
                                                 ),
                                         ),
+                                        // For editor tools: only users who can write posts need it.
                                         'permission_callback' => function () {
                                                 return current_user_can( 'read' );
+                                                return current_user_can( 'edit_posts' );
                                         },
                                 ),
 …
+        }
+        /**
+         * Returns a kind's registration info for the post-kinds/1.0/fields route.
+         *
+         * @since 3.3.4
+         *
+         * @param WP_REST_Request $request Request, with the kind slug (or all) in kind.
+         * @return Post_Kind|Post_Kind[]|WP_Error The kind, all kinds, or an error for an unknown kind.
+         */
         public static function read( $request ) {
                 $kind = $request->get_param( 'kind' );
+                return self::get_kind_info( $kind, 'all' );
+                $info = self::get_kind_info( $kind, 'all' );
+                if ( false === $info ) {
+                        return new WP_Error( 'rest_post_kind_not_found', __( 'Unknown post kind.', 'indieweb-post-kinds' ), array( 'status' => 404 ) );
+                }
+                return $info;
+        }
 …
         /**
          * Add our query variables to query_vars list.
+         *
+         * @since 3.2.4
+         *
          * @access public
 …
          * Filter the query for our post kinds.
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.4.14
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_photo_filter( $query ) {
                 // check if the user is requesting an admin page
+                // check if the user is requesting an admin page.
                 if ( is_admin() || ! $query->is_main_query() ) {
                         return $query;
+                }
                 $photos = get_query_var( 'kind_photos' );
                 // Return if  not set
+                // Return if  not set.
                 if ( $photos ) {
                         $query->set( 'posts_per_page', 30 );
 …
                         $query->is_comment_feed = false;
                         $query->is_home         = false;
+                        // Set for posts with images in their content or a photo property; see Kind_Media_Metadata::update_photo_flag().
                         $query->set(
                                 'meta_query',
                                 array(
-                                        'relation' => 'OR',
                                         array(
+                                                'key'     => '_content_img_ids',
+                                                'compare' => 'EXISTS',
+                                        ),
+                                        array(
+                                                'key'     => 'mf2_photo',
+                                                'key'     => '_kind_has_photo',
                                                 'compare' => 'EXISTS',
                                         ),
 …
          * Filter the query for our post kinds.
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.2.4
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_filter_query( $query ) {
                 // check if the user is requesting an admin page
+                // check if the user is requesting an admin page.
                 if ( is_admin() || ! $query->is_main_query() ) {
                         return $query;
+                }
                 $exclude = get_query_var( 'exclude' );
                 // Return if both are not set
+                // Return if both are not set.
                 if ( ! taxonomy_exists( $exclude ) ) {
                         return $query;
 …
          * Filter the main query for post kinds.
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.6.0
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_firehose_query( $query ) {
                 // check if the user is requesting an admin page
+                // check if the user is requesting an admin page.
                 if ( is_admin() || ! $query->is_main_query() ) {
                         return $query;
 …
+                }
+                $query->set(
+                        'tax_query',
+                $tax_query = array(
                         array(
+                                'relation' => 'OR',
+                                array(
+                                        'taxonomy' => 'kind',
+                                        'field'    => 'slug',
+                                        'terms'    => $firehose,
+                                        'operator' => 'IN',
+                                ),
+                                array(
+                                        'taxonomy' => 'kind',
+                                        'operator' => 'NOT EXISTS',
+                                ),
+                        )
+                );
+                                'taxonomy' => 'kind',
+                                'field'    => 'slug',
+                                'terms'    => $firehose,
+                                'operator' => 'IN',
+                        ),
+                );
+                // Posts without a kind are shown too. The upgrade routine gives them one,
+                // so the costly NOT EXISTS clause is only needed until it completes.
+                if ( Kind_Upgrade::is_pending() ) {
+                        $tax_query['relation'] = 'OR';
+                        $tax_query[]           = array(
+                                'taxonomy' => 'kind',
+                                'operator' => 'NOT EXISTS',
+                        );
+                }
+                $query->set( 'tax_query', $tax_query );
                 return $query;
+        }
 …
          * Allows for some pre-defined aliases
+         *
+         * @access public
+         *
+         * @param $query
+         * @since 3.4.19
+         *
+         * @access public
+         *
+         * @param WP_Query $query The query.
+         * @return WP_Query The query.
          */
         public static function kind_alias_filter( $query ) {
 …
         /**
          * Register our REST API endpoint for post kinds.
+         *
+         * @since 3.1.0
+         *
          * @access public
 …
                         'kind',
                         array(
                                 'get_callback'    => array( self::class, 'get_post_kind_slug' ),
+                                'get_callback'    => array( self::class, 'get_rest_post_kind' ),
                                 'update_callback' => array( self::class, 'set_rest_post_kind' ),
                                 'schema'          => array(
+                                        'kind' => __( 'Post Kind', 'indieweb-post-kinds' ),
+                                        'type' => 'string',
+                                        'description' => __( 'The post kind, or false if the post has none.', 'indieweb-post-kinds' ),
+                                        // False is only returned, never accepted: the enum allows kind slugs alone.
+                                        'type'        => array( 'string', 'boolean' ),
+                                        'enum'        => self::get_kind_list(),
+                                        'context'     => array( 'view', 'edit' ),
                                 ),
+                        )
 …
         /**
          * Filter template hierarchy to include our template files.
+         *
+         * @since 3.1.2
+         *
          * @access public
 …
          * Generate a sample permalink for a post.
+         *
+         * @since 3.2.2
+         *
          * @access public
+         *
 …
                 if ( is_numeric( $permalink[1] ) && $post_id === (int) $permalink[1] ) {
                         $excerpt = self::get_excerpt( $post );
                         $excerpt = sanitize_title( mb_strimwidth( wp_strip_all_tags( $excerpt ), 0, 40 ) ); // phpcs:ignore
+                        $excerpt = sanitize_title( mb_strimwidth( wp_strip_all_tags( $excerpt ), 0, 40 ) );
                         if ( ! empty( $excerpt ) ) {
                                 $permalink[1] = wp_unique_post_slug( $excerpt, $post_id, $post->post_status, $post->post_type, $post->post_parent );
 …
          * Generate a post title.
+         *
+         * @access public
+         *
+         * @param int!WP_Post    $post Post ID or Post Object.
+         * @return string
+         * @since 3.3.3
+         *
+         * @access public
+         *
+         * @param int|WP_Post $post   Post ID or post object.
+         * @param int         $length Optional. Maximum length of the title. Default 40.
+         * @return string|null The title, or null if the post does not exist.
          */
         public static function generate_title( $post, $length = 40 ) {
 …
                         $kind_post = new Kind_Post( $post );
                         $cite      = $kind_post->get_cite();
+                        if ( Parse_This_MF2::is_microformat( $cite ) ) {
+                        // Citations are stored as a list; use the first.
+                        if ( wp_is_numeric_array( $cite ) && 1 === count( $cite ) ) {
+                                $cite = $cite[0];
+                        }
+                        if ( class_exists( '\\ParseThis\\MF2_Utils' ) && \ParseThis\MF2_Utils::is_microformat( $cite ) ) {
                                 if ( array_key_exists( 'name', $cite['properties'] ) ) {
                                         $excerpt = $cite['properties']['name'];
 …
+                        }
+                }
                 return mb_strimwidth( $excerpt, 0, $length, '...' ); // phpcs:ignore
+                return mb_strimwidth( $excerpt, 0, $length, '...' );
+        }
 …
          * Filter the post title. Add a symbol at the end if generated title.
+         *
+         * @access public
+         *
+         * @param string $title   Current post title
+         * @param int    $post_id Post ID
+         * @since 3.0.9
+         *
+         * @access public
+         *
+         * @param string $title   Current post title.
+         * @param int    $post_id Post ID.
          * @return string
          */
 …
                                 $title = sprintf( '[%1$s] %2$s', $post_kind, self::generate_title( $post_id, 60 ) );
+                        }
+                } elseif ( empty( $title ) && is_comment_feed() ) {
+                        // Comment feed items read "Comment on <title> by <author>"; name untitled posts.
+                        $title = self::generate_title( $post_id, 60 );
+                }
                 return $title;
 …
          * Filter the single post title.
+         *
+         * @access public
+         *
+         * @param string $title   Current post title
+         * @param WP_Post    $post Post object
+         * @since 3.3.3
+         *
+         * @access public
+         *
+         * @param string  $title Current post title.
+         * @param WP_Post $post  Post object.
          * @return string
          */
 …
          * Filter the post excerpt.
+         *
+         * @since 3.2.0
+         *
          * @access public
+         *
 …
          * Set our post object terms.
+         *
+         * @since 3.0.8
+         *
          * @access public
+         *
 …
          * @param array  $terms      Array of object terms.
          * @param array  $tt_ids     Array of term taxonomy IDs.
          * @param string $taxonomy   Taxonomy slug
+         * @param string $taxonomy   Taxonomy slug.
          * @param bool   $append     If terms should be appended or overwrite.
          * @param array  $old_tt_ids Array of original trem taxonomy IDs.
 …
                         $new_term = $new_term instanceof WP_Term ? $new_term->slug : '';
                         if ( $old_term !== $new_term ) {
+                                // Trigger a hook on a changed kind identifying old and new so actions can be performed
+                                /**
+                                 * Fires when a post's kind changes.
+                                 *
+                                 * @since 3.0.8
+                                 *
+                                 * @param int    $object_id Post ID.
+                                 * @param string $old_term  Slug of the previous kind, or an empty string if there was none.
+                                 * @param string $new_term  Slug of the new kind, or an empty string if the kind was removed.
+                                 */
                                 do_action( 'change_kind', $object_id, $old_term, $new_term );
+                        }
 …
         /**
          * To Be Run on Plugin Activation.
+         */
+        /**
+         * Registers the built-in kinds, once.
+         *
+         * Called from init() and on activation. A plugin is activated after
+         * plugins_loaded and init have run for the request, so neither the kinds
+         * nor the register_post_kind() function (kind-functions.php) would
+         * otherwise be loaded when the kind terms are created.
+         *
+         * @since 4.0.0
+         */
+        public static function load_kinds() {
+                if ( self::$builtins_loaded ) {
+                        return;
+                }
+                self::$builtins_loaded = true;
+                if ( ! function_exists( 'register_post_kind' ) ) {
+                        require_once plugin_dir_path( __FILE__ ) . 'kind-functions.php';
+                }
+                require plugin_dir_path( __FILE__ ) . 'register-kinds.php';
+        }
+        /**
+         * Creates the kind terms on activation.
+         *
+         * Stops with an error if the IndieWeb Taxonomy plugin, which Post Kinds
+         * replaces, is active.
+         *
+         * @since 2.0.2
          */
         public static function activate_kinds() {
                 if ( function_exists( 'iwt_plugin_notice' ) ) {
+                        deactivate_plugins( plugin_basename( __FILE__ ) );
+                        wp_die( 'You have Indieweb Taxonomy activated. Post Kinds replaces this plugin. Please disable Taxonomy before activating' );
+                }
+                        deactivate_plugins( plugin_basename( dirname( __DIR__ ) . '/indieweb-post-kinds.php' ) );
+                        wp_die( esc_html__( 'Post Kinds replaces the IndieWeb Taxonomy plugin. Deactivate IndieWeb Taxonomy, then activate Post Kinds.', 'indieweb-post-kinds' ) );
+                }
+                self::load_kinds();
                 self::register();
                 self::kind_defaultterms();
 …
+        }
+        /**
+         * Returns the rewrite regex for the pagination part of a URL.
+         *
+         * @since 3.5.0
+         *
+         * @return string The regex, such as 'page/?([0-9]{1,})'.
+         */
         public static function get_pagination_regex() {
                 global $wp_rewrite;
 …
+        }
+        /**
+         * Returns the rewrite regex for the feed part of a URL.
+         *
+         * @since 3.5.0
+         *
+         * @param bool $with_base Optional. Whether to start with the feed base ('feed/'). Default true.
+         * @return string The regex, such as 'feed/(feed|rdf|rss|rss2|atom)'.
+         */
         public static function get_feed_regex( $with_base = true ) {
                 global $wp_rewrite;
                 // Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
+                // Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?.
                 $feedregex2 = '';
                 foreach ( (array) $wp_rewrite->feeds as $feed_name ) {
 …
+        }
+        /**
+         * Joins regex parts into a rewrite rule pattern.
+         *
+         * @since 3.5.0
+         *
+         * @param string[] $elements Parts of the pattern, in order.
+         * @return string The parts joined by slashes and ending in '?$', or an empty string if there are none.
+         */
         public static function generate_permastruct( $elements ) {
                 if ( empty( $elements ) || ! is_array( $elements ) ) {
 …
         /**
+         * Returns the start of kind archive URLs, as in /kind/like/.
+         *
+         * Set as the Kind base on Settings > Permalinks.
+         *
+         * @since 4.0.0
+         *
+         * @return string The base. Default 'kind'.
+         */
+        public static function get_kind_base() {
+                $base = get_option( 'kind_base', '' );
+                $base = is_string( $base ) && '' !== $base ? $base : 'kind';
+                /**
+                 * Filters the start of kind archive URLs, as in /kind/like/.
+                 *
+                 * The Kind base on Settings > Permalinks sets it. Flush rewrite rules after
+                 * changing this.
+                 *
+                 * @since 4.0.0
+                 *
+                 * @param string $base The base. Default the Kind base setting, or 'kind'.
+                 */
+                return (string) apply_filters( 'kind_base_slug', $base );
+        }
+        /**
          * Register the custom taxonomy for kinds.
+         *
+         * @since 2.0.2
          */
         public static function register() {
 …
                         'add_or_remove_items'        => _x( 'Add or remove kinds', 'add or remove items', 'indieweb-post-kinds' ),
                         'choose_from_most_used'      => _x( 'Choose from the most used kinds', 'choose most used', 'indieweb-post-kinds' ),
                         'not found'                  => _x( 'No kinds found', 'no kinds found', 'indieweb-post-kinds' ),
+                        'not_found'                  => _x( 'No kinds found', 'no kinds found', 'indieweb-post-kinds' ),
                         'no_terms'                   => _x( 'No kinds', 'no kinds', 'indieweb-post-kinds' ),
                         'back_to_items'              => __( 'Back to Kinds', 'indieweb-post-kinds' ),
 …
                         'item_link_description'      => __( 'A link to a kind', 'indieweb-post-kinds' ),
                 );
+                // The slug is used as the name too: core finds the default term by name, and a translated name would not match.
+                $default_kind = get_option( 'kind_default', 'note' );
                 $args = array(
 …
                         'show_admin_column'  => true,
                         'meta_box_cb'        => array( self::class, 'select_metabox' ),
                         'rewrite'            => true,
+                        'rewrite'            => array( 'slug' => self::get_kind_base() ),
                         'query_var'          => true,
                         'default_term'       => array(
                                 'name' => __( 'Article', 'indieweb-post-kinds' ),
                                 'slug' => 'article',
+                                'name' => $default_kind,
+                                'slug' => $default_kind,
                         ),
                 );
                 register_taxonomy( 'kind', array( 'post' ), $args );
+                add_permastruct( 'kind_date', 'kind/%kind%/%year%/%monthnum%/' );
+                add_permastruct( 'kind_date', self::get_kind_base() . '/%kind%/%year%/%monthnum%/' );
+                /**
+                 * Filters the taxonomies that get kind archive rewrite rules.
+                 *
+                 * Each taxonomy gets rules for /kind/{kind}/{taxonomy}/{term}/, where kind is the Kind base. Rewrite rules
+                 * are flushed when the plugin is activated or updated; flush them yourself
+                 * (Settings > Permalinks > Save) after changing this.
+                 *
+                 * @since 3.4.15
+                 *
+                 * @param string[] $taxonomies Taxonomy names. Default 'post_tag', 'category' and 'series'.
+                 */
                 $kind_rewrite_taxonomies = apply_filters( 'kind_rewrite_taxonomies', array( 'post_tag', 'category', 'series' ) );
                 // For each kind, support filtering by other taxonomies.
                 foreach ( $kind_rewrite_taxonomies as $taxonomy ) {
+                        add_permastruct( 'kind_' . $taxonomy, 'kind/%kind%/' . $taxonomy . '/%' . $taxonomy . '%' );
+                }
+                        add_permastruct( 'kind_' . $taxonomy, self::get_kind_base() . '/%kind%/' . $taxonomy . '/%' . $taxonomy . '%' );
+                }
+                /**
+                 * Filters the URL slug for archives that exclude kinds, as in /exclude/kind/{kinds}/.
+                 *
+                 * Flush rewrite rules after changing this.
+                 *
+                 * @since 3.4.15
+                 *
+                 * @param string $slug Slug. Default 'exclude'.
+                 */
                 $kind_exclude_slug = apply_filters( 'kind_exclude_slug', 'exclude' );
 …
                 add_permastruct( 'kind_excludes', $kind_exclude_slug . '/%kind_exclude%/%kind_exclude_terms%' );
+                /**
+                 * Filters the URL slug for the archive of posts with photos.
+                 *
+                 * Flush rewrite rules after changing this.
+                 *
+                 * @since 3.4.15
+                 *
+                 * @param string $slug Slug. Default 'photos'.
+                 */
                 $kind_photos_slug   = apply_filters( 'kind_photos_slug', 'photos' );
+                /**
+                 * Filters the URL slug for the firehose feed, which includes every kind.
+                 *
+                 * Flush rewrite rules after changing this.
+                 *
+                 * @since 3.6.0
+                 *
+                 * @param string $slug Slug. Default 'firehose'.
+                 */
                 $kind_firehose_slug = apply_filters( 'kind_firehose_slug', 'firehose' );
                 $year_regex       = '([0-9]{4})';
                 $month_regex      = '(0-9]{2})';
+                $month_regex      = '([0-9]{2})';
                 $day_regex        = '([0-9]{1,})';
                 $pagination_regex = self::get_pagination_regex();
                 $feed_regex       = self::get_feed_regex();
                 $feed_regex2      = self::get_feed_regex( false );
+                $tax_regex        = '([^/]*)';
+                $term_regex       = '([^/]*)';
+                // Year Archives for Photos
+                // Year Archives for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $year_regex, $pagination_regex ) ),
 …
                 );
                 // Year and Month Archive for Photos
+                // Year and Month Archive for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $year_regex, $month_regex, $pagination_regex ) ),
 …
                 );
                 // Year and Month And Day Archive for Photos
+                // Year and Month And Day Archive for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $year_regex, $month_regex, $day_regex, $pagination_regex ) ),
 …
                 );
                 // Month And Day Archive for Photos
+                // Month And Day Archive for Photos.
                 add_rewrite_rule(
                         self::generate_permastruct( array( $kind_photos_slug, $month_regex, $day_regex, $pagination_regex ) ),
 …
         /**
+         * Points the kind taxonomy's default term at the Default Kind setting.
+         *
+         * Core sets the default term when the taxonomy is registered; this applies a
+         * change to the setting within the same request.
+         *
+         * @since 4.0.0
+         */
+        public static function sync_default_term() {
+                $term = get_term_by( 'slug', get_option( 'kind_default', 'note' ), 'kind' );
+                if ( $term ) {
+                        update_option( 'default_term_kind', $term->term_id );
+                }
+        }
+        /**
          * Sets up Default Terms for Kind Taxonomy.
+         *
+         * Creates a term for each registered kind that has none, and updates the
+         * name and description of terms that differ from the kind's, for example
+         * after a translation changes. Terms that already match are not written.
+         *
+         * @since 2.0.2
          */
         public static function kind_defaultterms() {
+                $terms = self::get_kind_list();
+                foreach ( $terms as $term ) {
+                        if ( ! get_term_by( 'slug', $term, 'kind' ) ) {
+                $existing = get_terms(
+                        array(
+                                'taxonomy'   => 'kind',
+                                'hide_empty' => false,
+                        )
+                );
+                $existing = is_wp_error( $existing ) ? array() : array_column( $existing, null, 'slug' );
+                foreach ( self::get_kind_list() as $term ) {
+                        if ( ! isset( $existing[ $term ] ) ) {
                                 self::create_post_kind( $term );
+                        } else {
+                                continue;
+                        }
+                        $kind = self::get_post_kind_info( $term );
+                        if ( $kind && ( $existing[ $term ]->name !== $kind->singular_name || $existing[ $term ]->description !== $kind->description ) ) {
                                 self::update_post_kind( $term );
+                        }
 …
          * Update our post kind if the term already exists.
+         *
+         * @since 3.1.0
+         *
          * @access private
+         *
          * @param $term
+         * @param string $term Post kind slug.
          */
         private static function update_post_kind( $term ) {
 …
          * Create our post kind term.
+         *
+         * @since 3.1.0
+         *
          * @access private
+         *
          * @param $term
+         * @param string $term Post kind slug.
          */
         private static function create_post_kind( $term ) {
                 $kind = self::get_post_kind_info( $term );
                 if ( $kind ) {
+                        // The first argument is the term name; wp_insert_term() has no 'name' argument.
                         wp_insert_term(
                                 $kind->slug,
+                                $kind->singular_name,
                                 'kind',
                                 array(
-                                        'name'        => $kind->singular_name,
                                         'description' => $kind->description,
                                         'slug'        => $term,
 …
          * Filter our post kind permalink.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
                         return $permalink; }
                 // Get post
+                // Get post.
                 $post = get_post( $post_id );
                 if ( ! $post ) {
                         return $permalink; }
                 // Get taxonomy terms
                 $terms = wp_get_object_terms( $post->ID, 'kind' );
                 if ( ! is_wp_error( $terms ) && ! empty( $terms ) && is_object( $terms[0] ) ) {
+                // Get taxonomy terms; get_the_terms() uses the term cache the main query primes.
+                $terms = get_the_terms( $post, 'kind' );
+                if ( is_array( $terms ) && ! empty( $terms ) && is_object( $terms[0] ) ) {
                         $taxonomy_slug = $terms[0]->slug;
                 } else {
 …
         /**
          * Fetch the current post kind terms from the current query.
+         *
+         * @since 3.0.3
+         *
          * @access public
 …
          * Prefix Introduced in WP5.5
+         *
+         * @since 3.5.0
+         *
          * @access public
+         *
 …
          * Original Title and Prefix introduced in WP5.5.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
          */
         public static function kind_archive_title( $title, $original_title = null, $prefix = null ) {
+                $return     = array();
+                $wp_version = get_bloginfo( 'version' );
+                $return = array();
+                /**
+                 * This filter is documented in wp-includes/general-template.php
+                 */
                 $prefix = apply_filters( 'get_the_archive_title_prefix', $prefix );
 …
         /**
          * Filters the post kind archive description.
+         *
+         * @since 2.5.2
+         *
          * @access public
 …
          * Sets Post Format for Post Kind.
+         *
+         * @param int     $post_id Post ID
+         * @param WP_Post $post Post Object
+         * @param boolean $update,
+         * @since 2.5.0
+         *
+         * @param int     $post_id Post ID.
+         * @param WP_Post $post    Post object.
+         * @param bool    $update  Whether this is an existing post being updated.
          */
         public static function post_formats( $post_id, $post, $update ) {
 …
          * Fiters the `<title>` tag parts for the post kind.
+         *
+         * @since 3.1.3
+         *
          * @access public
+         *
 …
         public static function document_title_parts( $parts ) {
                 if ( is_tax() || is_category() || is_tag() ) {
+                        $terms = self::get_terms_from_query();
+                        $terms  = self::get_terms_from_query();
+                        $return = array();
                         foreach ( $terms as $term ) {
                                 if ( 'kind' === $term->taxonomy ) {
 …
          * Callback for the taxonomy meta box for our post kinds taxonomy.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
          */
         public static function select_metabox( $post ) {
+                $include = get_option( 'kind_termslist' );
+                $include = array_merge( $include, array( 'note', 'reply', 'article' ) );
+                // If Simple Location is Enabled, include the check-in type
+                // Filter Kinds
+                $include = array_merge( Kind_Config::get_termslist(), array( 'note', 'reply', 'article' ) );
+                /**
+                 * Filters the kinds offered in the editor and listed by the Kind Menu widget.
+                 *
+                 * By default these are the kinds selected in the settings, plus note, reply and article.
+                 *
+                 * @since 2.0.2
+                 *
+                 * @param string[] $include Kind slugs.
+                 */
                 $include = array_unique( apply_filters( 'kind_include', $include ) );
                 // Note cannot be removed or disabled without hacking the code
+                // Note cannot be removed or disabled without hacking the code.
                 if ( ! in_array( 'note', $include, true ) ) {
                         $include[] = 'note';
+                }
+                if ( isset( $_GET['kind'] ) ) {
+                        $default = get_term_by( 'slug', $_GET['kind'], 'kind' );
+                // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Preselects the kind on the new post screen; nothing is saved.
+                $requested = ( isset( $_GET['kind'] ) && is_string( $_GET['kind'] ) ) ? sanitize_key( wp_unslash( $_GET['kind'] ) ) : '';
+                if ( '' !== $requested ) {
+                        $default = get_term_by( 'slug', $requested, 'kind' );
                 } elseif ( 'publish' === get_post_status( $post ) ) {
                         // On existing published posts without a kind fall back on article which most closely mimics the behavior of an unclassified post
+                        // On existing published posts without a kind fall back on article which most closely mimics the behavior of an unclassified post.
                         $default = get_term_by( 'slug', 'article', 'kind' );
                 } else {
 …
          * Register our post kinds.
+         *
+         * @since 3.1.0
+         *
          * @access public
+         *
          * @param string $slug Post kind slug.
+         * @param array  $args Post kind arguments {
+                 * @param string $singular_name  Name for one instance of the kind.
+                 * @param string $name   General name for the kind plural.
+                 * @param string $verb The string for the verb or action (liked this).
+                 * @param string $property Microformats 2 property, superseded by properties
+                 * @param array $properties Properties is an array outlining the fields for the particular kind. See Kind Fields class for more details
+                 * @param string $format Post Format that maps to this.
+                 * @param string $description Description of the Kind
+                 * @param url $description-url Link to more information
+                 * @param string $title Should this kind have an explicit title.
+                 * @param boolean $show Show in Settings.
+         * @param array  $args {
+         *     Post kind arguments. Arguments that are not listed are kept and can
+         *     be read as properties of the Post_Kind.
+         *
+         *     @type string $singular_name   Name for one instance of the kind. Default the slug.
+         *     @type string $name            General name for the kind, plural. Default the slug.
+         *     @type string $verb            The verb or action, such as 'Liked'. Default the slug.
+         *     @type string $property        Microformats 2 property, such as 'like-of'. Default empty.
+         *     @type array  $properties      The fields for the kind. See Kind_Fields.
+         *     @type string $format          Post format that maps to this kind. Default 'standard'.
+         *     @type string $icon            Icon name. Default the slug.
+         *     @type string $description     Description of the kind.
+         *     @type string $description_url Link to more information.
+         *     @type string $shortlink       Shortlink code for the kind.
+         *     @type bool   $title           Whether the kind should have an explicit title.
+         *     @type bool   $show            Whether to show the kind in Settings. Default false.
          * }
          * @return bool
+         * @return bool True if the kind was registered, false if it already exists.
          */
         public static function register_post_kind( $slug, $args ) {
                 $kind = new Post_Kind( $slug, $args );
                 // Do not allow reregistering existing kinds
+                // Do not allow reregistering existing kinds.
                 if ( isset( self::$kinds[ $slug ] ) ) {
                         return false;
 …
         /**
          * Retrieve info on a provided post kind.
+         *
+         * @since 3.1.0
+         *
          * @access public
 …
+        }
-        // Enable a hidden post kind
         /**
          * Enables a hidden post kind.
+         *
+         * @since 3.1.0
+         *
          * @access public
 …
          * Retrieve list of registered post kinds.
+         *
+         * @since 3.1.0
+         *
          * @access public
          * @return array
 …
          * Returns all translated strings.
+         *
+         * @since 2.5.2
+         *
          * @param string $kind     Post Kind to return.
          * @param string $property The individual property
+         * @param string $property The individual property.
          * @return string|array Return kind-property. If either is set to all, return all.
          */
 …
                         return $k;
+                }
                 if ( ! array_key_exists( $property, get_object_vars( $k ) ) ) {
+                if ( ! $k->has( $property ) ) {
                         return false;
+                }
 …
         /**
          * Add available webmention links.
+         *
+         * @since 2.3.5
+         *
          * @access public
 …
         /**
          * Add available enclosure links.
+         *
+         * @since 3.0.4
+         *
          * @access public
 …
          * Generate a dropdown of our post kinds for the post list table view.
+         *
+         * @since 2.5.2
+         *
          * @access public
          * @param string $post_type Current post type being listed.
 …
                 if ( 'post' === $post_type ) {
                         $taxonomy      = 'kind';
+                        $selected      = isset( $_GET[ $taxonomy ] ) ? $_GET[ $taxonomy ] : '';
+                        // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- A list-table filter; nothing is saved.
+                        $selected      = ( isset( $_GET[ $taxonomy ] ) && is_string( $_GET[ $taxonomy ] ) ) ? sanitize_key( wp_unslash( $_GET[ $taxonomy ] ) ) : '';
                         $kind_taxonomy = get_taxonomy( $taxonomy );
                         wp_dropdown_categories(
 …
          * Set our post kind terms upon publish transition status.
+         *
+         * @access public
+         * @param int          $post_id Current post ID
+         * @since 2.0.2
+         *
+         * @access public
+         *
+         * @param int          $post_id Current post ID.
          * @param WP_Post|null $post    Current post object.
          */
 …
                         return;
+                }
                 $count = wp_get_post_terms( $post_id, 'kind' );
                 if ( is_countable( $count ) && $count <= 0 ) {
+                $terms = wp_get_post_terms( $post_id, 'kind' );
+                if ( ! is_wp_error( $terms ) && empty( $terms ) ) {
                         set_post_kind( $post_id, get_option( 'kind_default' ) );
+                }
 …
         /**
          * Maybe set our post kind terms upon post status transition.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
          * Filter the classes on a post's markup.
+         *
+         * @since 2.0.2
+         *
          * @access public
+         *
 …
          * Returns a pretty, translated version of a post kind slug.
+         *
+         * @since 2.1.1
+         *
          * @param string $slug A post format slug.
          * @return string The translated post format name.
 …
         public static function get_post_kind_string( $slug ) {
                 $string = self::get_kind_info( $slug, 'singular_name' );
                 return $slug ? $slug : '';
+                return $string ? $string : '';
+        }
         /**
          * Returns a link to a post kind index.
+         *
+         * @since 2.1.1
+         *
          * @param string $kind The post kind slug.
 …
          * Retrieve a total count statistic for a given post kind.
+         *
+         * @since 3.1.3
+         *
          * @access public
+         *
 …
         /**
          * Returns the post kind slug for the current post.
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
          * Returns the post kind name for the current post.
+         *
+         * @access public
+         *
+         * @param WP_Post|int|null $post
+         * @return array|bool|string
+         * @since 2.1.1
+         *
+         * @access public
+         *
+         * @param WP_Post|int|null $post Optional. Post ID or post object. Default the current post.
+         * @return string|false The kind's translated name, or false if the post has no kind.
          */
         public static function get_post_kind( $post = null ) {
 …
          * Check if a post has any of the given kinds, or any kind.
+         *
+         * @since 2.1.1
+         *
          * @uses has_term()
+         *
 …
          * Assign a kind to a post.
+         *
+         * @since 2.1.1
+         *
          * @param int|WP_Post $post The post for which to assign a kind.
+         * @param string     $kind A kind to assign. Using an empty string or array will default to article.
+         * @return mixed WP_Error on error. Array of affected term IDs on success.
+         * @param string      $kind Optional. A registered kind's slug. Default 'article'.
+         * @return array|false|WP_Error Array of affected term IDs on success. WP_Error if the post
+         *                              or the kind is not valid, or false on failure.
          */
         public static function set_post_kind( $post, $kind = 'article' ) {
 …
         /**
+         * Update callback for REST API endpoint.
+         *
+         * @access public
+         *
+         * @param string $kind Post kind being processed.
+         * @param $post_array
+         */
+        public static function set_rest_post_kind( $kind, $post_array ) {
+                if ( isset( $post_array['id'] ) ) {
+                        self::set_post_kind( $post_array['id'], $kind );
+                }
+         * Update callback for the kind REST field.
+         *
+         * @since 3.1.0
+         *
+         * @access public
+         *
+         * @param string        $kind Post kind to set.
+         * @param WP_Post|array $post Post being updated.
+         * @return true|WP_Error True on success, WP_Error if the kind could not be set.
+         */
+        public static function set_rest_post_kind( $kind, $post ) {
+                // WordPress passes the post being updated as a WP_Post object.
+                $post_id = $post instanceof WP_Post ? $post->ID : ( is_array( $post ) && isset( $post['id'] ) ? (int) $post['id'] : 0 );
+                if ( ! $post_id ) {
+                        return new WP_Error( 'rest_invalid_post', __( 'Invalid post.', 'indieweb-post-kinds' ), array( 'status' => 400 ) );
+                }
+                if ( ! current_user_can( 'edit_post', $post_id ) ) {
+                        return new WP_Error( 'rest_cannot_edit', __( 'Sorry, you are not allowed to set the kind of this post.', 'indieweb-post-kinds' ), array( 'status' => rest_authorization_required_code() ) );
+                }
+                $result = self::set_post_kind( $post_id, $kind );
+                if ( is_wp_error( $result ) ) {
+                        $result->add_data( array( 'status' => 400 ) );
+                        return $result;
+                }
+                return true;
+        }
+        /**
+         * Get callback for the kind REST field.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param array $post Prepared post data, as an array with an id key.
+         * @return string|false The post's kind slug, or false if it has none.
+         */
+        public static function get_rest_post_kind( $post ) {
+                // The prepared post is an array; passing it to get_post() would cast it to 1.
+                $post_id = is_array( $post ) && isset( $post['id'] ) ? (int) $post['id'] : 0;
+                return $post_id ? self::get_post_kind_slug( $post_id ) : false;
+        }
 …
          * Whether or not to display the before kind content.
+         *
+         * @since 2.6.6
+         *
          * @access public
          * @return mixed|void
          */
         public static function before_kind() {
+                /**
+                 * Filters whether to show the kind's icon or name before the response.
+                 *
+                 * Return false to hide it everywhere and remove the display option from the settings page.
+                 *
+                 * @since 2.6.6
+                 *
+                 * @param bool $display Whether to show it. Default true.
+                 */
                 return apply_filters( 'kind_icon_display', true );
+        }
 …
          * Display before Kind - either icon text or no display.
+         *
+         * @since 2.6.6
+         *
          * @param string $kind    The slug for the kind of the current post.
          * @param string $display Override display;
+         * @param string $display Override display.
          * @return string Marked up kind information.
          */
 …
                         $display = get_option( 'kind_display' );
+                }
                 $text = '<span class="kind-display-text">' . self::get_kind_info( $kind, 'verb' ) . '</span> ';
+                $text = '<span class="kind-display-text">' . esc_html( self::get_kind_info( $kind, 'verb' ) ) . '</span> ';
                 $icon = self::get_icon( $kind );
                 // Hide Icon in Feed View
+                // Hide Icon in Feed View.
                 if ( 'text' !== $display && is_feed() ) {
                         $icon = '';
 …
          * Retrieve the icon SVG for a provided post kind.
+         *
+         * @since 2.4.0
+         *
          * @access public
+         *
 …
          */
         public static function get_icon( $kind, $echo = false ) {
+                // Icons are shown per post, per widget item and per settings row; read each file once.
+                static $svgs = array();
+                $kind        = sanitize_key( $kind );
+                if ( ! isset( $svgs[ $kind ] ) ) {
+                        $svg           = sprintf( '%1$ssvgs/%2$s.svg', plugin_dir_path( __DIR__ ), $kind );
+                        $svgs[ $kind ] = file_exists( $svg ) ? (string) file_get_contents( $svg ) : '';
+                        // A default size for places without the plugin's stylesheet, such as feed readers. CSS overrides it.
+                        $svgs[ $kind ] = preg_replace( '/^<svg\b/', '<svg width="1em" height="1em"', $svgs[ $kind ] );
+                }
+                if ( '' === $svgs[ $kind ] ) {
+                        return '';
+                }
                 $name       = self::get_kind_info( $kind, 'singular_name' );
+                $svg        = sprintf( '%1$ssvgs/%2$s.svg', plugin_dir_path( __DIR__ ), $kind );
+                $attributes = apply_filters( 'post_kinds_icon_attributes', 'style="display: inline-block; max-height: 1rem; margin-right: 0.5rem"' );
+                if ( file_exists( $svg ) ) {
+                        $return = sprintf( '<span class="svg-icon svg-%1$s" aria-label="%2$s" title="%2$s" %3$s><span aria-hidden="true">%4$s</span></span>', esc_attr( $kind ), esc_attr( $name ), $attributes, file_get_contents( $svg ) );
+                } else {
+                        return '';
+                }
+                /**
+                 * Filters the HTML attributes added to the span that wraps a kind icon.
+                 *
+                 * The string is output as-is, so it must be safe, escaped markup.
+                 *
+                 * @since 3.5.8
+                 * @since 4.0.0 The default is empty; the stylesheet sizes the icon.
+                 *
+                 * @param string $attributes HTML attributes. Default empty.
+                 */
+                $attributes = (string) apply_filters( 'post_kinds_icon_attributes', '' );
+                $attributes = '' === $attributes ? '' : ' ' . $attributes;
+                $return     = sprintf( '<span class="svg-icon svg-%1$s" aria-label="%2$s" title="%2$s"%3$s><span aria-hidden="true">%4$s</span></span>', esc_attr( $kind ), esc_attr( $name ), $attributes, $svgs[ $kind ] );
                 if ( $echo ) {
                         echo $return; // phpcs:ignore
+                        echo $return; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The plugin's own SVG icon; the kind and name are escaped, and the attributes come from the post_kinds_icon_attributes filter.
+                }
                 return $return;

indieweb-post-kinds/trunk/includes/class-kind-view.php

-              r3001401
+              r3738687
 <?php
 /**
  * Post Kind View Class
+ * Kind_View class.
+ *
+ * Includes Helper Functions to Set Up Display Behavior and Allows Calling of View Templates
+ * @package Post_Kinds
+ * @since   2.0.2
  */
+// The Kind_View class sets up the kind display behavior for kinds
+defined( 'ABSPATH' ) || exit;
+/**
+ * Sets up how kinds are displayed, and locates and renders the view templates.
+ *
+ * @since 2.0.2
+ */
 class Kind_View {
+        /**
+         * Adds the hooks that display kind markup.
+         *
+         * @since 2.0.2
+         */
         public static function init() {
+                /**
+                 * Filters whether to add response markup to post content, excerpts and feeds automatically.
+                 *
+                 * Return false to place it in the theme instead, for example with
+                 * Kind_View::get_display().
+                 *
+                 * @since 3.6.0
+                 *
+                 * @param bool $display Whether to add it. Default true.
+                 */
                 if ( apply_filters( 'kind_content_display', true ) ) {
                         add_filter( 'the_content', array( static::class, 'content_response' ), 9 );
 …
         /**
          * Filters the attachment image attributes for image post kinds.
+         *
+         * @since 2.6.1
+         *
          * @access public
 …
+        }
+        /*
+         * Function will locate the correct template and return it.
+         *
+         * @param string $slug Post Kind Slug.
+         * @param string $name Post Kind Term Name.
+         * @return string|null File if located or null if unable to find.
+        /**
+         * Finds the view file for a kind, in the theme or the plugin.
+         *
+         * @since 3.4.0
+         *
+         * @param string $slug View slug, such as 'kind'.
+         * @param string $name Kind slug, such as 'like'.
+         * @return string|null Path of the view file, an empty string if no kind is given,
+         *                     or null if no view file exists.
          */
         public static function locate_view( $slug, $name ) {
 …
                         return '';
+                }
+                $templates[] = "{$slug}-{$name}.php";
+                $templates[] = "{$slug}.php";
+                $templates   = array( "{$slug}-{$name}.php", "{$slug}.php" );
+                /**
+                 * Filters the folders searched for view files before the plugin's own views folder.
+                 *
+                 * @since 3.3.0
+                 *
+                 * @param string[] $paths Folder paths, each with a trailing slash. Default the theme's kind_views folder.
+                 */
                 $look        = apply_filters( 'kind_view_paths', array( get_theme_file_path( 'kind_views/' ) ) );
                 $look[]      = plugin_dir_path( __DIR__ ) . 'views/';
 …
          * Function will return the output.
+         *
+         * @since 2.4.0
+         *
          * @access public
+         *
          * @param string $slug Post kind slug.
          * @param string $name Post kind term name.
          * @param array $args Optional Arguments
+         * @param array  $args Optional. Arguments for the view. 'post_id' is the post's ID.
          * @return string
          */
 …
+                }
+                $author = self::get_hcard( $cite['author'] );
+                // Every author's h-card, as a list such as "Ann, Bob and Cat".
+                $author = array_filter( array_map( array( static::class, 'get_hcard' ), $cite['authors'] ) );
+                $author = empty( $author ) ? false : wp_sprintf( '%l', $author );
                 $url   = $cite['url'];
 …
          * Return the post kind display.
+         *
+         * @since 2.1.1
+         *
          * @access public
+         *
 …
                 if ( 'post' === get_post_type( $post_id ) ) {
                         $kind    = get_post_kind_slug( $post_id );
+                        $content = self::get_view_part( 'kind', $kind );
+                        $content = self::get_view_part( 'kind', $kind, array( 'post_id' => $post_id ) );
+                        /**
+                         * Filters the response markup for a post.
+                         *
+                         * @since 2.0.2
+                         *
+                         * @param string $content Rendered view markup.
+                         * @param int    $post_id Post ID.
+                         */
                         return apply_filters( 'kind_response_display', $content, $post_id );
+                }
 …
          * Echo the output of get_display.
+         *
+         * @since 2.1.1
+         *
          * @access public
          * @param int|null $post_id Post ID.
          */
         public static function display( $post_id = null ) {
                 echo self::get_display( $post_id ); // phpcs:ignore
+                echo self::get_display( $post_id ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The view escapes its output as it is built.
+        }
         /**
          * Output the post kind content to the post content.
+         *
+         * @since 2.0.2
+         *
          * @access public
 …
+                }
                 global $wp_current_filter;
                 // Don't allow to be added to the_content more than once (prevent infinite loops)
+                // Don't allow to be added to the_content more than once (prevent infinite loops).
                 $done = false;
                 foreach ( $wp_current_filter as $filter ) {
 …
          * Output the post kind content to the feed item content.
+         *
+         * @since 3.0.5
+         *
          * @access public
+         *
 …
          * Output the post kind content to the content if the `jsonfeed` plugin is active.
+         *
+         * @since 3.0.5
+         *
          * @access public
+         *
 …
                 $kind_post = new Kind_Post( $post );
+                $kind      = $kind_post->get_kind();
+                $type      = Kind_Taxonomy::get_kind_info( $kind, 'property' );
+                $cite      = mf2_to_jf2( $kind_post->get_cite() );
+                $cite      = \ParseThis\mf2_to_jf2( $kind_post->get_cite() );
                 if ( is_string( $cite ) ) {
 …
          * Append the post kind display to excerpts.
+         *
+         * @since 2.3.3
+         *
          * @access public
+         *
 …
          * This function will remove the www.prefix if it is part of the URL.
+         *
+         * @since 2.3.7
+         *
          * @access public
+         *
 …
          * Converts an array of attributes and output them as a string.
+         *
+         * @since 2.1.1
+         *
          * @access public
+         *
 …
         /**
          * Converts a URL into a complete `<a>` link with link text.
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
                                 $atr = self::get_attributes( $atr );
+                }
                 $return = '<a ' . $atr . ' href="' . $url . '">' . $name . '</a>';
+                $return = '<a ' . $atr . ' href="' . esc_url( $url ) . '">' . esc_html( $name ) . '</a>';
                 return $return;
+        }
 …
          * Create formatted HTML output for a field.
+         *
+         * @access public
+         *
+         * @param string $field Content to put in the markup
+         * @since 2.2.0
+         *
+         * @access public
+         *
+         * @param string $field Content to put in the markup.
          * @param string $attr  Attributes to add to the tag markup.
          * @param string $type  HTML tag type to create. Default span.
 …
         public static function get_formatted( $field, $attr, $type = 'span' ) {
                 if ( ! isset( $field ) ) {
+                        return $string;
+                }
+                        return '';
+                }
+                $type   = tag_escape( $type );
                 $string = '<' . $type . $attr . '>' . $field . '</' . $type . '>';
                 return $string;
 …
         /**
          * Return post kind-wrapped oEmbed content for a provided URL.
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
                         'dailymotion.com',
                         'flickr.com',
                         'imgur.com',
+                        'imgur.com', // phpcs:ignore PluginCheck.CodeAnalysis.Offloading.OffloadedContent -- A domain whose links are embedded with oEmbed, not a remote asset.
                         'issuu.com',
                         'kickstarter.com',
 …
                         'youtube.com',
                 );
+                /**
+                 * Filters the domains whose cited URLs are embedded with oEmbed.
+                 *
+                 * @since 3.3.6
+                 *
+                 * @param string[] $approvelist Domain names.
+                 */
                 $approvelist = apply_filters( 'post_kind_embed_approvelist', $approvelist );
                 if ( ! in_array( $host, $approvelist, true ) ) {
                         return '';
+                }
+                if ( isset( $GLOBALS['wp_embed'] ) ) {
+                        $embed = $GLOBALS['wp_embed']->autoembed( $url );
+                }
+                if ( ! isset( $GLOBALS['wp_embed'] ) ) {
+                        return '';
+                }
+                $embed = $GLOBALS['wp_embed']->autoembed( $url );
                 if ( 0 === strcmp( $embed, $url ) ) {
                         $embed = '';
                 } else {
+                        $embed = sprintf( '<div class="kind-embed">%1$s<a class="u-url" href="%2$s"></a></div>', $embed, $url );
+                        // The embed is the oEmbed markup WordPress generated.
+                        $embed = sprintf( '<div class="kind-embed">%1$s<a class="u-url" href="%2$s"></a></div>', $embed, esc_url( $url ) );
+                }
                         return $embed;
 …
         /**
          * Returns an array of domains with the post type terminologies
+         *
+         * @since 2.1.1
+         *
          * @access public
 …
                 $domain  = self::extract_domain_name( $url );
                 if ( array_key_exists( $domain, $strings ) ) {
+                        /**
+                         * Filters the phrase for what a known site's URL points to, such as 'a video' for YouTube.
+                         *
+                         * It runs only for the sites listed above; other URLs get "a post".
+                         *
+                         * @since 2.0.2
+                         *
+                         * @param string $string Translated phrase.
+                         */
                         return apply_filters( 'kind_post_type_string', $strings[ $domain ] );
                 } else {
 …
         /**
          * Retrieve/Generate the h-card.
+         *
+         * @since 2.1.1
+         *
          * @param mixed $author The author to generate Accepts an array or optionally other info.
 …
                 /**
+                 * Filter for alternate retrieval types
+                 *
+                 * This could be using WordPress's gravatar system, retrieval by pure URL, etc.
+                 *
+                 * @param string|boolean $author Defaults to false, but may return string.
+                 * @param mixed  $author Data on the author, type optional. Defaults to array.
+                 * @param array  $args        Arguments passed to get_hcard.
+                 * Filters the author data before it is turned into an h-card.
+                 *
+                 * Use it to look up author details another way, for example from a URL
+                 * or Gravatar.
+                 *
+                 * @since 2.3.0
+                 *
+                 * @param mixed $author Author data, usually an array with name, url and photo.
+                 * @param array $args   Arguments passed to Kind_View::get_hcard().
                  */
                 $author = apply_filters( 'get_hcard_data', $author, $args );
 …
                 /**
+                 * Filter for alternate presentation
+                 *
+                 * @param string|boolean $card Defaults to false, but may return string.
+                 * @param mixed  $author Data on the author, type optional. Defaults to array.
+                 * @param array  $args        Arguments passed to get_hcard.
+                 * Filters the h-card markup for an author.
+                 *
+                 * Return non-empty markup to replace the plugin's own h-card. The markup is
+                 * output as-is, so it must be escaped.
+                 *
+                 * @since 2.3.0
+                 *
+                 * @param string $card   H-card markup. Default empty, which uses the plugin's markup.
+                 * @param array  $author Author data, with name, url and photo.
+                 * @param array  $args   Arguments passed to Kind_View::get_hcard().
                  */
                 $card = apply_filters( 'get_hcard', '', $author, $args );
 …
                         return $card;
+                }
                 // Temporarily drop multi-data on display
                 if ( ! empty( $author['url'] ) && is_array( $author['url'] ) ) {
                         $author['url'] = $author['url'][0];
+                }
+                if ( is_array( $author['name'] ) ) {
                                 $author['name'] = $author['name'][0];
+                }
                 if ( empty( $author['name'] ) && ! empty( $author['url'] ) ) {
+                // One card is one author: use the first of any list. Kind_Post::normalize_authors() splits lists into cards.
+                foreach ( array( 'name', 'url', 'photo' ) as $key ) {
+                        $value          = isset( $author[ $key ] ) ? $author[ $key ] : '';
+                        $author[ $key ] = is_array( $value ) ? (string) reset( $value ) : (string) $value;
+                }
+                // Escape everything here: author data often comes from other sites.
+                $author['url']   = esc_url( $author['url'] );
+                $author['photo'] = esc_url( $author['photo'] );
+                if ( '' === trim( wp_strip_all_tags( $author['name'] ) ) && ! empty( $author['url'] ) ) {
                         $author['name'] = __( 'an author', 'indieweb-post-kinds' );
+                }
+                $author['name']  = esc_html( wp_strip_all_tags( $author['name'] ) );
+                $args['width']   = absint( $args['width'] );
+                $args['height']  = absint( $args['height'] );
                 // If no filter generated the card, generate the card.
 …
+                                }
                                 if ( empty( $author['url'] ) ) {
                                         return sprintf( '<img src="%1s" class="h-card u-photo p-author" alt="%2s" width=%3s height=%4s />', $author['photo'], $author['name'], $args['width'], $args['height'] );
+                                        return sprintf( '<img src="%1$s" class="h-card u-photo p-author" alt="%2$s" width="%3$d" height="%4$d" />', $author['photo'], $author['name'], $args['width'], $args['height'] );
                                 } else {
                                         return sprintf( '<a class="h-card p-author" href="%1s"><img class="u-photo" src="%2s" alt="%3s" width=%4s height=%5s /></a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'] );
+                                        return sprintf( '<a class="h-card p-author" href="%1$s"><img class="u-photo" src="%2$s" alt="%3$s" width="%4$d" height="%5$d" /></a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'] );
+                                }
                                 break;
                         case 'name':
                                 return sprintf( '<span class="h-card p-author">%1s</span>', $author['name'] );
+                                return sprintf( '<span class="h-card p-author">%1$s</span>', $author['name'] );
                         case 'both':
                                 if ( ! empty( $author['photo'] ) ) {
                                         if ( empty( $author['url'] ) ) {
                                                 return sprintf( '<span class="h-card p-author"><img src="%1s" class="u-photo" alt="%2s" width=%3s height=%4s />%5s</span>', $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
+                                                return sprintf( '<span class="h-card p-author"><img src="%1$s" class="u-photo" alt="%2$s" width="%3$d" height="%4$d" />%5$s</span>', $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
                                         } else {
                                                 return sprintf( '<a href="%1s" class="h-card p-author"><img class="u-photo" src="%2s" alt="%3s" width=%4s height=%5s />%6s</a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
+                                                return sprintf( '<a href="%1$s" class="h-card p-author"><img class="u-photo" src="%2$s" alt="%3$s" width="%4$d" height="%5$d" />%6$s</a>', $author['url'], $author['photo'], $author['name'], $args['width'], $args['height'], $author['name'] );
+                                        }
+                                } elseif ( ! empty( $author['url'] ) ) {
+                                        return sprintf( '<a href="%1$s" class="h-card p-author">%2$s</a>', $author['url'], $author['name'] );
                                 } else {
                                         return sprintf( '<span class="h-card p-author">%1s</span>', $author['name'] );
+                                        return sprintf( '<span class="h-card p-author">%1$s</span>', $author['name'] );
+                                }
                                 break;
 …
          * Retrieve a title for a given citation.
+         *
+         * @since 2.3.0
+         *
          * @access public
+         *
 …
                         return false;
+                }
+                if ( empty( $cite['url'] ) ) {
+                        if ( ! isset( $cite['name'] ) ) {
+                // FIXME: Temporary Fix for array functionality.
+                $url  = isset( $cite['url'] ) ? $cite['url'] : '';
+                $url  = esc_url( is_array( $url ) ? (string) reset( $url ) : (string) $url );
+                $name = isset( $cite['name'] ) ? $cite['name'] : null;
+                $name = is_array( $name ) ? (string) reset( $name ) : $name;
+                if ( empty( $url ) ) {
+                        if ( null === $name ) {
                                 return '';
+                        }
+                        return sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+                }
+                // FIXME: Temporary Fix for array functionality
+                if ( is_array( $cite['url'] ) ) {
+                        $cite['url'] = $cite['url'][0];
+                }
+                if ( ! array_key_exists( 'name', $cite ) ) {
+                        // $cite['name'] = self::get_post_type_string( $cite['url'] );
+                        $cite['name'] = $cite['url'];
+                }
+                return sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $cite['url'], $cite['name'] );
+                        return sprintf( '<span class="p-name">%1$s</span>', esc_html( wp_strip_all_tags( (string) $name ) ) );
+                }
+                if ( null === $name || '' === $name ) {
+                        $name = $url;
+                }
+                return sprintf( '<a href="%1$s" class="p-name u-url">%2$s</a>', $url, esc_html( wp_strip_all_tags( (string) $name ) ) );
+        }
         /**
          * Retrieve site name for given citation.
+         *
+         * @since 2.3.0
+         *
          * @access public
 …
                         return false;
+                }
+                return sprintf( '<span class="p-publication">%1s</span>', $cite['publication'] );
+        }
+        /**
+         * Returns a requested Rating item.
+         *
+         * The returned value will be a printf-ready translated string.
+         *
+         * @access
+         *
+         * @param int $rating Rating Value.
+         * @return mixed|string
+                $publication = is_array( $cite['publication'] ) ? (string) reset( $cite['publication'] ) : (string) $cite['publication'];
+                return sprintf( '<span class="p-publication">%1$s</span>', esc_html( wp_strip_all_tags( $publication ) ) );
+        }
+        /**
+         * Returns the citation's summary as escaped plain text.
+         *
+         * Summaries are plain text: tags are stripped, and the text is marked up as
+         * p-summary. Line breaks are kept.
+         *
+         * @since 4.0.0
+         *
+         * @access public
+         *
+         * @param array $cite Normalized citation (see Kind_Post::normalize_cite()).
+         * @return string The summary markup, or an empty string if there is none.
+         */
+        public static function get_summary( $cite ) {
+                if ( ! is_array( $cite ) || empty( $cite['summary'] ) ) {
+                        return '';
+                }
+                $summary = $cite['summary'];
+                if ( is_array( $summary ) ) {
+                        foreach ( array( 'value', 'text', 'html' ) as $key ) {
+                                if ( isset( $summary[ $key ] ) ) {
+                                        $summary = $summary[ $key ];
+                                        break;
+                                }
+                        }
+                        $summary = is_array( $summary ) ? (string) reset( $summary ) : $summary;
+                }
+                $summary = trim( wp_strip_all_tags( (string) $summary ) );
+                if ( '' === $summary ) {
+                        return '';
+                }
+                return sprintf( '<blockquote class="p-summary">%1$s</blockquote>', nl2br( esc_html( $summary ) ) );
+        }
+        /**
+         * Returns a rating as a row of stars.
+         *
+         * @since 3.7.0
+         *
+         * @access public
+         *
+         * @param int|string $rating Rating value. Values above 10 show 10 stars.
+         * @return string Plain text: one star per point, or an empty string.
          */
         public static function rating_text( $rating ) {
+                if ( ! $rating || 0 === $rating ) {
+                        return '';
+                }
+                $ret = '';
+                for ( $i = $rating; $i > 0; $i-- ) {
+                        $ret .= '⭐';
+                }
+                return $ret;
+        }
+        /**
+         * Returns a requested RSVP option item.
+         *
+         * The returned value will be a printf-ready translated string.
+         *
+         * @access
+         *
+         * @param string $type RSVP type to return.
+         * @return mixed|string
+         */
+        public static function rsvp_text( $type ) {
+                if ( ! $type ) {
+                        return '';
+                }
+                $rating = is_numeric( $rating ) ? (int) $rating : 0;
+                if ( $rating <= 0 ) {
+                        return '';
+                }
+                return str_repeat( '⭐', min( $rating, 10 ) );
+        }
+        /**
+         * Returns the text for an RSVP.
+         *
+         * Called with only a type, it returns a printf-ready string whose
+         * %1$s and %2$s are the event URL and name, as before 4.0.0; the caller
+         * must escape both. With a URL or name, it returns the escaped sentence
+         * with the event linked.
+         *
+         * @since 2.6.1
+         *
+         * @access public
+         *
+         * @param string      $type RSVP value: yes, no, maybe, interested or remote.
+         * @param string|null $url  Optional. Event URL.
+         * @param string|null $name Optional. Event name. Defaults to the URL.
+         * @return string The RSVP text, or an empty string for an unknown type.
+         */
+        public static function rsvp_text( $type, $url = null, $name = null ) {
                 $rsvp = array(
                         /* translators: URL for link to event and name of event */
                         'yes'        => __( 'Attending <a href="%1$s" class="u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'maybe'      => __( 'Might be attending <a href="%1$s" class="u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'no'         => __( 'Unable to Attend <a href="%1$s" class="u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'interested' => __( 'Interested in Attending <a href="%1$s" class=u-in-reply-to">%2$s</a>', 'indieweb-post-kinds' ),
                         /* translators: URL for link to event and name of event */
                         'remote'     => __( 'Attending <a href="%1$s" class="u-in-reply-to">%2$s</a> remotely', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'yes'        => __( 'Attending %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'maybe'      => __( 'Might be attending %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'no'         => __( 'Unable to Attend %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'interested' => __( 'Interested in Attending %s', 'indieweb-post-kinds' ),
+                        /* translators: %s: Link to the event */
+                        'remote'     => __( 'Attending %s remotely', 'indieweb-post-kinds' ),
                 );
+                return $rsvp[ $type ];
+                if ( ! is_string( $type ) || ! array_key_exists( $type, $rsvp ) ) {
+                        return '';
+                }
+                if ( null === $url && null === $name ) {
+                        return sprintf( esc_html( $rsvp[ $type ] ), '<a href="%1$s" class="u-in-reply-to">%2$s</a>' );
+                }
+                $url  = esc_url( (string) $url );
+                $name = ( null === $name || '' === $name ) ? $url : $name;
+                $name = esc_html( wp_strip_all_tags( (string) $name ) );
+                if ( '' === $url ) {
+                        $link = sprintf( '<span class="p-in-reply-to">%1$s</span>', $name );
+                } else {
+                        $link = sprintf( '<a href="%1$s" class="u-in-reply-to">%2$s</a>', $url, $name );
+                }
+                return sprintf( esc_html( $rsvp[ $type ] ), $link );
+        }
         /**
          * Returns a requested read status option item.
+         *
+         * @since 3.0.7
+         *
          * @access public
 …
                         'finished' => __( 'Finished Reading: ', 'indieweb-post-kinds' ),
                 );
                 return $read[ $type ];
+                return ( is_string( $type ) && isset( $read[ $type ] ) ) ? $read[ $type ] : '';
+        }
 …
          * Return a string for a requested duration.
+         *
+         * @access public
+         *
+         * @param string|Dateinterval $interval Duration to display.
+         * @return string
+         * @throws Exception
+         * @since 2.6.1
+         * @since 4.0.0 Returns escaped markup.
+         *
+         * @access public
+         *
+         * @param string|DateInterval $interval Duration to display.
+         * @return string The duration as an escaped dt-duration time element, or an empty string if it is not a valid duration.
          */
         public static function display_duration( $interval ) {
+                if ( ! $interval instanceof DateInterval ) {
+                        $interval = new DateInterval( $interval );
+                }
+                $interval = kind_safe_interval( $interval );
                 if ( ! $interval ) {
                         return '';
 …
+                }
                 return sprintf( '<time class="dt-duration" datetime="%1$s">%2$s</time>', date_interval_to_iso8601( $interval ), implode( ' ', $duration ) );
+                return sprintf( '<time class="dt-duration" datetime="%1$s">%2$s</time>', esc_attr( date_interval_to_iso8601( $interval ) ), esc_html( implode( ' ', $duration ) ) );
+        }
 }  // End Class

indieweb-post-kinds/trunk/includes/class-mf2-post.php

-              r2973430
+              r3738687
 <?php
+/**
+ * MF2_Post class.
+ *
+ * @package Post_Kinds
+ * @since   3.1.0
+ */
+defined( 'ABSPATH' ) || exit;
 /**
  * MF2 Post Class
+ *
+ * @package Post Kinds
+ * Assists in retrieving/saving microformats 2 properties from a post
+ * Assists in retrieving/saving microformats 2 properties from a post.
+ *
+ * @since 3.1.0
+ * @deprecated 4.0.0 Use Kind_Post. MF2_Post will be removed in a future major version.
  */
 class MF2_Post implements ArrayAccess {
+        /**
+         * Post ID.
+         *
+         * @since 3.1.0
+         * @var int
+         */
         public $uid;
+        /**
+         * ID of the post author.
+         *
+         * @since 3.1.0
+         * @var int|string
+         */
         public $post_author;
+        /**
+         * Post type.
+         *
+         * @since 3.3.0
+         * @var string
+         */
         public $post_type;
+        /**
+         * Author, as an h-card.
+         *
+         * @since 3.1.0
+         * @var array|string|false
+         */
         public $author;
+        /**
+         * Publication the post appeared in.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $publication;
+        /**
+         * Published date, in DATE_W3C format.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $published;
+        /**
+         * Updated date, in DATE_W3C format.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $updated;
+        /**
+         * Content, with 'html' and 'value' versions.
+         *
+         * @since 3.1.0
+         * @var array
+         */
         public $content;
+        /**
+         * Summary (excerpt).
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $summary;
+        /**
+         * ID of the parent post.
+         *
+         * @since 3.1.0
+         * @var int
+         */
         public $post_parent;
+        /**
+         * Post kind slug, or media type for an attachment.
+         *
+         * @since 3.1.0
+         * @var string|false|null
+         */
         public $kind;
+        /**
+         * Permalink, or file URL for an attachment.
+         *
+         * @since 3.1.0
+         * @var string|false
+         */
         public $url;
+        /**
+         * Post title.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $name;
+        /**
+         * Category and tag names.
+         *
+         * @since 3.1.0
+         * @var string[]
+         */
         public $category = array();
+        /**
+         * URL of the featured image.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $featured;
+        /**
+         * Properties stored in mf2_ prefixed post meta, without the prefix.
+         *
+         * @since 3.1.0
+         * @var array
+         */
         private $mf2 = array();
+        /**
+         * Reads a post's properties.
+         *
+         * @since 3.1.0
+         * @deprecated 4.0.0 Use Kind_Post.
+         *
+         * @param int|WP_Post|string $post Post ID, post object, or the URL of a post or attachment.
+         */
         public function __construct( $post ) {
+                _deprecated_function( __METHOD__, '4.0.0', 'Kind_Post' );
                 if ( is_numeric( $post ) ) {
                         $this->uid = (int) $post;
 …
+        }
+        /**
+         * Returns the published date.
+         *
+         * For an attachment, this is the date stored in post meta.
+         *
+         * @since 3.3.0
+         *
+         * @return string|false The date, or false if there is none.
+         */
         public function get_published() {
                 if ( 'attachment' === $this->post_type ) {
                         return $this->meta['published'] ?? '';
+                        return $this->get_single( $this->mf2['published'] ?? '' );
+                }
                 return get_the_date( DATE_W3C, $this->uid );
+        }
+        /**
+         * Returns the updated date.
+         *
+         * For an attachment, this is the date stored in post meta.
+         *
+         * @since 3.3.0
+         *
+         * @return string|false The date, or false if there is none.
+         */
         public function get_updated() {
                 if ( 'attachment' === $this->post_type ) {
                         return $this->meta['updated'] ?? '';
+                        return $this->get_single( $this->mf2['updated'] ?? '' );
+                }
                 return get_the_modified_date( DATE_W3C, $this->uid );
+        }
+        /**
+         * Returns the publication the post appeared in.
+         *
+         * For posts other than attachments, this is the site title.
+         *
+         * @since 3.3.0
+         *
+         * @return string The publication, or an empty string if an attachment has none.
+         */
         public function get_publication() {
                 if ( 'attachment' !== $this->post_type ) {
                         return get_bloginfo( 'title' );
+                }
+                return $this->meta['publication'] ?? '';
+        }
+                return $this->get_single( $this->mf2['publication'] ?? '' );
+        }
+        /**
+         * Whether a property exists, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         * @return bool
+         */
+        #[\ReturnTypeWillChange]
         public function offsetExists( $offset ) {
                 $vars = get_object_vars( $this );
 …
+        }
+        /**
+         * Returns a property, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         * @return mixed The value, or null if it does not exist.
+         */
+        #[\ReturnTypeWillChange]
         public function offsetGet( $offset ) {
                 $vars = get_object_vars( $this );
 …
+        }
+        /**
+         * Sets a property, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         * @param mixed  $value  The value.
+         */
+        #[\ReturnTypeWillChange]
         public function offsetSet( $offset, $value ) {
                 $this->set( $offset, $value );
+        }
+        /**
+         * Deletes a property stored in post meta, for ArrayAccess.
+         *
+         * @since 3.2.0
+         *
+         * @param string $offset Property name.
+         */
+        #[\ReturnTypeWillChange]
         public function offsetUnset( $offset ) {
                 $this->delete( $offset );
+        }
+        /**
+         * Returns the names of a post's categories and tags.
+         *
+         * 'Uncategorized' is left out.
+         *
+         * @since 3.2.0
+         *
+         * @param int $post_id Post ID.
+         * @return string[] Category and tag names.
+         */
         public function get_categories( $post_id ) {
                 $category = array();
                 // Get a list of categories and extract their names
+                // Get a list of categories and extract their names.
                 $post_categories = get_the_terms( $post_id, 'category' );
                 if ( ! empty( $post_categories ) && ! is_wp_error( $post_categories ) ) {
 …
+                }
                 // Get a list of tags and extract their names
+                // Get a list of tags and extract their names.
                 $post_tags = get_the_terms( $post_id, 'post_tag' );
                 if ( ! empty( $post_tags ) && ! is_wp_error( $post_tags ) ) {
 …
+        }
+        /**
+         * Returns the post kind, or the media type of an attachment.
+         *
+         * @since 3.1.0
+         *
+         * @return string|false|null The kind slug, or null for an attachment that is not image, video or audio.
+         */
         private function get_post_kind() {
                 if ( is_attachment( $this->uid ) ) {
 …
+        }
+        /**
+         * Returns the post object.
+         *
+         * @since 3.1.0
+         *
+         * @return WP_Post|null The post, or null if it does not exist.
+         */
         public function get_post() {
                 return get_post( $this->uid );
 …
         /**
          * Is prefix in string.
+         *
+         * @since 3.1.0
+         *
          * @param  string $source The source string.
 …
         /**
          * Returns True if Array is Multidimensional.
+         *
+         * @since 3.1.0
+         *
          * @param array $arr array.
 …
+        }
+        /**
+         * Sanitizes HTML with the allowed tags from the plugin settings.
+         *
+         * @since 3.1.0
+         *
+         * @param mixed $value The value. Anything but a string is returned unchanged.
+         * @return mixed The sanitized value.
+         */
         public static function sanitize_content( $value ) {
                 if ( ! is_string( $value ) ) {
 …
+        }
+        /**
+         * Sanitizes a URL or text, recursively.
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $value The value.
+         * @return string|array The sanitized value.
+         */
         public function sanitize_text( $value ) {
                 if ( is_array( $value ) ) {
 …
          * Retrieve author
+         *
+         * @since 3.1.0
+         *
          * @return boolean|array The result or false if does not exist.
          */
         public function get_author() {
                 if ( ! $this->post_author ) {
                         return $this->meta['author'] ?? false;
+                }
                 // Attachments may have been uploaded by a user but may have metadata for original author
+                        return $this->get_single( $this->mf2['author'] ?? false );
+                }
+                // Attachments may have been uploaded by a user but may have metadata for original author.
                 if ( 'attachment' === $this->post_type ) {
                         return $this->meta['author'] ?? '';
+                        return $this->get_single( $this->mf2['author'] ?? '' );
+                }
                 return array(
 …
         /**
+         * Sets an array with only the mf2 prefixed meta.
+         *
+         * Returns the properties stored in mf2_ prefixed post meta, without the prefix.
+         *
+         * @since 3.1.0
          */
         private function get_mf2meta() {
 …
                         return array();
+                }
+                if ( isset( $meta['response'] ) ) {
+                        $response = maybe_unserialize( $meta['response'] );
+                        // Retrieve from the old response array and store in new location.
+                        if ( ! empty( $response ) ) {
+                // Very old versions stored the citation in the response meta. Read it as
+                // mf2_cite when there is no newer citation; the upgrade routine moves it.
+                if ( isset( $meta['response'] ) && ! isset( $meta['mf2_cite'] ) ) {
+                        $response = maybe_unserialize( $meta['response'][0] );
+                        if ( is_array( $response ) ) {
                                 $new = array();
-                                // Convert to new format and update.
                                 if ( ! empty( $response['title'] ) ) {
                                         $new['name'] = $response['title'];
 …
+                                }
                                 if ( ! empty( $response['author'] ) ) {
+                                        $new['card']         = array();
+                                        $new['card']['name'] = $response['author'];
+                                        $new['card'] = array( 'name' => $response['author'] );
                                         if ( ! empty( $response['icon'] ) ) {
                                                 $new['card']['photo'] = $response['icon'];
+                                        }
+                                }
+                                $new         = array_unique( $new );
+                                $new['card'] = array_unique( $new['card'] );
+                                if ( isset( $new ) ) {
+                                        update_post_meta( $this->uid, 'mf2_cite', $new );
+                                        delete_post_meta( $this->uid, 'response' );
+                                        $meta['cite'] = $new;
+                                if ( $new ) {
+                                        $meta['mf2_cite'] = array( $new );
+                                }
+                        }
 …
                                 unset( $meta[ $key ] );
                                 $key = str_replace( 'mf2_', '', $key );
                                 // Do not save microput prefixed instructions
+                                // Do not save microput prefixed instructions.
                                 if ( self::str_prefix( $key, 'mp-' ) ) {
                                         continue;
 …
          * Map Properties Based on Post Type
+         *
+         * @since 3.3.0
          */
         private function get_post_type_properties() {
 …
          * Retrieve value
+         *
+         * @param  string $key The key to retrieve.
+         * @param  boolean $single Whether to return a a single value or array if there is only one value.
+         * @since 3.1.0
+         *
+         * @param string|null $key    Optional. The key to retrieve. Default null, for every property.
+         * @param bool        $single Optional. Whether to unwrap a single value from its array. Default true.
          * @return boolean|string|array The result or false if does not exist.
          */
 …
+        }
+        /**
+         * Whether the post has a property.
+         *
+         * @since 3.1.0
+         *
+         * @param string $key Property name.
+         * @return bool
+         */
         public function has_key( $key ) {
                 $keys = array_merge( get_object_vars( $this ), $this->mf2 );
 …
+        }
+        /**
+         * Unwraps single-item arrays, recursively.
+         *
+         * @since 3.1.0
+         *
+         * @param mixed $value   The value to unwrap.
+         * @param bool  $discard Optional. Whether to keep only the first item of a list
+         *                       with more than one item. Default false.
+         * @return mixed The value, with single-item arrays replaced by their item.
+         */
         private function single_array( $value, $discard = false ) {
                 if ( ! is_array( $value ) ) {
 …
+        }
+        /**
+         * Stores a property, or several.
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $key   Property name, an array of property => value pairs, or an mf2 item.
+         * @param mixed        $value Optional. The value. Default null.
+         * @return mixed The result of storing the value, or false or null if nothing was stored.
+         */
         public function set( $key, $value = null ) {
                 if ( ! $key ) {
 …
+        }
+        /**
+         * Deletes a property stored in post meta.
+         *
+         * @since 3.1.0
+         *
+         * @param string $key Property name.
+         * @return bool True on success, false on failure.
+         */
         public function delete( $key ) {
                 return delete_post_meta( $this->uid, 'mf2_' . $key );
+        }
+        /**
+         * Converts mf2 to jf2.
+         *
+         * @since 3.1.0
+         *
+         * @param array $cite The mf2 item.
+         * @return array The jf2 item.
+         */
         public function mf2_to_jf2( $cite ) {
                 return mf2_to_jf2( $cite );
+        }
+        /**
+         * Returns the first item of an array.
+         *
+         * @since 3.1.0
+         *
+         * @param mixed $value The value.
+         * @return mixed The first item, or the value if it is not an array.
+         */
         public function get_single( $value ) {
                 if ( is_array( $value ) ) {
 …
+        }
+        /**
+         * Converts jf2 to mf2.
+         *
+         * @since 3.1.0
+         *
+         * @param array  $item The jf2 item.
+         * @param string $type Optional. jf2 type to use if the item has none. Default 'cite'.
+         * @return array The mf2 item.
+         */
         public function jf2_to_mf2( $item, $type = 'cite' ) {
                 if ( is_array( $item ) && isset( $item['type'] ) && ! isset( $item['properties'] ) ) {
 …
+        }
+        // Retrieve the right property to use for the link preview based on the kind.
+        // It will return an array of properties or false if it cannot find what it needs.
+        // Also will update old posts with new settings
+        /**
+         * Returns a property for the link preview, as jf2.
+         *
+         * Updates a property stored in the format used before 2.7.0.
+         *
+         * @since 3.1.0
+         *
+         * @param string $property Property name.
+         * @return array|false The property, or false if there is none.
+         */
         public function fetch( $property ) {
                 // If the property is not set then exit
+                // If the property is not set then exit.
                 if ( ! $property || ! $this->has_key( $property ) ) {
                         return false;
 …
                         $return = array_shift( $return );
+                }
                 // If it is in fact a string it is the pre 2.7.0 format and should be updated
+                // If it is in fact a string it is the pre 2.7.0 format and should be updated.
                 if ( is_string( $return ) ) {
                         if ( $this->has_key( 'cite' ) ) {
 …
+        }
+        /**
+         * Returns the IDs of media attached to a post.
+         *
+         * @since 3.1.0
+         *
+         * @param string      $type MIME type, such as 'image'.
+         * @param int|WP_Post $post Post ID or post object.
+         * @return int[] Attachment IDs.
+         */
         public function get_attached_media( $type, $post ) {
                 $posts = get_attached_media( $type, $post );
 …
+        }
+        /**
+         * Returns the post's audio.
+         *
+         * @since 3.1.0
+         *
+         * @return int[]|false Attachment IDs, or false if there are none.
+         */
         public function get_audios() {
                 // Check if the post itself if an audio attachment.
 …
+        }
+        /**
+         * Returns the post's videos.
+         *
+         * @since 3.1.0
+         *
+         * @return int[]|false Attachment IDs, or false if there are none.
+         */
         public function get_videos() {
                 // Check if the post itself if an audio attachment.
 …
+        }
+        /**
+         * Returns the post's images.
+         *
+         * @since 3.1.0
+         *
+         * @param bool $content_allow Optional. Whether to return images in the content. Default false.
+         * @return int[]|false Attachment IDs, or false if there are none.
+         */
         public function get_images( $content_allow = false ) {
                 // Check if the post itself is an image attachment.
 …
                 $post_content = $this->content['html'] ?? '';
                 if ( $post_content ) {
+                        // Recorded when the post is saved; see Kind_Media_Metadata::save_post().
                         $att_ids = get_post_meta( $this->uid, '_content_img_ids', true );
-                        if ( false === $att_ids ) {
-                                $att_ids = Kind_Media_Metadata::get_img_from_content( $post->post_content );
-                                update_post_meta( $this->uid, '_content_img_ids', $att_ids );
+                        }
                         if ( $att_ids ) {
                                 return $content_allow ? $att_ids : array();
 …
+                        }
+                }
                 // If there is a featured image return only that. Otherwise return all images
+                // If there is a featured image return only that. Otherwise return all images.
                 $featured = get_post_thumbnail_id( $this->uid );
                 if ( $featured ) {
 …
                 $att_ids = $this->get_attached_media( 'image', $this->uid );
                 $photos  = $this->get( 'photo', false );
+                if ( is_array( $photos ) ) {
+                        if ( ! wp_is_numeric_array( $photos ) ) {
+                                $photos = array( $photos );
+                        }
+                        $photos = $this->sideload_images( $photos );
+                        $this->set( 'photo', $photos );
+                if ( is_array( $photos ) && ! wp_is_numeric_array( $photos ) ) {
+                        $photos = array( $photos );
+                }
                 $att_ids = array_merge( $att_ids, $this->get_attachments_from_urls( $photos ) );
 …
+        }
+        private function media_sideload_image( $url, $post_id, $description = null ) {
+                // To prevent sideloading the same image multiple times check for the original URL which will now be stored
+                $ids = get_posts(
+                        array(
+                                'post_type'        => 'attachment',
+                                'suppress_filters' => false,
+                                'nopaging'         => true,
+                                'meta_key'         => 'mf2_url',
+                                'meta_value'       => $url,
+                                'fields'           => 'ids',
+                        )
+                );
+                if ( ! empty( $ids ) ) {
+                        return $ids[0];
+                }
+                $id = media_sideload_image( $url, $post_id, $description, 'id' );
+                if ( $id ) {
+                        update_post_meta( $id, 'mf2_url', $url );
+                }
+                return $id;
+        }
+        private function sideload_images( $photos ) {
+                require_once ABSPATH . 'wp-admin/includes/media.php';
+                require_once ABSPATH . 'wp-admin/includes/file.php';
+                require_once ABSPATH . 'wp-admin/includes/image.php';
+                foreach ( $photos as $key => $value ) {
+                        if ( is_string( $value ) ) {
+                                if ( ! wp_http_validate_url( $value ) ) {
+                                        continue;
+                                } elseif ( ! attachment_url_to_postid( $value ) ) {
+                                        $id = self::media_sideload_image( $value, $this->uid );
+                                        if ( $id ) {
+                                                $photos[ $key ] = wp_get_attachment_url( $id );
+                                        }
+                                }
+                        }
+                        // Attempt to normalize old data
+                        if ( is_array( $value ) ) {
+                                $value = mf2_to_jf2( $value );
+                                $id    = attachment_url_to_postid( $value['url'] );
+                                if ( ! $id ) {
+                                        $id = self::media_sideload_image( $value['url'], $this->uid );
+                                        if ( $id ) {
+                                                $value['url'] = wp_get_attachment_url( $id );
+                                        }
+                                }
+                                $args = array(
+                                        'ID'           => $id,
+                                        'post_title'   => $value['name'] ?? '',
+                                        'post_excerpt' => $value['summary'] ?? '',
+                                );
+                                $args = array_filter( $args );
+                                wp_update_post( $args );
+                                unset( $value['name'] );
+                                unset( $value['summary'] );
+                                foreach ( $value as $k => $v ) {
+                                        update_post_meta( $id, 'mf2_' . $k, $v );
+                                }
+                                $photos[ $key ] = $value['url'];
+                        }
+                }
+                return $photos;
+        }
+        /**
+         * Looks up the attachment IDs for media URLs.
+         *
+         * @since 3.1.0
+         *
+         * @param string|array $urls A URL, or a list of URLs or arrays with a 'url' key.
+         * @return int[] Attachment IDs found.
+         */
         public function get_attachments_from_urls( $urls ) {
                 if ( is_string( $urls ) ) {

indieweb-post-kinds/trunk/includes/class-post-kind.php

-              r2973430
+              r3738687
 <?php
 /**
  * Post Kind Class
+ * Post_Kind class.
+ *
  * @package Post Kind
  * Used to define a Post Kind object
+ * @package Post_Kinds
+ * @since   3.1.0
  */
+final class Post_Kind {
+        public $id; // Term ID
+        public $slug; // Kind Slug
+        public $name; // Name of Kind - Plural
+        public $singular_name; // Name of Kind - Singular
+        public $verb; // The string for the verb or action (liked this)
+        public $format; // Post Format that Maps to This
+        public $icon; // Icon
+defined( 'ABSPATH' ) || exit;
+/**
+ * Defines a single post kind, as registered with register_post_kind().
+ *
+ * @since 3.1.0
+ */
+final class Post_Kind implements JsonSerializable {
+        /**
+         * Term ID.
+         *
+         * @since 3.1.0
+         * @var int
+         */
+        public $id;
+        /**
+         * Kind slug.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $slug;
+        /**
+         * General name for the kind, plural.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $name;
+        /**
+         * Name for one instance of the kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $singular_name;
+        /**
+         * The verb or action, such as 'Liked'.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $verb;
+        /**
+         * Post format that maps to this kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $format;
+        /**
+         * Icon name.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $icon;
+        /**
+         * Description of the kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $description;
+        /**
+         * Link to more information about the kind.
+         *
+         * @since 3.1.0
+         * @var string
+         */
         public $description_url;
+        public $title; // Should this Kind Have an Explicit Title
+        public $show; // Show in Settings
+        public $property; // Primary Property
+        public $properties; // Array of Properties
+        public $shortlink; // Shortlink Coding per http://tantek.pbworks.com/w/page/21743973/Whistle#design
+        /**
+         * Whether the kind should have an explicit title.
+         *
+         * @since 3.1.0
+         * @var bool
+         */
+        public $title;
+        /**
+         * Whether to show the kind in Settings.
+         *
+         * @since 3.1.0
+         * @var bool
+         */
+        public $show;
+        /**
+         * Primary microformats 2 property, such as 'like-of'.
+         *
+         * @since 3.1.0
+         * @var string
+         */
+        public $property;
+        /**
+         * The fields for the kind. See Kind_Fields.
+         *
+         * @since 3.1.0
+         * @var array
+         */
+        public $properties;
+        /**
+         * Shortlink code, per http://tantek.pbworks.com/w/page/21743973/Whistle#design.
+         *
+         * @since 3.4.0
+         * @var string
+         */
+        public $shortlink;
+        /**
+         * Arguments given at registration that are not declared properties, such as
+         * those a custom kind adds. Kept here rather than as dynamic properties,
+         * which are deprecated in PHP 8.2, and still readable as $kind->name.
+         *
+         * @since 4.0.0
+         * @var array
+         */
+        private $extra = array();
+        /**
+         * Defines a kind.
+         *
+         * @since 3.1.0
+         *
+         * @param string $slug Kind slug.
+         * @param array  $args Optional. Kind arguments. See Kind_Taxonomy::register_post_kind().
+         */
         public function __construct( $slug, $args = array() ) {
                 $this->slug = $slug;
 …
+        }
+        /**
+         * Sets the kind's properties from its arguments, filling in defaults.
+         *
+         * Arguments that are not declared properties are kept as extra arguments.
+         *
+         * @since 3.1.0
+         *
+         * @param array $args Kind arguments. See Kind_Taxonomy::register_post_kind().
+         */
         public function set_props( $args ) {
                 $defaults = array(
 …
                         'format'        => 'standard',
                         'icon'          => $this->slug,
                         'show'          => 'false',
+                        'show'          => false,
                         'property'      => '',
                 );
                 $args     = wp_parse_args( $args, $defaults );
                 foreach ( $args as $property_name => $property_value ) {
+                        $this->$property_name = $property_value;
+                        if ( 'extra' !== $property_name && property_exists( $this, $property_name ) ) {
+                                $this->$property_name = $property_value;
+                        } else {
+                                $this->extra[ $property_name ] = $property_value;
+                        }
+                }
+        }
+        /**
+         * Reads an extra argument given at registration.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name Argument name.
+         * @return mixed The value, or null if it was not given.
+         */
+        public function __get( $name ) {
+                return isset( $this->extra[ $name ] ) ? $this->extra[ $name ] : null;
+        }
+        /**
+         * Whether an extra argument was given at registration.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name Argument name.
+         * @return bool
+         */
+        public function __isset( $name ) {
+                return isset( $this->extra[ $name ] );
+        }
+        /**
+         * Sets an extra argument, without creating a dynamic property.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name  Argument name.
+         * @param mixed  $value Value.
+         */
+        public function __set( $name, $value ) {
+                $this->extra[ $name ] = $value;
+        }
+        /**
+         * Whether the kind has a declared property or an extra argument of this name.
+         *
+         * @since 4.0.0
+         *
+         * @param string $name Property or argument name.
+         * @return bool
+         */
+        public function has( $name ) {
+                return ( 'extra' !== $name && property_exists( $this, $name ) ) || array_key_exists( $name, $this->extra );
+        }
+        /**
+         * Returns the kind's declared properties and extra arguments, for JSON.
+         *
+         * @since 4.0.0
+         *
+         * @return array
+         */
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize() {
+                $vars = get_object_vars( $this );
+                unset( $vars['extra'] );
+                return array_merge( $this->extra, $vars );
+        }
+}

indieweb-post-kinds/trunk/includes/compat.php

-              r2973430
+              r3738687
 <?php
+// get_feed_build_date introduced in WordPress 5.2
+if ( ! function_exists( 'get_feed_build_date' ) ) {
+        function get_feed_build_date( $format ) {
+                global $wp_query;
+                if ( empty( $wp_query ) || ! $wp_query->have_posts() ) {
+                        // Fallback to last time any post was modified or published.
+                        return get_lastpostmodified( 'GMT' );
+                }
+                        // Extract the post modified times from the posts.
+                        $modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
+                        // If this is a comment feed, check those objects too.
+                if ( $wp_query->is_comment_feed() && $wp_query->comment_count ) {
+                        // Extract the comment modified times from the comments.
+                        $comment_times = wp_list_pluck( $wp_query->comments, 'comment_date_gmt' );
+                                // Add the comment times to the post times for comparison.
+                                $modified_times = array_merge( $modified_times, $comment_times );
+                }
+                        // Determine the maximum modified time.
+                        $max_modified_time = max(
+                                array_map(
+                                        function ( $time ) use ( $format ) {
+                                                                                return mysql2date( $format, $time, false );
+                                        },
+                                        $modified_times
+                                )
+                        );
+                        /**
+                         * Filters the date the last post or comment in the query was modified.
+                         *
+                         * @since 5.2.0
+                         *
+                         * @param string $max_modified_time Date the last post or comment was modified in the query.
+                         * @param string $format            The date format requested in get_feed_build_date.
+                         */
+                        return apply_filters( 'get_feed_build_date', $max_modified_time, $format );
+/**
+ * Polyfills for functions added to WordPress or PHP after the plugin's minimums
+ * (WordPress 6.2, PHP 7.4).
+ *
+ * Each polyfill is a copy of the core function, guarded by function_exists(),
+ * and notes the version that introduced it so it can be removed once the
+ * minimum catches up. ClassicPress may already provide some of them.
+ *
+ * @package Post_Kinds
+ */
+defined( 'ABSPATH' ) || exit;
+// wp_get_admin_notice() was introduced in WordPress 6.4.
+if ( ! function_exists( 'wp_get_admin_notice' ) ) {
+        /**
+         * Creates and returns the markup for an admin notice.
+         *
+         * @since 6.4.0
+         *
+         * @param string $message The message.
+         * @param array  $args {
+         *     Optional. An array of arguments for the admin notice. Default empty array.
+         *
+         *     @type string   $type               Optional. The type of admin notice.
+         *                                        For example, 'error', 'success', 'warning', 'info'.
+         *                                        Default empty string.
+         *     @type bool     $dismissible        Optional. Whether the admin notice is dismissible. Default false.
+         *     @type string   $id                 Optional. The value of the admin notice's ID attribute. Default empty string.
+         *     @type string[] $additional_classes Optional. A string array of class names. Default empty array.
+         *     @type string[] $attributes         Optional. Additional attributes for the notice div. Default empty array.
+         *     @type bool     $paragraph_wrap     Optional. Whether to wrap the message in paragraph tags. Default true.
+         * }
+         * @return string The markup for an admin notice.
+         */
+        function wp_get_admin_notice( $message, $args = array() ) {
+                $defaults = array(
+                        'type'               => '',
+                        'dismissible'        => false,
+                        'id'                 => '',
+                        'additional_classes' => array(),
+                        'attributes'         => array(),
+                        'paragraph_wrap'     => true,
+                );
+                $args = wp_parse_args( $args, $defaults );
+                /**
+                 * Filters the arguments for an admin notice.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param array  $args    The arguments for the admin notice.
+                 * @param string $message The message for the admin notice.
+                 */
+                $args       = apply_filters( 'wp_admin_notice_args', $args, $message );
+                $id         = '';
+                $classes    = 'notice';
+                $attributes = '';
+                if ( is_string( $args['id'] ) ) {
+                        $trimmed_id = trim( $args['id'] );
+                        if ( '' !== $trimmed_id ) {
+                                $id = 'id="' . $trimmed_id . '" ';
+                        }
+                }
+                if ( is_string( $args['type'] ) ) {
+                        $type = trim( $args['type'] );
+                        if ( str_contains( $type, ' ' ) ) {
+                                _doing_it_wrong(
+                                        __FUNCTION__,
+                                        sprintf(
+                                                /* translators: %s: The "type" key. */
+                                                esc_html__( 'The %s key must be a string without spaces.', 'default' ),
+                                                '<code>type</code>'
+                                        ),
+                                        '6.4.0'
+                                );
+                        }
+                        if ( '' !== $type ) {
+                                $classes .= ' notice-' . $type;
+                        }
+                }
+                if ( true === $args['dismissible'] ) {
+                        $classes .= ' is-dismissible';
+                }
+                if ( is_array( $args['additional_classes'] ) && ! empty( $args['additional_classes'] ) ) {
+                        $classes .= ' ' . implode( ' ', $args['additional_classes'] );
+                }
+                if ( is_array( $args['attributes'] ) && ! empty( $args['attributes'] ) ) {
+                        $attributes = '';
+                        foreach ( $args['attributes'] as $attr => $val ) {
+                                if ( is_bool( $val ) ) {
+                                        $attributes .= $val ? ' ' . $attr : '';
+                                } elseif ( is_int( $attr ) ) {
+                                        $attributes .= ' ' . esc_attr( trim( $val ) );
+                                } elseif ( $val ) {
+                                        $attributes .= ' ' . $attr . '="' . esc_attr( trim( $val ) ) . '"';
+                                }
+                        }
+                }
+                if ( false !== $args['paragraph_wrap'] ) {
+                        $message = "<p>$message</p>";
+                }
+                $markup = sprintf( '<div %1$sclass="%2$s"%3$s>%4$s</div>', $id, $classes, $attributes, $message );
+                /**
+                 * Filters the markup for an admin notice.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string $markup  The HTML markup for the admin notice.
+                 * @param string $message The message for the admin notice.
+                 * @param array  $args    The arguments for the admin notice.
+                 */
+                return apply_filters( 'wp_admin_notice_markup', $markup, $message, $args );
+        }
+}
+// Backcompat for wp_filter_content_tags introduced in 5.5.
+if ( ! function_exists( 'wp_filter_content_tags' ) ) {
+        function wp_filter_content_tags( $content ) {
+                return wp_make_content_images_responsive( $content ); // phpcs:ignore
+// wp_admin_notice() was introduced in WordPress 6.4.
+if ( ! function_exists( 'wp_admin_notice' ) ) {
+        /**
+         * Outputs an admin notice.
+         *
+         * @since 6.4.0
+         *
+         * @param string $message The message to output.
+         * @param array  $args {
+         *     Optional. An array of arguments for the admin notice. Default empty array.
+         *
+         *     @type string   $type               Optional. The type of admin notice.
+         *                                        For example, 'error', 'success', 'warning', 'info'.
+         *                                        Default empty string.
+         *     @type bool     $dismissible        Optional. Whether the admin notice is dismissible. Default false.
+         *     @type string   $id                 Optional. The value of the admin notice's ID attribute. Default empty string.
+         *     @type string[] $additional_classes Optional. A string array of class names. Default empty array.
+         *     @type string[] $attributes         Optional. Additional attributes for the notice div. Default empty array.
+         *     @type bool     $paragraph_wrap     Optional. Whether to wrap the message in paragraph tags. Default true.
+         * }
+         */
+        function wp_admin_notice( $message, $args = array() ) {
+                /**
+                 * Fires before an admin notice is output.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string $message The message for the admin notice.
+                 * @param array  $args    The arguments for the admin notice.
+                 */
+                do_action( 'wp_admin_notice', $message, $args );
+                echo wp_kses_post( wp_get_admin_notice( $message, $args ) );
+        }
+}
+// wp_trigger_error() was introduced in WordPress 6.4 (ClassicPress 2.2.0).
+if ( ! function_exists( 'wp_trigger_error' ) ) {
+        /**
+         * Generates a user-level error/warning/notice/deprecation message.
+         *
+         * Generates the message when `WP_DEBUG` is true.
+         *
+         * @since 6.4.0
+         *
+         * @param string $function_name The function that triggered the error.
+         * @param string $message       The message explaining the error.
+         *                              The message can contain allowed HTML 'a' (with href), 'code',
+         *                              'br', 'em', and 'strong' tags and http or https protocols.
+         *                              If it contains other HTML tags or protocols, the message should be escaped
+         *                              before passing to this function to avoid being stripped {@see wp_kses()}.
+         * @param int    $error_level   Optional. The designated error type for this error.
+         *                              Only works with E_USER family of constants. Default E_USER_NOTICE.
+         *
+         * @throws WP_Exception If the error level is E_USER_ERROR. Exception where WP_Exception does not exist.
+         */
+        function wp_trigger_error( $function_name, $message, $error_level = E_USER_NOTICE ) {
+                // Bail out if WP_DEBUG is not turned on.
+                if ( ! WP_DEBUG ) {
+                        return;
+                }
+                /**
+                 * Fires when the given function triggers a user-level error/warning/notice/deprecation message.
+                 *
+                 * Can be used for debug backtracking.
+                 *
+                 * @since 6.4.0
+                 *
+                 * @param string $function_name The function that was called.
+                 * @param string $message       A message explaining what has been done incorrectly.
+                 * @param int    $error_level   The designated error type for this error.
+                 */
+                do_action( 'wp_trigger_error_run', $function_name, $message, $error_level );
+                if ( ! empty( $function_name ) ) {
+                        $message = sprintf( '%s(): %s', $function_name, $message );
+                }
+                $message = wp_kses(
+                        $message,
+                        array(
+                                'a'      => array( 'href' => true ),
+                                'br'     => array(),
+                                'code'   => array(),
+                                'em'     => array(),
+                                'strong' => array(),
+                        ),
+                        array( 'http', 'https' )
+                );
+                if ( E_USER_ERROR === $error_level ) {
+                        // WP_Exception was also introduced in WordPress 6.4.
+                        $exception = class_exists( 'WP_Exception' ) ? 'WP_Exception' : 'Exception';
+                        throw new $exception( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.ExceptionNotEscaped
+                }
+                trigger_error( $message, $error_level ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error, WordPress.Security.EscapeOutput.OutputNotEscaped
+        }
+}

indieweb-post-kinds/trunk/includes/kind-functions.php

-              r3014138
+              r3738687
 <?php
 /**
  * Kind Functions
+ * Global functions for registering, reading and displaying kinds.
+ *
+ * Global Scoped Functions for Handling Kinds.
+ *
+ * @package Post Kinds
+ * @package Post_Kinds
+ * @since   2.0.2
  */
+/**
+ *
+ */
+function register_post_kind( $slug, $args ) {
+        Kind_Taxonomy::register_post_kind( $slug, $args );
+}
+function set_post_kind_visibility( $slug, $show = true ) {
+        Kind_Taxonomy::set_post_kind_visibility( $slug, $show );
+}
+/**
+ * Retrieves an array of post kind slugs.
+ *
+ * @return array The array of post kind slugs.
+ */
+function get_post_kind_slugs() {
+        return Kind_Taxonomy::get_post_kind_slugs();
+}
+/**
+ * Returns a pretty, translated version of a post kind slug
+ *
+ * @param string $slug A post format slug.
+ * @return string The translated post format name.
+ */
+function get_post_kind_string( $slug ) {
+        return Kind_Taxonomy::get_post_kind_string( $slug );
+}
+/**
+ * Returns a link to a post kind index.
+ *
+ * @param string $kind The post kind slug.
+ * @return string The post kind term link.
+ */
+function get_post_kind_link( $kind ) {
+        return Kind_Taxonomy::get_post_kind_link( $kind );
+}
+/**
+ * Returns the post kind slug for the current post.
+ *
+ * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+ * @return string The post kind slug.
+ */
+function get_post_kind_slug( $post = null ) {
+        return Kind_Taxonomy::get_post_kind_slug( $post );
+}
+/**
+ * Returns the post kind name for the current post.
+ *
+ * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+ * @return string The post kind name.
+ */
+function get_post_kind( $post = null ) {
+        return Kind_Taxonomy::get_post_kind( $post );
+}
+/**
+ * Check if a post has any of the given kinds, or any kind.
+ *
+ * @uses has_term()
+ *
+ * @param string|array $kinds Optional. The kind to check.
+ * @param object|int   $post Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
+ * @return bool True if the post has any of the given kinds (or any kind, if no kind specified), false otherwise.
+ */
+function has_post_kind( $kinds = array(), $post = null ) {
+        return Kind_Taxonomy::has_post_kind( $kinds, $post );
+}
+/**
+ * Assign a kind to a post
+ *
+ * @param int|object $post The post for which to assign a kind.
+ * @param string     $kind A kind to assign. Using an empty string or array will default to note.
+ * @return mixed WP_Error on error. Array of affected term IDs on success.
+ */
+function set_post_kind( $post, $kind ) {
+        return Kind_Taxonomy::set_post_kind( $post, $kind );
+}
+/**
+ * Return the Displayed Response for a Specific Kind
+ *
+ * @param $slug
+ * @param $name
+ * @param $args
+ * @return string
+ */
+function get_kind_view_part( $slug, $name = null, $args = null ) {
+        Kind_View::get_view_part( $slug, $name, $args );
+}
+function kind_display( $post_id = null ) {
+                echo Kind_View::get_display( $post_id ); // phpcs:ignore
+}
+function kind_flatten_array( $a ) {
+        if ( ! is_array( $a ) ) {
+defined( 'ABSPATH' ) || exit;
+if ( ! function_exists( 'register_post_kind' ) ) {
+        /**
+         * Registers a post kind.
+         *
+         * @since 3.1.0
+         *
+         * @param string $slug Post kind slug.
+         * @param array  $args Post kind arguments. See Kind_Taxonomy::register_post_kind().
+         */
+        function register_post_kind( $slug, $args ) {
+                Kind_Taxonomy::register_post_kind( $slug, $args );
+        }
+}
+if ( ! function_exists( 'set_post_kind_visibility' ) ) {
+        /**
+         * Shows or hides a post kind in Settings.
+         *
+         * @since 3.1.0
+         *
+         * @param string $slug Post kind slug.
+         * @param bool   $show Optional. Whether to show the kind. Default true.
+         */
+        function set_post_kind_visibility( $slug, $show = true ) {
+                Kind_Taxonomy::set_post_kind_visibility( $slug, $show );
+        }
+}
+if ( ! function_exists( 'get_post_kind_slugs' ) ) {
+        /**
+         * Retrieves an array of post kind slugs.
+         *
+         * @since 0.30
+         *
+         * @return array The array of post kind slugs.
+         */
+        function get_post_kind_slugs() {
+                return Kind_Taxonomy::get_kind_list();
+        }
+}
+if ( ! function_exists( 'get_post_kind_string' ) ) {
+        /**
+         * Returns a pretty, translated version of a post kind slug.
+         *
+         * @since 0.30
+         *
+         * @param string $slug A post kind slug.
+         * @return string The translated post kind name, or an empty string if the kind is not registered.
+         */
+        function get_post_kind_string( $slug ) {
+                return Kind_Taxonomy::get_post_kind_string( $slug );
+        }
+}
+if ( ! function_exists( 'get_post_kind_link' ) ) {
+        /**
+         * Returns a link to a post kind index.
+         *
+         * @since 0.30
+         *
+         * @param string $kind The post kind slug.
+         * @return string|WP_Error|false The post kind term link, a WP_Error from get_term_link(),
+         *                               or false if the kind has no term.
+         */
+        function get_post_kind_link( $kind ) {
+                return Kind_Taxonomy::get_post_kind_link( $kind );
+        }
+}
+if ( ! function_exists( 'get_post_kind_slug' ) ) {
+        /**
+         * Returns the post kind slug for the current post.
+         *
+         * @since 0.30
+         *
+         * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+         * @return string|false The post kind slug, or false if the post has no kind.
+         */
+        function get_post_kind_slug( $post = null ) {
+                return Kind_Taxonomy::get_post_kind_slug( $post );
+        }
+}
+if ( ! function_exists( 'get_post_kind' ) ) {
+        /**
+         * Returns the post kind name for the current post.
+         *
+         * @since 0.30
+         *
+         * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
+         * @return string|false The translated post kind name, or false if the post has no kind.
+         */
+        function get_post_kind( $post = null ) {
+                return Kind_Taxonomy::get_post_kind( $post );
+        }
+}
+if ( ! function_exists( 'has_post_kind' ) ) {
+        /**
+         * Check if a post has any of the given kinds, or any kind.
+         *
+         * @since 0.30
+         *
+         * @uses has_term()
+         *
+         * @param string|array $kinds Optional. The kind to check.
+         * @param WP_Post|int  $post  Optional. The post to check. If not supplied, defaults to the current post if used in the loop.
+         * @return bool True if the post has any of the given kinds (or any kind, if no kind specified), false otherwise.
+         */
+        function has_post_kind( $kinds = array(), $post = null ) {
+                return Kind_Taxonomy::has_post_kind( $kinds, $post );
+        }
+}
+if ( ! function_exists( 'set_post_kind' ) ) {
+        /**
+         * Assign a kind to a post.
+         *
+         * @since 0.30
+         *
+         * @param int|WP_Post $post The post for which to assign a kind.
+         * @param string      $kind A registered kind's slug.
+         * @return array|false|WP_Error Array of affected term IDs on success. WP_Error if the post
+         *                              or the kind is not valid, or false on failure.
+         */
+        function set_post_kind( $post, $kind ) {
+                return Kind_Taxonomy::set_post_kind( $post, $kind );
+        }
+}
+if ( ! function_exists( 'get_kind_view_part' ) ) {
+        /**
+         * Returns the rendered view for a kind.
+         *
+         * @since 2.5.0
+         *
+         * @param string     $slug View slug, such as 'kind'.
+         * @param string     $name Optional. Kind slug, such as 'like'. Default null.
+         * @param array|null $args Optional. Arguments for the view. See Kind_View::get_view_part(). Default null.
+         * @return string The view's markup.
+         */
+        function get_kind_view_part( $slug, $name = null, $args = null ) {
+                return Kind_View::get_view_part( $slug, $name, $args );
+        }
+}
+if ( ! function_exists( 'kind_display' ) ) {
+        /**
+         * Outputs the kind markup for a post.
+         *
+         * For themes that place the markup themselves instead of adding it to the content.
+         *
+         * @since 2.6.1
+         *
+         * @param int|null $post_id Optional. Post ID. Default the current post.
+         */
+        function kind_display( $post_id = null ) {
+                        echo Kind_View::get_display( $post_id ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- The view escapes its output as it is built.
+        }
+}
+if ( ! function_exists( 'kind_flatten_array' ) ) {
+        /**
+         * Removes empty values from an array and unwraps single-item lists, recursively.
+         *
+         * @since 2.7.5
+         *
+         * @param mixed $a The value to flatten.
+         * @return mixed The flattened value. An empty string if nothing is left.
+         */
+        function kind_flatten_array( $a ) {
+                if ( ! is_array( $a ) ) {
+                        return $a;
+                }
+                if ( wp_is_numeric_array( $a ) ) {
+                        $a = array_values( array_filter( array_map( 'kind_flatten_array', $a ) ) );
+                } else {
+                        $a = array_filter( $a );
+                }
+                if ( empty( $a ) ) {
+                        return '';
+                }
+                if ( 1 === count( $a ) && isset( $a[0] ) ) {
+                        return $a[0];
+                }
                 return $a;
+        }
+        if ( wp_is_numeric_array( $a ) ) {
+                $array = array_map( 'kind_flatten_array', $a );
+        }
+        $array = array_filter( $a );
+        if ( 1 === count( $a ) ) {
+                return $a[0];
+        }
+}
+// Return any sort of src urls in content
+function kind_src_url_in_content( $content ) {
+        if ( ! $content ) {
+}
+if ( ! function_exists( 'kind_src_url_in_content' ) ) {
+        /**
+         * Returns every src attribute value in some markup.
+         *
+         * @since 3.0.0
+         *
+         * @param string $content The markup.
+         * @return string[]|int The src URLs, or 0 if there are none.
+         */
+        function kind_src_url_in_content( $content ) {
+                if ( ! $content ) {
+                        return 0;
+                }
+                if ( preg_match_all( '@src="([^"]+)"@', $content, $output ) ) {
+                        return array_pop( $output );
+                }
                 return 0;
+        }
+        if ( preg_match_all( '@src="([^"]+)"@', $content, $output ) ) {
+                return array_pop( $output );
+        }
+        return 0;
+}
+/**
+ * Get a Marketed Up Link to the Post.
+ *
+ * @param WP_Post|null Post to Display.
+ * @param string|array Classes to add to link
+ * @param string|array Classes to add to the date
+ * @return string Marked up link to a post.
+ **/
+function kind_get_the_link( $post = null, $cls = null, $date_cls = null ) {
+        $post = get_post( $post );
+        $kind = get_post_kind_slug( $post );
+        if ( is_array( $cls ) ) {
+                $cls = implode( ' ', $cls );
+        }
+        if ( is_array( $date_cls ) ) {
+                $date_cls = implode( ' ', $date_cls );
+        }
+        $time_string = '<time class="%3$s" datetime="%1$s">%2$s</time>';
+        $time_string = sprintf(
+                $time_string,
+                esc_attr( get_the_date( DATE_W3C, $post ) ),
+                get_the_date( '', $post ),
+                $date_cls
+        );
+        return sprintf( '<a class="%4$s" href="%2$s">%1$s</a> - %3$s', kind_get_the_title( $post, $kind ), get_the_permalink( $post ), $time_string, esc_attr( $cls ) );
+}
+/**
+ * Get a Generated Title for a Post as Most Post Kinds do Not Have an Explicit Title.
+ *
+ * @param WP_Post|null Post to Display.
+ * @param array $args Arguments.
+ * @return string Marked up link to a post.
+ **/
+function kind_get_the_title( $post = null, $args = array() ) {
+        $defaults = array(
+                'photo_size' => array( 32, 32 ),
+        );
+        $args = wp_parse_args( $args, $defaults );
+        $post      = get_post( $post );
+        $kind      = get_post_kind_slug( $post );
+        $title     = get_the_title( $post );
+        $before    = Kind_Taxonomy::get_before_kind( $kind );
+        $content   = '';
+        $kind_post = new Kind_Post( $post );
+        if ( ! empty( $title ) ) {
+                return $title;
+        }
+        if ( in_array( $kind, array( 'audio', 'video', 'photo' ), true ) ) {
+                switch ( $kind ) {
+                        case 'photo':
+                                $photos = $kind_post->get_photo();
+                                $before = wp_get_attachment_image(
+                                        $photos[0],
+                                        $args['photo_size'],
+                                        false,
+                                        array(
+                                                'class' => 'kind-photo-thumbnail',
+                                        )
+                                );
+                }
+        } elseif ( ! in_array( $kind, array( 'note', 'article' ), true ) ) {
+                $cite = $kind_post->get_cite( 'name' );
+                if ( false === $cite ) {
+                        $content = Kind_View::get_post_type_string( $kind_post->get_cite( 'url' ) );
+}
+if ( ! function_exists( 'kind_get_the_link' ) ) {
+        /**
+         * Returns a marked up link to a post, followed by its date.
+         *
+         * @since 3.5.9
+         *
+         * @param WP_Post|int|null  $post     Optional. Post to display. Default the current post.
+         * @param string|array|null $cls      Optional. Classes to add to the link. Default null.
+         * @param string|array|null $date_cls Optional. Classes to add to the date. Default null.
+         * @return string Marked up link to a post.
+         */
+        function kind_get_the_link( $post = null, $cls = null, $date_cls = null ) {
+                $post = get_post( $post );
+                $kind = get_post_kind_slug( $post );
+                if ( is_array( $cls ) ) {
+                        $cls = implode( ' ', $cls );
+                }
+                if ( is_array( $date_cls ) ) {
+                        $date_cls = implode( ' ', $date_cls );
+                }
+                $time_string = '<time class="%3$s" datetime="%1$s">%2$s</time>';
+                $time_string = sprintf(
+                        $time_string,
+                        esc_attr( get_the_date( DATE_W3C, $post ) ),
+                        esc_html( get_the_date( '', $post ) ),
+                        esc_attr( $date_cls )
+                );
+                return sprintf( '<a class="%4$s" href="%2$s">%1$s</a> - %3$s', kind_get_the_title( $post, $kind ), esc_url( get_the_permalink( $post ) ), $time_string, esc_attr( $cls ) );
+        }
+}
+if ( ! function_exists( 'kind_get_the_title' ) ) {
+        /**
+         * Returns a post's title, generating one if the post has none.
+         *
+         * Most post kinds do not have an explicit title.
+         *
+         * @since 3.5.9
+         *
+         * @param WP_Post|int|null $post Optional. Post to display. Default the current post.
+         * @param array            $args {
+         *     Optional. Arguments.
+         *
+         *     @type int[]|string $photo_size Image size for a photo post's thumbnail. Default array( 32, 32 ).
+         * }
+         * @return string The title, or the kind's icon or name and generated text.
+         */
+        function kind_get_the_title( $post = null, $args = array() ) {
+                $defaults = array(
+                        'photo_size' => array( 32, 32 ),
+                );
+                $args = wp_parse_args( $args, $defaults );
+                $post      = get_post( $post );
+                $kind      = get_post_kind_slug( $post );
+                $title     = get_the_title( $post );
+                $before    = Kind_Taxonomy::get_before_kind( $kind );
+                $content   = '';
+                $kind_post = new Kind_Post( $post );
+                if ( ! empty( $title ) ) {
+                        return $title;
+                }
+                if ( in_array( $kind, array( 'audio', 'video', 'photo' ), true ) ) {
+                        switch ( $kind ) {
+                                case 'photo':
+                                        $photos = $kind_post->get_photo();
+                                        $before = wp_get_attachment_image(
+                                                $photos[0],
+                                                $args['photo_size'],
+                                                false,
+                                                array(
+                                                        'class' => 'kind-photo-thumbnail',
+                                                )
+                                        );
+                        }
+                } elseif ( ! in_array( $kind, array( 'note', 'article' ), true ) ) {
+                        $cite = $kind_post->get_cite( 'name' );
+                        if ( false === $cite ) {
+                                $content = Kind_View::get_post_type_string( $kind_post->get_cite( 'url' ) );
+                        } else {
+                                $content = $cite;
+                        }
                 } else {
+                        $content = $cite;
+                }
+        } else {
+                $content = $post->post_excerpt;
+                // If no excerpt use content
+                if ( ! $content ) {
+                        $content = $post->post_content;
+                }
+                // If no content use date
+                if ( $content ) {
+                        $content = mb_strimwidth( wp_strip_all_tags( $content ), 0, 40, '...' );
+                }
+        }
+        if ( is_array( $content ) ) {
+                $content = wp_json_encode( $content );
+        }
+        $content = apply_filters( 'kind_get_the_title_content', $content, $post );
+        $before  = apply_filters( 'kind_get_the_title_before', $before, $post );
+        return trim( sprintf( '%1$s %2$s', $before, $content ) );
+}
+                        $content = $post->post_excerpt;
+                        // If no excerpt use content.
+                        if ( ! $content ) {
+                                $content = $post->post_content;
+                        }
+                        // If no content use date.
+                        if ( $content ) {
+                                $content = mb_strimwidth( wp_strip_all_tags( $content ), 0, 40, '...' );
+                        }
+                }
+                if ( is_array( $content ) ) {
+                        $content = wp_json_encode( $content );
+                }
+                // The content is text (a cited name or an excerpt), often from another site.
+                $content = esc_html( wp_strip_all_tags( (string) $content ) );
+                /**
+                 * Filters the text of a generated post title.
+                 *
+                 * The text is a cited name, an excerpt or similar, already escaped. A callback
+                 * that adds markup must escape what it adds.
+                 *
+                 * @since 3.5.9
+                 *
+                 * @param string  $content Escaped title text.
+                 * @param WP_Post $post    The post.
+                 */
+                $content = apply_filters( 'kind_get_the_title_content', $content, $post );
+                /**
+                 * Filters the markup shown before a generated post title.
+                 *
+                 * The markup is output as-is, so it must be escaped.
+                 *
+                 * @since 3.5.9
+                 *
+                 * @param string  $before The kind's icon or name, from Kind_Taxonomy::get_before_kind().
+                 * @param WP_Post $post   The post.
+                 */
+                $before  = apply_filters( 'kind_get_the_title_before', $before, $post );
+                return trim( sprintf( '%1$s %2$s', $before, $content ) );
+        }
+}

indieweb-post-kinds/trunk/includes/register-kinds.php

-              r3001401
+              r3738687
 <?php
+/* Registers built-in Post Kinds
+/**
+ * Registers the built-in kinds.
+ *
+ * The arguments each kind takes are documented in
+ * Kind_Taxonomy::register_post_kind().
+ *
+ * @package Post_Kinds
+ * @since   3.3.4
  */
+defined( 'ABSPATH' ) || exit;
 register_post_kind(
         'article',
         array(
                 'singular_name'   => __( 'Article', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Articles', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => '', // microformats 2 property
+                'singular_name'   => __( 'Article', 'indieweb-post-kinds' ),
+                'name'            => __( 'Articles', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => '',
                 'properties'      => array(),
                 'format'          => '', // Post Format that maps to this
+                'format'          => '',
                 'description'     => __( 'traditional long form content: a post with an explicit title and body', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/article',
                 'shortlink'       => 'b',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => true,
+                'show'            => true,
+        )
 );
 …
         'note',
         array(
                 'singular_name'   => __( 'Note', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Notes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => '', // microformats 2 property
+                'singular_name'   => __( 'Note', 'indieweb-post-kinds' ),
+                'name'            => __( 'Notes', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => '',
                 'properties'      => array(),
                 'format'          => 'aside', // Post Format that maps to this
+                'format'          => 'aside',
                 'description'     => __( 'short content: a post or status update with just plain content and typically without a title', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/note',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'reply',
         array(
                 'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Replies', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Replied to', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'in-reply-to', // microformats 2 property
+                'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ),
+                'name'            => __( 'Replies', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Replied to', 'indieweb-post-kinds' ),
+                'property'        => 'in-reply-to',
                 'properties'      => array(
                         'in-reply-to' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'a reply to content typically on another site', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/reply',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'repost',
         array(
                 'singular_name'   => __( 'Repost', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Reposts', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Reposted', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'repost-of', // microformats 2 property
+                'singular_name'   => __( 'Repost', 'indieweb-post-kinds' ),
+                'name'            => __( 'Reposts', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Reposted', 'indieweb-post-kinds' ),
+                'property'        => 'repost-of',
                 'properties'      => array(
                         'repost-of' => array(
 …
                         ),
                 ),
                 'format'          => '', // Post Format that maps to this
+                'format'          => '',
                 'description'     => __( 'a complete reposting of content from another site', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/repost',
                 'shortlink'       => 'b',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => true,
+                'show'            => true,
+        )
 );
 …
         'like',
         array(
                 'singular_name'   => __( 'Like', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Likes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Liked', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'like-of', // microformats 2 property
+                'singular_name'   => __( 'Like', 'indieweb-post-kinds' ),
+                'name'            => __( 'Likes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Liked', 'indieweb-post-kinds' ),
+                'property'        => 'like-of',
                 'properties'      => array(
                         'like-of' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'a way to pay compliments to the original post/poster of external content', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/like',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'favorite',
         array(
                 'singular_name'   => __( 'Favorite', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Favorites', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Favorited', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'favorite-of', // microformats 2 property
+                'singular_name'   => __( 'Favorite', 'indieweb-post-kinds' ),
+                'name'            => __( 'Favorites', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Favorited', 'indieweb-post-kinds' ),
+                'property'        => 'favorite-of',
                 'properties'      => array(
                         'favorite-of' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'special to the author', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/favorite',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'bookmark',
         array(
                 'singular_name'   => __( 'Bookmark', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Bookmarks', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Bookmarked', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'bookmark-of', // microformats 2 property
+                'singular_name'   => __( 'Bookmark', 'indieweb-post-kinds' ),
+                'name'            => __( 'Bookmarks', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Bookmarked', 'indieweb-post-kinds' ),
+                'property'        => 'bookmark-of',
                 'properties'      => array(
                         'bookmark-of' => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'storing a link/bookmark for personal use or sharing with others', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/bookmark',
                 'shortlink'       => 'h',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'photo',
         array(
                 'singular_name'   => __( 'Photo', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Photos', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'photo', // microformats 2 property
                 'format'          => 'image', // Post Format that maps to this
+                'singular_name'   => __( 'Photo', 'indieweb-post-kinds' ),
+                'name'            => __( 'Photos', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'photo',
+                'format'          => 'image',
                 'description'     => __( 'a post with an embedded image/photo as its primary focus', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/photo',
                 'shortlink'       => 'p',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'video',
         array(
                 'singular_name'   => __( 'Video', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Videos', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'video', // microformats 2 property
                 'format'          => 'video', // Post Format that maps to this
+                'singular_name'   => __( 'Video', 'indieweb-post-kinds' ),
+                'name'            => __( 'Videos', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'video',
+                'format'          => 'video',
                 'description'     => __( 'a post with an embedded video as its primary focus', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/video',
                 'shortlink'       => 'a',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'audio',
         array(
                 'singular_name'   => __( 'Audio', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Audios', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'audio', // microformats 2 property
                 'format'          => 'audio', // Post Format that maps to this
+                'singular_name'   => __( 'Audio', 'indieweb-post-kinds' ),
+                'name'            => __( 'Audios', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'audio',
+                'format'          => 'audio',
                 'description'     => __( 'a post with an embedded audio file as its primary focus', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/audio',
                 'shortlink'       => 'a',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'tag',
         array(
                 'singular_name'   => __( 'Tag', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Tags', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Tagged', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'tag-of', // microformats 2 property
                 'format'          => 'link', // Post Format that maps to this
+                'singular_name'   => __( 'Tag', 'indieweb-post-kinds' ),
+                'name'            => __( 'Tags', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Tagged', 'indieweb-post-kinds' ),
+                'property'        => 'tag-of',
+                'format'          => 'link',
                 'description'     => __( 'allows you to tag a post as being of a specific category or tag, or for person tagging', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/tag',
                 'shortlink'       => 'd',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'rsvp',
         array(
                 'singular_name'   => __( 'RSVP', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'RSVPs', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'RSVPed', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'in-reply-to', // microformats 2 property
+                'singular_name'   => __( 'RSVP', 'indieweb-post-kinds' ),
+                'name'            => __( 'RSVPs', 'indieweb-post-kinds' ),
+                'verb'            => __( 'RSVPed', 'indieweb-post-kinds' ),
+                'property'        => 'in-reply-to',
                 'properties'      => array(
                         'rsvp'        => array(
 …
                         ),
                 ),
                 'format'          => 'link', // Post Format that maps to this
+                'format'          => 'link',
                 'description'     => __( 'a specific type of reply regarding attendance of an event', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/rsvp',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'listen',
         array(
                 'singular_name'   => __( 'Listen', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Listens', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Listened', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'listen-of', // microformats 2 property
+                'singular_name'   => __( 'Listen', 'indieweb-post-kinds' ),
+                'name'            => __( 'Listens', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Listened', 'indieweb-post-kinds' ),
+                'property'        => 'listen-of',
                 'properties'      => array(
                         'listen-of' => array(
 …
                         ),
                 ),
                 'format'          => 'audio', // Post Format that maps to this
+                'format'          => 'audio',
                 'description'     => __( 'listening to audio; sometimes called a scrobble', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/listen',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'watch',
         array(
                 'singular_name'   => __( 'Watch', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Watches', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Watched', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'watch-of', // microformats 2 property
+                'singular_name'   => __( 'Watch', 'indieweb-post-kinds' ),
+                'name'            => __( 'Watches', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Watched', 'indieweb-post-kinds' ),
+                'property'        => 'watch-of',
                 'properties'      => array(
                         'watch-of' => array(
 …
                         ),
                 ),
                 'format'          => 'video', // Post Format that maps to this
+                'format'          => 'video',
                 'description'     => __( 'watching a movie, television show, online video, play or other visual-based event', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/watch',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'checkin',
         array(
                 'singular_name'   => __( 'Checkin', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Checkins', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Checked into', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'checkin', // microformats 2 property
+                'singular_name'   => __( 'Checkin', 'indieweb-post-kinds' ),
+                'name'            => __( 'Checkins', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Checked into', 'indieweb-post-kinds' ),
+                'property'        => 'checkin',
                 'properties'      => array(
                         'checkin' => array(
 …
                         ),
                 ),
                 'format'          => 'status', // Post Format that maps to this
+                'format'          => 'status',
                 'description'     => __( 'identifying you are at a particular geographic location', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/checkin',
                 'shortlink'       => 'g',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'wish',
         array(
                 'singular_name'   => __( 'Wish', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Wishes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Wished', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'wish-of', // microformats 2 property
                 'format'          => 'link', // Post Format that maps to this
+                'singular_name'   => __( 'Wish', 'indieweb-post-kinds' ),
+                'name'            => __( 'Wishes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Wished', 'indieweb-post-kinds' ),
+                'property'        => 'wish-of',
+                'format'          => 'link',
                 'description'     => __( 'a post indicating a desire/wish. The archive of which would be a wishlist, such as a gift registry or similar', 'indieweb-post-kinds' ),
                 'description_url' => '',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'play',
         array(
                 'singular_name'   => __( 'Play', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Playing', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Played', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'play-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Play', 'indieweb-post-kinds' ),
+                'name'            => __( 'Playing', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Played', 'indieweb-post-kinds' ),
+                'property'        => 'play-of',
+                'format'          => 'status',
                 'description'     => __( 'playing a game', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/game_play',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'weather',
         array(
                 'singular_name'   => __( 'Weather', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Weather', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => ' ', // The string for the verb or action (liked this)
                 'property'        => 'weather', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Weather', 'indieweb-post-kinds' ),
+                'name'            => __( 'Weather', 'indieweb-post-kinds' ),
+                'verb'            => ' ',
+                'property'        => 'weather',
+                'format'          => 'status',
                 'description'     => __( 'current weather conditions', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/weather',
                 'shortlink'       => 'u',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'exercise',
         array(
                 'singular_name'   => __( 'Exercise', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Exercise', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Exercised', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'exercise', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Exercise', 'indieweb-post-kinds' ),
+                'name'            => __( 'Exercise', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Exercised', 'indieweb-post-kinds' ),
+                'property'        => 'exercise',
+                'format'          => 'status',
                 'description'     => __( 'some form of physical activity or workout (examples: walk, run, cycle, hike, yoga, etc.)', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/exercise',
                 'shortlink'       => 'm',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'trip',
         array(
                 'singular_name'   => __( 'Trip', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Trips', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Travelled', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'trip', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Trip', 'indieweb-post-kinds' ),
+                'name'            => __( 'Trips', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Travelled', 'indieweb-post-kinds' ),
+                'property'        => 'trip',
+                'format'          => '',
                 'description'     => __( 'represents a geographic journey', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/trip',
                 'shortlink'       => 'e',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'itinerary',
         array(
                 'singular_name'   => __( 'Itinerary', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Itineraries', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Travelled', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'itinerary', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Itinerary', 'indieweb-post-kinds' ),
+                'name'            => __( 'Itineraries', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Travelled', 'indieweb-post-kinds' ),
+                'property'        => 'itinerary',
+                'format'          => '',
                 'description'     => __( 'parts of a scheduled trip including transit by car, plane, train, etc.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/trip',
                 'shortlink'       => 'e',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'eat',
         array(
                 'singular_name'   => __( 'Eat', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Eat', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Ate', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'ate', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Eat', 'indieweb-post-kinds' ),
+                'name'            => __( 'Eat', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Ate', 'indieweb-post-kinds' ),
+                'property'        => 'ate',
+                'format'          => 'status',
                 'description'     => __( 'what you are eating, perhaps for a food diary', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/food',
                 'shortlink'       => 'u',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'drink',
         array(
                 'singular_name'   => __( 'Drink', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Drinks', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Drank', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'drank', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Drink', 'indieweb-post-kinds' ),
+                'name'            => __( 'Drinks', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Drank', 'indieweb-post-kinds' ),
+                'property'        => 'drank',
+                'format'          => 'status',
                 'description'     => __( 'what you are drinking, perhaps for a food dairy', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/food',
                 'shortlink'       => 'u',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'follow',
         array(
                 'singular_name'   => __( 'Follow', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Follows', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Followed', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'follow-of', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Follow', 'indieweb-post-kinds' ),
+                'name'            => __( 'Follows', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Followed', 'indieweb-post-kinds' ),
+                'property'        => 'follow-of',
+                'format'          => '',
                 'description'     => __( 'indicating you are now following or subscribing to another person`s activities online', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/follow',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'jam',
         array(
                 'singular_name'   => __( 'Jam', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Jams', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Listened to', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'jam-of', // microformats 2 property
                 'format'          => 'audio', // Post Format that maps to this
+                'singular_name'   => __( 'Jam', 'indieweb-post-kinds' ),
+                'name'            => __( 'Jams', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Listened to', 'indieweb-post-kinds' ),
+                'property'        => 'jam-of',
+                'format'          => 'audio',
                 'description'     => __( 'a particularly personally meaningful song (a listen with added emphasis)', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/jam',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'read',
         array(
                 'singular_name'   => __( 'Read', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Reads', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Read', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'read-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Read', 'indieweb-post-kinds' ),
+                'name'            => __( 'Reads', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Read', 'indieweb-post-kinds' ),
+                'property'        => 'read-of',
+                'format'          => 'status',
                 'description'     => __( 'reading a book, magazine, newspaper, other physical document, or online post', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/read',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'quote',
         array(
                 'singular_name'   => __( 'Quote', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Quotes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Quoted', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'quotation-of', // microformats 2 property
                 'format'          => 'quote', // Post Format that maps to this
+                'singular_name'   => __( 'Quote', 'indieweb-post-kinds' ),
+                'name'            => __( 'Quotes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Quoted', 'indieweb-post-kinds' ),
+                'property'        => 'quotation-of',
+                'format'          => 'quote',
                 'description'     => __( 'quoted content', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/quote',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'mood',
         array(
                 'singular_name'   => __( 'Mood', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Moods', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Felt', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'mood', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Mood', 'indieweb-post-kinds' ),
+                'name'            => __( 'Moods', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Felt', 'indieweb-post-kinds' ),
+                'property'        => 'mood',
+                'format'          => 'status',
                 'description'     => __( 'how you are feeling (example: happy, sad, indifferent, etc.)', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/mood',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'recipe',
         array(
                 'singular_name'   => __( 'Recipe', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Recipes', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Cooked', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'recipe', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Recipe', 'indieweb-post-kinds' ),
+                'name'            => __( 'Recipes', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Cooked', 'indieweb-post-kinds' ),
+                'property'        => 'recipe',
+                'format'          => '',
                 'description'     => __( 'list of ingredients and directions for making food or drink', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/recipe',
                 'shortlink'       => 'b',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => true,
+                'show'            => false,
+        )
 );
 …
         'issue',
         array(
                 'singular_name'   => __( 'Issue', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Issues', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Filed an Issue', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'in-reply-to', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Issue', 'indieweb-post-kinds' ),
+                'name'            => __( 'Issues', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Filed an Issue', 'indieweb-post-kinds' ),
+                'property'        => 'in-reply-to',
+                'format'          => '',
                 'description'     => __( 'Issue is a special kind of article post that is a reply to typically some source code, though potentially anything at a source control repository.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/issue',
                 'shortlink'       => 't',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => true,
+                'show'            => true,
+        )
 );
 …
         'question',
         array(
                 'singular_name'   => __( 'Question', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Questions', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Asked a question', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'question', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Question', 'indieweb-post-kinds' ),
+                'name'            => __( 'Questions', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Asked a question', 'indieweb-post-kinds' ),
+                'property'        => 'question',
+                'format'          => '',
                 'description'     => __( 'Question is a post type for soliciting answer replies, which are then typically up/down voted by others and then displayed underneath the question post ordered by highest positive vote count rather than time ordered.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/question',
                 'shortlink'       => 'q',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'sleep',
         array(
                 'singular_name'   => __( 'Sleep', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Sleeps', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Slept', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'sleep', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Sleep', 'indieweb-post-kinds' ),
+                'name'            => __( 'Sleeps', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Slept', 'indieweb-post-kinds' ),
+                'property'        => 'sleep',
+                'format'          => '',
                 'description'     => __( 'Sleep is a passive metrics post type that indicates how much time (and often a graph of how deeply) a person has slept.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/sleep',
                 'shortlink'       => 'm',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'event',
         array(
                 'singular_name'   => __( 'Event', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Events', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Planned', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'event', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Event', 'indieweb-post-kinds' ),
+                'name'            => __( 'Events', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Planned', 'indieweb-post-kinds' ),
+                'property'        => 'event',
+                'format'          => '',
                 'description'     => __( 'An event is a type of post that in addition to a post name (event title) has a start datetime (likely end datetime), and a location.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/event',
                 'shortlink'       => 'e',
                 'title'           => true, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => true,
+                'show'            => false,
+        )
 );
 …
         'review',
         array(
                 'singular_name'   => __( 'Review', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Reviews', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Reviewed', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'review-of', // microformats 2 property
                 'format'          => '', // Post Format that maps to this
+                'singular_name'   => __( 'Review', 'indieweb-post-kinds' ),
+                'name'            => __( 'Reviews', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Reviewed', 'indieweb-post-kinds' ),
+                'property'        => 'review-of',
+                'format'          => '',
                 'description'     => __( 'A review is a post evaluating a product or service, usually involving a written description, sometimes with summary numerical evaluations, also known as just a rating.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/review',
                 'shortlink'       => 't',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+                'title'           => false,
+                'show'            => true,
+        )
 );
 …
         'acquisition',
         array(
                 'singular_name'   => __( 'Acquisition', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Acquisitions', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Acquired', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'acquired-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Acquisition', 'indieweb-post-kinds' ),
+                'name'            => __( 'Acquisitions', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Acquired', 'indieweb-post-kinds' ),
+                'property'        => 'acquired-of',
+                'format'          => 'status',
                 'description'     => __( 'Purchases, gifts, found things, or objects donated', 'indieweb-post-kinds' ),
                 'description_url' => 'http://indieweb.org/acquisition',
                 'shortlink'       => 'f',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => false, // Show in Settings
+                'title'           => false,
+                'show'            => false,
+        )
 );
 …
         'craft',
         array(
                 'singular_name'   => __( 'Craft', 'indieweb-post-kinds' ), // Name for one instance of the kind
                 'name'            => __( 'Crafts', 'indieweb-post-kinds' ), // General name for the kind plural
                 'verb'            => __( 'Crafted', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
                 'property'        => 'craft-of', // microformats 2 property
                 'format'          => 'status', // Post Format that maps to this
+                'singular_name'   => __( 'Craft', 'indieweb-post-kinds' ),
+                'name'            => __( 'Crafts', 'indieweb-post-kinds' ),
+                'verb'            => __( 'Crafted', 'indieweb-post-kinds' ),
+                'property'        => 'craft-of',
+                'format'          => 'status',
                 'description'     => __( 'Activities like knitting, crocheting, cross stitch, wood working, restoration, 3d printing...the activity of building something.', 'indieweb-post-kinds' ),
                 'description_url' => 'https://indieweb.org/crafts',
                 'shortlink'       => 'x',
                 'title'           => false, // Should this kind have an explicit title
                 'show'            => true, // Show in Settings
+        )
 );
+                'title'           => false,
+                'show'            => true,
+        )
+);

indieweb-post-kinds/trunk/includes/time-functions.php

-              r2973430
+              r3738687
 <?php
 /**
  * Time Functions
+ * Global date and time functions.
+ *
+ * Global Scoped Functions for Handling Time.
+ * The generic helpers moved to Kind_Time in 4.0.0; their global names remain
+ * here as deprecated wrappers.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
  */
+defined( 'ABSPATH' ) || exit;
+if ( ! function_exists( 'kind_safe_datetime' ) ) {
+        /**
+         * Creates a date from a value without throwing on invalid input.
+         *
+         * Dates come from post meta and Micropub requests, where a malformed value
+         * would otherwise throw an uncaught exception and break the page.
+         *
+         * @since 4.0.0
+         *
+         * @param DateTimeInterface|string $value     Date, or a date string.
+         * @param DateTimeZone|null        $timezone  Optional. Timezone for strings without one.
+         * @param bool                     $immutable Optional. Whether to return a DateTimeImmutable. Default true.
+         * @return DateTimeImmutable|DateTime|false The date, or false if the value is not a valid date.
+         */
+        function kind_safe_datetime( $value, $timezone = null, $immutable = true ) {
+                if ( $value instanceof DateTimeInterface ) {
+                        if ( $immutable ) {
+                                return $value instanceof DateTimeImmutable ? $value : DateTimeImmutable::createFromMutable( $value );
+                        }
+                        return $value instanceof DateTime ? $value : DateTime::createFromImmutable( $value );
+                }
+                if ( ! is_string( $value ) || '' === trim( $value ) ) {
+                        return false;
+                }
+                try {
+                        return $immutable ? new DateTimeImmutable( $value, $timezone ) : new DateTime( $value, $timezone );
+                } catch ( Exception $e ) {
+                        return false;
+                }
+        }
+}
+if ( ! function_exists( 'kind_safe_interval' ) ) {
+        /**
+         * Creates a duration from an ISO 8601 duration without throwing on invalid input.
+         *
+         * @since 4.0.0
+         *
+         * @param DateInterval|string $value Duration, or an ISO 8601 duration such as PT3M30S.
+         * @return DateInterval|false The duration, or false if the value is not a valid duration.
+         */
+        function kind_safe_interval( $value ) {
+                if ( $value instanceof DateInterval ) {
+                        return $value;
+                }
+                if ( ! is_string( $value ) || '' === trim( $value ) ) {
+                        return false;
+                }
+                try {
+                        return new DateInterval( $value );
+                } catch ( Exception $e ) {
+                        return false;
+                }
+        }
+}
 if ( ! function_exists( 'tz_seconds_to_offset' ) ) {
+        /**
+         * Converts a UTC offset in seconds to an offset string.
+         *
+         * @since 2.3.0
+         *
+         * @param int $seconds Offset in seconds.
+         * @return string Offset such as '-05:00'.
+         */
         function tz_seconds_to_offset( $seconds ) {
                 return ( $seconds < 0 ? '-' : '+' ) . sprintf( '%02d:%02d', abs( $seconds / 60 / 60 ), abs( $seconds / 60 ) % 60 );
 …
 if ( ! function_exists( 'tz_offset_to_seconds' ) ) {
+        /**
+         * Converts an offset string to a UTC offset in seconds.
+         *
+         * @since 2.3.0
+         *
+         * @param string $offset Offset such as '-05:00' or '-0500'.
+         * @return int Offset in seconds, or 0 if the string is not an offset.
+         */
         function tz_offset_to_seconds( $offset ) {
                 if ( preg_match( '/([+-])(\d{2}):?(\d{2})/', $offset, $match ) ) {
                         $sign = ( '-' ? -1 : 1 === $match[1] );
+                        $sign = ( '-' === $match[1] ) ? -1 : 1;
                         return ( ( $match[2] * 60 * 60 ) + ( $match[3] * 60 ) ) * $sign;
                 } else {
 …
 if ( ! function_exists( 'tz_seconds_to_timezone' ) ) {
+        /**
+         * Converts a UTC offset in seconds to a time zone.
+         *
+         * @since 3.2.2
+         *
+         * @param int $seconds Offset in seconds.
+         * @return DateTimeZone|false The time zone, or false if it cannot be created.
+         */
         function tz_seconds_to_timezone( $seconds ) {
-                if ( version_compare( phpversion(), '5.5.10', '<' ) ) {
-                        return timezone_name_from_abbr( '', $seconds, 0 );
+                }
                 if ( 0 !== $seconds ) {
                         $tz = timezone_open( tz_seconds_to_offset( $seconds ) );
 …
 if ( ! function_exists( 'tz_timezone_to_seconds' ) ) {
+        /**
+         * Returns a time zone's UTC offset in seconds.
+         *
+         * @since 3.2.2
+         *
+         * @param string $timezone Time zone name or offset string.
+         * @return int|false Offset in seconds, or false if the time zone is not valid.
+         */
         function tz_timezone_to_seconds( $timezone ) {
                 $tz = timezone_open( $timezone );
 …
 if ( ! function_exists( 'get_gmt_offsets' ) ) {
+        /**
+         * Returns the UTC offsets currently in use by any time zone, sorted.
+         *
+         * The list is built from every time zone, so it is kept in the object
+         * cache for the day: for the request, and across requests when the cache
+         * is persistent. Daylight saving changes it at most a few times a year.
+         *
+         * @since 3.0.0
+         *
+         * @return string[] Offsets such as '-05:00'.
+         */
         function get_gmt_offsets() {
+                $key = 'gmt_offsets_' . gmdate( 'Y-m-d' );
+                $o   = wp_cache_get( $key, 'post-kinds' );
+                if ( is_array( $o ) ) {
+                        return $o;
+                }
                 $o       = array();
                 $t_zones = timezone_identifiers_list();
                 foreach ( $t_zones as $a ) {
-                        $t = '';
                         try {
                                 // this throws exception for 'US/Pacific-New'
+                                // Some identifiers, such as 'US/Pacific-New', throw on some PHP versions.
                                 $zone    = new DateTimeZone( $a );
                                 $seconds = $zone->getOffset( new DateTime( 'now', $zone ) );
                                 $o[]     = tz_seconds_to_offset( $seconds );
                         } catch ( Exception $e ) {
                                 die( 'Exception : ' . esc_html( $e->getMessage() ) . '<br />' );
                                 // what to do in catch ? , nothing just relax
+                                // Skip the zone rather than fail.
+                                continue;
+                        }
+                }
                 $o = array_unique( $o );
                 asort( $o );
+                wp_cache_set( $key, $o, 'post-kinds', DAY_IN_SECONDS );
                 return $o;
+        }
 …
 if ( ! function_exists( 'get_default_offset' ) ) {
+        // Gets the default offset
+        /**
+         * Returns the site's UTC offset, from its gmt_offset option.
+         *
+         * @since 3.0.0
+         *
+         * @return string Offset such as '-05:00'.
+         */
         function get_default_offset() {
                 $tz_seconds = get_option( 'gmt_offset' ) * 3600;
 …
 if ( ! function_exists( 'build_iso8601_time' ) ) {
+        // Turns individual pieces of a date and time into a single ISO8601 string
+        /**
+         * Joins a date, time and offset into an ISO 8601 string.
+         *
+         * @since 3.0.0
+         *
+         * @param string $date   Date in Y-m-d format.
+         * @param string $time   Time in H:i:s format.
+         * @param string $offset Offset such as '-05:00'. Empty for the site's offset.
+         * @return string The date and time, or an empty string if both are empty.
+         */
         function build_iso8601_time( $date, $time, $offset ) {
                 if ( empty( $date ) && empty( $time ) ) {
 …
 if ( ! function_exists( 'build_iso8601_duration' ) ) {
+        // Given an array with the pieces of a duration build an ISO8601 duration
+        /**
+         * Builds an ISO 8601 duration from its pieces.
+         *
+         * @since 3.0.0
+         *
+         * @param int[] $values Years (Y), months (M), days (D), hours (H), minutes (I) and seconds (S).
+         * @return string The duration, or an empty string if every piece is empty.
+         */
         function build_iso8601_duration( $values ) {
                 $values = array_filter( $values );
 …
 if ( ! function_exists( 'calculate_duration' ) ) {
+        // Given two ISO8601 time strings return a DateInterval Object
+        /**
+         * Returns the duration between two dates.
+         *
+         * @since 2.5.0
+         * @since 4.0.0 Also accepts DateTimeInterface objects, such as Kind_Post::get( 'start' ) returns.
+         *
+         * @param DateTimeInterface|string $start_string Start, as a date or a string in Y-m-d\TH:i:sP format.
+         * @param DateTimeInterface|string $end_string   End, as a date or a string in Y-m-d\TH:i:sP format.
+         * @return DateInterval|false The duration, or false if either date is not valid or they are the same.
+         */
         function calculate_duration( $start_string, $end_string ) {
+                $start = array();
+                $end   = array();
+                if ( ! is_string( $start_string ) || ! is_string( $end_string ) ) {
+                $dates = array();
+                foreach ( array( $start_string, $end_string ) as $value ) {
+                        if ( is_string( $value ) ) {
+                                // Only the full format: looser parsing reads stray text, such as a single letter, as a date.
+                                $value = date_create_immutable_from_format( 'Y-m-d\TH:i:sP', $value );
+                        }
+                        if ( ! $value instanceof DateTimeInterface ) {
+                                return false;
+                        }
+                        $dates[] = $value;
+                }
+                list( $start, $end ) = $dates;
+                if ( $start == $end ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual -- Compares the moments, not the objects.
                         return false;
+                }
+                if ( $start_string === $end_string ) {
+                        return false;
+                }
+                $start = date_create_from_format( 'Y-m-d\TH:i:sP', $start_string );
+                $end   = date_create_from_format( 'Y-m-d\TH:i:sP', $end_string );
+                if ( ( $start instanceof DateTime ) && ( $end instanceof DateTime ) ) {
+                        $duration = $start->diff( $end );
+                        return $duration;
+                }
+                return false;
+        }
+}
+if ( ! function_exists( 'seconds_to_iso8601' ) ) {
+        function seconds_to_iso8601( $second ) {
+                $h   = intval( $second / 3600 );
+                $m   = intval( ( $second - $h * 3600 ) / 60 );
+                $s   = $second - ( $h * 3600 + $m * 60 );
+                $ret = 'PT';
+                if ( $h ) {
+                        $ret .= $h . 'H';
+                }
+                if ( $m ) {
+                        $ret .= $m . 'M';
+                }
+                if ( ( ! $h && ! $m ) || $s ) {
+                        $ret .= $s . 'S';
+                }
+                return $ret;
+                return $start->diff( $end );
+        }
+}
 if ( ! function_exists( 'date_interval_to_iso8601' ) ) {
+        // Return a date interval as an ISO8601 string
+        /**
+         * Converts a duration to an ISO 8601 duration string.
+         *
+         * @since 3.0.0
+         *
+         * @param \DateInterval $interval The duration.
+         * @return string The duration, such as 'PT3M30S'.
+         */
         function date_interval_to_iso8601( \DateInterval $interval ) {
                 // Reading all non-zero date parts.
 …
+}
+function display_formatted_datetime( $date ) {
+        if ( is_string( $date ) ) {
+                $date = new DateTimeImmutable( $date );
+        }
+        return $date->format( get_option( 'date_format' ) ) . ' ' . $date->format( get_option( 'time_format' ) );
+}
+/**
+ * Function to divide a datetime into an array for use in a field
+ *
+ * @access public
+ *
+ * @param DateTime $datetime
+ * @return array {
+ *  @type string $date Date in Y-m-d format.
+ *  @type string $time Time in H:i:s format.
+ *  @type DateTimeZone $timezone Timezone object.
+ * }
+ */
+function divide_datetime( $datetime ) {
+        if ( ! $datetime ) {
+                return false;
+        }
+        if ( is_string( $datetime ) ) {
+                $datetime = new DateTime( $datetime );
+        }
+        if ( ! $datetime ) {
+                return false;
+        }
+        $time         = array();
+        $time['date'] = $datetime->format( 'Y-m-d' );
+        if ( '0000-01-01' === $time['date'] ) {
+                $time['date'] = '';
+        }
+        $time['time']   = $datetime->format( 'H:i:s' );
+        $time['offset'] = get_datetime_offset( $datetime );
+        $time['class']  = get_class( $datetime );
+        return array_filter( $time );
+}
+/**
+ * Function to build a datetime from individual pieces
+ *
+ * @access public
+ *
+ * @param string $date Date in Y-m-d format.
+ * @param string $time Time in H:i:s format.
+ * @param DateTimeZone $timezone Timezone object.
+ *
+ * @return DateTimeImmutable|false DateTime object or false if not valid
+ */
+function build_datetime( $date, $time, $offset = null ) {
+        if ( empty( $date ) && empty( $time ) ) {
+                return false;
+        }
+        if ( is_string( $offset ) ) {
+                $timezone = timezone_open( $offset );
+        } elseif ( $offset instanceof DateTimeZone ) {
+                $timezone = $offset;
+        } else {
+                return false;
+        }
+        if ( ! $timezone ) {
+                $timezone = wp_timezone();
+        }
+        return date_create_immutable_from_format( 'Y-m-d\TH:i:sP', $date . 'T' . $time, $timezone );
+}
+/**
+ * Return a formatted offset from a datetime object
+ *
+ * @access public
+ *
+ * @param DateTime $datetime DateTime object or if not passed set to now and site timezone
+ *
+ * @return string|false Formatted offset or false if not valid
+ */
+function get_datetime_offset( $datetime = null ) {
+        if ( ! $datetime ) {
+                $datetime = new DateTimeImmutable( 'now', wp_timezone() );
+        }
+        $seconds = $datetime->getOffset();
+        if ( false === $seconds ) {
+                return false;
+        }
+        return ( $seconds < 0 ? '-' : '+' ) . sprintf( '%02d:%02d', abs( $seconds / 60 / 60 ), abs( $seconds / 60 ) % 60 );
+}
+// Given an ISO8601 duration return an array with the piece otherwise 0 duration.
+function divide_interval( $interval ) {
+        $default = array(
+                'Y' => 0,
+                'M' => 0,
+                'D' => 0,
+                'H' => 0,
+                'I' => 0,
+                'S' => 0,
+        );
+        if ( ! $interval ) {
+                return $default;
+        }
+        if ( is_string( $interval ) && ! empty( $interval ) ) {
+                try {
+                        $interval = new DateInterval( $interval );
+                } catch ( \Exception $e ) {
+                        return $default;
+                }
+        }
+        // Reading all non-zero date parts.
+        $return = array(
+                'Y' => $interval->y,
+                'M' => $interval->m,
+                'D' => $interval->d,
+                'H' => $interval->h,
+                'I' => $interval->i,
+                'S' => $interval->s,
+        );
+        return wp_parse_args( $return, $default );
+}
+// Given an array with the pieces of a duration build an ISO8601 duration
+function build_interval( $values ) {
+        $date = wp_array_slice_assoc( $values, array( 'Y', 'M', 'D' ) );
+        $time = wp_array_slice_assoc( $values, array( 'H', 'I', 'S' ) );
+        if ( ! $date || ! $time ) {
+                return '';
+        }
+        $spec = 'P';
+        // Adding each part to the spec-string.
+        foreach ( $date as $key => $value ) {
+                $spec .= $value . $key;
+        }
+        if ( count( $time ) > 0 ) {
+                $spec .= 'T';
+                foreach ( $time as $key => $value ) {
+                        if ( 'I' === $key ) {
+                                $spec .= $value . 'M';
+                        } else {
+                                $spec .= $value . $key;
+                        }
+                }
+        }
+        return $spec;
+}
+if ( ! function_exists( 'display_formatted_datetime' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::display_formatted_datetime().
+         *
+         * @since 3.2.0
+         * @deprecated 4.0.0 Use Kind_Time::display_formatted_datetime(). Will be removed in 5.0.0.
+         *
+         * @param DateTimeInterface|string $date Date, or a string kind_safe_datetime() accepts.
+         * @return string The formatted date and time, or an empty string if the date is not valid.
+         */
+        function display_formatted_datetime( $date ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::display_formatted_datetime()' );
+                return Kind_Time::display_formatted_datetime( $date );
+        }
+}
+if ( ! function_exists( 'divide_datetime' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::divide_datetime().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::divide_datetime(). Will be removed in 5.0.0.
+         *
+         * @param DateTimeInterface|string $datetime Date, or a string kind_safe_datetime() accepts.
+         * @return array|false The date's parts. See Kind_Time::divide_datetime().
+         */
+        function divide_datetime( $datetime ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::divide_datetime()' );
+                return Kind_Time::divide_datetime( $datetime );
+        }
+}
+if ( ! function_exists( 'build_datetime' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::build_datetime().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::build_datetime(). Will be removed in 5.0.0.
+         *
+         * @param string                   $date   Date in Y-m-d format.
+         * @param string                   $time   Time in H:i or H:i:s format.
+         * @param string|DateTimeZone|null $offset Optional. Offset or time zone. Default the site's time zone.
+         * @return DateTimeImmutable|false The date, or false if it is not valid.
+         */
+        function build_datetime( $date, $time, $offset = null ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::build_datetime()' );
+                return Kind_Time::build_datetime( $date, $time, $offset );
+        }
+}
+if ( ! function_exists( 'get_datetime_offset' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::get_datetime_offset().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::get_datetime_offset(). Will be removed in 5.0.0.
+         *
+         * @param DateTimeInterface|null $datetime Optional. Date. Default now, in the site's time zone.
+         * @return string|false The offset, or false if it cannot be read.
+         */
+        function get_datetime_offset( $datetime = null ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::get_datetime_offset()' );
+                return Kind_Time::get_datetime_offset( $datetime );
+        }
+}
+if ( ! function_exists( 'divide_interval' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::divide_interval().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::divide_interval(). Will be removed in 5.0.0.
+         *
+         * @param DateInterval|string|null $interval Duration, or an ISO 8601 duration string.
+         * @return int[] The duration's parts. See Kind_Time::divide_interval().
+         */
+        function divide_interval( $interval ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::divide_interval()' );
+                return Kind_Time::divide_interval( $interval );
+        }
+}
+if ( ! function_exists( 'build_interval' ) ) {
+        /**
+         * Deprecated wrapper; see Kind_Time::build_interval().
+         *
+         * @since 3.3.4
+         * @deprecated 4.0.0 Use Kind_Time::build_interval(). Will be removed in 5.0.0.
+         *
+         * @param int[] $values Years (Y), months (M), days (D), hours (H), minutes (I) and seconds (S).
+         * @return string The duration, or an empty string if every piece is 0.
+         */
+        function build_interval( $values ) {
+                _deprecated_function( __FUNCTION__, '4.0.0', 'Kind_Time::build_interval()' );
+                return Kind_Time::build_interval( $values );
+        }
+}

indieweb-post-kinds/trunk/indieweb-post-kinds.php

-              r3067251
+              r3738687
+ *
  * @link    http://indieweb.org/Post_Kinds_Plugin
  * @package Post Kinds
+ * @package Post_Kinds
  * Plugin Name: Post Kinds
  * Plugin URI: https://wordpress.org/plugins/indieweb-post-kinds/
  * Description: Ever want to reply to someone else's post with a post on your own site? Or to "like" someone else's post, but with your own site?
+ * Version: 3.7.3
+ * Version: 4.0.0
+ * Requires at least: 6.2
+ * Requires PHP: 7.4
+ * License: GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Author: David Shanske
  * Author URI: https://david.shanske.com
 …
  * Domain Path:  /languages
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! defined( 'POST_KINDS_KSES' ) ) {
 …
 add_action( 'upgrader_process_complete', array( 'Post_Kinds_Plugin', 'upgrader_process_complete' ), 10, 2 );
-if ( ! file_exists( plugin_dir_path( __FILE__ ) . 'lib/parse-this/parse-this.php' ) ) {
-        add_action( 'admin_notices', array( 'Post_Kinds_Plugin', 'parse_this_error' ) );
+}
 if ( Post_Kinds_Plugin::show_editor_error() ) {
 …
 add_action( 'init', array( 'Post_Kinds_Plugin', 'init' ) );
+/**
+ * Loads the plugin, its assets and its global functions.
+ */
 class Post_Kinds_Plugin {
+        /**
+         * Plugin version, read from the plugin header on init.
+         *
+         * @since 2.4.0
+         * @var string
+         */
         public static $version;
+        /**
+         * Sets the version and registers the kind taxonomy.
+         *
+         * @since 2.4.0
+         */
         public static function init() {
                 self::$version = get_file_data( __FILE__, array( 'Version' => 'Version' ) )['Version'];
 …
+        }
+        /**
+         * Outputs an admin notice when Parse This is not available at all.
+         *
+         * @since 3.1.0
+         */
         public static function parse_this_error() {
+                $class   = 'notice notice-error';
+                $message = __( 'Parse This is not installed. Please advise the developer', 'indieweb-post-kinds' );
+                printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), esc_html( $message ) );
+        }
+                wp_admin_notice(
+                        esc_html__( 'Parse This is not installed. Please advise the developer', 'indieweb-post-kinds' ),
+                        array( 'type' => 'error' )
+                );
+        }
+        /**
+         * Outputs an admin notice when another plugin loaded a copy of Parse This
+         * older than 2.0.0.
+         *
+         * Post Kinds still works, because its bundled 2.0 API is loaded alongside the
+         * older copy, but the older copy serves the parse-this REST route used by the
+         * reply metabox.
+         *
+         * @since 4.0.0
+         */
+        public static function parse_this_outdated_notice() {
+                if ( ! current_user_can( 'activate_plugins' ) ) {
+                        return;
+                }
+                wp_admin_notice(
+                        sprintf(
+                                /* translators: %s: Name of the plugin, or path of the file, that loaded the older copy of Parse This. */
+                                esc_html__( 'Post Kinds: %s is loading a copy of Parse This older than version 2.0. Post Kinds will keep working, but URL lookups in the post editor use that older copy. Updating that plugin, or installing the Parse This plugin (version 2.0 or later), resolves this.', 'indieweb-post-kinds' ),
+                                '<strong>' . esc_html( self::parse_this_source() ) . '</strong>'
+                        ),
+                        array( 'type' => 'warning' )
+                );
+        }
+        /**
+         * Returns whether the loaded copy of Parse This is version 2.0.0 or later.
+         *
+         * Copies older than 2.0.0 do not define PARSE_THIS_VERSION.
+         *
+         * @since 4.0.0
+         *
+         * @return bool
+         */
+        public static function parse_this_is_current() {
+                return defined( 'PARSE_THIS_VERSION' ) && version_compare( PARSE_THIS_VERSION, '2.0.0', '>=' );
+        }
+        /**
+         * Returns a name for whatever loaded Parse This: the plugin's name, or the
+         * file's path relative to the content directory if it isn't a plugin.
+         *
+         * @since 4.0.0
+         *
+         * @return string
+         */
+        public static function parse_this_source() {
+                if ( ! function_exists( 'parse_this_loader' ) ) {
+                        return '';
+                }
+                $file = wp_normalize_path( ( new ReflectionFunction( 'parse_this_loader' ) )->getFileName() );
+                $dir  = trailingslashit( wp_normalize_path( WP_PLUGIN_DIR ) );
+                if ( 0 === strpos( $file, $dir ) ) {
+                        $slug = strtok( substr( $file, strlen( $dir ) ), '/' );
+                        if ( ! function_exists( 'get_plugins' ) ) {
+                                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                        }
+                        foreach ( get_plugins() as $basename => $data ) {
+                                if ( 0 === strpos( $basename, $slug . '/' ) ) {
+                                        return $data['Name'];
+                                }
+                        }
+                        return $slug;
+                }
+                return str_replace( trailingslashit( wp_normalize_path( WP_CONTENT_DIR ) ), '', $file );
+        }
+        /**
+         * Whether to check for the block editor and warn about it.
+         *
+         * Not on ClassicPress, or when the Classic Editor plugin is active.
+         *
+         * @since 3.3.4
+         *
+         * @return bool
+         */
         public static function show_editor_error() {
                 // Do not show this error in ClassicPress
+                // Do not show this error in ClassicPress.
                 if ( self::is_classicpress() ) {
                         return false;
+                }
-                // Do not show if less than Version 5
-                if ( version_compare( get_bloginfo( 'version' ), '5.0' ) <= 0 ) {
-                        return false;
+                }
                 if ( class_exists( 'Classic_Editor' ) ) {
                         return false;
 …
+        }
+        /**
+         * Whether the site runs ClassicPress.
+         *
+         * @since 3.6.0
+         *
+         * @return bool
+         */
         public static function is_classicpress() {
                 return function_exists( 'classicpress_version' );
+        }
+        /**
+         * Outputs an admin notice on screens that use the block editor.
+         *
+         * Post Kinds works only with the Classic Editor. The notice is not shown
+         * if the Classic Editor or Disable Gutenberg plugin is active.
+         *
+         * @since 3.2.6
+         *
+         * @return string|void An empty string if no notice is needed.
+         */
         public static function classic_editor_error() {
                 if ( ! self::post_uses_gutenberg() ) {
 …
+        /**
+         * Flushes the rewrite rules after Post Kinds is updated.
+         *
+         * @since 3.4.19
+         *
+         * @param WP_Upgrader $upgrade_object The upgrader.
+         * @param array       $options        Details of the update.
+         */
         public static function upgrader_process_complete( $upgrade_object, $options ) {
                 $current_plugin_path_name = plugin_basename( __FILE__ );
 …
+        }
+        /**
+         * Creates the kind terms and flushes the rewrite rules on activation.
+         *
+         * @since 3.3.0
+         */
         public static function activate() {
                 Kind_Taxonomy::activate_kinds();
 …
+        }
+        /**
+         * Flushes the rewrite rules on deactivation.
+         *
+         * @since 3.3.0
+         */
         public static function deactivate() {
                 flush_rewrite_rules();
+        }
+        /**
+         * Loads the translations, global functions and Parse This, and adds the hooks.
+         *
+         * @since 2.5.2
+         */
         public static function plugins_loaded() {
                 $cls = get_called_class();
                 load_plugin_textdomain( 'indieweb-post-kinds', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
                 // Add WordPress Compatibility File for Functions Introduced Post 4.9.9.
+                // Polyfills for functions newer than the plugin's minimums.
                 require_once plugin_dir_path( __FILE__ ) . 'includes/compat.php';
-                // Parse this Compat File.
-                require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/compat-functions.php';
                 // Add Kind Global Functions.
 …
                 require_once plugin_dir_path( __FILE__ ) . '/includes/time-functions.php';
+                // Parse This
+                require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/autoload.php';
+                if ( ! class_exists( 'REST_Parse_This' ) ) {
+                        require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/class-rest-parse-this.php';
+                }
+                require_once plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/functions.php';
+                /*
+                 * Parse This. The standalone plugin, if active, has already loaded at
+                 * plugins_loaded priority 9 and defined parse_this_loader(). Otherwise
+                 * load the bundled copy. Its loader sets up the classes, the functions
+                 * and the REST route.
+                 */
+                $parse_this = plugin_dir_path( __FILE__ ) . 'lib/parse-this/parse-this.php';
+                if ( ! function_exists( 'parse_this_loader' ) && file_exists( $parse_this ) ) {
+                        require_once $parse_this;
+                        parse_this_loader();
+                }
+                if ( ! function_exists( 'parse_this_loader' ) ) {
+                        add_action( 'admin_notices', array( $cls, 'parse_this_error' ) );
+                } elseif ( ! self::parse_this_is_current() ) {
+                        /*
+                         * Another plugin loaded a copy older than 2.0.0. Load the bundled 2.0
+                         * API alongside it: everything in 2.0 is in the ParseThis namespace,
+                         * so it does not clash with the old copy's global names, and both
+                         * versions only load their bundled Mf2\Parser and Masterminds\HTML5
+                         * if those classes do not already exist.
+                         */
+                        $includes = plugin_dir_path( __FILE__ ) . 'lib/parse-this/includes/';
+                        if ( file_exists( $includes . 'autoload.php' ) ) {
+                                require_once $includes . 'autoload.php';
+                                require_once $includes . 'functions.php';
+                        }
+                        add_action( 'admin_notices', array( $cls, 'parse_this_outdated_notice' ) );
+                }
                 $class_load = array(
+                        'Plugins', // Plugin Specific Customization
+                        'Media_Metadata', // Media Metadata Enhancements
+                        'Config', // Configuration Menu
+                        'Metabox', // Metabox for Classic Editor
+                        'View', // Kind Display Functionality
+                        'Plugins', // Plugin Specific Customization.
+                        'Media_Metadata', // Media Metadata Enhancements.
+                        'Config', // Configuration Menu.
+                        'Metabox', // Metabox for Classic Editor.
+                        'View', // Kind Display Functionality.
+                        'Upgrade', // One-time upgrade of stored data.
                 );
                 foreach ( $class_load as $load ) {
                         add_action( 'init', array( 'Kind_' . $load, 'init' ) );
+                }
+                if ( defined( 'WP_CLI' ) && WP_CLI ) {
+                        WP_CLI::add_command( 'post-kinds upgrade', array( 'Kind_Upgrade', 'cli' ) );
+                }
 …
                 add_action( 'admin_enqueue_scripts', array( $cls, 'admin_style_load' ) );
                 // Load Privacy Declaration
+                // Load Privacy Declaration.
                 add_action( 'admin_init', array( $cls, 'privacy_declaration' ) );
+                remove_all_actions( 'do_feed_rss2' );
+                remove_all_actions( 'do_feed_atom' );
+                add_action( 'do_feed_rss2', array( $cls, 'do_feed_rss2' ), 10, 1 );
+                add_action( 'do_feed_atom', array( $cls, 'do_feed_atom' ), 10, 1 );
+                // Register Widgets
+                // Register Widgets.
                 add_action(
                         'widgets_init',
 …
+        }
-        public static function do_feed_atom( $for_comments ) {
-                if ( $for_comments ) {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-atom-comments.php' );
-                } else {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-atom.php' );
+                }
+        }
-        public static function do_feed_rss2( $for_comments ) {
-                if ( $for_comments ) {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-rss2-comments.php' );
-                } else {
-                        load_template( plugin_dir_path( __FILE__ ) . 'templates/feed-rss2.php' );
+                }
+        }
         /**
          * Adds link to Plugin Page for Options Page.
+         *
+         * @since 2.4.0
+         *
          * @access public
 …
         /**
          * Loads the Stylesheet for the Plugin.
+         *
+         * @since 2.4.0
          */
         public static function style_load() {
 …
         /**
          * Loads the Admin Stylesheet for the Plugin.
+         *
+         * @since 2.4.0
          */
         public static function admin_style_load() {
 …
+        }
+        /**
+         * Adds suggested text to the privacy policy guide.
+         *
+         * @since 3.0.5
+         */
         public static function privacy_declaration() {
                 if ( function_exists( 'wp_add_privacy_policy_content' ) ) {
 …
+        }
+        /**
+         * Whether the current screen uses the block editor.
+         *
+         * Screens other than the post editor count as using it.
+         *
+         * @since 3.3.2
+         *
+         * @return bool
+         */
         public static function post_uses_gutenberg() {
                 $screen = get_current_screen();

indieweb-post-kinds/trunk/js/clone-media-fragment.js

-              r2110745
+              r3738687
 function cloneMediaFragment() {
   // Check that the fragment is a Media Fragment (starts with t=)
   if(window.location.hash && window.location.hash.match(/^#t=/)) {
     // Find any video and audio tags on the page
     document.querySelectorAll("video,audio").forEach(function(el){
       // Create a virtual element to use as a URI parser
       var parser = document.createElement('a');
       parser.href = el.currentSrc;
+      // Replace the hash
       parser.hash = window.location.hash;
       // Set the src of the video/audio tag to the full URL
       el.src = parser.href;
     });
+  }
+        // Check that the fragment is a Media Fragment (starts with t=)
+        if ( window.location.hash && window.location.hash.match( /^#t=/ ) ) {
+                // Find any video and audio tags on the page
+                document.querySelectorAll( 'video,audio' ).forEach( function( el ) {
+                        // Create a virtual element to use as a URI parser
+                        var parser = document.createElement( 'a' );
+                        parser.href = el.currentSrc;
+                        // Replace the hash
+                        parser.hash = window.location.hash;
+                        // Set the src of the video/audio tag to the full URL
+                        el.src = parser.href;
+                } );
+        }
+}
 document.addEventListener("DOMContentLoaded", function() {
   cloneMediaFragment();
   // When the media is paused, update the fragment of the page
+  document.querySelectorAll("video,audio").forEach(function(el) {
     el.addEventListener("pause", function(event) {
       // Update the media fragment to the current time
       // Use replaceState to avoid triggering the "hashchange" listener above
       history.replaceState(null, null, "#t=" + Math.round(event.target.currentTime));
     });
   });
 });
+document.addEventListener( 'DOMContentLoaded', function() {
+        cloneMediaFragment();
+        // When the media is paused, update the fragment of the page
+        document.querySelectorAll( 'video,audio' ).forEach( function( el ) {
+                el.addEventListener( 'pause', function( event ) {
+                        // Update the media fragment to the current time
+                        // Use replaceState to avoid triggering the "hashchange" listener above
+                        history.replaceState( null, null, '#t=' + Math.round( event.target.currentTime ) );
+                } );
+        } );
+} );
 // If the user changes the hash manually, clone the fragment to the media URLs
 window.addEventListener("hashchange", cloneMediaFragment);
+window.addEventListener( 'hashchange', cloneMediaFragment );

indieweb-post-kinds/trunk/js/kind.js

-              r3001401
+              r3738687
+/* global PKAPI, moment, wp */
+/* eslint-disable no-alert -- The metabox uses alert() and confirm() for feedback by design. */
 jQuery( document ).ready( function( $ ) {
+        var KindWindow;
         changeSettings();
+function clearPostProperties() {
+        var fieldIds = [
+                'cite_url',
+                'cite_name',
+                'cite_summary',
+                'cite_tags',
+                'cite_media',
+                'cite_author_name',
+                'cite_author_url',
+                'cite_author_photo',
+                'cite_featured',
+                'cite_publication',
+                'mf2_rsvp',
+                'mf2_rating',
+                'mf2_start_time',
+                'mf2_start_date',
+                'mf2_end_time',
+                'mf2_end_date',
+                'cite_published_time',
+                'cite_published_date',
+                'cite_updated_time',
+                'cite_updated_date',
+                'duration_years',
+                'duration_months',
+                'duration_days',
+                'duration_hours',
+                'duration_minutes',
+                'duration_seconds'
+        ];
+        function clearPostProperties() {
+                var fieldIds = [
+                        'cite_url',
+                        'cite_name',
+                        'cite_summary',
+                        'cite_tags',
+                        'cite_media',
+                        'cite_author_name',
+                        'cite_author_url',
+                        'cite_author_photo',
+                        'cite_featured',
+                        'cite_publication',
+                        'mf2_rsvp',
+                        'mf2_rating',
+                        'mf2_start_time',
+                        'mf2_start_date',
+                        'mf2_end_time',
+                        'mf2_end_date',
+                        'cite_published_time',
+                        'cite_published_date',
+                        'cite_updated_time',
+                        'cite_updated_date',
+                        'duration_years',
+                        'duration_months',
+                        'duration_days',
+                        'duration_hours',
+                        'duration_minutes',
+                        'duration_seconds',
+                ];
                 if ( ! confirm( PKAPI.clear_message ) ) {
                         return;
 …
                 $.each( fieldIds, function( count, val ) {
                         document.getElementById( val ).value = '';
                 });
+                } );
                 $( '#kind-media-container' ).addClass( 'hidden' );
                 $( '#kind-media-container' ).children( 'img' ).hide();
                 $( '#add-kind-media' ).show();
+}
+function addhttp( url ) {
+        if ( ! /^(?:f|ht)tps?\:\/\//.test( url ) ) {
+                url = 'http://' + url;
+        }
+        return url;
+}
+function showLoadingSpinner() {
+        $( '#replybox-meta' ).addClass( 'is-loading' );
+}
+function hideLoadingSpinner() {
+        $( '#replybox-meta' ).removeClass( 'is-loading' );
+}
+//function used to validate website URL
+function checkUrl( url ) {
+    //regular expression for URL
+    var pattern = /^(http|https)?:\/\/[a-zA-Z0-9-\.]+\.[a-z]{2,4}/;
+    if ( pattern.test( url ) ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+function getLinkPreview() {
+        if ( '' === $( '#cite_url' ).val() ) {
+                return;
+        }
+        $.ajax({
+                type: 'GET',
+                // Here we supply the endpoint url, as opposed to the action in the data object with the admin-ajax method
+                url: PKAPI.api_url + 'parse/',
+                beforeSend: function( xhr ) {
+                // Here we set a header 'X-WP-Nonce' with the nonce as opposed to the nonce in the data object with admin-ajax
+                xhr.setRequestHeader( 'X-WP-Nonce', PKAPI.api_nonce );
+                },
+                data: {
+                        url: $( '#cite_url' ).val(),
+                        kind: $( 'input[name=\'tax_input[kind]\']:checked' ).val(),
+                        follow: true
+                },
+                success: function( response ) {
+                        var published;
+                        var updated;
+                        if ( 'undefined' === typeof response ) {
+                                alert( 'Error: Unable to Retrieve' );
+        }
+        function showLoadingSpinner() {
+                $( '#replybox-meta' ).addClass( 'is-loading' );
+        }
+        function hideLoadingSpinner() {
+                $( '#replybox-meta' ).removeClass( 'is-loading' );
+        }
+        //function used to validate website URL
+        function checkUrl( url ) {
+                //regular expression for URL
+                var pattern = /^(http|https)?:\/\/[a-zA-Z0-9-\.]+\.[a-z]{2,4}/;
+                return pattern.test( url );
+        }
+        // Fills the Author tab from one author or a list. Each field holds one value
+        // per author, separated by semicolons, so the values stay paired by position.
+        function fillAuthors( authors ) {
+                var fields = { name: [], url: [], photo: [] };
+                if ( ! Array.isArray( authors ) ) {
+                        authors = [ authors ];
+                }
+                $.each( authors, function( index, author ) {
+                        if ( 'string' === typeof author ) {
+                                author = checkUrl( author ) ? { url: author } : { name: author };
+                        }
+                        if ( ! author || 'object' !== typeof author ) {
                                 return;
+                        }
+                        if ( 'message' in response ) {
+                                alert( response.message );
+                        $.each( fields, function( key, values ) {
+                                var value = author[ key ];
+                                if ( Array.isArray( value ) ) {
+                                        value = value.join( '; ' );
+                                } else if ( value && 'object' === typeof value ) {
+                                        value = value.value;
+                                }
+                                values.push( 'string' === typeof value ? value : '' );
+                        } );
+                } );
+                $.each( fields, function( key, values ) {
+                        $( '#cite_author_' + key ).val( values.join( '' ) ? values.join( '; ' ) : '' );
+                } );
+        }
+        function getLinkPreview() {
+                if ( '' === $( '#cite_url' ).val() ) {
+                        return;
+                }
+                $.ajax( {
+                        type: 'GET',
+                        // Here we supply the endpoint url, as opposed to the action in the data object with the admin-ajax method
+                        url: PKAPI.api_url + 'parse/',
+                        beforeSend: function( xhr ) {
+                                // Here we set a header 'X-WP-Nonce' with the nonce as opposed to the nonce in the data object with admin-ajax
+                                xhr.setRequestHeader( 'X-WP-Nonce', PKAPI.api_nonce );
+                        },
+                        data: {
+                                url: $( '#cite_url' ).val(),
+                                follow: true,
+                        },
+                        success: function( response ) {
+                                var published, updated, duration;
+                                if ( 'undefined' === typeof response ) {
+                                        alert( PKAPI.error_message );
+                                        return;
+                                }
+                                if ( 'message' in response ) {
+                                        alert( response.message );
+                                        return;
+                                }
+                                if ( 'name' in response ) {
+                                        $( '#cite_name' ).val( response.name );
+                                }
+                                if ( 'published' in response ) {
+                                        published = moment.parseZone( response.published );
+                                        $( '#cite_published_date' ).val( published.format( 'YYYY-MM-DD' ) );
+                                        $( '#cite_published_time' ).val( published.format( 'HH:mm:ss' ) );
+                                        $( '#cite_published_offset' ).val( published.format( 'Z' ) );
+                                }
+                                if ( 'updated' in response ) {
+                                        updated = moment.parseZone( response.updated );
+                                        $( '#cite_updated_date' ).val( updated.format( 'YYYY-MM-DD' ) );
+                                        $( '#cite_updated_time' ).val( updated.format( 'HH:mm:ss' ) );
+                                        $( '#cite_updated_offset' ).val( updated.format( 'Z' ) );
+                                }
+                                if ( 'duration' in response ) {
+                                        duration = moment.duration( response.duration );
+                                        $( '#duration_years' ).val( duration.years() );
+                                        $( '#duration_months' ).val( duration.months() );
+                                        $( '#duration_days' ).val( duration.days() );
+                                        $( '#duration_hours' ).val( duration.hours() );
+                                        $( '#duration_minutes' ).val( duration.minutes() );
+                                        $( '#duration_seconds' ).val( duration.seconds() );
+                                }
+                                if ( 'summary' in response ) {
+                                        $( '#cite_summary' ).val( response.summary );
+                                }
+                                if ( 'featured' in response ) {
+                                        $( '#cite_featured' ).val( response.featured );
+                                }
+                                if ( 'author' in response ) {
+                                        fillAuthors( response.author );
+                                }
+                                if ( 'publication' in response && ( 'string' !== typeof response.publication ) ) {
+                                        if ( 'name' in response.publication ) {
+                                                $( '#cite_publication' ).val( response.publication.name );
+                                        }
+                                } else {
+                                        $( '#cite_publication' ).val( response.publication );
+                                }
+                                if ( 'category' in response ) {
+                                        if ( 'object' === typeof response.category ) {
+                                                $( '#cite_tags' ).val( response.category.join( ';' ) );
+                                        }
+                                }
+                                alert( PKAPI.success_message );
+                        },
+                        error: function( jqXHR ) {
+                                if ( jqXHR.responseJSON && jqXHR.responseJSON.message ) {
+                                        alert( jqXHR.responseJSON.message );
+                                } else {
+                                        alert( PKAPI.error_message );
+                                }
+                        },
+                        complete: hideLoadingSpinner,
+                } );
+        }
+        function changeSettings() {
+                var kind = $( 'input[name=\'tax_input[kind]\']:checked' ).val();
+                switch ( kind ) {
+                        case 'note':
+                                hideTitle();
+                                hideReply();
+                                hideRSVP();
+                                hideRating();
+                                hideTime();
+                                hideMedia();
+                                break;
+                        case 'article':
+                                showTitle();
+                                hideReply();
+                                hideRSVP();
+                                hideRating();
+                                hideTime();
+                                hideMedia();
+                                break;
+                        case 'issue':
+                                showTitle();
+                                showReply();
+                                hideRSVP();
+                                hideRating();
+                                hideTime();
+                                hideMedia();
+                                break;
+                        case 'listen':
+                        case 'jam':
+                        case 'watch':
+                        case 'read':
+                        case 'play':
+                                hideTitle();
+                                showReply();
+                                hideRSVP();
+                                showRating();
+                                showTime();
+                                hideMedia();
+                                break;
+                        case 'photo':
+                        case 'video':
+                        case 'audio':
+                                hideTitle();
+                                showReply();
+                                hideRSVP();
+                                hideRating();
+                                showTime();
+                                showMedia();
+                                break;
+                        case 'rsvp':
+                                showReply();
+                                hideTitle();
+                                hideTime();
+                                showRSVP();
+                                hideRating();
+                                hideMedia();
+                                break;
+                        case 'review':
+                        case 'drink':
+                        case 'eat':
+                                showReply();
+                                hideTitle();
+                                hideTime();
+                                hideRSVP();
+                                showRating();
+                                hideMedia();
+                                break;
+                        default:
+                                showReply();
+                                hideTime();
+                                hideTitle();
+                                hideRSVP();
+                                hideRating();
+                                hideMedia();
+                }
+        }
+        function showReply() {
+                $( '#replybox-meta' ).removeClass( 'hidden' );
+        }
+        function hideReply() {
+                $( '#replybox-meta' ).addClass( 'hidden' );
+        }
+        function showMedia() {
+                $( '#add-kind-media' ).removeClass( 'hidden' );
+        }
+        function hideMedia() {
+                $( '#add-kind-media' ).addClass( 'hidden' );
+        }
+        function showTitle() {
+                var titlediv = $( '#titlediv' ).detach();
+                titlediv.prependTo( '#post-body-content' );
+        }
+        function hideTitle() {
+                var titlediv = $( '#titlediv' ).detach();
+                titlediv.insertAfter( '#postdivrich' );
+        }
+        function showRSVP() {
+                $( '#rsvp-option' ).removeClass( 'hide-if-js' );
+        }
+        function hideRSVP() {
+                $( '#rsvp-option' ).addClass( 'hide-if-js' );
+        }
+        function showRating() {
+                $( '#rating-option' ).removeClass( 'hide-if-js' );
+        }
+        function hideRating() {
+                $( '#rating-option' ).addClass( 'hide-if-js' );
+        }
+        function showTime() {
+                $( '#kind-time' ).removeClass( 'hide-if-js' );
+        }
+        function hideTime() {
+                $( '#kind-time' ).addClass( 'hide-if-js' );
+        }
+        function handleKindMediaWindow() {
+                'use strict';
+                var json;
+                /**
+                 * If an instance of KindWindow already exists, then we can open it
+                 * rather than creating a new instance.
+                 */
+                if ( undefined !== KindWindow ) {
+                        KindWindow.open();
+                        return;
+                }
+                KindWindow = wp.media.frames.KindWindow = wp.media( {
+                        title: PKAPI.media_title,
+                        button: {
+                                text: PKAPI.media_button,
+                        },
+                        multiple: false,
+                } );
+                KindWindow.on( 'select', function() {
+                        json = KindWindow.state().get( 'selection' ).first().toJSON();
+                        if ( ! json.url ) {
                                 return;
+                        }
+                        if ( 'name' in response ) {
+                                $( '#cite_name' ).val( response.name );
+                        }
+                        if ( 'published' in response ) {
+                                var published = moment.parseZone( response.published );
+                                $( '#cite_published_date' ).val( published.format( 'YYYY-MM-DD' ) ) ;
+                                $( '#cite_published_time' ).val( published.format( 'HH:mm:ss' ) ) ;
+                                $( '#cite_published_offset' ).val( published.format( 'Z' ) );
+                        }
+                        if ( 'updated' in response ) {
+                                var updated = moment.parseZone( response.updated );
+                                $( '#cite_updated_date' ).val( updated.format( 'YYYY-MM-DD' ) ) ;
+                                $( '#cite_updated_time' ).val( updated.format( 'HH:mm:ss' ) ) ;
+                                $( '#cite_updated_offset' ).val( updated.format( 'Z' ) );
+                        }
+                        if ( 'duration' in response ) {
+                                var duration = moment.duration( response.duration);
+                                $( '#duration_years' ).val( duration.years() );
+                                $( '#duration_months' ).val( duration.months() );
+                                $( '#duration_days' ).val( duration.days() );
+                                $( '#duration_hours' ).val( duration.hours() );
+                                $( '#duration_minutes' ).val( duration.minutes() );
+                                $( '#duration_seconds' ).val( duration.seconds() );
+                        }
+                        if ( 'summary' in response ) {
+                                $( '#cite_summary' ).val( response.summary ) ;
+                        }
+                        if ( 'featured' in response ) {
+                                $( '#cite_featured' ).val( response.featured ) ;
+                        }
+                        if ( ( 'author' in response ) && ( 'string' != typeof response.author ) ) {
+                                if ( 'name' in response.author ) {
+                                        if ( 'string' === typeof response.author.name ) {
+                                                $( '#cite_author_name' ).val( response.author.name );
+                                        } else {
+                                                $( '#cite_author_name' ).val( response.author.name.join( ';' ) ) ;
+                                        }
+                                }
+                                if ( 'photo' in response.author ) {
+                                        if ( 'string' === typeof response.author.name ) {
+                                                $( '#cite_author_photo' ).val( response.author.photo );
+                                        } else {
+                                                $( '#cite_author_photo' ).val( response.author.photo.join( ';' ) ) ;
+                                        }
+                                }
+                                if ( 'url' in response.author ) {
+                                        if ( 'string' === typeof response.author.url ) {
+                                                $( '#cite_author_url' ).val( response.author.url );
+                                        } else {
+                                                $( '#cite_author_url' ).val( response.author.url.join( ';' ) ) ;
+                                        }
+                                }
+                        }
+                        if ( 'publication' in response && ( 'string' != typeof response.publication ) ) {
+                                if ( 'name' in response.publication ) {
+                                        $( '#cite_publication' ).val( response.publication.name );
+                                }
+                        $( '#cite_name' ).val( json.title );
+                        $( '#cite_url' ).val( json.url );
+                        $( '#cite_media' ).val( json.id );
+                        $( '#cite_summary' ).val( json.description );
+                        $( '#kind-media-container' )
+                                .children( 'img' )
+                                .attr( 'src', json.url )
+                                .attr( 'alt', json.caption )
+                                .attr( 'title', json.title )
+                                .show()
+                                .parent()
+                                .removeClass( 'hidden' );
+                        $( '#add-kind-media' ).hide();
+                } );
+                KindWindow.open();
+        }
+        jQuery( document )
+                .on( 'change', '#taxonomy-kind', function( event ) {
+                        changeSettings();
+                        event.preventDefault();
+                } )
+                .on( 'blur', '#cite_url', function( event ) {
+                        if ( '' !== $( '#cite_url' ).val() ) {
+                                if ( false === checkUrl( $( '#cite_url' ).val() ) ) {
+                                        alert( PKAPI.invalid_url );
+                                } else if ( '' === $( '#cite_name' ).val() ) {
+                                        showLoadingSpinner();
+                                        getLinkPreview();
+                                }
+                                event.preventDefault();
+                        }
+                } )
+                .on( 'click', '.clear-kindmeta-button', function( event ) {
+                        clearPostProperties();
+                        event.preventDefault();
+                } )
+                .on( 'click', 'a.show-kind-details', function( event ) {
+                        if ( $( '#kind-details' ).is( ':hidden' ) ) {
+                                $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' );
+                                $( '#kind-details' ).slideDown( 'fast' ).siblings( 'a.hide-kind-details' ).show().focus();
                         } else {
+                                $( '#cite_publication' ).val( response.publication ) ;
+                        }
+                        if ( 'category' in response ) {
+                                if ( 'object' === typeof response.category ) {
+                                        $( '#cite_tags' ).val( response.category.join( ';' ) );
+                                }
+                        }
+                alert( PKAPI.success_message );
+                console.log( response );
+                },
+                fail: function( response ) {
+                        console.log( response );
+                        alert( response.message );
+                },
+                error: function( jqXHR, textStatus, errorThrown ) {
+                        alert( jqXHR.responseJSON.message );
+                        console.log( jqXHR );
+                },
+                always: hideLoadingSpinner()
+        });
+}
+function changeSettings() {
+        kind = $( 'input[name=\'tax_input[kind]\']:checked' ).val();
+        switch ( kind ) {
+                case 'note':
+                        hideTitle();
+                        hideReply();
+                        hideRSVP();
+                        hideRating();
+                        hideTime();
+                        hideMedia();
+                        break;
+                case 'article':
+                        showTitle();
+                        hideReply();
+                        hideRSVP();
+                        hideRating();
+                        hideTime();
+                        hideMedia();
+                        break;
+                case 'issue':
+                        showTitle();
+                        showReply();
+                        hideRSVP();
+                        hideRating();
+                        hideTime();
+                        hideMedia();
+                        break;
+                case 'listen':
+                case 'jam':
+                case 'watch':
+                case 'read':
+                case 'play':
+                        hideTitle();
+                        showReply();
+                        hideRSVP();
+                        showRating();
+                        showTime();
+                        hideMedia();
+                        break;
+                case 'photo':
+                case 'video':
+                case 'audio':
+                        hideTitle();
+                        showReply();
+                        hideRSVP();
+                        hideRating();
+                        showTime();
+                        showMedia();
+                        break;
+                case 'rsvp':
+                        showReply();
+                        hideTitle();
+                        hideTime();
+                        showRSVP();
+                        hideRating();
+                        hideMedia();
+                        break;
+                case 'review':
+                case 'drink':
+                case 'eat':
+                        showReply();
+                        hideTitle();
+                        hideTime();
+                        hideRSVP();
+                        showRating();
+                        hideMedia();
+                        break;
+                default:
+                        showReply();
+                        hideTime();
+                        hideTitle();
+                        hideRSVP();
+                        hideRating();
+                        hideMedia();
+        }
+}
+function showReply() {
+        $( '#replybox-meta' ).removeClass( 'hidden' );
+}
+function hideReply() {
+        $( '#replybox-meta' ).addClass( 'hidden' );
+}
+function showMedia() {
+        $( '#add-kind-media' ).removeClass( 'hidden' );
+}
+function hideMedia() {
+        $( '#add-kind-media' ).addClass( 'hidden' );
+}
+function showTitle() {
+        var titlediv = $( '#titlediv' ).detach();
+        titlediv.prependTo( '#post-body-content' );
+}
+function hideTitle() {
+        var titlediv = $( '#titlediv' ).detach();
+        titlediv.insertAfter( '#postdivrich' );
+}
+function showRSVP() {
+        $( '#rsvp-option' ).removeClass( 'hide-if-js' );
+}
+function hideRSVP() {
+        $( '#rsvp-option' ).addClass( 'hide-if-js' );
+}
+function showRating() {
+        $( '#rating-option' ).removeClass( 'hide-if-js' );
+}
+function hideRating() {
+        $( '#rating-option' ).addClass( 'hide-if-js' );
+}
+function showTime() {
+        $( '#kind-time' ).removeClass( 'hide-if-js' );
+}
+function hideTime() {
+        $( '#kind-time' ).addClass( 'hide-if-js' );
+}
+function handleKindMediaWindow() {
+        'use strict';
+        var KindWindow, ImageData, json;
+        /**
+         * If an instance of KindWindow already exists, then we can open it
+         * rather than creating a new instance.
+         */
+        if ( undefined !== KindWindow ) {
+                KindWindow.open();
+                return;
+        }
+        KindWindow = wp.media.frames.KindWindow = wp.media({
+                title: 'Attach',
+                button: {
+                        text: 'Use this media'
+                },
+                multiple: false
+        });
+        KindWindow.on( 'select', function() {
+                json = KindWindow.state().get( 'selection' ).first().toJSON();
+                console.log( json );
+                if ( 0 > $.trim( json.url.length ) ) {
+                        return;
+                }
+                $( '#cite_name' ).val( json.title );
+                $( '#cite_url' ).val( json.url );
+                $( '#cite_media' ).val( json.id );
+                $( '#cite_summary' ).val( json.description );
+                $( '#kind-media-container' )
+                        .children( 'img' )
+                        .attr( 'src', json.url )
+                        .attr( 'alt', json.caption )
+                        .attr( 'title', json.title )
+                        .show()
+                        .parent()
+                        .removeClass( 'hidden' );
+                $( '#add-kind-media' ).hide();
+        });
+        KindWindow.open();
+}
+jQuery( document )
+        .on( 'change', '#taxonomy-kind', function( event ) {
+                changeSettings();
+                event.preventDefault();
+        })
+        .on( 'blur', '#cite_url', function( event ) {
+                if ( '' !== $( '#cite_url' ).val() ) {
+                        if ( false == checkUrl( $( '#cite_url' ).val() ) ) {
+                                alert( 'Invalid URL' );
+                        } else if ( '' === $( '#cite_name' ).val() ) {
+                                showLoadingSpinner();
+                                getLinkPreview();
+                        }
+                        event.preventDefault();
+                }
+        })
+        .on( 'click', '.clear-kindmeta-button', function( event ) {
+                clearPostProperties();
+                event.preventDefault();
+        })
+        .on( 'click', 'a.show-kind-details', function( event ) {
+                if ( $( '#kind-details' ).is( ':hidden' ) ) {
+                        $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' );
+                        $( '#kind-details' ).slideDown( 'fast' ).siblings( 'a.hide-kind-details' ).show().focus();
+                } else {
+                        $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' ).focus();
+                }
+                event.preventDefault();
+        })
+        .on( 'click', 'a.show-kind-author-details', function( event ) {
+                if ( $( '#kind-author' ).is( ':hidden' ) ) {
+                        $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' );
+                        $( '#kind-author' ).slideDown( 'fast' ).siblings( 'a.hide-kind-author' ).show().focus();
+                } else {
+                        $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' ).focus();
+                }
+                event.preventDefault();
+        })
+        .on( 'click', '#add-kind-media', function( event ) {
+                event.preventDefault();
+                handleKindMediaWindow();
+        });
+});
+                                $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' ).focus();
+                        }
+                        event.preventDefault();
+                } )
+                .on( 'click', 'a.show-kind-author-details', function( event ) {
+                        if ( $( '#kind-author' ).is( ':hidden' ) ) {
+                                $( '#kind-details' ).slideUp( 'fast' ).siblings( 'a.show-kind-details' );
+                                $( '#kind-author' ).slideDown( 'fast' ).siblings( 'a.hide-kind-author' ).show().focus();
+                        } else {
+                                $( '#kind-author' ).slideUp( 'fast' ).siblings( 'a.show-kind-author' ).focus();
+                        }
+                        event.preventDefault();
+                } )
+                .on( 'click', '#add-kind-media', function( event ) {
+                        event.preventDefault();
+                        handleKindMediaWindow();
+                } );
+} );

indieweb-post-kinds/trunk/languages/indieweb-post-kinds.pot

-              r3067251
+              r3738687
 # Copyright (C) 2024 David Shanske
 # This file is distributed under the same license as the Post Kinds plugin.
+# Copyright (C) 2026 David Shanske
+# This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
 "Project-Id-Version: Post Kinds 3.7.3\n"
+"Project-Id-Version: Post Kinds 4.0.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/indieweb-post-kinds\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 …
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Creation-Date: 2024-04-09T03:10:32+00:00\n"
+"POT-Creation-Date: 2026-10-10T20:26:16+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.10.0\n"
+"X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: indieweb-post-kinds\n"
 #. Plugin Name of the plugin
 #: indieweb-post-kinds.php
 #: includes/class-kind-config.php:251
 #: includes/class-kind-config.php:252
 #: includes/class-kind-config.php:258
+#: indieweb-post-kinds.php:7
+#: includes/class-kind-config.php:433
+#: includes/class-kind-config.php:434
+#: includes/class-kind-config.php:440
 msgid "Post Kinds"
 msgstr ""
 #. Plugin URI of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:8
 msgid "https://wordpress.org/plugins/indieweb-post-kinds/"
 msgstr ""
 #. Description of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:9
 msgid "Ever want to reply to someone else's post with a post on your own site? Or to \"like\" someone else's post, but with your own site?"
 msgstr ""
 #. Author of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:15
 msgid "David Shanske"
 msgstr ""
 #. Author URI of the plugin
 #: indieweb-post-kinds.php
+#: indieweb-post-kinds.php:16
 msgid "https://david.shanske.com"
 msgstr ""
+#: includes/class-kind-config.php:96
+#: includes/class-kind-config.php:224
+msgid "The allowed HTML must be a valid JSON object. The previous value has been kept."
+msgstr ""
+#: includes/class-kind-config.php:261
+msgid "Kind base"
+msgstr ""
+#: includes/class-kind-config.php:269
 msgid "Content Options"
 msgstr ""
 #: includes/class-kind-config.php:105
+#: includes/class-kind-config.php:278
 msgid "Select All Kinds You Wish to Use"
 msgstr ""
 #: includes/class-kind-config.php:112
+#: includes/class-kind-config.php:285
 msgid "Default Kind for New Posts"
 msgstr ""
 #: includes/class-kind-config.php:120
+#: includes/class-kind-config.php:293
 msgid "Embed Sites into your Response"
 msgstr ""
 #: includes/class-kind-config.php:131
+#: includes/class-kind-config.php:304
 msgid "Kinds to Show in Main Feed. Selecting None will Disable this Filter"
 msgstr ""
 #: includes/class-kind-config.php:142
+#: includes/class-kind-config.php:315
 msgid "Move Response to Bottom of Content"
 msgstr ""
 #: includes/class-kind-config.php:153
+#: includes/class-kind-config.php:326
 msgid "Display Before Kind"
 msgstr ""
 #: includes/class-kind-config.php:161
+#: includes/class-kind-config.php:334
 msgid "Show Icon"
 msgstr ""
 #: includes/class-kind-config.php:162
+#: includes/class-kind-config.php:335
 msgid "Show Text"
 msgstr ""
 #: includes/class-kind-config.php:163
+#: includes/class-kind-config.php:336
 msgid "Show Icon and Text"
 msgstr ""
 #: includes/class-kind-config.php:164
+#: includes/class-kind-config.php:337
 msgid "Display Nothing"
 msgstr ""
 #: includes/class-kind-config.php:172
+#: includes/class-kind-config.php:345
 msgid "Response Content Allowed Html Elements"
 msgstr ""
 #: includes/class-kind-config.php:183
+#: includes/class-kind-config.php:356
 msgid "Automatically add the Kind to the Title"
 msgstr ""
 #: includes/class-kind-config.php:391
+#: includes/class-kind-config.php:593
 msgid "Indieweb Post Kinds"
 msgstr ""
 #: includes/class-kind-config.php:392
+#: includes/class-kind-config.php:594
 msgid "Adds support for responding and interacting with other sites."
 msgstr ""
 #: includes/class-kind-config.php:415
+#: includes/class-kind-config.php:619
 msgid "Post Properties"
 msgstr ""
 #: includes/class-kind-config.php:416
+#: includes/class-kind-config.php:620
 msgid ""
 "\n"
 …
 msgstr ""
 #: includes/class-kind-fields.php:27
+#: includes/class-kind-fields.php:39
 msgid "(GMT-11:00) Niue"
 msgstr ""
 #: includes/class-kind-fields.php:28
+#: includes/class-kind-fields.php:40
 msgid "(GMT-11:00) Pago Pago"
 msgstr ""
 #: includes/class-kind-fields.php:29
+#: includes/class-kind-fields.php:41
 msgid "(GMT-10:00) Hawaii Time"
 msgstr ""
 #: includes/class-kind-fields.php:30
+#: includes/class-kind-fields.php:42
 msgid "(GMT-10:00) Rarotonga"
 msgstr ""
 #: includes/class-kind-fields.php:31
+#: includes/class-kind-fields.php:43
 msgid "(GMT-10:00) Tahiti"
 msgstr ""
 #: includes/class-kind-fields.php:32
+#: includes/class-kind-fields.php:44
 msgid "(GMT-09:30) Marquesas"
 msgstr ""
 #: includes/class-kind-fields.php:33
+#: includes/class-kind-fields.php:45
 msgid "(GMT-09:00) Alaska Time"
 msgstr ""
 #: includes/class-kind-fields.php:34
+#: includes/class-kind-fields.php:46
 msgid "(GMT-09:00) Gambier"
 msgstr ""
 #: includes/class-kind-fields.php:35
+#: includes/class-kind-fields.php:47
 msgid "(GMT-08:00) Pacific Time"
 msgstr ""
 #: includes/class-kind-fields.php:36
+#: includes/class-kind-fields.php:48
 msgid "(GMT-08:00) Pacific Time - Tijuana"
 msgstr ""
 #: includes/class-kind-fields.php:37
+#: includes/class-kind-fields.php:49
 msgid "(GMT-08:00) Pacific Time - Vancouver"
 msgstr ""
 #: includes/class-kind-fields.php:38
+#: includes/class-kind-fields.php:50
 msgid "(GMT-08:00) Pacific Time - Whitehorse"
 msgstr ""
 #: includes/class-kind-fields.php:39
+#: includes/class-kind-fields.php:51
 msgid "(GMT-08:00) Pitcairn"
 msgstr ""
 #: includes/class-kind-fields.php:40
+#: includes/class-kind-fields.php:52
 msgid "(GMT-07:00) Mountain Time - Dawson Creek"
 msgstr ""
 #: includes/class-kind-fields.php:41
+#: includes/class-kind-fields.php:53
 msgid "(GMT-07:00) Mountain Time"
 msgstr ""
 #: includes/class-kind-fields.php:42
+#: includes/class-kind-fields.php:54
 msgid "(GMT-07:00) Mountain Time - Edmonton"
 msgstr ""
 #: includes/class-kind-fields.php:43
+#: includes/class-kind-fields.php:55
 msgid "(GMT-07:00) Mountain Time - Hermosillo"
 msgstr ""
 #: includes/class-kind-fields.php:44
+#: includes/class-kind-fields.php:56
 msgid "(GMT-07:00) Mountain Time - Chihuahua, Mazatlan"
 msgstr ""
 #: includes/class-kind-fields.php:45
+#: includes/class-kind-fields.php:57
 msgid "(GMT-07:00) Mountain Time - Arizona"
 msgstr ""
 #: includes/class-kind-fields.php:46
+#: includes/class-kind-fields.php:58
 msgid "(GMT-07:00) Mountain Time - Yellowknife"
 msgstr ""
 #: includes/class-kind-fields.php:47
+#: includes/class-kind-fields.php:59
 msgid "(GMT-06:00) Belize"
 msgstr ""
 #: includes/class-kind-fields.php:48
+#: includes/class-kind-fields.php:60
 msgid "(GMT-06:00) Central Time"
 msgstr ""
 #: includes/class-kind-fields.php:49
+#: includes/class-kind-fields.php:61
 msgid "(GMT-06:00) Costa Rica"
 msgstr ""
 #: includes/class-kind-fields.php:50
+#: includes/class-kind-fields.php:62
 msgid "(GMT-06:00) El Salvador"
 msgstr ""
 #: includes/class-kind-fields.php:51
+#: includes/class-kind-fields.php:63
 msgid "(GMT-06:00) Guatemala"
 msgstr ""
 #: includes/class-kind-fields.php:52
+#: includes/class-kind-fields.php:64
 msgid "(GMT-06:00) Managua"
 msgstr ""
 #: includes/class-kind-fields.php:53
+#: includes/class-kind-fields.php:65
 msgid "(GMT-06:00) Central Time - Mexico City"
 msgstr ""
 #: includes/class-kind-fields.php:54
+#: includes/class-kind-fields.php:66
 msgid "(GMT-06:00) Central Time - Regina"
 msgstr ""
 #: includes/class-kind-fields.php:55
+#: includes/class-kind-fields.php:67
 msgid "(GMT-06:00) Central Time - Tegucigalpa"
 msgstr ""
 #: includes/class-kind-fields.php:56
+#: includes/class-kind-fields.php:68
 msgid "(GMT-06:00) Central Time - Winnipeg"
 msgstr ""
 #: includes/class-kind-fields.php:57
+#: includes/class-kind-fields.php:69
 msgid "(GMT-06:00) Galapagos"
 msgstr ""
 #: includes/class-kind-fields.php:58
+#: includes/class-kind-fields.php:70
 msgid "(GMT-05:00) Bogota"
 msgstr ""
 #: includes/class-kind-fields.php:59
+#: includes/class-kind-fields.php:71
 msgid "(GMT-05:00) America Cancun"
 msgstr ""
 #: includes/class-kind-fields.php:60
+#: includes/class-kind-fields.php:72
 msgid "(GMT-05:00) Cayman"
 msgstr ""
 #: includes/class-kind-fields.php:61
+#: includes/class-kind-fields.php:73
 msgid "(GMT-05:00) Guayaquil"
 msgstr ""
 #: includes/class-kind-fields.php:62
+#: includes/class-kind-fields.php:74
 msgid "(GMT-05:00) Havana"
 msgstr ""
 #: includes/class-kind-fields.php:63
+#: includes/class-kind-fields.php:75
 msgid "(GMT-05:00) Eastern Time - Iqaluit"
 msgstr ""
 #: includes/class-kind-fields.php:64
+#: includes/class-kind-fields.php:76
 msgid "(GMT-05:00) Jamaica"
 msgstr ""
 #: includes/class-kind-fields.php:65
+#: includes/class-kind-fields.php:77
 msgid "(GMT-05:00) Lima"
 msgstr ""
 #: includes/class-kind-fields.php:66
+#: includes/class-kind-fields.php:78
 msgid "(GMT-05:00) Nassau"
 msgstr ""
 #: includes/class-kind-fields.php:67
+#: includes/class-kind-fields.php:79
 msgid "(GMT-05:00) Eastern Time"
 msgstr ""
 #: includes/class-kind-fields.php:68
+#: includes/class-kind-fields.php:80
 msgid "(GMT-05:00) Panama"
 msgstr ""
 #: includes/class-kind-fields.php:69
+#: includes/class-kind-fields.php:81
 msgid "(GMT-05:00) Port-au-Prince"
 msgstr ""
 #: includes/class-kind-fields.php:70
+#: includes/class-kind-fields.php:82
 msgid "(GMT-05:00) Rio Branco"
 msgstr ""
 #: includes/class-kind-fields.php:71
+#: includes/class-kind-fields.php:83
 msgid "(GMT-05:00) Eastern Time - Toronto"
 msgstr ""
 #: includes/class-kind-fields.php:72
+#: includes/class-kind-fields.php:84
 msgid "(GMT-05:00) Easter Island"
 msgstr ""
 #: includes/class-kind-fields.php:73
+#: includes/class-kind-fields.php:85
 msgid "(GMT-04:30) Caracas"
 msgstr ""
 #: includes/class-kind-fields.php:74
+#: includes/class-kind-fields.php:86
 msgid "(GMT-03:00) Asuncion"
 msgstr ""
 #: includes/class-kind-fields.php:75
+#: includes/class-kind-fields.php:87
 msgid "(GMT-04:00) Barbados"
 msgstr ""
 #: includes/class-kind-fields.php:76
+#: includes/class-kind-fields.php:88
 msgid "(GMT-04:00) Boa Vista"
 msgstr ""
 #: includes/class-kind-fields.php:77
+#: includes/class-kind-fields.php:89
 msgid "(GMT-03:00) Campo Grande"
 msgstr ""
 #: includes/class-kind-fields.php:78
+#: includes/class-kind-fields.php:90
 msgid "(GMT-03:00) Cuiaba"
 msgstr ""
 #: includes/class-kind-fields.php:79
+#: includes/class-kind-fields.php:91
 msgid "(GMT-04:00) Curacao"
 msgstr ""
 #: includes/class-kind-fields.php:80
+#: includes/class-kind-fields.php:92
 msgid "(GMT-04:00) Grand Turk"
 msgstr ""
 #: includes/class-kind-fields.php:81
+#: includes/class-kind-fields.php:93
 msgid "(GMT-04:00) Guyana"
 msgstr ""
 #: includes/class-kind-fields.php:82
+#: includes/class-kind-fields.php:94
 msgid "(GMT-04:00) Atlantic Time - Halifax"
 msgstr ""
 #: includes/class-kind-fields.php:83
+#: includes/class-kind-fields.php:95
 msgid "(GMT-04:00) La Paz"
 msgstr ""
 #: includes/class-kind-fields.php:84
+#: includes/class-kind-fields.php:96
 msgid "(GMT-04:00) Manaus"
 msgstr ""
 #: includes/class-kind-fields.php:85
+#: includes/class-kind-fields.php:97
 msgid "(GMT-04:00) Martinique"
 msgstr ""
 #: includes/class-kind-fields.php:86
+#: includes/class-kind-fields.php:98
 msgid "(GMT-04:00) Port of Spain"
 msgstr ""
 #: includes/class-kind-fields.php:87
+#: includes/class-kind-fields.php:99
 msgid "(GMT-04:00) Porto Velho"
 msgstr ""
 #: includes/class-kind-fields.php:88
+#: includes/class-kind-fields.php:100
 msgid "(GMT-04:00) Puerto Rico"
 msgstr ""
 #: includes/class-kind-fields.php:89
+#: includes/class-kind-fields.php:101
 msgid "(GMT-04:00) Santo Domingo"
 msgstr ""
 #: includes/class-kind-fields.php:90
+#: includes/class-kind-fields.php:102
 msgid "(GMT-04:00) Thule"
 msgstr ""
 #: includes/class-kind-fields.php:91
+#: includes/class-kind-fields.php:103
 msgid "(GMT-04:00) Bermuda"
 msgstr ""
 #: includes/class-kind-fields.php:92
+#: includes/class-kind-fields.php:104
 msgid "(GMT-03:30) Newfoundland Time - St. Johns"
 msgstr ""
 #: includes/class-kind-fields.php:93
+#: includes/class-kind-fields.php:105
 msgid "(GMT-03:00) Araguaina"
 msgstr ""
 #: includes/class-kind-fields.php:94
+#: includes/class-kind-fields.php:106
 msgid "(GMT-03:00) Buenos Aires"
 msgstr ""
 #: includes/class-kind-fields.php:95
+#: includes/class-kind-fields.php:107
 msgid "(GMT-03:00) Salvador"
 msgstr ""
 #: includes/class-kind-fields.php:96
+#: includes/class-kind-fields.php:108
 msgid "(GMT-03:00) Belem"
 msgstr ""
 #: includes/class-kind-fields.php:97
+#: includes/class-kind-fields.php:109
 msgid "(GMT-03:00) Cayenne"
 msgstr ""
 #: includes/class-kind-fields.php:98
+#: includes/class-kind-fields.php:110
 msgid "(GMT-03:00) Fortaleza"
 msgstr ""
 #: includes/class-kind-fields.php:99
+#: includes/class-kind-fields.php:111
 msgid "(GMT-03:00) Godthab"
 msgstr ""
 #: includes/class-kind-fields.php:100
+#: includes/class-kind-fields.php:112
 msgid "(GMT-03:00) Maceio"
 msgstr ""
 #: includes/class-kind-fields.php:101
+#: includes/class-kind-fields.php:113
 msgid "(GMT-03:00) Miquelon"
 msgstr ""
 #: includes/class-kind-fields.php:102
+#: includes/class-kind-fields.php:114
 msgid "(GMT-03:00) Montevideo"
 msgstr ""
 #: includes/class-kind-fields.php:103
+#: includes/class-kind-fields.php:115
 msgid "(GMT-03:00) Paramaribo"
 msgstr ""
 #: includes/class-kind-fields.php:104
+#: includes/class-kind-fields.php:116
 msgid "(GMT-03:00) Recife"
 msgstr ""
 #: includes/class-kind-fields.php:105
+#: includes/class-kind-fields.php:117
 msgid "(GMT-03:00) Santiago"
 msgstr ""
 #: includes/class-kind-fields.php:106
+#: includes/class-kind-fields.php:118
 msgid "(GMT-02:00) Sao Paulo"
 msgstr ""
 #: includes/class-kind-fields.php:107
+#: includes/class-kind-fields.php:119
 msgid "(GMT-03:00) Palmer"
 msgstr ""
 #: includes/class-kind-fields.php:108
+#: includes/class-kind-fields.php:120
 msgid "(GMT-03:00) Rothera"
 msgstr ""
 #: includes/class-kind-fields.php:109
+#: includes/class-kind-fields.php:121
 msgid "(GMT-03:00) Stanley"
 msgstr ""
 #: includes/class-kind-fields.php:110
+#: includes/class-kind-fields.php:122
 msgid "(GMT-02:00) Noronha"
 msgstr ""
 #: includes/class-kind-fields.php:111
+#: includes/class-kind-fields.php:123
 msgid "(GMT-02:00) South Georgia"
 msgstr ""
 #: includes/class-kind-fields.php:112
+#: includes/class-kind-fields.php:124
 msgid "(GMT-01:00) Scoresbysund"
 msgstr ""
 #: includes/class-kind-fields.php:113
+#: includes/class-kind-fields.php:125
 msgid "(GMT-01:00) Azores"
 msgstr ""
 #: includes/class-kind-fields.php:114
+#: includes/class-kind-fields.php:126
 msgid "(GMT-01:00) Cape Verde"
 msgstr ""
 #: includes/class-kind-fields.php:115
+#: includes/class-kind-fields.php:127
 msgid "(GMT+00:00) Abidjan"
 msgstr ""
 #: includes/class-kind-fields.php:116
+#: includes/class-kind-fields.php:128
 msgid "(GMT+00:00) Accra"
 msgstr ""
 #: includes/class-kind-fields.php:117
+#: includes/class-kind-fields.php:129
 msgid "(GMT+00:00) Bissau"
 msgstr ""
 #: includes/class-kind-fields.php:118
+#: includes/class-kind-fields.php:130
 msgid "(GMT+00:00) Casablanca"
 msgstr ""
 #: includes/class-kind-fields.php:119
+#: includes/class-kind-fields.php:131
 msgid "(GMT+00:00) El Aaiun"
 msgstr ""
 #: includes/class-kind-fields.php:120
+#: includes/class-kind-fields.php:132
 msgid "(GMT+00:00) Monrovia"
 msgstr ""
 #: includes/class-kind-fields.php:121
+#: includes/class-kind-fields.php:133
 msgid "(GMT+00:00) Danmarkshavn"
 msgstr ""
 #: includes/class-kind-fields.php:122
+#: includes/class-kind-fields.php:134
 msgid "(GMT+00:00) Canary Islands"
 msgstr ""
 #: includes/class-kind-fields.php:123
+#: includes/class-kind-fields.php:135
 msgid "(GMT+00:00) Faeroe"
 msgstr ""
 #: includes/class-kind-fields.php:124
+#: includes/class-kind-fields.php:136
 msgid "(GMT+00:00) Reykjavik"
 msgstr ""
 #: includes/class-kind-fields.php:125
+#: includes/class-kind-fields.php:137
 msgid "(GMT+00:00) GMT (no daylight saving)"
 msgstr ""
 #: includes/class-kind-fields.php:126
+#: includes/class-kind-fields.php:138
 msgid "(GMT+00:00) Dublin"
 msgstr ""
 #: includes/class-kind-fields.php:127
+#: includes/class-kind-fields.php:139
 msgid "(GMT+00:00) Lisbon"
 msgstr ""
 #: includes/class-kind-fields.php:128
+#: includes/class-kind-fields.php:140
 msgid "(GMT+00:00) London"
 msgstr ""
 #: includes/class-kind-fields.php:129
+#: includes/class-kind-fields.php:141
 msgid "(GMT+01:00) Algiers"
 msgstr ""
 #: includes/class-kind-fields.php:130
+#: includes/class-kind-fields.php:142
 msgid "(GMT+01:00) Ceuta"
 msgstr ""
 #: includes/class-kind-fields.php:131
+#: includes/class-kind-fields.php:143
 msgid "(GMT+01:00) Lagos"
 msgstr ""
 #: includes/class-kind-fields.php:132
+#: includes/class-kind-fields.php:144
 msgid "(GMT+01:00) Ndjamena"
 msgstr ""
 #: includes/class-kind-fields.php:133
+#: includes/class-kind-fields.php:145
 msgid "(GMT+01:00) Tunis"
 msgstr ""
 #: includes/class-kind-fields.php:134
+#: includes/class-kind-fields.php:146
 msgid "(GMT+02:00) Windhoek"
 msgstr ""
 #: includes/class-kind-fields.php:135
+#: includes/class-kind-fields.php:147
 msgid "(GMT+01:00) Amsterdam"
 msgstr ""
 #: includes/class-kind-fields.php:136
+#: includes/class-kind-fields.php:148
 msgid "(GMT+01:00) Andorra"
 msgstr ""
 #: includes/class-kind-fields.php:137
+#: includes/class-kind-fields.php:149
 msgid "(GMT+01:00) Central European Time - Belgrade"
 msgstr ""
 #: includes/class-kind-fields.php:138
+#: includes/class-kind-fields.php:150
 msgid "(GMT+01:00) Berlin"
 msgstr ""
 #: includes/class-kind-fields.php:139
+#: includes/class-kind-fields.php:151
 msgid "(GMT+01:00) Brussels"
 msgstr ""
 #: includes/class-kind-fields.php:140
+#: includes/class-kind-fields.php:152
 msgid "(GMT+01:00) Budapest"
 msgstr ""
 #: includes/class-kind-fields.php:141
+#: includes/class-kind-fields.php:153
 msgid "(GMT+01:00) Copenhagen"
 msgstr ""
 #: includes/class-kind-fields.php:142
+#: includes/class-kind-fields.php:154
 msgid "(GMT+01:00) Gibraltar"
 msgstr ""
 #: includes/class-kind-fields.php:143
+#: includes/class-kind-fields.php:155
 msgid "(GMT+01:00) Luxembourg"
 msgstr ""
 #: includes/class-kind-fields.php:144
+#: includes/class-kind-fields.php:156
 msgid "(GMT+01:00) Madrid"
 msgstr ""
 #: includes/class-kind-fields.php:145
+#: includes/class-kind-fields.php:157
 msgid "(GMT+01:00) Malta"
 msgstr ""
 #: includes/class-kind-fields.php:146
+#: includes/class-kind-fields.php:158
 msgid "(GMT+01:00) Monaco"
 msgstr ""
 #: includes/class-kind-fields.php:147
+#: includes/class-kind-fields.php:159
 msgid "(GMT+01:00) Oslo"
 msgstr ""
 #: includes/class-kind-fields.php:148
+#: includes/class-kind-fields.php:160
 msgid "(GMT+01:00) Paris"
 msgstr ""
 #: includes/class-kind-fields.php:149
+#: includes/class-kind-fields.php:161
 msgid "(GMT+01:00) Central European Time - Prague"
 msgstr ""
 #: includes/class-kind-fields.php:150
+#: includes/class-kind-fields.php:162
 msgid "(GMT+01:00) Rome"
 msgstr ""
 #: includes/class-kind-fields.php:151
+#: includes/class-kind-fields.php:163
 msgid "(GMT+01:00) Stockholm"
 msgstr ""
 #: includes/class-kind-fields.php:152
+#: includes/class-kind-fields.php:164
 msgid "(GMT+01:00) Tirane"
 msgstr ""
 #: includes/class-kind-fields.php:153
+#: includes/class-kind-fields.php:165
 msgid "(GMT+01:00) Vienna"
 msgstr ""
 #: includes/class-kind-fields.php:154
+#: includes/class-kind-fields.php:166
 msgid "(GMT+01:00) Warsaw"
 msgstr ""
 #: includes/class-kind-fields.php:155
+#: includes/class-kind-fields.php:167
 msgid "(GMT+01:00) Zurich"
 msgstr ""
 #: includes/class-kind-fields.php:156
+#: includes/class-kind-fields.php:168
 msgid "(GMT+02:00) Cairo"
 msgstr ""
 #: includes/class-kind-fields.php:157
+#: includes/class-kind-fields.php:169
 msgid "(GMT+02:00) Johannesburg"
 msgstr ""
 #: includes/class-kind-fields.php:158
+#: includes/class-kind-fields.php:170
 msgid "(GMT+02:00) Maputo"
 msgstr ""
 #: includes/class-kind-fields.php:159
+#: includes/class-kind-fields.php:171
 msgid "(GMT+02:00) Tripoli"
 msgstr ""
 #: includes/class-kind-fields.php:160
+#: includes/class-kind-fields.php:172
 msgid "(GMT+02:00) Amman"
 msgstr ""
 #: includes/class-kind-fields.php:161
+#: includes/class-kind-fields.php:173
 msgid "(GMT+02:00) Beirut"
 msgstr ""
 #: includes/class-kind-fields.php:162
+#: includes/class-kind-fields.php:174
 msgid "(GMT+02:00) Damascus"
 msgstr ""
 #: includes/class-kind-fields.php:163
+#: includes/class-kind-fields.php:175
 msgid "(GMT+02:00) Gaza"
 msgstr ""
 #: includes/class-kind-fields.php:164
+#: includes/class-kind-fields.php:176
 msgid "(GMT+02:00) Jerusalem"
 msgstr ""
 #: includes/class-kind-fields.php:165
+#: includes/class-kind-fields.php:177
 msgid "(GMT+02:00) Nicosia"
 msgstr ""
 #: includes/class-kind-fields.php:166
+#: includes/class-kind-fields.php:178
 msgid "(GMT+02:00) Athens"
 msgstr ""
 #: includes/class-kind-fields.php:167
+#: includes/class-kind-fields.php:179
 msgid "(GMT+02:00) Bucharest"
 msgstr ""
 #: includes/class-kind-fields.php:168
+#: includes/class-kind-fields.php:180
 msgid "(GMT+02:00) Chisinau"
 msgstr ""
 #: includes/class-kind-fields.php:169
+#: includes/class-kind-fields.php:181
 msgid "(GMT+02:00) Helsinki"
 msgstr ""
 #: includes/class-kind-fields.php:170
+#: includes/class-kind-fields.php:182
 msgid "(GMT+02:00) Istanbul"
 msgstr ""
 #: includes/class-kind-fields.php:171
+#: includes/class-kind-fields.php:183
 msgid "(GMT+02:00) Moscow-01 - Kaliningrad"
 msgstr ""
 #: includes/class-kind-fields.php:172
+#: includes/class-kind-fields.php:184
 msgid "(GMT+02:00) Kiev"
 msgstr ""
 #: includes/class-kind-fields.php:173
+#: includes/class-kind-fields.php:185
 msgid "(GMT+02:00) Riga"
 msgstr ""
 #: includes/class-kind-fields.php:174
+#: includes/class-kind-fields.php:186
 msgid "(GMT+02:00) Sofia"
 msgstr ""
 #: includes/class-kind-fields.php:175
+#: includes/class-kind-fields.php:187
 msgid "(GMT+02:00) Tallinn"
 msgstr ""
 #: includes/class-kind-fields.php:176
+#: includes/class-kind-fields.php:188
 msgid "(GMT+02:00) Vilnius"
 msgstr ""
 #: includes/class-kind-fields.php:177
+#: includes/class-kind-fields.php:189
 msgid "(GMT+03:00) Khartoum"
 msgstr ""
 #: includes/class-kind-fields.php:178
+#: includes/class-kind-fields.php:190
 msgid "(GMT+03:00) Nairobi"
 msgstr ""
 #: includes/class-kind-fields.php:179
+#: includes/class-kind-fields.php:191
 msgid "(GMT+03:00) Syowa"
 msgstr ""
 #: includes/class-kind-fields.php:180
+#: includes/class-kind-fields.php:192
 msgid "(GMT+03:00) Baghdad"
 msgstr ""
 #: includes/class-kind-fields.php:181
+#: includes/class-kind-fields.php:193
 msgid "(GMT+03:00) Qatar"
 msgstr ""
 #: includes/class-kind-fields.php:182
+#: includes/class-kind-fields.php:194
 msgid "(GMT+03:00) Riyadh"
 msgstr ""
 #: includes/class-kind-fields.php:183
+#: includes/class-kind-fields.php:195
 msgid "(GMT+03:00) Minsk"
 msgstr ""
 #: includes/class-kind-fields.php:184
+#: includes/class-kind-fields.php:196
 msgid "(GMT+03:00) Moscow+00 - Moscow"
 msgstr ""
 #: includes/class-kind-fields.php:185
+#: includes/class-kind-fields.php:197
 msgid "(GMT+03:30) Tehran"
 msgstr ""
 #: includes/class-kind-fields.php:186
+#: includes/class-kind-fields.php:198
 msgid "(GMT+04:00) Baku"
 msgstr ""
 #: includes/class-kind-fields.php:187
+#: includes/class-kind-fields.php:199
 msgid "(GMT+04:00) Dubai"
 msgstr ""
 #: includes/class-kind-fields.php:188
+#: includes/class-kind-fields.php:200
 msgid "(GMT+04:00) Tbilisi"
 msgstr ""
 #: includes/class-kind-fields.php:189
+#: includes/class-kind-fields.php:201
 msgid "(GMT+04:00) Yerevan"
 msgstr ""
 #: includes/class-kind-fields.php:190
+#: includes/class-kind-fields.php:202
 msgid "(GMT+04:00) Moscow+01 - Samara"
 msgstr ""
 #: includes/class-kind-fields.php:191
+#: includes/class-kind-fields.php:203
 msgid "(GMT+04:00) Mahe"
 msgstr ""
 #: includes/class-kind-fields.php:192
+#: includes/class-kind-fields.php:204
 msgid "(GMT+04:00) Mauritius"
 msgstr ""
 #: includes/class-kind-fields.php:193
+#: includes/class-kind-fields.php:205
 msgid "(GMT+04:00) Reunion"
 msgstr ""
 #: includes/class-kind-fields.php:194
+#: includes/class-kind-fields.php:206
 msgid "(GMT+04:30) Kabul"
 msgstr ""
 #: includes/class-kind-fields.php:195
+#: includes/class-kind-fields.php:207
 msgid "(GMT+05:00) Mawson"
 msgstr ""
 #: includes/class-kind-fields.php:196
+#: includes/class-kind-fields.php:208
 msgid "(GMT+05:00) Aqtau"
 msgstr ""
 #: includes/class-kind-fields.php:197
+#: includes/class-kind-fields.php:209
 msgid "(GMT+05:00) Aqtobe"
 msgstr ""
 #: includes/class-kind-fields.php:198
+#: includes/class-kind-fields.php:210
 msgid "(GMT+05:00) Ashgabat"
 msgstr ""
 #: includes/class-kind-fields.php:199
+#: includes/class-kind-fields.php:211
 msgid "(GMT+05:00) Dushanbe"
 msgstr ""
 #: includes/class-kind-fields.php:200
+#: includes/class-kind-fields.php:212
 msgid "(GMT+05:00) Karachi"
 msgstr ""
 #: includes/class-kind-fields.php:201
+#: includes/class-kind-fields.php:213
 msgid "(GMT+05:00) Tashkent"
 msgstr ""
 #: includes/class-kind-fields.php:202
+#: includes/class-kind-fields.php:214
 msgid "(GMT+05:00) Moscow+02 - Yekaterinburg"
 msgstr ""
 #: includes/class-kind-fields.php:203
+#: includes/class-kind-fields.php:215
 msgid "(GMT+05:00) Kerguelen"
 msgstr ""
 #: includes/class-kind-fields.php:204
+#: includes/class-kind-fields.php:216
 msgid "(GMT+05:00) Maldives"
 msgstr ""
 #: includes/class-kind-fields.php:205
+#: includes/class-kind-fields.php:217
 msgid "(GMT+05:30) India Standard Time"
 msgstr ""
 #: includes/class-kind-fields.php:206
+#: includes/class-kind-fields.php:218
 msgid "(GMT+05:30) Colombo"
 msgstr ""
 #: includes/class-kind-fields.php:207
+#: includes/class-kind-fields.php:219
 msgid "(GMT+05:45) Katmandu"
 msgstr ""
 #: includes/class-kind-fields.php:208
+#: includes/class-kind-fields.php:220
 msgid "(GMT+06:00) Vostok"
 msgstr ""
 #: includes/class-kind-fields.php:209
+#: includes/class-kind-fields.php:221
 msgid "(GMT+06:00) Almaty"
 msgstr ""
 #: includes/class-kind-fields.php:210
+#: includes/class-kind-fields.php:222
 msgid "(GMT+06:00) Bishkek"
 msgstr ""
 #: includes/class-kind-fields.php:211
+#: includes/class-kind-fields.php:223
 msgid "(GMT+06:00) Dhaka"
 msgstr ""
 #: includes/class-kind-fields.php:212
+#: includes/class-kind-fields.php:224
 msgid "(GMT+06:00) Moscow+03 - Omsk, Novosibirsk"
 msgstr ""
 #: includes/class-kind-fields.php:213
+#: includes/class-kind-fields.php:225
 msgid "(GMT+06:00) Thimphu"
 msgstr ""
 #: includes/class-kind-fields.php:214
+#: includes/class-kind-fields.php:226
 msgid "(GMT+06:00) Chagos"
 msgstr ""
 #: includes/class-kind-fields.php:215
+#: includes/class-kind-fields.php:227
 msgid "(GMT+06:30) Rangoon"
 msgstr ""
 #: includes/class-kind-fields.php:216
+#: includes/class-kind-fields.php:228
 msgid "(GMT+06:30) Cocos"
 msgstr ""
 #: includes/class-kind-fields.php:217
+#: includes/class-kind-fields.php:229
 msgid "(GMT+07:00) Davis"
 msgstr ""
 #: includes/class-kind-fields.php:218
+#: includes/class-kind-fields.php:230
 msgid "(GMT+07:00) Bangkok"
 msgstr ""
 #: includes/class-kind-fields.php:219
+#: includes/class-kind-fields.php:231
 msgid "(GMT+07:00) Hovd"
 msgstr ""
 #: includes/class-kind-fields.php:220
+#: includes/class-kind-fields.php:232
 msgid "(GMT+07:00) Jakarta"
 msgstr ""
 #: includes/class-kind-fields.php:221
+#: includes/class-kind-fields.php:233
 msgid "(GMT+07:00) Moscow+04 - Krasnoyarsk"
 msgstr ""
 #: includes/class-kind-fields.php:222
+#: includes/class-kind-fields.php:234
 msgid "(GMT+07:00) Hanoi"
 msgstr ""
 #: includes/class-kind-fields.php:223
+#: includes/class-kind-fields.php:235
 msgid "(GMT+07:00) Ho Chi Minh"
 msgstr ""
 #: includes/class-kind-fields.php:224
+#: includes/class-kind-fields.php:236
 msgid "(GMT+07:00) Christmas"
 msgstr ""
 #: includes/class-kind-fields.php:225
+#: includes/class-kind-fields.php:237
 msgid "(GMT+08:00) Casey"
 msgstr ""
 #: includes/class-kind-fields.php:226
+#: includes/class-kind-fields.php:238
 msgid "(GMT+08:00) Brunei"
 msgstr ""
 #: includes/class-kind-fields.php:227
+#: includes/class-kind-fields.php:239
 msgid "(GMT+08:00) Choibalsan"
 msgstr ""
 #: includes/class-kind-fields.php:228
+#: includes/class-kind-fields.php:240
 msgid "(GMT+08:00) Hong Kong"
 msgstr ""
 #: includes/class-kind-fields.php:229
+#: includes/class-kind-fields.php:241
 msgid "(GMT+08:00) Moscow+05 - Irkutsk"
 msgstr ""
 #: includes/class-kind-fields.php:230
+#: includes/class-kind-fields.php:242
 msgid "(GMT+08:00) Kuala Lumpur"
 msgstr ""
 #: includes/class-kind-fields.php:231
+#: includes/class-kind-fields.php:243
 msgid "(GMT+08:00) Macau"
 msgstr ""
 #: includes/class-kind-fields.php:232
+#: includes/class-kind-fields.php:244
 msgid "(GMT+08:00) Makassar"
 msgstr ""
 #: includes/class-kind-fields.php:233
+#: includes/class-kind-fields.php:245
 msgid "(GMT+08:00) Manila"
 msgstr ""
 #: includes/class-kind-fields.php:234
+#: includes/class-kind-fields.php:246
 msgid "(GMT+08:00) China Time - Beijing"
 msgstr ""
 #: includes/class-kind-fields.php:235
+#: includes/class-kind-fields.php:247
 msgid "(GMT+08:00) Singapore"
 msgstr ""
 #: includes/class-kind-fields.php:236
+#: includes/class-kind-fields.php:248
 msgid "(GMT+08:00) Taipei"
 msgstr ""
 #: includes/class-kind-fields.php:237
+#: includes/class-kind-fields.php:249
 msgid "(GMT+08:00) Ulaanbaatar"
 msgstr ""
 #: includes/class-kind-fields.php:238
+#: includes/class-kind-fields.php:250
 msgid "(GMT+08:00) Western Time - Perth"
 msgstr ""
 #: includes/class-kind-fields.php:239
+#: includes/class-kind-fields.php:251
 msgid "(GMT+08:30) Pyongyang"
 msgstr ""
 #: includes/class-kind-fields.php:240
+#: includes/class-kind-fields.php:252
 msgid "(GMT+09:00) Dili"
 msgstr ""
 #: includes/class-kind-fields.php:241
+#: includes/class-kind-fields.php:253
 msgid "(GMT+09:00) Jayapura"
 msgstr ""
 #: includes/class-kind-fields.php:242
+#: includes/class-kind-fields.php:254
 msgid "(GMT+09:00) Seoul"
 msgstr ""
 #: includes/class-kind-fields.php:243
+#: includes/class-kind-fields.php:255
 msgid "(GMT+09:00) Tokyo"
 msgstr ""
 #: includes/class-kind-fields.php:244
+#: includes/class-kind-fields.php:256
 msgid "(GMT+09:00) Moscow+06 - Yakutsk"
 msgstr ""
 #: includes/class-kind-fields.php:245
+#: includes/class-kind-fields.php:257
 msgid "(GMT+09:00) Palau"
 msgstr ""
 #: includes/class-kind-fields.php:246
+#: includes/class-kind-fields.php:258
 msgid "(GMT+10:30) Central Time - Adelaide"
 msgstr ""
 #: includes/class-kind-fields.php:247
+#: includes/class-kind-fields.php:259
 msgid "(GMT+09:30) Central Time - Darwin"
 msgstr ""
 #: includes/class-kind-fields.php:249
+#: includes/class-kind-fields.php:261
 msgid "(GMT+10:00) Moscow+07 - Magadan"
 msgstr ""
 #: includes/class-kind-fields.php:250
+#: includes/class-kind-fields.php:262
 msgid "(GMT+10:00) Moscow+07 - Yuzhno-Sakhalinsk"
 msgstr ""
 #: includes/class-kind-fields.php:251
+#: includes/class-kind-fields.php:263
 msgid "(GMT+10:00) Eastern Time - Brisbane"
 msgstr ""
 #: includes/class-kind-fields.php:252
+#: includes/class-kind-fields.php:264
 msgid "(GMT+11:00) Eastern Time - Hobart"
 msgstr ""
 #: includes/class-kind-fields.php:253
+#: includes/class-kind-fields.php:265
 msgid "(GMT+11:00) Eastern Time - Melbourne, Sydney"
 msgstr ""
 #: includes/class-kind-fields.php:254
+#: includes/class-kind-fields.php:266
 msgid "(GMT+10:00) Truk"
 msgstr ""
 #: includes/class-kind-fields.php:255
+#: includes/class-kind-fields.php:267
 msgid "(GMT+10:00) Guam"
 msgstr ""
 #: includes/class-kind-fields.php:256
+#: includes/class-kind-fields.php:268
 msgid "(GMT+10:00) Port Moresby"
 msgstr ""
 #: includes/class-kind-fields.php:257
+#: includes/class-kind-fields.php:269
 msgid "(GMT+11:00) Efate"
 msgstr ""
 #: includes/class-kind-fields.php:258
+#: includes/class-kind-fields.php:270
 msgid "(GMT+11:00) Guadalcanal"
 msgstr ""
 #: includes/class-kind-fields.php:259
+#: includes/class-kind-fields.php:271
 msgid "(GMT+11:00) Kosrae"
 msgstr ""
 #: includes/class-kind-fields.php:260
+#: includes/class-kind-fields.php:272
 msgid "(GMT+11:00) Norfolk"
 msgstr ""
 #: includes/class-kind-fields.php:261
+#: includes/class-kind-fields.php:273
 msgid "(GMT+11:00) Noumea"
 msgstr ""
 #: includes/class-kind-fields.php:262
+#: includes/class-kind-fields.php:274
 msgid "(GMT+11:00) Ponape"
 msgstr ""
 #: includes/class-kind-fields.php:263
+#: includes/class-kind-fields.php:275
 msgid "(GMT+12:00) Moscow+09 - Petropavlovsk-Kamchatskiy"
 msgstr ""
 #: includes/class-kind-fields.php:264
+#: includes/class-kind-fields.php:276
 msgid "(GMT+13:00) Auckland"
 msgstr ""
 #: includes/class-kind-fields.php:265
+#: includes/class-kind-fields.php:277
 msgid "(GMT+13:00) Fiji"
 msgstr ""
 #: includes/class-kind-fields.php:266
+#: includes/class-kind-fields.php:278
 msgid "(GMT+12:00) Funafuti"
 msgstr ""
 #: includes/class-kind-fields.php:267
+#: includes/class-kind-fields.php:279
 msgid "(GMT+12:00) Kwajalein"
 msgstr ""
 #: includes/class-kind-fields.php:268
+#: includes/class-kind-fields.php:280
 msgid "(GMT+12:00) Majuro"
 msgstr ""
 #: includes/class-kind-fields.php:269
+#: includes/class-kind-fields.php:281
 msgid "(GMT+12:00) Nauru"
 msgstr ""
 #: includes/class-kind-fields.php:270
+#: includes/class-kind-fields.php:282
 msgid "(GMT+12:00) Tarawa"
 msgstr ""
 #: includes/class-kind-fields.php:271
+#: includes/class-kind-fields.php:283
 msgid "(GMT+12:00) Wake"
 msgstr ""
 #: includes/class-kind-fields.php:272
+#: includes/class-kind-fields.php:284
 msgid "(GMT+12:00) Wallis"
 msgstr ""
 #: includes/class-kind-fields.php:273
+#: includes/class-kind-fields.php:285
 msgid "(GMT+14:00) Apia"
 msgstr ""
 #: includes/class-kind-fields.php:274
+#: includes/class-kind-fields.php:286
 msgid "(GMT+13:00) Enderbury"
 msgstr ""
 #: includes/class-kind-fields.php:275
+#: includes/class-kind-fields.php:287
 msgid "(GMT+13:00) Fakaofo"
 msgstr ""
 #: includes/class-kind-fields.php:276
+#: includes/class-kind-fields.php:288
 msgid "(GMT+13:00) Tongatapu"
 msgstr ""
 #: includes/class-kind-fields.php:277
+#: includes/class-kind-fields.php:289
 msgid "(GMT+14:00) Kiritimati"
 msgstr ""
 #: includes/class-kind-fields.php:385
+#: includes/class-kind-fields.php:396
 msgid "Author Name"
 msgstr ""
 #: includes/class-kind-fields.php:389
 #: templates/reply-author.php:12
+#: includes/class-kind-fields.php:400
+#: templates/reply-author.php:26
 msgid "Author URL"
 msgstr ""
 #: includes/class-kind-fields.php:393
+#: includes/class-kind-fields.php:404
 msgid "Author Photo"
 msgstr ""
 #: includes/class-kind-media-metadata.php:66
 #: includes/register-kinds.php:542
 #: includes/register-kinds.php:607
+#: includes/class-kind-media-metadata.php:125
+#: includes/register-kinds.php:551
+#: includes/register-kinds.php:616
 msgid "Artist"
 msgstr ""
 #: includes/class-kind-media-metadata.php:67
+#: includes/class-kind-media-metadata.php:126
 msgid "The creator of the image"
 msgstr ""
 #: includes/class-kind-media-metadata.php:72
+#: includes/class-kind-media-metadata.php:131
 msgid "Artist URL"
 msgstr ""
 #: includes/class-kind-media-metadata.php:73
+#: includes/class-kind-media-metadata.php:132
 msgid "The Artists URL or webpage"
 msgstr ""
 #: includes/class-kind-menu-widget.php:10
+#: includes/class-kind-menu-widget.php:25
 msgid "Kind Menu Widget"
 msgstr ""
 #: includes/class-kind-menu-widget.php:13
+#: includes/class-kind-menu-widget.php:28
 msgid "A widget that allows you to display a menu of kind archives"
 msgstr ""
 #. translators: 1. Blog Title 2. Kind Singular Name
+#: includes/class-kind-menu-widget.php:62
+msgid "title=\"%1$s %2$s Feed\""
+msgstr ""
+#: includes/class-kind-menu-widget.php:78
+#: includes/class-kind-menu-widget.php:80
+#, php-format
+msgid "%1$s %2$s Feed"
+msgstr ""
+#: includes/class-kind-menu-widget.php:96
 msgid "All Posts"
 msgstr ""
 #: includes/class-kind-menu-widget.php:122
 #: includes/class-kind-post-widget.php:95
+#: includes/class-kind-menu-widget.php:149
+#: includes/class-kind-post-widget.php:118
 msgid "Title: "
 msgstr ""
 #: includes/class-kind-menu-widget.php:143
+#: includes/class-kind-menu-widget.php:169
 msgid "Show Link to All:"
 msgstr ""
 #: includes/class-kind-menu-widget.php:148
+#: includes/class-kind-menu-widget.php:174
 msgid "Show Count:"
 msgstr ""
 #: includes/class-kind-metabox.php:154
+#: includes/class-kind-metabox.php:211
 msgid "Your URL has been successfully retrieved and parsed"
 msgstr ""
 #: includes/class-kind-metabox.php:155
+#: includes/class-kind-metabox.php:212
 msgid "Are you sure you want to clear post properties?"
 msgstr ""
+#: includes/class-kind-metabox.php:272
+#: includes/class-kind-metabox.php:213
+msgid "Error: Unable to Retrieve"
+msgstr ""
+#: includes/class-kind-metabox.php:214
+msgid "Invalid URL"
+msgstr ""
+#: includes/class-kind-metabox.php:215
+msgid "Attach"
+msgstr ""
+#: includes/class-kind-metabox.php:216
+msgid "Use this media"
+msgstr ""
+#: includes/class-kind-metabox.php:346
 msgid "Very Dissatisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:273
+#: includes/class-kind-metabox.php:347
 msgid "Dissatisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:274
+#: includes/class-kind-metabox.php:348
 msgid "Neutral"
 msgstr ""
 #: includes/class-kind-metabox.php:275
+#: includes/class-kind-metabox.php:349
 msgid "Satisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:276
+#: includes/class-kind-metabox.php:350
 msgid "Very Satisfied"
 msgstr ""
 #: includes/class-kind-metabox.php:300
 #: includes/register-kinds.php:459
+#: includes/class-kind-metabox.php:376
+#: includes/register-kinds.php:468
 msgid "Yes"
 msgstr ""
+#: includes/class-kind-metabox.php:301
+#: includes/class-kind-metabox.php:377
+#: includes/register-kinds.php:469
+msgid "No"
+msgstr ""
+#: includes/class-kind-metabox.php:378
+#: includes/register-kinds.php:470
+msgid "Maybe"
+msgstr ""
+#: includes/class-kind-metabox.php:379
+#: includes/register-kinds.php:471
+msgid "Interested"
+msgstr ""
+#: includes/class-kind-metabox.php:380
+#: includes/register-kinds.php:472
+msgid "Remote"
+msgstr ""
+#: includes/class-kind-metabox.php:404
 #: includes/register-kinds.php:460
+msgid "No"
+msgstr ""
+#: includes/class-kind-metabox.php:302
+#: includes/register-kinds.php:461
+msgid "Maybe"
+msgstr ""
+#: includes/class-kind-metabox.php:303
+#: includes/register-kinds.php:462
+msgid "Interested"
+msgstr ""
+#: includes/class-kind-metabox.php:304
+#: includes/register-kinds.php:463
+msgid "Remote"
+msgstr ""
+#: includes/class-kind-metabox.php:326
+#: includes/register-kinds.php:451
+#: views/kind.php:81
 msgid "RSVP"
 msgstr ""
 #: includes/class-kind-metabox.php:342
+#: includes/class-kind-metabox.php:422
 msgid "Rating"
 msgstr ""
 #: includes/class-kind-metabox.php:357
+#: includes/class-kind-metabox.php:461
 msgid "Response Properties"
 msgstr ""
 #: includes/class-kind-plugins.php:133
+#: includes/class-kind-plugins.php:209
 msgctxt "direct article"
 msgid "this"
 msgstr ""
+#: includes/class-kind-post-widget.php:10
+#: includes/class-kind-plugins.php:535
+msgid "Nothing could be parsed from the URL."
+msgstr ""
+#: includes/class-kind-post-widget.php:25
 msgid "Kind Post Widget"
 msgstr ""
 #: includes/class-kind-post-widget.php:13
+#: includes/class-kind-post-widget.php:28
 msgid "A widget that allows you to display a list of posts by type"
 msgstr ""
+#: includes/class-kind-post-widget.php:63
+msgid "No Posts Found"
+msgstr ""
+#: includes/class-kind-post-widget.php:115
+#: includes/class-kind-post-widget.php:137
 msgid "Number of Posts:"
 msgstr ""
+#: includes/class-kind-taxonomy.php:305
+msgid "Post Kind"
+msgstr ""
+#: includes/class-kind-taxonomy.php:526
+#: includes/class-kind-taxonomy.php:161
+msgid "Unknown post kind."
+msgstr ""
+#: includes/class-kind-taxonomy.php:363
+msgid "The post kind, or false if the post has none."
+msgstr ""
+#: includes/class-kind-taxonomy.php:609
+msgid "Post Kinds replaces the IndieWeb Taxonomy plugin. Deactivate IndieWeb Taxonomy, then activate Post Kinds."
+msgstr ""
+#: includes/class-kind-taxonomy.php:697
 msgctxt "taxonomy general name"
 msgid "Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:527
+#: includes/class-kind-taxonomy.php:698
 msgctxt "taxonomy singular name"
 msgid "Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:528
+#: includes/class-kind-taxonomy.php:699
 msgctxt "search locations"
 msgid "Search Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:529
+#: includes/class-kind-taxonomy.php:700
 msgctxt "popular kinds"
 msgid "Popular Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:530
+#: includes/class-kind-taxonomy.php:701
 msgctxt "all taxonomy items"
 msgid "All Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:531
+#: includes/class-kind-taxonomy.php:702
 msgctxt "taxonomy parent item"
 msgid "Parent Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:532
+#: includes/class-kind-taxonomy.php:703
 msgctxt "taxonomy parent item with colon"
 msgid "Parent Kind:"
 msgstr ""
 #: includes/class-kind-taxonomy.php:533
+#: includes/class-kind-taxonomy.php:704
 msgid "This will appear on archives as the description if your theme supports"
 msgstr ""
 #: includes/class-kind-taxonomy.php:534
+#: includes/class-kind-taxonomy.php:705
 msgctxt "edit taxonomy item"
 msgid "Edit Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:535
+#: includes/class-kind-taxonomy.php:706
 msgctxt "view taxonomy item"
 msgid "View Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:536
+#: includes/class-kind-taxonomy.php:707
 msgctxt "update taxonomy item"
 msgid "Update Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:537
+#: includes/class-kind-taxonomy.php:708
 msgctxt "add taxonomy item"
 msgid "Add New Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:538
+#: includes/class-kind-taxonomy.php:709
 msgctxt "new taxonomy item"
 msgid "New Kind"
 msgstr ""
 #: includes/class-kind-taxonomy.php:539
+#: includes/class-kind-taxonomy.php:710
 msgctxt "separate kinds with commas"
 msgid "Separate kinds with commas"
 msgstr ""
 #: includes/class-kind-taxonomy.php:540
+#: includes/class-kind-taxonomy.php:711
 msgctxt "add or remove items"
 msgid "Add or remove kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:541
+#: includes/class-kind-taxonomy.php:712
 msgctxt "choose most used"
 msgid "Choose from the most used kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:542
+#: includes/class-kind-taxonomy.php:713
 msgctxt "no kinds found"
 msgid "No kinds found"
 msgstr ""
 #: includes/class-kind-taxonomy.php:543
+#: includes/class-kind-taxonomy.php:714
 msgctxt "no kinds"
 msgid "No kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:544
+#: includes/class-kind-taxonomy.php:715
 msgid "Back to Kinds"
 msgstr ""
 #: includes/class-kind-taxonomy.php:545
+#: includes/class-kind-taxonomy.php:716
 msgid "Kind Link"
 msgstr ""
 #: includes/class-kind-taxonomy.php:546
+#: includes/class-kind-taxonomy.php:717
 msgid "A link to a kind"
-msgstr ""
-#: includes/class-kind-taxonomy.php:565
-#: includes/register-kinds.php:8
-msgid "Article"
 msgstr ""
 …
 #. translators: 1: Taxonomy. 2: Month name and year
 #. translators: 1. Taxonomy . 1: Date
+#: includes/class-kind-taxonomy.php:860
+#: includes/class-kind-taxonomy.php:863
+#: includes/class-kind-taxonomy.php:866
+#: includes/class-kind-taxonomy.php:1114
+#: includes/class-kind-taxonomy.php:1117
+#: includes/class-kind-taxonomy.php:1120
+#, php-format
 msgid "%1$1s - %2$2s"
 msgstr ""
 #. translators: 1: Taxonomy. Yearly archive title. 2: Year
 #: includes/class-kind-taxonomy.php:860
+#: includes/class-kind-taxonomy.php:1114
 msgctxt "yearly archives date format"
 msgid "Y"
 …
 #. translators: 1: Taxonomy. 2: Month name and year
 #: includes/class-kind-taxonomy.php:863
+#: includes/class-kind-taxonomy.php:1117
 msgctxt "monthly archives date format"
 msgid "F Y"
 …
 #. translators: 1. Taxonomy . 1: Date
 #: includes/class-kind-taxonomy.php:866
+#: includes/class-kind-taxonomy.php:1120
 msgctxt "daily archives date format"
 msgid "F j, Y"
 …
 #. translators: 1. Title 2. Translated term for Firehose Feed
+#: includes/class-kind-taxonomy.php:870
+#: includes/class-kind-taxonomy.php:1124
+#, php-format
 msgid "%1$s - %2$2s"
 msgstr ""
 #. translators: 1. Title 2. Translated term for Firehose Feed
 #: includes/class-kind-taxonomy.php:870
+#: includes/class-kind-taxonomy.php:1124
 msgid "Firehose"
 msgstr ""
 #. translators: 1: Title prefix. 2: Title.
+#: includes/class-kind-taxonomy.php:876
+#: includes/class-kind-taxonomy.php:1130
+#, php-format
 msgctxt "archive title"
 msgid "%1$s %2$s"
 …
 #. translators: All
+#: includes/class-kind-taxonomy.php:1164
+#: includes/class-kind-taxonomy.php:1455
+#, php-format
 msgid "All %1s"
 msgstr ""
 #: includes/class-kind-taxonomy.php:1334
+#: includes/class-kind-taxonomy.php:1647
 msgid "Invalid post"
 msgstr ""
 #: includes/class-kind-taxonomy.php:1337
+#: includes/class-kind-taxonomy.php:1650
 msgid "Invalid Kind"
 msgstr ""
+#: includes/class-kind-view.php:418
+#: includes/class-kind-taxonomy.php:1670
+msgid "Invalid post."
+msgstr ""
+#: includes/class-kind-taxonomy.php:1673
+msgid "Sorry, you are not allowed to set the kind of this post."
+msgstr ""
+#: includes/class-kind-view.php:495
 msgctxt "singular Twitter"
 msgid "a tweet"
 msgstr ""
 #: includes/class-kind-view.php:419
+#: includes/class-kind-view.php:496
 msgctxt "singular Vimeo"
 msgid "a video"
 msgstr ""
 #: includes/class-kind-view.php:420
+#: includes/class-kind-view.php:497
 msgctxt "singular Youtube"
 msgid "a video"
 msgstr ""
 #: includes/class-kind-view.php:421
+#: includes/class-kind-view.php:498
 msgctxt "singular Intagram"
 msgid "an image"
 msgstr ""
 #: includes/class-kind-view.php:427
+#: includes/class-kind-view.php:513
 msgctxt "singular post"
 msgid "a post"
 msgstr ""
 #: includes/class-kind-view.php:494
+#: includes/class-kind-view.php:589
 msgid "an author"
 msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:614
+msgid "Attending <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:616
+msgid "Might be attending <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:618
+msgid "Unable to Attend <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:620
+msgid "Interested in Attending <a href=\"%1$s\" class=u-in-reply-to\">%2$s</a>"
+msgstr ""
+#. translators: URL for link to event and name of event
+#: includes/class-kind-view.php:622
+msgid "Attending <a href=\"%1$s\" class=\"u-in-reply-to\">%2$s</a> remotely"
+msgstr ""
+#: includes/class-kind-view.php:640
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:752
+#, php-format
+msgid "Attending %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:754
+#, php-format
+msgid "Might be attending %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:756
+#, php-format
+msgid "Unable to Attend %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:758
+#, php-format
+msgid "Interested in Attending %s"
+msgstr ""
+#. translators: %s: Link to the event
+#: includes/class-kind-view.php:760
+#, php-format
+msgid "Attending %s remotely"
+msgstr ""
+#: includes/class-kind-view.php:794
 msgid "Want to Read: "
 msgstr ""
 #: includes/class-kind-view.php:641
+#: includes/class-kind-view.php:795
 msgid "Reading: "
 msgstr ""
 #: includes/class-kind-view.php:642
+#: includes/class-kind-view.php:796
 msgid "Finished Reading: "
 msgstr ""
 #. translators: singular and plural
+#: includes/class-kind-view.php:674
+#: includes/class-kind-view.php:828
+#, php-format
 msgid "%d year"
 msgid_plural "%d years"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:678
+#: includes/class-kind-view.php:832
+#, php-format
 msgid "%d month"
 msgid_plural "%d months"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:682
+#: includes/class-kind-view.php:836
+#, php-format
 msgid "%d day"
 msgid_plural "%d days"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:686
+#: includes/class-kind-view.php:840
+#, php-format
 msgid "%d hour"
 msgid_plural "%d hours"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:690
+#: includes/class-kind-view.php:844
+#, php-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 …
 #. translators: singular and plural
+#: includes/class-kind-view.php:694
+#: includes/class-kind-view.php:848
+#, php-format
 msgid "%d second"
 msgid_plural "%d seconds"
 …
 msgstr[1] ""
+#: includes/register-kinds.php:9
+#: includes/register-kinds.php:17
+msgid "Article"
+msgstr ""
+#: includes/register-kinds.php:18
 msgid "Articles"
 msgstr ""
 #: includes/register-kinds.php:14
+#: includes/register-kinds.php:23
 msgid "traditional long form content: a post with an explicit title and body"
 msgstr ""
 #: includes/register-kinds.php:25
+#: includes/register-kinds.php:34
 msgid "Note"
 msgstr ""
 #: includes/register-kinds.php:26
+#: includes/register-kinds.php:35
 msgid "Notes"
 msgstr ""
 #: includes/register-kinds.php:31
+#: includes/register-kinds.php:40
 msgid "short content: a post or status update with just plain content and typically without a title"
 msgstr ""
 #: includes/register-kinds.php:42
+#: includes/register-kinds.php:51
 msgid "Reply"
 msgstr ""
 #: includes/register-kinds.php:43
+#: includes/register-kinds.php:52
 msgid "Replies"
 msgstr ""
 #: includes/register-kinds.php:44
+#: includes/register-kinds.php:53
 msgid "Replied to"
 msgstr ""
 #: includes/register-kinds.php:49
+#: includes/register-kinds.php:58
 msgid "In Reply To"
 msgstr ""
+#: includes/register-kinds.php:53
+#: includes/register-kinds.php:62
+#: includes/register-kinds.php:131
+#: includes/register-kinds.php:200
+#: includes/register-kinds.php:269
+#: includes/register-kinds.php:338
+#: includes/register-kinds.php:481
+#: includes/register-kinds.php:543
+#: includes/register-kinds.php:608
+#: includes/register-kinds.php:673
+#: templates/reply-metabox.php:56
+msgid "Name"
+msgstr ""
+#: includes/register-kinds.php:66
+#: includes/register-kinds.php:135
+#: includes/register-kinds.php:204
+#: includes/register-kinds.php:273
+#: includes/register-kinds.php:342
+#: includes/register-kinds.php:485
+#: includes/register-kinds.php:547
+#: includes/register-kinds.php:612
+#: includes/register-kinds.php:677
+#: templates/reply-metabox.php:50
+msgid "URL"
+msgstr ""
+#: includes/register-kinds.php:70
+#: includes/register-kinds.php:139
+#: includes/register-kinds.php:208
+#: includes/register-kinds.php:277
+#: includes/register-kinds.php:346
+#: templates/reply-author.php:20
+#: templates/reply-metabox.php:45
+msgid "Author"
+msgstr ""
+#: includes/register-kinds.php:77
+#: includes/register-kinds.php:146
+#: includes/register-kinds.php:215
+#: includes/register-kinds.php:284
+#: includes/register-kinds.php:353
+#: includes/register-kinds.php:489
+#: includes/register-kinds.php:558
+#: includes/register-kinds.php:623
+msgid "Summary"
+msgstr ""
+#: includes/register-kinds.php:81
+#: includes/register-kinds.php:150
+#: includes/register-kinds.php:219
+#: includes/register-kinds.php:288
+#: includes/register-kinds.php:357
+#: includes/register-kinds.php:493
+msgid "Publication/Website"
+msgstr ""
+#: includes/register-kinds.php:85
+#: includes/register-kinds.php:154
+#: includes/register-kinds.php:223
+#: includes/register-kinds.php:292
+#: includes/register-kinds.php:361
+msgid "Publish Date"
+msgstr ""
+#: includes/register-kinds.php:89
+#: includes/register-kinds.php:158
+#: includes/register-kinds.php:227
+#: includes/register-kinds.php:296
+#: includes/register-kinds.php:365
+msgid "Updated Time"
+msgstr ""
+#: includes/register-kinds.php:93
+#: includes/register-kinds.php:162
+#: includes/register-kinds.php:231
+#: includes/register-kinds.php:300
+#: includes/register-kinds.php:369
+#: includes/register-kinds.php:445
+#: includes/register-kinds.php:505
+#: includes/register-kinds.php:570
+#: includes/register-kinds.php:635
+msgid "Tags"
+msgstr ""
+#: includes/register-kinds.php:100
+#: includes/register-kinds.php:169
+#: includes/register-kinds.php:238
+#: includes/register-kinds.php:307
+#: includes/register-kinds.php:376
+#: includes/register-kinds.php:512
+msgid "Featured Media"
+msgstr ""
+#: includes/register-kinds.php:109
+msgid "a reply to content typically on another site"
+msgstr ""
+#: includes/register-kinds.php:120
+#: includes/register-kinds.php:127
+msgid "Repost"
+msgstr ""
+#: includes/register-kinds.php:121
+msgid "Reposts"
+msgstr ""
 #: includes/register-kinds.php:122
+msgid "Reposted"
+msgstr ""
+#: includes/register-kinds.php:178
+msgid "a complete reposting of content from another site"
+msgstr ""
+#: includes/register-kinds.php:189
+#: includes/register-kinds.php:196
+msgid "Like"
+msgstr ""
+#: includes/register-kinds.php:190
+msgid "Likes"
+msgstr ""
 #: includes/register-kinds.php:191
+msgid "Liked"
+msgstr ""
+#: includes/register-kinds.php:247
+msgid "a way to pay compliments to the original post/poster of external content"
+msgstr ""
+#: includes/register-kinds.php:258
+msgid "Favorite"
+msgstr ""
+#: includes/register-kinds.php:259
+msgid "Favorites"
+msgstr ""
 #: includes/register-kinds.php:260
+#: includes/register-kinds.php:265
+msgid "Favorited"
+msgstr ""
+#: includes/register-kinds.php:316
+msgid "special to the author"
+msgstr ""
+#: includes/register-kinds.php:327
+#: includes/register-kinds.php:334
+msgid "Bookmark"
+msgstr ""
+#: includes/register-kinds.php:328
+msgid "Bookmarks"
+msgstr ""
 #: includes/register-kinds.php:329
+#: includes/register-kinds.php:472
+msgid "Bookmarked"
+msgstr ""
+#: includes/register-kinds.php:385
+msgid "storing a link/bookmark for personal use or sharing with others"
+msgstr ""
+#: includes/register-kinds.php:396
+msgid "Photo"
+msgstr ""
+#: includes/register-kinds.php:397
+msgid "Photos"
+msgstr ""
+#: includes/register-kinds.php:401
+msgid "a post with an embedded image/photo as its primary focus"
+msgstr ""
+#: includes/register-kinds.php:412
+msgid "Video"
+msgstr ""
+#: includes/register-kinds.php:413
+msgid "Videos"
+msgstr ""
+#: includes/register-kinds.php:417
+msgid "a post with an embedded video as its primary focus"
+msgstr ""
+#: includes/register-kinds.php:428
+msgid "Audio"
+msgstr ""
+#: includes/register-kinds.php:429
+msgid "Audios"
+msgstr ""
+#: includes/register-kinds.php:433
+msgid "a post with an embedded audio file as its primary focus"
+msgstr ""
+#: includes/register-kinds.php:444
+msgid "Tag"
+msgstr ""
+#: includes/register-kinds.php:446
+msgid "Tagged"
+msgstr ""
+#: includes/register-kinds.php:449
+msgid "allows you to tag a post as being of a specific category or tag, or for person tagging"
+msgstr ""
+#: includes/register-kinds.php:461
+msgid "RSVPs"
+msgstr ""
+#: includes/register-kinds.php:462
+msgid "RSVPed"
+msgstr ""
+#: includes/register-kinds.php:477
+msgid "Event Details"
+msgstr ""
+#: includes/register-kinds.php:497
+msgid "Start Date"
+msgstr ""
+#: includes/register-kinds.php:501
+msgid "End Date"
+msgstr ""
+#: includes/register-kinds.php:521
+msgid "a specific type of reply regarding attendance of an event"
+msgstr ""
+#: includes/register-kinds.php:532
+msgid "Listen"
+msgstr ""
+#: includes/register-kinds.php:533
+msgid "Listens"
+msgstr ""
 #: includes/register-kinds.php:534
+msgid "Listened"
+msgstr ""
+#: includes/register-kinds.php:539
+msgid "Listen To"
+msgstr ""
+#: includes/register-kinds.php:562
+msgid "Album"
+msgstr ""
+#: includes/register-kinds.php:566
+#: includes/register-kinds.php:631
+msgid "Release Date"
+msgstr ""
+#: includes/register-kinds.php:577
+msgid "Album Art"
+msgstr ""
+#: includes/register-kinds.php:586
+msgid "listening to audio; sometimes called a scrobble"
+msgstr ""
+#: includes/register-kinds.php:597
+msgid "Watch"
+msgstr ""
+#: includes/register-kinds.php:598
+msgid "Watches"
+msgstr ""
 #: includes/register-kinds.php:599
+msgid "Watched"
+msgstr ""
+#: includes/register-kinds.php:604
+msgid "Watching To"
+msgstr ""
+#: includes/register-kinds.php:627
+msgid "Series"
+msgstr ""
+#: includes/register-kinds.php:642
+msgid "Poster"
+msgstr ""
+#: includes/register-kinds.php:651
+msgid "watching a movie, television show, online video, play or other visual-based event"
+msgstr ""
+#: includes/register-kinds.php:662
+msgid "Checkin"
+msgstr ""
+#: includes/register-kinds.php:663
+msgid "Checkins"
+msgstr ""
 #: includes/register-kinds.php:664
-#: templates/reply-metabox.php:42
-msgid "Name"
-msgstr ""
-#: includes/register-kinds.php:57
-#: includes/register-kinds.php:126
-#: includes/register-kinds.php:195
-#: includes/register-kinds.php:264
-#: includes/register-kinds.php:333
-#: includes/register-kinds.php:476
-#: includes/register-kinds.php:538
-#: includes/register-kinds.php:603
-#: includes/register-kinds.php:668
-#: lib/parse-this/includes/class-rest-parse-this.php:49
-#: templates/reply-metabox.php:36
-msgid "URL"
-msgstr ""
-#: includes/register-kinds.php:61
-#: includes/register-kinds.php:130
-#: includes/register-kinds.php:199
-#: includes/register-kinds.php:268
-#: includes/register-kinds.php:337
-#: templates/reply-author.php:6
-#: templates/reply-metabox.php:31
-msgid "Author"
-msgstr ""
-#: includes/register-kinds.php:68
-#: includes/register-kinds.php:137
-#: includes/register-kinds.php:206
-#: includes/register-kinds.php:275
-#: includes/register-kinds.php:344
-#: includes/register-kinds.php:480
-#: includes/register-kinds.php:549
-#: includes/register-kinds.php:614
-msgid "Summary"
-msgstr ""
-#: includes/register-kinds.php:72
-#: includes/register-kinds.php:141
-#: includes/register-kinds.php:210
-#: includes/register-kinds.php:279
-#: includes/register-kinds.php:348
-#: includes/register-kinds.php:484
-msgid "Publication/Website"
-msgstr ""
-#: includes/register-kinds.php:76
-#: includes/register-kinds.php:145
-#: includes/register-kinds.php:214
-#: includes/register-kinds.php:283
-#: includes/register-kinds.php:352
-msgid "Publish Date"
-msgstr ""
-#: includes/register-kinds.php:80
-#: includes/register-kinds.php:149
-#: includes/register-kinds.php:218
-#: includes/register-kinds.php:287
-#: includes/register-kinds.php:356
-msgid "Updated Time"
-msgstr ""
-#: includes/register-kinds.php:84
-#: includes/register-kinds.php:153
-#: includes/register-kinds.php:222
-#: includes/register-kinds.php:291
-#: includes/register-kinds.php:360
-#: includes/register-kinds.php:436
-#: includes/register-kinds.php:496
-#: includes/register-kinds.php:561
-#: includes/register-kinds.php:626
-msgid "Tags"
-msgstr ""
-#: includes/register-kinds.php:91
-#: includes/register-kinds.php:160
-#: includes/register-kinds.php:229
-#: includes/register-kinds.php:298
-#: includes/register-kinds.php:367
-#: includes/register-kinds.php:503
-msgid "Featured Media"
-msgstr ""
-#: includes/register-kinds.php:100
-msgid "a reply to content typically on another site"
-msgstr ""
-#: includes/register-kinds.php:111
-#: includes/register-kinds.php:118
-msgid "Repost"
-msgstr ""
-#: includes/register-kinds.php:112
-msgid "Reposts"
-msgstr ""
-#: includes/register-kinds.php:113
-msgid "Reposted"
-msgstr ""
-#: includes/register-kinds.php:169
-msgid "a complete reposting of content from another site"
-msgstr ""
-#: includes/register-kinds.php:180
-#: includes/register-kinds.php:187
-msgid "Like"
-msgstr ""
-#: includes/register-kinds.php:181
-msgid "Likes"
-msgstr ""
-#: includes/register-kinds.php:182
-msgid "Liked"
-msgstr ""
-#: includes/register-kinds.php:238
-msgid "a way to pay compliments to the original post/poster of external content"
-msgstr ""
-#: includes/register-kinds.php:249
-msgid "Favorite"
-msgstr ""
-#: includes/register-kinds.php:250
-msgid "Favorites"
-msgstr ""
-#: includes/register-kinds.php:251
-#: includes/register-kinds.php:256
-msgid "Favorited"
-msgstr ""
-#: includes/register-kinds.php:307
-msgid "special to the author"
-msgstr ""
-#: includes/register-kinds.php:318
-#: includes/register-kinds.php:325
-msgid "Bookmark"
-msgstr ""
-#: includes/register-kinds.php:319
-msgid "Bookmarks"
-msgstr ""
-#: includes/register-kinds.php:320
-msgid "Bookmarked"
-msgstr ""
-#: includes/register-kinds.php:376
-msgid "storing a link/bookmark for personal use or sharing with others"
-msgstr ""
-#: includes/register-kinds.php:387
-msgid "Photo"
-msgstr ""
-#: includes/register-kinds.php:388
-msgid "Photos"
-msgstr ""
-#: includes/register-kinds.php:392
-msgid "a post with an embedded image/photo as its primary focus"
-msgstr ""
-#: includes/register-kinds.php:403
-msgid "Video"
-msgstr ""
-#: includes/register-kinds.php:404
-msgid "Videos"
-msgstr ""
-#: includes/register-kinds.php:408
-msgid "a post with an embedded video as its primary focus"
-msgstr ""
-#: includes/register-kinds.php:419
-msgid "Audio"
-msgstr ""
-#: includes/register-kinds.php:420
-msgid "Audios"
-msgstr ""
-#: includes/register-kinds.php:424
-msgid "a post with an embedded audio file as its primary focus"
-msgstr ""
-#: includes/register-kinds.php:435
-msgid "Tag"
-msgstr ""
-#: includes/register-kinds.php:437
-msgid "Tagged"
-msgstr ""
-#: includes/register-kinds.php:440
-msgid "allows you to tag a post as being of a specific category or tag, or for person tagging"
-msgstr ""
-#: includes/register-kinds.php:452
-msgid "RSVPs"
-msgstr ""
-#: includes/register-kinds.php:453
-msgid "RSVPed"
-msgstr ""
-#: includes/register-kinds.php:468
-msgid "Event Details"
-msgstr ""
-#: includes/register-kinds.php:488
-msgid "Start Date"
-msgstr ""
-#: includes/register-kinds.php:492
-msgid "End Date"
-msgstr ""
-#: includes/register-kinds.php:512
-msgid "a specific type of reply regarding attendance of an event"
-msgstr ""
-#: includes/register-kinds.php:523
-msgid "Listen"
-msgstr ""
-#: includes/register-kinds.php:524
-msgid "Listens"
-msgstr ""
-#: includes/register-kinds.php:525
-msgid "Listened"
-msgstr ""
-#: includes/register-kinds.php:530
-msgid "Listen To"
-msgstr ""
-#: includes/register-kinds.php:553
-msgid "Album"
-msgstr ""
-#: includes/register-kinds.php:557
-#: includes/register-kinds.php:622
-msgid "Release Date"
-msgstr ""
-#: includes/register-kinds.php:568
-msgid "Album Art"
-msgstr ""
-#: includes/register-kinds.php:577
-msgid "listening to audio; sometimes called a scrobble"
-msgstr ""
-#: includes/register-kinds.php:588
-msgid "Watch"
-msgstr ""
-#: includes/register-kinds.php:589
-msgid "Watches"
-msgstr ""
-#: includes/register-kinds.php:590
-msgid "Watched"
-msgstr ""
-#: includes/register-kinds.php:595
-msgid "Watching To"
-msgstr ""
-#: includes/register-kinds.php:618
-msgid "Series"
-msgstr ""
-#: includes/register-kinds.php:633
-msgid "Poster"
-msgstr ""
-#: includes/register-kinds.php:642
-msgid "watching a movie, television show, online video, play or other visual-based event"
-msgstr ""
-#: includes/register-kinds.php:653
-msgid "Checkin"
-msgstr ""
-#: includes/register-kinds.php:654
-msgid "Checkins"
-msgstr ""
-#: includes/register-kinds.php:655
 msgid "Checked into"
 msgstr ""
 #: includes/register-kinds.php:660
+#: includes/register-kinds.php:669
 msgid "Checked In"
 msgstr ""
 #: includes/register-kinds.php:672
+#: includes/register-kinds.php:681
 msgid "Latitude"
 msgstr ""
 #: includes/register-kinds.php:680
+#: includes/register-kinds.php:689
 msgid "Longitude"
 msgstr ""
 #: includes/register-kinds.php:688
+#: includes/register-kinds.php:697
 msgid "Street Address"
 msgstr ""
 #: includes/register-kinds.php:692
+#: includes/register-kinds.php:701
 msgid "Locality"
 msgstr ""
 #: includes/register-kinds.php:696
+#: includes/register-kinds.php:705
 msgid "Region"
 msgstr ""
 #: includes/register-kinds.php:700
+#: includes/register-kinds.php:709
 msgid "Country Name"
 msgstr ""
 #: includes/register-kinds.php:704
+#: includes/register-kinds.php:713
 msgid "Postal Code"
 msgstr ""
 #: includes/register-kinds.php:710
+#: includes/register-kinds.php:719
 msgid "identifying you are at a particular geographic location"
 msgstr ""
 #: includes/register-kinds.php:721
+#: includes/register-kinds.php:730
 msgid "Wish"
 msgstr ""
 #: includes/register-kinds.php:722
+#: includes/register-kinds.php:731
 msgid "Wishes"
 msgstr ""
 #: includes/register-kinds.php:723
+#: includes/register-kinds.php:732
 msgid "Wished"
 msgstr ""
 #: includes/register-kinds.php:726
+#: includes/register-kinds.php:735
 msgid "a post indicating a desire/wish. The archive of which would be a wishlist, such as a gift registry or similar"
 msgstr ""
 #: includes/register-kinds.php:737
+#: includes/register-kinds.php:746
 msgid "Play"
 msgstr ""
 #: includes/register-kinds.php:738
+#: includes/register-kinds.php:747
 msgid "Playing"
 msgstr ""
 #: includes/register-kinds.php:739
+#: includes/register-kinds.php:748
 msgid "Played"
 msgstr ""
 #: includes/register-kinds.php:742
+#: includes/register-kinds.php:751
 msgid "playing a game"
 msgstr ""
 #: includes/register-kinds.php:753
 #: includes/register-kinds.php:754
+#: includes/register-kinds.php:762
+#: includes/register-kinds.php:763
 msgid "Weather"
 msgstr ""
 #: includes/register-kinds.php:758
+#: includes/register-kinds.php:767
 msgid "current weather conditions"
 msgstr ""
 #: includes/register-kinds.php:769
 #: includes/register-kinds.php:770
+#: includes/register-kinds.php:778
+#: includes/register-kinds.php:779
 msgid "Exercise"
 msgstr ""
 #: includes/register-kinds.php:771
+#: includes/register-kinds.php:780
 msgid "Exercised"
 msgstr ""
 #: includes/register-kinds.php:774
+#: includes/register-kinds.php:783
 msgid "some form of physical activity or workout (examples: walk, run, cycle, hike, yoga, etc.)"
 msgstr ""
 #: includes/register-kinds.php:785
+#: includes/register-kinds.php:794
 msgid "Trip"
 msgstr ""
 #: includes/register-kinds.php:786
+#: includes/register-kinds.php:795
 msgid "Trips"
 msgstr ""
 #: includes/register-kinds.php:787
 #: includes/register-kinds.php:803
+#: includes/register-kinds.php:796
+#: includes/register-kinds.php:812
 msgid "Travelled"
 msgstr ""
 #: includes/register-kinds.php:790
+#: includes/register-kinds.php:799
 msgid "represents a geographic journey"
 msgstr ""
 #: includes/register-kinds.php:801
+#: includes/register-kinds.php:810
 msgid "Itinerary"
 msgstr ""
 #: includes/register-kinds.php:802
+#: includes/register-kinds.php:811
 msgid "Itineraries"
 msgstr ""
 #: includes/register-kinds.php:806
+#: includes/register-kinds.php:815
 msgid "parts of a scheduled trip including transit by car, plane, train, etc."
 msgstr ""
 #: includes/register-kinds.php:818
 #: includes/register-kinds.php:819
+#: includes/register-kinds.php:827
+#: includes/register-kinds.php:828
 msgid "Eat"
 msgstr ""
 #: includes/register-kinds.php:820
+#: includes/register-kinds.php:829
 msgid "Ate"
 msgstr ""
 #: includes/register-kinds.php:823
+#: includes/register-kinds.php:832
 msgid "what you are eating, perhaps for a food diary"
 msgstr ""
 #: includes/register-kinds.php:835
+#: includes/register-kinds.php:844
 msgid "Drink"
 msgstr ""
 #: includes/register-kinds.php:836
+#: includes/register-kinds.php:845
 msgid "Drinks"
 msgstr ""
 #: includes/register-kinds.php:837
+#: includes/register-kinds.php:846
 msgid "Drank"
 msgstr ""
 #: includes/register-kinds.php:840
+#: includes/register-kinds.php:849
 msgid "what you are drinking, perhaps for a food dairy"
 msgstr ""
 #: includes/register-kinds.php:852
+#: includes/register-kinds.php:861
 msgid "Follow"
 msgstr ""
 #: includes/register-kinds.php:853
+#: includes/register-kinds.php:862
 msgid "Follows"
 msgstr ""
 #: includes/register-kinds.php:854
+#: includes/register-kinds.php:863
 msgid "Followed"
 msgstr ""
 #: includes/register-kinds.php:857
+#: includes/register-kinds.php:866
 msgid "indicating you are now following or subscribing to another person`s activities online"
 msgstr ""
 #: includes/register-kinds.php:869
+#: includes/register-kinds.php:878
 msgid "Jam"
 msgstr ""
 #: includes/register-kinds.php:870
+#: includes/register-kinds.php:879
 msgid "Jams"
 msgstr ""
 #: includes/register-kinds.php:871
+#: includes/register-kinds.php:880
 msgid "Listened to"
 msgstr ""
 #: includes/register-kinds.php:874
+#: includes/register-kinds.php:883
 msgid "a particularly personally meaningful song (a listen with added emphasis)"
 msgstr ""
 #: includes/register-kinds.php:886
 #: includes/register-kinds.php:888
+#: includes/register-kinds.php:895
+#: includes/register-kinds.php:897
 msgid "Read"
 msgstr ""
 #: includes/register-kinds.php:887
+#: includes/register-kinds.php:896
 msgid "Reads"
 msgstr ""
 #: includes/register-kinds.php:891
+#: includes/register-kinds.php:900
 msgid "reading a book, magazine, newspaper, other physical document, or online post"
 msgstr ""
 #: includes/register-kinds.php:903
+#: includes/register-kinds.php:912
 msgid "Quote"
 msgstr ""
 #: includes/register-kinds.php:904
+#: includes/register-kinds.php:913
 msgid "Quotes"
 msgstr ""
 #: includes/register-kinds.php:905
+#: includes/register-kinds.php:914
 msgid "Quoted"
 msgstr ""
 #: includes/register-kinds.php:908
+#: includes/register-kinds.php:917
 msgid "quoted content"
 msgstr ""
 #: includes/register-kinds.php:920
+#: includes/register-kinds.php:929
 msgid "Mood"
 msgstr ""
 #: includes/register-kinds.php:921
+#: includes/register-kinds.php:930
 msgid "Moods"
 msgstr ""
 #: includes/register-kinds.php:922
+#: includes/register-kinds.php:931
 msgid "Felt"
 msgstr ""
 #: includes/register-kinds.php:925
+#: includes/register-kinds.php:934
 msgid "how you are feeling (example: happy, sad, indifferent, etc.)"
 msgstr ""
 #: includes/register-kinds.php:937
+#: includes/register-kinds.php:946
 msgid "Recipe"
 msgstr ""
 #: includes/register-kinds.php:938
+#: includes/register-kinds.php:947
 msgid "Recipes"
 msgstr ""
 #: includes/register-kinds.php:939
+#: includes/register-kinds.php:948
 msgid "Cooked"
 msgstr ""
 #: includes/register-kinds.php:942
+#: includes/register-kinds.php:951
 msgid "list of ingredients and directions for making food or drink"
 msgstr ""
 #: includes/register-kinds.php:954
+#: includes/register-kinds.php:963
 msgid "Issue"
 msgstr ""
 #: includes/register-kinds.php:955
+#: includes/register-kinds.php:964
 msgid "Issues"
 msgstr ""
 #: includes/register-kinds.php:956
+#: includes/register-kinds.php:965
 msgid "Filed an Issue"
 msgstr ""
 #: includes/register-kinds.php:959
+#: includes/register-kinds.php:968
 msgid "Issue is a special kind of article post that is a reply to typically some source code, though potentially anything at a source control repository."
 msgstr ""
 #: includes/register-kinds.php:971
+#: includes/register-kinds.php:980
 msgid "Question"
 msgstr ""
 #: includes/register-kinds.php:972
+#: includes/register-kinds.php:981
 msgid "Questions"
 msgstr ""
 #: includes/register-kinds.php:973
+#: includes/register-kinds.php:982
 msgid "Asked a question"
 msgstr ""
 #: includes/register-kinds.php:976
+#: includes/register-kinds.php:985
 msgid "Question is a post type for soliciting answer replies, which are then typically up/down voted by others and then displayed underneath the question post ordered by highest positive vote count rather than time ordered."
 msgstr ""
 #: includes/register-kinds.php:988
+#: includes/register-kinds.php:997
 msgid "Sleep"
 msgstr ""
 #: includes/register-kinds.php:989
+#: includes/register-kinds.php:998
 msgid "Sleeps"
 msgstr ""
 #: includes/register-kinds.php:990
+#: includes/register-kinds.php:999
 msgid "Slept"
 msgstr ""
 #: includes/register-kinds.php:993
+#: includes/register-kinds.php:1002
 msgid "Sleep is a passive metrics post type that indicates how much time (and often a graph of how deeply) a person has slept."
 msgstr ""
 #: includes/register-kinds.php:1005
+#: includes/register-kinds.php:1014
 msgid "Event"
 msgstr ""
 #: includes/register-kinds.php:1006
+#: includes/register-kinds.php:1015
 msgid "Events"
 msgstr ""
 #: includes/register-kinds.php:1007
+#: includes/register-kinds.php:1016
 msgid "Planned"
 msgstr ""
 #: includes/register-kinds.php:1010
+#: includes/register-kinds.php:1019
 msgid "An event is a type of post that in addition to a post name (event title) has a start datetime (likely end datetime), and a location."
 msgstr ""
 #: includes/register-kinds.php:1021
+#: includes/register-kinds.php:1030
 msgid "Review"
 msgstr ""
 #: includes/register-kinds.php:1022
+#: includes/register-kinds.php:1031
 msgid "Reviews"
 msgstr ""
 #: includes/register-kinds.php:1023
+#: includes/register-kinds.php:1032
 msgid "Reviewed"
 msgstr ""
 #: includes/register-kinds.php:1026
+#: includes/register-kinds.php:1035
 msgid "A review is a post evaluating a product or service, usually involving a written description, sometimes with summary numerical evaluations, also known as just a rating."
 msgstr ""
 #: includes/register-kinds.php:1038
+#: includes/register-kinds.php:1047
 msgid "Acquisition"
 msgstr ""
 #: includes/register-kinds.php:1039
+#: includes/register-kinds.php:1048
 msgid "Acquisitions"
 msgstr ""
 #: includes/register-kinds.php:1040
+#: includes/register-kinds.php:1049
 msgid "Acquired"
 msgstr ""
 #: includes/register-kinds.php:1043
+#: includes/register-kinds.php:1052
 msgid "Purchases, gifts, found things, or objects donated"
 msgstr ""
 #: includes/register-kinds.php:1054
+#: includes/register-kinds.php:1063
 msgid "Craft"
 msgstr ""
 #: includes/register-kinds.php:1055
+#: includes/register-kinds.php:1064
 msgid "Crafts"
 msgstr ""
 #: includes/register-kinds.php:1056
+#: includes/register-kinds.php:1065
 msgid "Crafted"
 msgstr ""
 #: includes/register-kinds.php:1059
+#: includes/register-kinds.php:1068
 msgid "Activities like knitting, crocheting, cross stitch, wood working, restoration, 3d printing...the activity of building something."
 msgstr ""
 #: indieweb-post-kinds.php:65
+#: indieweb-post-kinds.php:87
 msgid "Parse This is not installed. Please advise the developer"
 msgstr ""
+#: indieweb-post-kinds.php:98
+#. translators: %s: Name of the plugin, or path of the file, that loaded the older copy of Parse This.
+#: indieweb-post-kinds.php:109
+#, php-format
+msgid "Post Kinds: %s is loading a copy of Parse This older than version 2.0. Post Kinds will keep working, but URL lookups in the post editor use that older copy. Updating that plugin, or installing the Parse This plugin (version 2.0 or later), resolves this."
+msgstr ""
+#: indieweb-post-kinds.php:209
 msgid "Classic Editor or Disable Gutenberg Plugin is not active. The Post Kinds plugin will not function correctly at this time without using the Classic Editor."
 msgstr ""
 #: indieweb-post-kinds.php:211
+#: indieweb-post-kinds.php:353
 msgid "Settings"
 msgstr ""
 #: indieweb-post-kinds.php:233
+#: indieweb-post-kinds.php:384
 msgid "For responses to URLs, such as responding to a post or article, this site allows the storage of data around the post/article in order to generate a rich citation. Items such as author name and image, summary of the text, embed provided by third-party site, etc may be stored and are solely to provide this context. We will remove any of this on request."
 msgstr ""
+#: lib/parse-this/includes/class-parse-this-discovery.php:57
+#: lib/parse-this/includes/class-parse-this-opml.php:17
+#: lib/parse-this/includes/class-parse-this.php:231
+#: lib/parse-this/includes/class-parse-this.php:265
+msgid "A valid URL was not provided."
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:19
+#: lib/parse-this/includes/class-rest-parse-this.php:20
+msgid "Parse This"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:35
+msgid "Parse This Debugger"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:55
+msgid "MF2"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:63
+msgid "Feed Discovery"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:71
+msgid "References"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:79
+msgid "Clean up Location"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:87
+msgid "Return Type"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:91
+msgid "Single"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:92
+msgid "Feed"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:98
+msgid "Follow Author Links"
+msgstr ""
+#: lib/parse-this/includes/class-rest-parse-this.php:107
+msgid "Parse"
+msgstr ""
+#: templates/reply-author.php:2
+#: templates/reply-author.php:16
 msgid "Information on the Author or Artist of the Piece"
 msgstr ""
 #: templates/reply-author.php:3
+#: templates/reply-author.php:17
 msgid "(Multiple Entries separated by semicolon)"
 msgstr ""
 #: templates/reply-author.php:18
+#: templates/reply-author.php:32
 msgid "Author Photo URL"
 msgstr ""
 #: templates/reply-details.php:2
+#: templates/reply-details.php:17
 msgid "Information on what you are responding to"
 msgstr ""
 #: templates/reply-details.php:4
+#: templates/reply-details.php:19
 msgid "Summary/Quote/Caption"
 msgstr ""
 #: templates/reply-details.php:9
+#: templates/reply-details.php:24
 msgid "Site Name/Publication/Album"
 msgstr ""
 #: templates/reply-details.php:14
+#: templates/reply-details.php:29
 msgid "Published/Released"
 msgstr ""
 #: templates/reply-details.php:15
+#: templates/reply-details.php:30
 msgid "Updated"
 msgstr ""
 #: templates/reply-details.php:18
+#: templates/reply-details.php:33
 msgid "Tags (semicolon separated)"
 msgstr ""
 #: templates/reply-details.php:23
+#: templates/reply-details.php:38
 msgid "Featured Image"
 msgstr ""
 #: templates/reply-metabox.php:30
+#: templates/reply-metabox.php:44
 msgid "Details"
 msgstr ""
+#: templates/reply-metabox.php:33
+#: templates/reply-metabox.php:46
+msgid "Upload or Attach Media"
+msgstr ""
+#: templates/reply-metabox.php:47
 msgid "Clear"
 msgstr ""
 #: templates/reply-time.php:4
+#: templates/reply-time.php:18
 msgid "Duration"
 msgstr ""
 #: templates/reply-time.php:7
+#: templates/reply-time.php:21
 msgid "Years"
 msgstr ""
 #: templates/reply-time.php:11
+#: templates/reply-time.php:25
 msgid "Months"
 msgstr ""
 #: templates/reply-time.php:15
+#: templates/reply-time.php:29
 msgid "Days"
 msgstr ""
 #: templates/reply-time.php:21
+#: templates/reply-time.php:35
 msgid "Hours"
 msgstr ""
 #: templates/reply-time.php:25
+#: templates/reply-time.php:39
 msgid "Minutes"
 msgstr ""
 #: templates/reply-time.php:29
+#: templates/reply-time.php:43
 msgid "Seconds"
 msgstr ""
 #: templates/reply-time.php:33
+#: templates/reply-time.php:47
 msgid "Start Time and End Time will be Used to Calculate Duration if Duration Not Set."
 msgstr ""
 #: templates/reply-time.php:35
+#: templates/reply-time.php:49
 msgid "Start Time"
 msgstr ""
 #: templates/reply-time.php:36
+#: templates/reply-time.php:50
 msgid "End Time"
 msgstr ""
 #: views/kind-bookmark.php:25
 #: views/kind-favorite.php:24
 #: views/kind-issue.php:24
 #: views/kind-jam.php:28
 #: views/kind-like.php:25
 #: views/kind-listen.php:30
 #: views/kind-read.php:28
 #: views/kind-video.php:45
 #: views/kind-watch.php:29
 #: views/kind.php:35
+#: views/kind-bookmark.php:39
+#: views/kind-favorite.php:38
+#: views/kind-issue.php:38
+#: views/kind-jam.php:46
+#: views/kind-like.php:39
+#: views/kind-listen.php:48
+#: views/kind-read.php:42
+#: views/kind-video.php:63
+#: views/kind-watch.php:47
+#: views/kind.php:53
 msgid "by"
 msgstr ""
 #: views/kind-event.php:22
+#: views/kind-event.php:39
 msgid "Start"
 msgstr ""
 #: views/kind-event.php:25
+#: views/kind-event.php:42
 msgid "End"
 msgstr ""
 #: views/kind-itinerary.php:33
+#: views/kind-itinerary.php:56
 msgid "Departs: "
 msgstr ""
 #: views/kind-itinerary.php:38
+#: views/kind-itinerary.php:61
 msgid "Arrives: "
 msgstr ""
 #: views/kind-jam.php:31
 #: views/kind-listen.php:33
 #: views/kind-watch.php:32
+#: views/kind-jam.php:49
+#: views/kind-listen.php:51
+#: views/kind-watch.php:50
 msgid " from "
 msgstr ""

indieweb-post-kinds/trunk/lib/parse-this/includes/autoload.php

-              r2332001
+              r3738687
 <?php
+/**
+ * Class autoloader for Parse This.
+ *
+ * @package Parse_This
+ */
+// autoloader for Parse This
+defined( 'ABSPATH' ) || exit;
+/*
+ * Maps classes in the ParseThis namespace to files in this directory, for
+ * example ParseThis\MF2_Utils to class-mf2-utils.php.
+ */
 spl_autoload_register(
         function ( $class ) {
+                $base_dir = trailingslashit( __DIR__ );
+                $bases    = array( 'Parse_This' );
+                foreach ( $bases as $base ) {
+                        if ( strncmp( $class, $base, strlen( $base ) ) === 0 ) {
+                                $filename = 'class-' . strtolower( str_replace( '_', '-', $class ) );
+                                $file     = $base_dir . $filename . '.php';
+                                if ( file_exists( $file ) ) {
+                                        require $file;
+                                }
+                        }
+                $prefix = 'ParseThis\\';
+                if ( 0 !== strncmp( $class, $prefix, strlen( $prefix ) ) ) {
+                        return;
+                }
+                $name = substr( $class, strlen( $prefix ) );
+                $file = __DIR__ . '/class-' . strtolower( str_replace( '_', '-', $name ) ) . '.php';
+                if ( file_exists( $file ) ) {
+                        require $file;
+                }
+        }
 );
+// Deprecated global names still used by other plugins.
+require_once __DIR__ . '/aliases.php';

indieweb-post-kinds/trunk/lib/parse-this/includes/functions.php

-              r2757240
+              r3738687
 <?php
+// Parse This Global Functions
+if ( ! function_exists( 'jf2_to_mf2' ) ) {
+/**
+ * Helper functions.
+ *
+ * All functions are in the ParseThis namespace. Each is wrapped in
+ * function_exists() because several plugins bundle their own copy of Parse
+ * This; the first copy loaded wins. Deprecated global names for some of them
+ * are defined in aliases.php.
+ *
+ * @package Parse_This
+ */
+namespace ParseThis;
+defined( 'ABSPATH' ) || exit;
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_to_mf2' ) ) {
+        /**
+         * Converts jf2 into microformats2 JSON.
+         *
+         * The inverse of mf2_to_jf2(). Empty values and the _raw key are dropped.
+         *
+         * @since 1.0.0
+         *
+         * @link https://jf2.spec.indieweb.org/
+         *
+         * @param array|mixed $jf2 jf2 object, or array( 'items' => ... ) for a list.
+         * @return array|mixed mf2 object with type and properties. Values that are not
+         *                     jf2 objects are returned unchanged.
+         */
         function jf2_to_mf2( $jf2 ) {
                 if ( ! $jf2 || ! is_array( $jf2 ) ) {
 …
                 if ( 1 === count( $jf2 ) && array_key_exists( 'items', $jf2 ) ) {
                         return array(
                                 'items' => array_map( 'jf2_to_mf2', $jf2['items'] ),
+                                'items' => array_map( __NAMESPACE__ . '\\jf2_to_mf2', $jf2['items'] ),
                         );
+                }
 …
+                }
                 if ( array_key_exists( 'children', $jf2 ) ) {
                         $mf2['children'] = array_map( 'jf2_to_mf2', $jf2['children'] );
+                        $mf2['children'] = array_map( __NAMESPACE__ . '\\jf2_to_mf2', $jf2['children'] );
                         unset( $jf2['children'] );
+                }
 …
                 foreach ( $jf2 as $key => $value ) {
                         // Exclude values
+                        // Exclude values.
                         if ( empty( $value ) || ( '_raw' === $key ) ) {
                                 continue;
 …
                                 $value = array( jf2_to_mf2( $value ) );
                         } elseif ( wp_is_numeric_array( $value ) ) {
                                 $value = array_map( 'jf2_to_mf2', $value );
+                                $value = array_map( __NAMESPACE__ . '\\jf2_to_mf2', $value );
                         } elseif ( ! wp_is_numeric_array( $value ) ) {
                                 $value = array( $value );
 …
+}
+if ( ! function_exists( 'mf2_to_jf2' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\mf2_to_jf2' ) ) {
+        /**
+         * Converts microformats2 JSON into jf2.
+         *
+         * Single-value property arrays are collapsed to the value, the h- prefix is
+         * removed from types, and nested microformats are converted recursively.
+         *
+         * @since 1.0.0
+         *
+         * @link https://jf2.spec.indieweb.org/
+         *
+         * @param array|mixed $mf2 mf2 object, a parsed mf2 document with items, or a
+         *                         list of mf2 objects.
+         * @return array|mixed jf2. A list of one is returned as the single item.
+         *                     Strings and objects are returned unchanged.
+         */
         function mf2_to_jf2( $mf2 ) {
                 if ( empty( $mf2 ) || is_string( $mf2 ) || is_object( $mf2 ) ) {
 …
                 $jf2 = array();
                 // If it is a numeric array, run this function through each item
+                // If it is a numeric array, run this function through each item.
                 if ( wp_is_numeric_array( $mf2 ) ) {
                         $jf2 = array_map( 'mf2_to_jf2', $mf2 );
+                        $jf2 = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $mf2 );
                         if ( 1 === count( $jf2 ) ) {
                                 return array_pop( $jf2 );
 …
                 if ( isset( $mf2['items'] ) ) {
                         $jf2['items'] = array_map( 'mf2_to_jf2', $mf2['items'] );
+                        $jf2['items'] = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $mf2['items'] );
+                }
                 if ( isset( $mf2['children'] ) ) {
                         $jf2['children'] = array_map( 'mf2_to_jf2', $mf2['children'] );
+                        $jf2['children'] = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $mf2['children'] );
+                }
 …
                                 if ( is_array( $value ) ) {
                                         if ( wp_is_numeric_array( $value ) ) {
                                                 $value = array_map( 'mf2_to_jf2', $value );
+                                                $value = array_map( __NAMESPACE__ . '\\mf2_to_jf2', $value );
                                                 if ( is_countable( $value ) && 1 === count( $value ) ) {
                                                         $value = array_pop( $value );
 …
+if ( ! function_exists( 'jf2_location' ) ) {
+        /*
+         Flatten nested location properties.
+        */
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_location' ) ) {
+        /**
+         * Flattens a nested jf2 location.
+         *
+         * The latitude, longitude and altitude are copied onto the object, and location
+         * becomes the place's label or name (or is removed). Any check-in on the
+         * object also receives the location's properties.
+         *
+         * @since 1.0.1
+         *
+         * @param array $data jf2 object.
+         * @return array The updated object.
+         */
         function jf2_location( $data ) {
                 if ( ! array_key_exists( 'location', $data ) ) {
                         return $data;
+                }
+                $location = $data['location'];
+                if ( is_string( $location ) ) {
+                // jf2_references() may have moved the location or check-in to refs,
+                // leaving its URL (as a one-item list) in its place.
+                $from_refs = function ( $value ) use ( $data ) {
+                        if ( is_array( $value ) && wp_is_numeric_array( $value ) && 1 === count( $value ) ) {
+                                $value = $value[0];
+                        }
+                        if ( is_string( $value ) && isset( $data['refs'][ $value ] ) && is_array( $data['refs'][ $value ] ) ) {
+                                return $data['refs'][ $value ];
+                        }
+                        return $value;
+                };
+                $location  = $from_refs( $data['location'] );
+                if ( ! is_array( $location ) || wp_is_numeric_array( $location ) ) {
                         return $data;
+                }
 …
                         unset( $data['location'] );
+                }
+                if ( isset( $data['checkin'] ) ) {
+                        $data['checkin'] = $from_refs( $data['checkin'] );
+                }
                 if ( array_key_exists( 'checkin', $data ) && is_array( $data['checkin'] ) ) {
                         foreach ( $location as $key => $value ) {
 …
+if ( ! function_exists( 'jf2_references' ) ) {
+        /*
+         Turns nested properties into references per the jf2 spec
+        */
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_author_to_card' ) ) {
+        /**
+         * Converts an author value into a jf2 card.
+         *
+         * Microsub requires author to always be a card, and jf2 consumers generally
+         * expect one. A URL string becomes a card with that url, any other string a
+         * card with that name, and an object without a type gets type card. A list of
+         * authors is converted item by item; a list of one becomes that card.
+         *
+         * @since 2.0.0
+         *
+         * @param mixed $author Author: a string, an object or a list of either.
+         * @return array|null The card (or list of cards), or null if there is no author.
+         */
+        function jf2_author_to_card( $author ) {
+                if ( is_string( $author ) ) {
+                        $author = trim( $author );
+                        if ( '' === $author ) {
+                                return null;
+                        }
+                        $key = ( preg_match( '#^https?://#i', $author ) && filter_var( $author, FILTER_VALIDATE_URL ) ) ? 'url' : 'name';
+                        return array(
+                                'type' => 'card',
+                                $key   => $author,
+                        );
+                }
+                if ( ! is_array( $author ) || empty( $author ) ) {
+                        return null;
+                }
+                if ( wp_is_numeric_array( $author ) ) {
+                        $cards = array_values( array_filter( array_map( __NAMESPACE__ . '\\jf2_author_to_card', $author ) ) );
+                        if ( empty( $cards ) ) {
+                                return null;
+                        }
+                        return ( 1 === count( $cards ) ) ? $cards[0] : $cards;
+                }
+                if ( ! isset( $author['type'] ) ) {
+                        $author = array( 'type' => 'card' ) + $author;
+                }
+                return $author;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\jf2_references' ) ) {
+        /**
+         * Moves nested objects into refs, per the jf2 spec.
+         *
+         * Any nested typed object with an http or https URL (an h-cite, h-card,
+         * h-event, h-product or any other type) is replaced by its URL, and stored
+         * in refs keyed by that URL, so the result is one level deep. The property
+         * becomes a list of values, as before. Objects without such a URL stay in place, authors stay
+         * cards, and a feed's items are left alone. References that a nested object
+         * carries are merged into the same refs.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Moves any typed object with a URL, not only citations, and
+         *              merges nested refs.
+         *
+         * @link https://jf2.spec.indieweb.org/#references
+         *
+         * @param array $data jf2 object.
+         * @return array The updated object.
+         */
         function jf2_references( $data ) {
+                if ( ! is_array( $data ) ) {
+                        return $data;
+                }
+                // Authors stay cards, and a feed's entries are not references.
+                $skip = array( 'refs', 'author', 'items', 'children' );
                 foreach ( $data as $key => $val ) {
                         if ( ! is_array( $val ) ) {
+                        if ( ! is_array( $val ) || in_array( $key, $skip, true ) || ( is_string( $key ) && '_' === substr( $key, 0, 1 ) ) ) {
                                 continue;
+                        }
+                        if ( ! wp_is_numeric_array( $val ) ) {
+                                $val = array( $val );
+                        }
+                        if ( wp_is_numeric_array( $val ) ) {
+                                foreach ( $val as $value ) {
+                                        // Indicates nested type
+                                        if ( is_array( $value ) && array_key_exists( 'type', $value ) && 'cite' === $value['type'] ) {
+                                                if ( ! isset( $data['refs'] ) ) {
+                                                        $data['refs'] = array();
+                                                }
+                                                if ( isset( $value['url'] ) ) {
+                                                        $data['refs'][ $value['url'] ] = $value;
+                                                        $data[ $key ]                  = array( $value['url'] );
+                                                }
+                        $values  = wp_is_numeric_array( $val ) ? $val : array( $val );
+                        $changed = false;
+                        foreach ( $values as $i => $value ) {
+                                if ( ! is_array( $value ) ) {
+                                        continue;
+                                }
+                                // A nested object may carry references of its own: keep one flat refs.
+                                if ( isset( $value['refs'] ) && is_array( $value['refs'] ) ) {
+                                        foreach ( $value['refs'] as $ref_url => $ref ) {
+                                                $data['refs'][ $ref_url ] = isset( $data['refs'][ $ref_url ] ) ? $data['refs'][ $ref_url ] + $ref : $ref;
+                                        }
+                                        if ( 'category' === $key ) {
+                                                foreach ( $value as $k => $v ) {
+                                                        if ( is_array( $v ) && array_key_exists( 'type', $v ) ) {
+                                                                if ( ! isset( $data['refs'] ) ) {
+                                                                        $data['refs'] = array();
+                                                                }
+                                                                if ( isset( $v['url'] ) ) {
+                                                                        $data['refs'][ $v['url'] ] = $v;
+                                                                        $data['category'][ $k ]    = $v['url'];
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                }
+                                        unset( $value['refs'] );
+                                        $values[ $i ] = $value;
+                                        $changed      = true;
+                                }
+                                $url = $value['url'] ?? null;
+                                if ( is_array( $url ) ) {
+                                        $url = reset( $url );
+                                }
+                                // Any typed object with an http(s) URL is a reference. One without
+                                // stays in place, where sanitizing can drop a bad URL and keep the rest.
+                                if ( empty( $value['type'] ) || ! is_string( $value['type'] ) || ! is_string( $url ) || ! preg_match( '#^https?://#i', trim( $url ) ) ) {
+                                        continue;
+                                }
+                                $data['refs'][ $url ] = isset( $data['refs'][ $url ] ) ? $data['refs'][ $url ] + $value : $value;
+                                $values[ $i ]         = $url;
+                                $changed              = true;
+                        }
+                        if ( $changed ) {
+                                $data[ $key ] = $values;
+                        }
+                }
 …
+}
+if ( ! function_exists( 'url_to_author' ) ) {
+        /**
+         * Examine a url and try to determine the author ID it represents.
+         *
+         * @param string $url Permalink to check.
+         *
+         * @return WP_User, or null on failure.
+if ( ! function_exists( __NAMESPACE__ . '\\url_to_author' ) ) {
+        /**
+         * Returns the local user that an author archive URL belongs to.
+         *
+         * Handles ?author=N URLs and pretty author permalinks.
+         *
+         * @since 1.0.0
+         *
+         * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
+         *
+         * @param string $url URL to check.
+         * @return WP_User|false|null The user, false if no user has that ID or slug, or
+         *                            null if the URL is not on this site or not an
+         *                            author URL.
          */
         function url_to_author( $url ) {
                 global $wp_rewrite;
                 // check if url hase the same host
+                // check if url hase the same host.
                 if ( wp_parse_url( site_url(), PHP_URL_HOST ) !== wp_parse_url( $url, PHP_URL_HOST ) ) {
                         return null;
+                }
                 // first, check to see if there is a 'author=N' to match against
+                // first, check to see if there is a 'author=N' to match against.
                 if ( preg_match( '/[?&]author=(\d+)/i', $url, $values ) ) {
                         $id = absint( $values[1] );
 …
+                        }
+                }
                 // check to see if we are using rewrite rules
+                // check to see if we are using rewrite rules.
                 $rewrite = $wp_rewrite->wp_rewrite_rules();
                 // not using rewrite rules, and 'author=N' method failed, so we're out of options
+                // not using rewrite rules, and 'author=N' method failed, so we're out of options.
                 if ( empty( $rewrite ) ) {
                         return null;
+                }
                 // generate rewrite rule for the author url
+                // generate rewrite rule for the author url.
                 $author_rewrite = $wp_rewrite->get_author_permastruct();
                 $author_regexp  = str_replace( '%author%', '', $author_rewrite );
                 // match the rewrite rule with the passed url
+                // match the rewrite rule with the passed url.
                 if ( preg_match( '/https?:\/\/(.+)' . preg_quote( $author_regexp, '/' ) . '([^\/]+)/i', $url, $match ) ) {
                         $user = get_user_by( 'slug', $match[2] );
 …
+}
+if ( ! function_exists( 'url_to_user' ) ) {
+        /**
+         * Get the user associated with a URL.
+         *
+         * @param string $url url to match
+         * @return WP_User $user Associated user, or null if no associated user
+if ( ! function_exists( __NAMESPACE__ . '\\url_to_user' ) ) {
+        /**
+         * Returns the local user associated with a URL.
+         *
+         * The site's home URL maps to the IndieWeb plugin's default author when the
+         * IndieWeb plugin is active, otherwise to the only author if there is just
+         * one. Author archive URLs map to their author, and other URLs are matched
+         * against users' website field.
+         *
+         * @since 1.0.0
+         *
+         * @param string $url URL to check.
+         * @return WP_User|false|null The user, or null (or false) if none matches.
          */
         function url_to_user( $url ) {
 …
                         return null;
+                }
                 // Ensure has trailing slash
+                // Ensure has trailing slash.
                 $url = trailingslashit( $url );
                 if ( ( 'https' === wp_parse_url( home_url(), PHP_URL_SCHEME ) ) && ( wp_parse_url( home_url(), PHP_URL_HOST ) === wp_parse_url( $url, PHP_URL_HOST ) ) ) {
                         $url = set_url_scheme( $url, 'https' );
+                }
                 // Try to save the expense of a search query if the URL is the site URL
+                // Try to save the expense of a search query if the URL is the site URL.
                 if ( home_url( '/' ) === $url ) {
                         // Use the Indieweb settings to set the default author
+                        // Use the Indieweb settings to set the default author.
                         if ( class_exists( 'Indieweb_Plugin' ) && ( get_option( 'iw_single_author' ) || ! is_multi_author() ) ) {
                                 return get_user_by( 'id', get_option( 'iw_default_author' ) );
+                        }
                         $users = get_users( array( 'who' => 'authors' ) );
+                        $users = get_users( array( 'capability' => array( 'edit_posts' ) ) );
                         if ( 1 === count( $users ) ) {
                                 return $users[0];
 …
                         return null;
+                }
                 // Check if this is a author post URL
+                // Check if this is a author post URL.
                 $user = url_to_author( $url );
                 if ( $user instanceof WP_User ) {
+                if ( $user instanceof \WP_User ) {
                         return $user;
+                }
 …
                 );
                 $users = get_users( $args );
                 // check result
+                // check result.
                 if ( ! empty( $users ) ) {
                         return $users[0];
 …
+}
+if ( ! function_exists( 'ifset' ) ) {
+                /**
+                 * If set, return otherwise false.
+                 *
+                 * @param type $var Check if set.
+                 * @return $var|false Return either $var or $return.
+                 */
+        function ifset( &$var, $return = false ) {
+                        return isset( $var ) ? $var : $return;
+        }
+}
+/*
+ Inverse of wp_parse_url
+ *
+ * Slightly modified from p3k-utils (https://github.com/aaronpk/p3k-utils)
+ * Copyright 2017 Aaron Parecki, used with permission under MIT License
+ *
+ * @link http://php.net/parse_url
+ * @param  string $parsed_url the parsed URL (wp_parse_url)
+ * @return string             the final URL
+ */
+if ( ! function_exists( 'build_url' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\build_url' ) ) {
+        /**
+         * Builds a URL from its parts; the inverse of wp_parse_url().
+         *
+         * Slightly modified from p3k-utils. Copyright 2017 Aaron Parecki, used with
+         * permission under the MIT License.
+         *
+         * @since 1.0.0
+         *
+         * @link https://github.com/aaronpk/p3k-utils
+         * @link https://www.php.net/parse_url
+         *
+         * @param array $parsed_url URL components as returned by wp_parse_url().
+         * @return string The URL.
+         */
         function build_url( $parsed_url ) {
                         $scheme   = ! empty( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
 …
+if ( ! function_exists( 'normalize_url' ) ) {
+        // Adds slash if no path is in the URL, and convert hostname to lowercase
+if ( ! function_exists( __NAMESPACE__ . '\\normalize_url' ) ) {
+        /**
+         * Normalizes a URL for comparison.
+         *
+         * Lowercases the host and adds a / path if there is none.
+         *
+         * @since 1.0.0
+         *
+         * @param string $url   URL to normalize.
+         * @param bool   $strip Optional. Whether to remove the query string. Default false.
+         * @return string|null The normalized URL, or null if it has no host.
+         */
         function normalize_url( $url, $strip = false ) {
                 $parts = wp_parse_url( $url );
 …
+}
+if ( ! function_exists( 'normalize_iso8601' ) ) {
+        // Tries to normalizes dates to a standard iso8601 string
+if ( ! function_exists( __NAMESPACE__ . '\\normalize_iso8601' ) ) {
+        /**
+         * Normalizes a date string to W3C (ISO 8601) format.
+         *
+         * @since 1.0.0
+         *
+         * @param string|mixed $string Date string.
+         * @return string|null The date in W3C format, the original string if it cannot
+         *                     be parsed, or null if it is empty or not a string.
+         */
         function normalize_iso8601( $string ) {
+                $date = new DateTime( $string );
+                if ( $date ) {
+                        return $date->format( DATE_W3C );
+                }
+                return $string;
+        }
+}
+if ( ! function_exists( 'post_type_discovery' ) ) {
+                if ( empty( $string ) || ! is_string( $string ) ) {
+                        return null;
+                }
+                try {
+                        $date = new \DateTime( $string );
+                } catch ( \Exception $e ) {
+                        return $string;
+                }
+                return $date->format( DATE_W3C );
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_find_fragment_element' ) ) {
+        /**
+         * Finds the element a URL fragment points to.
+         *
+         * @since 2.0.0
+         *
+         * @param DOMDocument $doc Parsed page.
+         * @param string      $id  Fragment, without the #.
+         * @return DOMElement|null The element with that id, or null.
+         */
+        function pt_find_fragment_element( $doc, $id ) {
+                if ( ! $doc instanceof \DOMDocument || ! is_string( $id ) || '' === $id ) {
+                        return null;
+                }
+                $id = rawurldecode( $id );
+                foreach ( $doc->getElementsByTagName( '*' ) as $element ) {
+                        if ( $element->getAttribute( 'id' ) === $id ) {
+                                return $element;
+                        }
+                }
+                return null;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_effective_url' ) ) {
+        /**
+         * Returns the URL a response finally came from, after any redirects.
+         *
+         * A fragment on the requested URL (which is never sent to the server) is
+         * kept, so that it can still pick out part of the page.
+         *
+         * @since 2.0.0
+         *
+         * @param string $url      Requested URL.
+         * @param array  $response Response from pt_remote_get().
+         * @return string The final URL, or $url if it isn't known.
+         */
+        function pt_effective_url( $url, $response ) {
+                $object = ( is_array( $response ) && isset( $response['http_response'] ) && is_object( $response['http_response'] ) && method_exists( $response['http_response'], 'get_response_object' ) ) ? $response['http_response']->get_response_object() : null;
+                if ( ! $object || empty( $object->url ) || ! is_string( $object->url ) || ! wp_http_validate_url( $object->url ) ) {
+                        return $url;
+                }
+                $final    = $object->url;
+                $fragment = wp_parse_url( $url, PHP_URL_FRAGMENT );
+                if ( $fragment && ! wp_parse_url( $final, PHP_URL_FRAGMENT ) ) {
+                        $final .= '#' . $fragment;
+                }
+                return $final;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_sniff_content_type' ) ) {
+        /**
+         * Works out a response's real format when its content type is missing,
+         * generic or wrong.
+         *
+         * Feeds are often served as text/plain or text/html, and JSON as
+         * text/plain or application/octet-stream. A body whose root element is
+         * <rss>, <rdf:RDF> or <feed> is a feed whatever the header says (an HTML
+         * page can't have those roots). A body that is a JSON object is checked
+         * for JSON Feed and mf2 JSON when the header is missing or generic.
+         *
+         * @since 2.0.0
+         *
+         * @param string $content_type Content type from the response, without
+         *                             parameters.
+         * @param string $body         Response body.
+         * @return string The content type to use: application/rss+xml,
+         *                application/atom+xml, application/feed+json or
+         *                application/mf2+json when sniffed, otherwise
+         *                $content_type unchanged.
+         */
+        function pt_sniff_content_type( $content_type, $body ) {
+                if ( ! is_string( $body ) || '' === $body ) {
+                        return $content_type;
+                }
+                $known = array( 'application/rss+xml', 'application/atom+xml', 'application/feed+json', 'application/mf2+json', 'application/jf2+json', 'application/jf2feed+json' );
+                if ( in_array( $content_type, $known, true ) ) {
+                        return $content_type;
+                }
+                // Skip a byte order mark, the XML declaration, processing instructions, comments and a doctype.
+                $start = ltrim( substr( $body, 0, 4096 ), "\xEF\xBB\xBF \t\r\n" );
+                $start = preg_replace( '/^(\s*(<\?[^>]*\?>|<!--.*?-->|<!DOCTYPE[^>]*>))+\s*/is', '', $start );
+                if ( preg_match( '/^<(rss|rdf:RDF)[\s>]/i', $start ) ) {
+                        return 'application/rss+xml';
+                }
+                if ( preg_match( '/^<feed[\s>]/i', $start ) ) {
+                        return 'application/atom+xml';
+                }
+                $generic = array( '', 'text/plain', 'application/octet-stream', 'text/html' );
+                if ( in_array( $content_type, $generic, true ) && '{' === substr( $start, 0, 1 ) ) {
+                        $json = json_decode( $body, true );
+                        if ( is_array( $json ) && isset( $json['version'] ) && is_string( $json['version'] ) && 0 === strpos( $json['version'], 'https://jsonfeed.org/version/' ) ) {
+                                return 'application/feed+json';
+                        }
+                        if ( is_array( $json ) && isset( $json['items'][0]['type'], $json['items'][0]['properties'] ) ) {
+                                return 'application/mf2+json';
+                        }
+                }
+                return $content_type;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\name_is_content_prefix' ) ) {
+        /**
+         * Checks whether a name only repeats the start of the content.
+         *
+         * Ignores a trailing ellipsis (... or …) on the name, as on truncated
+         * titles, and ignores whitespace in both.
+         *
+         * @since 2.0.0
+         *
+         * @param mixed $name    Name.
+         * @param mixed $content Content text.
+         * @return bool True if both are non-empty strings and the content starts
+         *              with the name.
+         */
+        function name_is_content_prefix( $name, $content ) {
+                if ( ! is_string( $name ) || ! is_string( $content ) ) {
+                        return false;
+                }
+                $name    = preg_replace( '/\\s+/u', '', preg_replace( '/\\s*(\\.\\.\\.|…)\\s*$/u', '', $name ) );
+                $content = preg_replace( '/\\s+/u', '', $content );
+                return '' !== $name && '' !== $content && 0 === strpos( $content, $name );
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\post_type_discovery' ) ) {
+        /**
+         * Determines the IndieWeb post type of a jf2 or mf2 entry.
+         *
+         * Events, reviews and recipes are their own type. For an entry, response
+         * properties decide the type first (review-of, rsvp, checkin, like-of,
+         * in-reply-to, ...), then media (video, photo, audio). An entry with a name
+         * that is not a prefix of its content (or summary) is an article; anything
+         * else is a note.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Adds review (from review-of, or the review type) and recipe,
+         *              and follows the spec for a name without content.
+         *
+         * @link https://indieweb.org/post-type-discovery
+         *
+         * @param array|mixed $jf2 jf2 object, or an mf2 object (converted first).
+         * @return string The post type, or an empty string for other types.
+         */
         function post_type_discovery( $jf2 ) {
                 if ( ! is_array( $jf2 ) ) {
 …
                         return '';
+                }
+                if ( 'event' === $jf2['type'] ) {
+                        return 'event';
+                // Events (as in the spec), and reviews and recipes (as XRay does), are their own type.
+                if ( in_array( $jf2['type'], array( 'event', 'review', 'recipe' ), true ) ) {
+                        return $jf2['type'];
+                }
                 if ( 'entry' === $jf2['type'] ) {
                         $map = array(
+                                'review'    => array( 'review-of' ),
                                 'rsvp'      => array( 'rsvp' ),
                                 'checkin'   => array( 'checkin' ),
 …
+                                }
+                        }
+                        if ( isset( $jf2['name'] ) && ! empty( $jf2['name'] ) ) {
+                                $jf2['name'] = $jf2['name'];
+                                $content     = ifset( $jf2['content'] );
+                                if ( ! $content ) {
+                                        $content = ifset( $jf2['summary'] );
+                                }
+                                if ( is_array( $content ) && array_key_exists( 'text', $content ) ) {
+                                        $content = $content['text'];
+                                }
+                                if ( is_string( $content ) ) {
+                                        $content = trim( $content );
+                                        if ( 0 !== strpos( $content, $jf2['name'] ) ) {
+                                                return 'article';
+                                        }
+                                }
+                        }
+                                return 'note';
+                        // https://www.w3.org/TR/post-type-discovery/#algorithm: a name that is not
+                        // a prefix of the content (or summary, or nothing) makes an article. A
+                        // truncated name (ending in an ellipsis) is compared without it.
+                        $name = ( isset( $jf2['name'] ) && is_string( $jf2['name'] ) ) ? trim( preg_replace( '/\s+/u', ' ', $jf2['name'] ) ) : '';
+                        if ( '' !== $name ) {
+                                $content = $jf2['content'] ?? null;
+                                if ( is_array( $content ) ) {
+                                        $content = $content['text'] ?? ( $content['value'] ?? null );
+                                }
+                                if ( ! is_string( $content ) || '' === trim( $content ) ) {
+                                        $content = $jf2['summary'] ?? '';
+                                }
+                                $content = is_string( $content ) ? trim( preg_replace( '/\s+/u', ' ', $content ) ) : '';
+                                if ( ! name_is_content_prefix( $name, $content ) ) {
+                                        return 'article';
+                                }
+                        }
+                        return 'note';
+                }
                 return '';
 …
+}
+if ( ! function_exists( 'seconds_to_iso8601' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\seconds_to_iso8601' ) ) {
+        /**
+         * Converts a number of seconds into an ISO 8601 duration.
+         *
+         * For example 3725 becomes PT1H2M5S.
+         *
+         * @since 1.0.0
+         *
+         * @param int|float $second Duration in seconds.
+         * @return string ISO 8601 duration.
+         */
         function seconds_to_iso8601( $second ) {
                 $h   = intval( $second / 3600 );
 …
+}
+if ( ! function_exists( 'pt_load_domdocument' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_load_domdocument' ) ) {
+        /**
+         * Parses HTML into a DOMDocument.
+         *
+         * On PHP 8.4 and later, uses PHP's own HTML5 parser (Dom\HTMLDocument),
+         * which builds the same tree a browser does and is several times faster
+         * than masterminds/html5 (see pt_native_html_document()). It can be turned
+         * off with the parse_this_native_html_parser filter. Otherwise, or if that
+         * fails, uses the bundled masterminds/html5 parser, and failing that PHP's
+         * DOMDocument with errors suppressed.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Uses PHP's HTML5 parser when available.
+         *
+         * @param string $content HTML.
+         * @return DOMDocument The parsed document.
+         */
         function pt_load_domdocument( $content ) {
+                $content = (string) $content;
+                /**
+                 * Filters whether to parse HTML with PHP's own HTML5 parser (PHP 8.4+).
+                 *
+                 * Return false to use masterminds/html5 even when PHP's parser is
+                 * available. The two can differ on invalid markup, where PHP's parser
+                 * follows the HTML5 algorithm (as browsers do).
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param bool $enabled Whether to use it. Default true.
+                 */
+                if ( class_exists( 'Dom\HTMLDocument' ) && apply_filters( 'parse_this_native_html_parser', true ) ) {
+                        $doc = pt_native_html_document( $content );
+                        if ( $doc ) {
+                                return $doc;
+                        }
+                }
                 if ( ! class_exists( '\Masterminds\HTML5', false ) ) {
                         $file = plugin_dir_path( __DIR__ ) . 'lib/html5/autoloader.php';
 …
                         $doc = $doc->loadHTML( $content );
                 } else {
+                        $doc = new DOMDocument();
+                        $doc = new \DOMDocument();
+                        // DOMDocument::loadHTML() throws on an empty string in PHP 8.
+                        if ( '' === trim( $content ) ) {
+                                return $doc;
+                        }
                         libxml_use_internal_errors( true );
+                        if ( function_exists( 'mb_convert_encoding' ) ) {
+                                $content = mb_convert_encoding( $content, 'HTML-ENTITIES', mb_detect_encoding( $content ) );
+                        if ( function_exists( 'mb_encode_numericentity' ) ) {
+                                // DOMDocument assumes ISO-8859-1, so convert to UTF-8 and encode non-ASCII characters as entities.
+                                $encoding = mb_detect_encoding( $content, array( 'UTF-8', 'ISO-8859-1' ), true );
+                                if ( $encoding && 'UTF-8' !== $encoding ) {
+                                        $content = mb_convert_encoding( $content, 'UTF-8', $encoding );
+                                }
+                                $content = mb_encode_numericentity( $content, array( 0x80, 0x10FFFF, 0, 0x1FFFFF ), 'UTF-8' );
+                        }
                         $doc->loadHTML( $content );
 …
+        }
+}
+if ( ! function_exists( 'pt_secure_rewrite' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_native_html_document' ) ) {
+        /**
+         * Parses HTML with PHP's HTML5 parser and returns it as a DOMDocument.
+         *
+         * Dom\HTMLDocument (PHP 8.4+) belongs to PHP's new DOM API, while php-mf2
+         * and the rest of Parse This work with DOMDocument. The parsed tree is
+         * passed across as XML, which reproduces it exactly without parsing the
+         * HTML twice. Comments (which may contain "--") and attributes whose names
+         * aren't valid XML (@click, x-on:click, :class) are removed first, since
+         * XML can't hold them and nothing here reads them. Elements are kept out of
+         * the XHTML namespace, so XPath queries such as //meta work as before.
+         *
+         * @since 2.0.0
+         *
+         * @param string $content HTML.
+         * @return DOMDocument|null The parsed document, or null if PHP's parser
+         *                          isn't available or the document can't be
+         *                          passed across.
+         */
+        function pt_native_html_document( $content ) {
+                if ( ! class_exists( 'Dom\HTMLDocument' ) ) {
+                        return null;
+                }
+                try {
+                        $html  = \Dom\HTMLDocument::createFromString( (string) $content, LIBXML_NOERROR | \Dom\HTML_NO_DEFAULT_NS );
+                        $xpath = new \Dom\XPath( $html );
+                        foreach ( iterator_to_array( $xpath->query( '//comment()' ) ) as $comment ) {
+                                $comment->remove();
+                        }
+                        foreach ( iterator_to_array( $xpath->query( '//@*' ) ) as $attribute ) {
+                                if ( ! preg_match( '/^[A-Za-z_][A-Za-z0-9_.\-]*$/', $attribute->name ) ) {
+                                        $attribute->ownerElement->removeAttribute( $attribute->name ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- PHP DOM property.
+                                }
+                        }
+                        $xml = $html->saveXml();
+                } catch ( \Throwable $e ) {
+                        return null;
+                }
+                $doc    = new \DOMDocument();
+                $errors = libxml_use_internal_errors( true );
+                $loaded = $doc->loadXML( $xml, LIBXML_NONET | LIBXML_NOERROR | LIBXML_NOWARNING | LIBXML_PARSEHUGE );
+                libxml_clear_errors();
+                libxml_use_internal_errors( $errors );
+                return $loaded ? $doc : null;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_remote_get' ) ) {
+        /**
+         * Retrieves a remote URL, retrying once with a browser user agent if the site rejects the request.
+         *
+         * Fetched documents decide which further URLs are requested (author pages,
+         * alternates, REST API links), so this must stay on wp_safe_remote_get(),
+         * which refuses local and private addresses. Don't switch it to
+         * wp_remote_get().
+         *
+         * @param string $url         URL to retrieve.
+         * @param array  $args        Optional. Arguments passed to wp_safe_remote_get().
+         * @param array  $retry_codes Optional. Response codes that trigger the retry.
+         * @return array|WP_Error The response, or WP_Error on failure.
+         */
+        function pt_remote_get( $url, $args = array(), $retry_codes = array( 403, 415 ) ) {
+                $args = wp_parse_args(
+                        $args,
+                        array(
+                                'timeout'             => 15,
+                                'limit_response_size' => 1048576,
+                                'redirection'         => 5,
+                        )
+                );
+                $response = wp_safe_remote_get( $url, $args );
+                if ( is_wp_error( $response ) ) {
+                        return $response;
+                }
+                if ( ! in_array( (int) wp_remote_retrieve_response_code( $response ), $retry_codes, true ) ) {
+                        return $response;
+                }
+                $args['user-agent'] = 'Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:57.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36 Parse This/WP';
+                $response           = wp_safe_remote_get( $url, $args );
+                if ( is_wp_error( $response ) ) {
+                        return $response;
+                }
+                $code = (int) wp_remote_retrieve_response_code( $response );
+                if ( in_array( $code, $retry_codes, true ) ) {
+                        return new \WP_Error( 'source_error', __( 'Unable to retrieve the URL.', 'parse-this' ), array( 'response_code' => $code ) );
+                }
+                return $response;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_secure_rewrite' ) ) {
+        /**
+         * Upgrades http:// URLs to https:// for hosts known to support HTTPS.
+         *
+         * @since 1.0.1
+         *
+         * @param string $url URL.
+         * @return string The URL, with https:// if its domain is on the list.
+         */
         function pt_secure_rewrite( $url ) {
                 $host   = wp_parse_url( $url, PHP_URL_HOST );
 …
                         'google.com',
                         'gravatar.com',
                         'gstatic.com',
+                        'gstatic.com', // phpcs:ignore PluginCheck.CodeAnalysis.Offloading.OffloadedContent -- A domain to rewrite to https, not content loaded from it.
                         'kernel.org',
                         'lwn.net',
                         'tumblr.com',
                         'twitter.com',
+                        'x.com',
                         'vimeo.com',
                         'wikipedia.org',
 …
                         'youtube.com',
                 );
+                /**
+                 * Filters the domains whose http:// URLs are upgraded to https://.
+                 *
+                 * Matching is on the registrable domain, so listing example.com also
+                 * covers www.example.com.
+                 *
+                 * @since 1.0.1
+                 *
+                 * @param string[] $secure Domains known to support HTTPS.
+                 */
                 $secure = apply_filters( 'pt_rewrite_secure', $secure );
                 if ( in_array( $host, $secure, true ) ) {
 …
+/**
+ * Parses Link Headers
+ *
+ *
+ * @return array
+ */
+if ( ! function_exists( 'pt_parse_header_links' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_parse_header_links' ) ) {
+        /**
+         * Parses HTTP Link headers.
+         *
+         * @since 2.0.0
+         *
+         * @link https://www.rfc-editor.org/rfc/rfc8288
+         *
+         * @param string|string[] $links One Link header value, or several. A value may
+         *                               hold multiple comma-separated links.
+         * @return array[] One entry per link and rel value, with 'uri', 'rel' and any
+         *                 other parameters (type, title, ...).
+         */
         function pt_parse_header_links( $links ) {
                 $items = array();
+                if ( is_string( $links ) ) {
+                        $links = array( $links );
+                }
                 if ( is_array( $links ) && 1 <= count( $links ) ) {
+                        // A header may hold several comma-separated links. Only split on commas that start a new <uri>, as URIs may contain commas.
+                        $split = array();
                         foreach ( $links as $link ) {
+                                $item   = array();
+                                $pieces = explode( ';', $link );
+                                $uri    = array_shift( $pieces );
+                                $split = array_merge( $split, preg_split( '/,(?=\s*<)/', $link ) );
+                        }
+                        foreach ( $split as $link ) {
+                                $item = array();
+                                if ( preg_match( '/^\s*<([^>]*)>(.*)$/s', $link, $match ) ) {
+                                        $uri    = $match[1];
+                                        $pieces = explode( ';', $match[2] );
+                                } else {
+                                        $pieces = explode( ';', $link );
+                                        $uri    = array_shift( $pieces );
+                                }
                                 foreach ( $pieces as $p ) {
+                                        $elements = explode( '=', $p );
+                                        $item[ trim( $elements[0] ) ] = trim( $elements[1], '"\'' );
+                                        $elements = explode( '=', $p, 2 );
+                                        $name     = trim( $elements[0] );
+                                        if ( '' === $name ) {
+                                                continue;
+                                        }
+                                        $item[ $name ] = isset( $elements[1] ) ? trim( $elements[1], " \t\"'" ) : '';
+                                }
 …
+}
+/**
+ * Find WordPress REST Alternate
+ *
+ *
+ * @return string|false
+ */
+if ( ! function_exists( 'pt_find_rest_alternate' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_find_rest_alternate' ) ) {
+        /**
+         * Finds the application/json alternate link among parsed Link headers.
+         *
+         * WordPress sends this for each post, pointing at its REST API URL.
+         *
+         * @since 2.0.0
+         *
+         * @param array[] $links Links from pt_parse_header_links().
+         * @return string|false The URL, or false if there is none.
+         */
         function pt_find_rest_alternate( $links ) {
                 foreach ( $links as $link ) {
                         if ( 'alternate' === ifset( $link['rel'] ) && 'application/json' === ifset( $link['type'] ) ) {
+                        if ( 'alternate' === ( $link['rel'] ?? null ) && 'application/json' === ( $link['type'] ?? null ) ) {
                                 return $link['uri'];
+                        }
 …
+}
+/**
+ * Find WordPress REST Endpoint
+ *
+ *
+ * @return string|false
+ */
+if ( ! function_exists( 'pt_find_rest_endpoint' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_find_rest_endpoint' ) ) {
+        /**
+         * Finds the WordPress REST API root among parsed Link headers.
+         *
+         * @since 2.0.0
+         *
+         * @param array[] $links Links from pt_parse_header_links().
+         * @return string|false The REST API root URL, or false if there is none.
+         */
         function pt_find_rest_endpoint( $links ) {
                 foreach ( $links as $link ) {
                         if ( 'https://api.w.org/' === ifset( $link['rel'] ) ) {
+                        if ( 'https://api.w.org/' === ( $link['rel'] ?? null ) ) {
                                 return $link['uri'];
+                        }
 …
+}
+if ( ! function_exists( 'pt_make_absolute_url' ) ) {
+if ( ! function_exists( __NAMESPACE__ . '\\pt_absolute_urls_in_html' ) ) {
+        /**
+         * Makes the links and media URLs in an HTML fragment absolute.
+         *
+         * Resolves href, src and poster attributes against a base URL, for content
+         * taken from a document (such as a JSON Feed item) whose own URL differs
+         * from where it will be shown.
+         *
+         * @since 2.0.0
+         *
+         * @param string $html HTML fragment.
+         * @param string $base Base URL.
+         * @return string The HTML with absolute URLs, or $html unchanged if it has
+         *                none to resolve or $base is not a URL.
+         */
+        function pt_absolute_urls_in_html( $html, $base ) {
+                if ( ! is_string( $html ) || '' === trim( $html ) || ! wp_http_validate_url( $base ) || ! preg_match( '/\s(href|src|poster)\s*=/i', $html ) ) {
+                        return $html;
+                }
+                $doc  = pt_load_domdocument( '<!DOCTYPE html><html><head><meta charset="utf-8"></head><body>' . $html . '</body></html>' );
+                $body = $doc->getElementsByTagName( 'body' )->item( 0 );
+                if ( ! $body ) {
+                        return $html;
+                }
+                foreach ( ( new \DOMXPath( $doc ) )->query( '//body//*[@href or @src or @poster]' ) as $element ) {
+                        foreach ( array( 'href', 'src', 'poster' ) as $attribute ) {
+                                $value = $element->getAttribute( $attribute );
+                                if ( '' !== $value && '#' !== $value[0] ) {
+                                        $element->setAttribute( $attribute, pt_make_absolute_url( $value, $base ) );
+                                }
+                        }
+                }
+                $out = '';
+                foreach ( $body->childNodes as $node ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- PHP DOM property.
+                        $out .= $doc->saveHTML( $node );
+                }
+                return $out;
+        }
+}
+if ( ! function_exists( __NAMESPACE__ . '\\pt_make_absolute_url' ) ) {
+        /**
+         * Resolves a relative URL against a base URL.
+         *
+         * @since 2.0.0
+         *
+         * @param string $maybe_relative_path URL or path to resolve.
+         * @param string $url                 Base URL.
+         * @return string The absolute URL, or $maybe_relative_path unchanged if it is
+         *                already absolute or either value cannot be parsed.
+         */
         function pt_make_absolute_url( $maybe_relative_path, $url ) {
                 if ( empty( $url ) ) {
 …
+                        }
+                }
                 // Start off with the absolute URL path.
                 $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
 …
                         $path = $relative_url_parts['path'];
                 // Else it's a relative path.
+                        // Else it's a relative path.
                 } elseif ( ! empty( $relative_url_parts['path'] ) ) {
                         // Strip off any file components from the absolute path.
 …
+                }
                 return $absolute_path . '/' . ltrim( $path, '/' );
+        }

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5.php

r2351228	r3738687
147	147	*
148	148	* @param string $input
149		* @param array $options
150	149	*
151	150	* @return \DOMDocument

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Elements.php

-              r2110745
+              r3738687
      */
     const BLOCK_ONLY_INLINE = 128;
+    /**
+     * Elements with optional end tags that cause auto-closing of previous and parent tags,
+     * as example most of the table related tags, see https://www.w3.org/TR/html401/struct/tables.html
+     * Structure is as follows:
+     * TAG-NAME => [PARENT-TAG-NAME-TO-CLOSE1, PARENT-TAG-NAME-TO-CLOSE2, ...].
+     *
+     * Order is important, after auto-closing one parent with might have to close also their parent.
+     *
+     * @var array<string, string[]>
+     */
+    public static $optionalEndElementsParentsToClose = array(
+        'tr' => array('td', 'tr'),
+        'td' => array('td', 'th'),
+        'th' => array('td', 'th'),
+        'tfoot' => array('td', 'th', 'tr', 'tbody', 'thead'),
+        'tbody' => array('td', 'th', 'tr', 'thead'),
+    );
     /**
 …
         'ul' => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
         'var' => 1,
         'video' => 65, // NORMAL | BLOCK_TAG
+        'video' => 1,
         'wbr' => 9, // NORMAL | VOID_TAG
 …
         'feDisplacementMap' => 1,
         'feDistantLight' => 1,
+        'feDropShadow' => 1,
         'feFlood' => 1,
         'feFuncA' => 1,
 …
         'fedisplacementmap' => 'feDisplacementMap',
         'fedistantlight' => 'feDistantLight',
+        'fedropshadow' => 'feDropShadow',
         'feflood' => 'feFlood',
         'fefunca' => 'feFuncA',

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Parser/CharacterReference.php

r2110745	r3738687
49	49
50	50	/**
51		* Given a hexidecimal number, return the UTF-8 character.
	51	* Given a hexadecimal number, return the UTF-8 character.
52	52	*
53	53	* @param $hexdec

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Parser/DOMTreeBuilder.php

-              r2623705
+              r3738687
      * This is used for handling Processor Instructions as they are
      * inserted. If omitted, PI's are inserted directly into the DOM tree.
+     *
-     * @param InstructionProcessor $proc
      */
     public function setInstructionProcessor(InstructionProcessor $proc)
 …
+        }
+        // some elements as table related tags might have optional end tags that force us to auto close multiple tags
+        // https://www.w3.org/TR/html401/struct/tables.html
+        if ($this->current instanceof \DOMElement && isset(Elements::$optionalEndElementsParentsToClose[$lname])) {
+            foreach (Elements::$optionalEndElementsParentsToClose[$lname] as $parentElName) {
+                if ($this->current instanceof \DOMElement && $this->current->tagName === $parentElName) {
+                    $this->autoclose($parentElName);
+                }
+            }
+        }
         try {
             $prefix = ($pos = strpos($lname, ':')) ? substr($lname, 0, $pos) : '';
 …
         if ($pushes > 0 && !Elements::isA($name, Elements::VOID_TAG)) {
             // PHP tends to free the memory used by DOM,
             // to avoid spl_object_hash collisions whe have to avoid garbage collection of $ele storing it into $pushes
+            // to avoid spl_object_id collisions we have to avoid garbage collection of $ele storing it into $pushes
             // see https://bugs.php.net/bug.php?id=67459
             $this->pushes[spl_object_hash($ele)] = array($pushes, $ele);
+            $this->pushes[spl_object_id($ele)] = array($pushes, $ele);
+        }
 …
+        }
         $cid = spl_object_hash($this->current);
+        $cid = spl_object_id($this->current);
         // XXX: HTML has no parent. What do we do, though,

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Parser/StringInputStream.php

r2110745	r3738687
184	184	* @return string The current character.
185	185	*/
	186	#[\ReturnTypeWillChange]
186	187	public function current()
187	188	{
…	…
193	194	* This is part of the Iterator interface.
194	195	*/
	196	#[\ReturnTypeWillChange]
195	197	public function next()
196	198	{
…	…
201	203	* Rewind to the start of the string.
202	204	*/
	205	#[\ReturnTypeWillChange]
203	206	public function rewind()
204	207	{
…	…
211	214	* @return bool Whether the current pointer location is valid.
212	215	*/
	216	#[\ReturnTypeWillChange]
213	217	public function valid()
214	218	{
…	…
325	329	}
326	330
	331	#[\ReturnTypeWillChange]
327	332	public function key()
328	333	{

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Parser/Tokenizer.php

-              r2839509
+              r3738687
             $tok = $this->scanner->next();
+            if ('!' === $tok) {
+            if (false === $tok) {
+                // end of string
+                $this->parseError('Illegal tag opening');
+            } elseif ('!' === $tok) {
                 $this->markupDeclaration();
             } elseif ('/' === $tok) {
 …
             } elseif ('?' === $tok) {
                 $this->processingInstruction();
             } elseif (ctype_alpha($tok)) {
+            } elseif ($this->is_alpha($tok)) {
                 $this->tagName();
             } else {
 …
         // EOF -> parse error
         // -> parse error
         if (!ctype_alpha($tok)) {
+        if (!$this->is_alpha($tok)) {
             $this->parseError("Expected tag name, got '%s'", $tok);
             if ("\0" == $tok || false === $tok) {
 …
         $val = $this->attributeValue();
         if ($isValidAttribute) {
+        if ($isValidAttribute && !array_key_exists($name, $attributes)) {
             $attributes[$name] = $val;
+        }
 …
         if ('!' == $this->scanner->current() && '>' == $this->scanner->peek()) {
             $this->scanner->consume(); // Consume the last '>'
             return true;
+        }
 …
+            }
             // Hexidecimal encoding.
+            // Hexadecimal encoding.
             // X[0-9a-fA-F]+;
             // x[0-9a-fA-F]+;
 …
         return '&';
+    }
+    /**
+     * Checks whether a (single-byte) character is an ASCII letter or not.
+     *
+     * @param string $input A single-byte string
+     *
+     * @return bool True if it is a letter, False otherwise
+     */
+    protected function is_alpha($input)
+    {
+        if (!is_string($input) || 1 !== strlen($input)) {
+            return false;
+        }
+        $code = ord($input);
+        return ($code >= 97 && $code <= 122) || ($code >= 65 && $code <= 90);
+    }
+}

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Parser/TreeBuildingRules.php

r2110745	r3738687
81	81	case 'tfoot':
82	82	case 'table': // Spec isn't explicit about this, but it's necessary.
83
84	83	return $this->closeIfCurrentMatches($new, $current, array(
85	84	'thead',

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Parser/UTF8Utils.php

-              r2110745
+              r3738687
     /**
      * Count the number of characters in a string.
      * UTF-8 aware. This will try (in order) iconv, MB, libxml, and finally a custom counter.
+     * UTF-8 aware. This will try (in order) iconv, MB, and finally a custom counter.
+     *
      * @param string $string
 …
         if (function_exists('iconv_strlen')) {
             return iconv_strlen($string, 'utf-8');
+        }
-        if (function_exists('utf8_decode')) {
-            // MPB: Will this work? Won't certain decodes lead to two chars
-            // extrapolated out of 2-byte chars?
-            return strlen(utf8_decode($string));
+        }

indieweb-post-kinds/trunk/lib/parse-this/lib/html5/HTML5/Serializer/OutputRules.php

-              r2351228
+              r3738687
 class OutputRules implements RulesInterface
+{
-    /**
-     * Defined in http://www.w3.org/TR/html51/infrastructure.html#html-namespace-0.
-     */
     const NAMESPACE_HTML = 'http://www.w3.org/1999/xhtml';
 …
     const IM_IN_MATHML = 3;
-    /**
-     * Used as cache to detect if is available ENT_HTML5.
+     *
-     * @var bool
-     */
-    private $hasHTML5 = false;
     protected $traverser;
 …
         $this->outputMode = static::IM_IN_HTML;
         $this->out = $output;
-        $this->hasHTML5 = defined('ENT_HTML5');
+    }
 …
+    }
+    /**
+     * @param \DOMElement $ele
+     */
     public function element($ele)
+    {
 …
         $this->openTag($ele);
+        // The tag is already self-closed (`<svg />` or `<math />`) in `openTag` if there are no child nodes.
+        $handledAsVoidTag = $this->outputMode !== static::IM_IN_HTML && !$ele->hasChildNodes();
         if (Elements::isA($name, Elements::TEXT_RAW)) {
             foreach ($ele->childNodes as $child) {
 …
         // If not unary, add a closing tag.
         if (!Elements::isA($name, Elements::VOID_TAG)) {
+        if (!$handledAsVoidTag && !Elements::isA($name, Elements::VOID_TAG)) {
             $this->closeTag($ele);
+        }
 …
     protected function wr($text)
+    {
         fwrite($this->out, $text);
+        fwrite($this->out, (string) $text);
         return $this;
 …
      *      encoding here will just escape &'<>".
+     *
-     *      Note, PHP 5.4+ has better html5 encoding.
+     *
-     * @todo Use the Entities class in php 5.3 to have html5 entities.
+     *
      * @param string $text      Text to encode.
      * @param bool   $attribute True if we are encoding an attrubute, false otherwise.
+     * @param bool   $attribute True if we are encoding an attribute, false otherwise.
+     *
      * @return string The encoded text.
 …
+        }
+        // If we are in PHP 5.4+ we can use the native html5 entity functionality to
+        // convert the named character references.
+        if ($this->hasHTML5) {
+            return htmlentities($text, ENT_HTML5 | ENT_SUBSTITUTE | ENT_QUOTES, 'UTF-8', false);
+        }         // If a version earlier than 5.4 html5 entities are not entirely handled.
+        // This manually handles them.
+        else {
+            return strtr($text, HTML5Entities::$map);
+        }
+        return htmlentities($text, ENT_HTML5 | ENT_SUBSTITUTE | ENT_QUOTES, 'UTF-8', false);
+    }

indieweb-post-kinds/trunk/lib/parse-this/lib/mf2/Parser.php

-              r2839509
+              r3738687
 /**
- * Registered with the XPath object and used within XPaths for finding root elements.
- * @param string $class
- * @return bool
- */
-function classHasMf2RootClassname($class) {
-        return count(mfNamesFromClass($class, 'h-')) > 0;
+}
-/**
  * Get Nested µf Property Name From Class
+ *
 …
          */
         public function __construct($input, $url = null, $jsonMode = false) {
-                $emptyDocDefault = '<html><body></body></html>';
                 libxml_use_internal_errors(true);
                 if (is_string($input)) {
-                        if (empty($input)) {
-                                        $input = $emptyDocDefault;
+                        }
                         if (class_exists('Masterminds\\HTML5')) {
                                         $doc = new \Masterminds\HTML5(array('disable_html_ns' => true));
 …
                 } else {
                         $doc = new DOMDocument();
+                        @$doc->loadHTML($emptyDocDefault);
+                }
+                // Create an XPath object and allow some PHP functions to be used within XPath queries.
+                        @$doc->loadHTML('');
+                }
                 $this->xpath = new DOMXPath($doc);
-                $this->xpath->registerNamespace('php', 'http://php.net/xpath');
-                $this->xpath->registerPhpFunctions('\\Mf2\\classHasMf2RootClassname');
                 $baseurl = $url;
 …
                         'properties' => $return
                 );
                 if(trim($e->getAttribute('id')) !== '') {
                         $parsed['id'] = trim($e->getAttribute("id"));
 …
                 // start with mf2 root class name xpath
                 $xpaths = array(
                         '(php:function("\\Mf2\\classHasMf2RootClassname", normalize-space(@class)))'
+                        'contains(concat(" ",normalize-space(@class)), " h-")'
                 );
 …
                                 break;
-                                case 'hfeed':
-                                        $this->upgradeRelTagToCategory($el);
-                                break;
-                                case 'hproduct':
-                                        $review_and_hreview_aggregate = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " review ") and contains(concat(" ", normalize-space(@class), " "), " hreview-aggregate ")]', $el);
-                                        if ( $review_and_hreview_aggregate->length ) {
-                                                foreach ( $review_and_hreview_aggregate as $tempEl ) {
-                                                        if ( !$this->hasRootMf2($tempEl) ) {
-                                                                $this->backcompat($tempEl, 'hreview-aggregate');
-                                                                $this->addMfClasses($tempEl, 'p-review h-review-aggregate');
-                                                                $this->addUpgraded($tempEl, array('review hreview-aggregate'));
+                                                        }
+                                                }
+                                        }
-                                        $review_and_hreview = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " review ") and contains(concat(" ", normalize-space(@class), " "), " hreview ")]', $el);
-                                        if ( $review_and_hreview->length ) {
-                                                foreach ( $review_and_hreview as $tempEl ) {
-                                                        if ( !$this->hasRootMf2($tempEl) ) {
-                                                                $this->backcompat($tempEl, 'hreview');
-                                                                $this->addMfClasses($tempEl, 'p-review h-review');
-                                                                $this->addUpgraded($tempEl, array('review hreview'));
+                                                        }
+                                                }
+                                        }
-                                break;
-                                case 'hreview-aggregate':
                                 case 'hreview':
                                         $item_and_vcard = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " item ") and contains(concat(" ", normalize-space(@class), " "), " vcard ")]', $el);
 …
                                 case 'vevent':
                                         $location_and_vcard = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " location ") and contains(concat(" ", normalize-space(@class), " "), " vcard ")]', $el);
                                         if ( $location_and_vcard->length ) {
                                                 foreach ( $location_and_vcard as $tempEl ) {
+                                        $location = $this->xpath->query('.//*[contains(concat(" ", normalize-space(@class), " "), " location ")]', $el);
+                                        if ( $location->length ) {
+                                                foreach ( $location as $tempEl ) {
                                                         if ( !$this->hasRootMf2($tempEl) ) {
                                                                 $this->addMfClasses($tempEl, 'p-location h-card');
+                                                                $this->addMfClasses($tempEl, 'h-card');
                                                                 $this->backcompat($tempEl, 'vcard');
+                                                        }
 …
         public function hasRootMf2(\DOMElement $el) {
                 $class = str_replace(array("\t", "\n"), ' ', $el->getAttribute('class'));
+                // Check for valid mf2 root classnames, not just any classname with a h- prefix.
+                return count(mfNamesFromClass($class, 'h-')) > 0;
+                $classes = array_filter(explode(' ', $class));
+                foreach ( $classes as $classname ) {
+                        if ( strpos($classname, 'h-') === 0 ) {
+                                return true;
+                        }
+                }
+                return false;
+        }
 …
                 'vevent' => 'h-event',
                 'hreview' => 'h-review',
-                'hreview-aggregate' => 'h-review-aggregate',
                 'hproduct' => 'h-product',
                 'adr' => 'h-adr',
-                'geo' => 'h-geo'
         );
 …
                 ),
                 'hfeed' => array(
+                        'author' => array(
+                                'replace' => 'p-author h-card',
+                                'context' => 'vcard'
+                        ),
+                        'url' => array(
+                                'replace' => 'u-url'
+                        ),
+                        'photo' => array(
+                                'replace' => 'u-photo'
+                        ),
+                        'category' => array(
+                                'replace' => 'p-category'
+                        ),
+                        # nothing currently
                 ),
                 'hentry' => array(
 …
                         ),
                         'location' => array(
+                                'replace' => 'p-location',
+                                'replace' => 'h-card',
+                                'context' => 'vcard'
                         ),
                         'geo' => array(
                                 'replace' => 'p-location h-geo'
                         ),
-                        'attendee' => array(
-                                'replace' => 'p-attendee h-card',
-                                'context' => 'vcard'
+                        )
                 ),
                 'hreview' => array(
 …
                         ),
                 ),
-                'hreview-aggregate' => array(
-                        'summary' => array(
-                                'replace' => 'p-name'
-                        ),
-                        # fn: see item.fn below
-                        # photo: see item.photo below
-                        # url: see item.url below
-                        'item' => array(
-                                'replace' => 'p-item h-item',
-                                'context' => 'item'
-                        ),
-                        'rating' => array(
-                                'replace' => 'p-rating'
-                        ),
-                        'best' => array(
-                                'replace' => 'p-best'
-                        ),
-                        'worst' => array(
-                                'replace' => 'p-worst'
-                        ),
-                        'average' => array(
-                                'replace' => 'p-average'
-                        ),
-                        'count' => array(
-                                'replace' => 'p-count'
-                        ),
-                        'votes' => array(
-                                'replace' => 'p-votes'
-                        ),
-                ),
                 'hproduct' => array(
                         'fn' => array(
 …
                                 'replace' => 'u-url',
                         ),
+                        // review is handled in the special processing section to allow for 'review hreview-aggregate'
+                        'review' => array(
+                                'replace' => 'p-review h-review',
+                        ),
                         'price' => array(
                                 'replace' => 'p-price'

indieweb-post-kinds/trunk/lib/parse-this/parse-this.php

-              r2507837
+              r3738687
  * Plugin Name: Parse This
  * Plugin URI: https://github.com/dshanske/parse-this
  * Description:
  * Version: 1.0.1
+ * Description: Turns URLs into structured jf2 data from microformats2, JSON-LD, meta tags and RSS, Atom and JSON feeds.
+ * Version: 2.0.0
  * Author: David Shanske
  * Author URI: https://david.shanske.com
+ * Requires at least: 6.2
+ * Requires PHP: 7.4
+ * License: GPLv2 or later
+ * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain: parse-this
+ * Domain Path:  /languages
+ *
+ * @package Parse_This
  */
+/*
+ Parse This Load
+ */
+defined( 'ABSPATH' ) || exit;
 if ( ! function_exists( 'parse_this_loader' ) ) {
+        /**
+         * Loads Parse This.
+         *
+         * Runs on plugins_loaded at priority 9, so that the standalone plugin loads
+         * ahead of copies bundled in other plugins (Post Kinds loads its copy at
+         * priority 11). Functions are guarded by function_exists() and the first
+         * autoloader registered serves the classes, so whichever copy loads first
+         * wins. It also registers the deprecated global names in aliases.php, so
+         * that plugins bundling an older copy use this one.
+         *
+         * Defines PARSE_THIS_VERSION for the copy that loads, and fires
+         * parse_this_loaded once everything is available. A copy older than 2.0.0
+         * defines neither, so a plugin can tell when an older bundled copy won.
+         *
+         * @since 1.0.0
+         * @since 2.0.0 Defines PARSE_THIS_VERSION and fires parse_this_loaded.
+         */
         function parse_this_loader() {
+                if ( ! defined( 'PARSE_THIS_VERSION' ) ) {
+                        /**
+                         * Version of the copy of Parse This that loaded. Keep in step with the
+                         * Version header.
+                         *
+                         * @since 2.0.0
+                         * @var string
+                         */
+                        define( 'PARSE_THIS_VERSION', '2.0.0' );
+                }
                 require_once plugin_dir_path( __FILE__ ) . 'includes/autoload.php';
+                require_once plugin_dir_path( __FILE__ ) . 'includes/functions.php';
+                // Functions Not Available in Earlier Versions of WordPress
+                require_once plugin_dir_path( __FILE__ ) . 'includes/compat-functions.php';
+                new ParseThis\REST_Endpoint();
+                require_once plugin_dir_path( __FILE__ ) . 'includes/functions.php';
+                // Parse This REST Endpoint
+                require_once plugin_dir_path( __FILE__ ) . 'includes/class-rest-parse-this.php';
+                /**
+                 * Fires once Parse This has loaded: its classes, functions and REST route
+                 * are available.
+                 *
+                 * Plugins that use Parse This can hook here, or check PARSE_THIS_VERSION,
+                 * rather than depend on load order.
+                 *
+                 * @since 2.0.0
+                 *
+                 * @param string $version Version of the copy of Parse This that loaded.
+                 */
+                do_action( 'parse_this_loaded', PARSE_THIS_VERSION );
+        }
         add_action( 'plugins_loaded', 'parse_this_loader', 9 );
+}

indieweb-post-kinds/trunk/lib/parse-this/readme.txt

-              r2507837
+              r3738687
 === Parse This ===
 Contributors: dshanske
 Tags: indieweb
 Stable tag: trunk
 Requires at least: 4.9
 Requires PHP: 5.6
 Tested up to: 5.6
+Tags: indieweb, microformats, jf2, json-ld, feeds
+Stable tag: 2.0.0
+Requires at least: 6.2
+Requires PHP: 7.4
+Tested up to: 7.1
 License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+Parse This turns URLs into structured jf2 data
+== Description ==
+Parse This is based on a variety of projects including the parsing code from Press This, which was removed from WordPress.
+* It supports parsing from MF2 if present
+* For sites that are not marked up with Microformats 2(MF2) it will fall back onto parsing JSON-LD, then HTML/OpenGraph/Dublin Core Tags/etc.
+* It supports parsing of JSONFeed and RSS/Atom feeds
+* It supports parsing of  WordPress REST API endpoints to generate a site feed
+The goal is to produce structured jf2 data that can be used for previewing links as well as feed readers and other options. It is also bundled in the Post Kinds and Yarns Microsub plugins as a library.
+It can be installed as a standalone plugin which will provide the necessary libraries and functionality as well as the REST API endpoint for getting JF2 data from an arbitrary URL or a WordPress Post.
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
+Parse This turns URLs into structured jf2 data.
+== Description ==
+Parse This fetches a URL and turns it into [jf2](https://jf2.spec.indieweb.org/), a simple JSON format for posts, people and feeds. The result can be used for link previews, feed readers, replies and likes, and similar features.
+It started from the parsing code in Press This, which was removed from WordPress, and has grown from there. It runs as a standalone plugin that other plugins, such as Post Kinds and Yarns Microsub, can require or bundle.
+It also runs on ClassicPress 2.x.
+= What it parses =
+* **Microformats2.** When a page is marked up with microformats, they are used first: entries, cards, events, reviews (including h-entry reviews with `review-of`), recipes, products and any other type. On a busy page it picks the item the page is about, and it follows the IndieWeb authorship algorithm.
+* **Other metadata.** Other sources only fill in what microformats don't provide: a site-specific parser for YouTube or X (Twitter), then JSON-LD (articles, events, reviews, products, recipes, media and people) and Open Graph, Dublin Core and other meta tags. If there is still no content, the page's WordPress REST API version is fetched, when the site advertises one.
+* **Parts of pages.** A link with a fragment (`#comment-12`) is parsed as just that part of the page. A WordPress comment link whose page has no microformats for it is read from the site's REST API as a reply.
+* **Feeds.** RSS and Atom (through WordPress's SimplePie), JSON Feed 1 and 1.1, jf2 and mf2 JSON, and WordPress REST API post collections, including feeds served with the wrong content type.
+* **Feed discovery.** It lists the feeds a page offers: alternates, `rel=feed` links, h-feeds and the WordPress REST API.
+On PHP 8.4 and later, HTML is parsed with PHP's own HTML5 parser; on older PHP, with the bundled masterminds/html5 parser.
+= Using it from PHP =
+    $parse = new ParseThis\Parser( 'https://example.com/a-post/' );
+    $result = $parse->fetch();
+    if ( ! is_wp_error( $result ) ) {
+        $parse->parse( array( 'return' => 'single' ) );
+        $jf2 = $parse->get();          // jf2 array.
+        $mf2 = $parse->get( 'mf2' );   // Or the same result as mf2.
+    }
+`ParseThis\Parser::parse()` accepts these arguments:
+* `return`: `single` for one item (default) or `feed` for a list of items.
+* `follow`: fetch and parse external author pages. Default false.
+* `limit`: maximum number of feed items. Default 150.
+* `jsonld`: try JSON-LD. Default true.
+* `html`: fall back to meta tags. Default true.
+* `references`: move nested objects with a URL (citations, cards, events, ...) into `refs`, as the jf2 spec describes. Default true.
+* `location`: flatten a nested location into `latitude`, `longitude` and `altitude` properties, with `location` as a plain string. Default false.
+* `alternate`: use a `rel=alternate` jf2 or mf2 version of the page if it has one. Default false.
+* `require_content`: whether a summary alone isn't enough, so the page's WordPress REST API version is fetched for full content. Default: true for feeds, false otherwise.
+* `always_arrays`: always return `category`, `photo`, `video`, `audio`, `syndication`, `like-of`, `repost-of`, `bookmark-of` and `in-reply-to` as arrays, as Microsub does. Default false, which follows jf2: a single value is not wrapped in an array.
+* `debug`: include the raw data each source was read from (`_meta`, `_jsonld`, `_json`, `_yt`, `_ombed`, `_rest`). Default false. Before 2.0.0 this was added whenever `WP_DEBUG` was on.
+To list a page's feeds instead, use `( new ParseThis\Discovery() )->fetch( $url )`.
+= Output format =
+Results follow [jf2](https://jf2.spec.indieweb.org/), with a few deliberate differences:
+* A feed's entries are in `items`, as in Microsub timelines, rather than the JF2 Feed profile's `children`.
+* Nested objects with a URL (citations, cards, events, products and any other type) are stored in `refs`, keyed by URL, as XRay does, rather than jf2's `references`. The property holds the URL. Authors stay cards.
+* Microformats properties that Parse This doesn't know are passed through as they are.
+* Entries get a `post-type` property from [Post Type Discovery](https://www.w3.org/TR/post-type-discovery/).
+* Reviews can be an h-review, or an h-entry with `review-of` (a URL, or a nested h-cite, h-card, h-event, h-item or h-product) and `rating`, `best` and `worst`, as proposed in [microformats/h-entry#32](https://github.com/microformats/h-entry/issues/32) and published by Post Kinds. Both, and an h-entry that is also an h-review, get the post type `review`.
+* `author` is always a card (or a list of cards), never a plain string.
+* Properties starting with an underscore (`_links`, `_rest`, ...) are internal or debugging data.
+* A fetched result has `_code`, the HTTP status (or the status the page declares with `<meta http-equiv="Status">`, such as 410 for a deleted post's stub), and `_source_format`, what it was read from: `mf2+html` (microformats), `html` (meta tags only), `mf2+json`, `jf2+json`, `feed+json` (JSON Feed), `xml` (RSS or Atom) or `wordpress` (REST API). After redirects, the document is read from, and relative links resolve against, the address it ended up at.
+* When a URL can't be parsed, `fetch()` returns a `WP_Error`: `invalid-url`, `not_found` (404), `unauthorized` (401), `forbidden` (403), `http_error` (any other 4xx or 5xx, with the status as `response_code` in the error data), `content-type` (a format Parse This doesn't read), or the request error itself (a timeout, for example).
+Values from fetched pages are sanitized: URL properties only contain `http` and `https` URLs, plain-text properties (`name`, `summary`, `category`, `content`'s `text`) have no HTML tags, and `content`'s `html` is limited to a safe set of tags. Escape values when you output them all the same, as with any remote data. Debugging data (`_jsonld`, `_meta`, ...) is not sanitized.
+= REST API =
+`GET /wp-json/parse-this/1.0/parse?url=https://example.com/`
+* `url` (required): the URL to parse.
+* `return`, `follow`, `references`, `location`, `require_content`, `always_arrays`, `debug`: as for `parse()` above.
+* `mf2`: return mf2 instead of jf2.
+* `discovery`: list the URL's feeds instead of parsing it.
+* `nocache`: fetch the URL again instead of using a cached result.
+Results are cached for 15 minutes per URL and set of parameters, so pasting the same link again doesn't fetch it again. Requests with `debug` are never cached.
+The endpoint requires the `edit_posts` capability (Contributors and above); the `parse_this_rest_capability` filter changes it. Anyone who can use it can also try it from **Tools > Parse This**.
+= Filters =
+* `pt_rewrite_secure`: the list of domains whose `http://` URLs are upgraded to `https://` before fetching.
+* `parse_this_img_filters`: an image URL found in a page, after the built-in exclusions (ads, spinners, tracking pixels and so on). Return an empty string to drop it.
+* `parse_this_url_shorteners`: the hosts treated as link shorteners. Links to them in a summary are expanded to where they redirect; other links are left as they are, without a request.
+* `parse_this_native_html_parser`: whether to parse HTML with PHP's own HTML5 parser on PHP 8.4 and later. Default true. Return false to use the bundled masterminds/html5 parser instead; the two only differ on invalid markup, where PHP's parser does what browsers do.
+* `parse_this_max_requests`: how many further requests one parse may make for followed author pages and short-link expansion. Default 10. Receives the URL.
+* `parse_this_cache_lifetime`: how long REST endpoint results are cached, in seconds. Default 15 minutes. Return 0 to turn caching off. Receives the URL.
+* `parse_this_rest_api_jf2_type`: the jf2 type for a post read through a site's WordPress REST API. Default `entry`. Receives the REST API post object, which includes its WordPress post type, and the site's REST API root URL.
+= Helper functions =
+All classes and functions are in the `ParseThis` namespace.
+* `ParseThis\mf2_to_jf2()` and `ParseThis\jf2_to_mf2()` convert between the two formats.
+* `ParseThis\post_type_discovery()` returns the IndieWeb post type (note, article, reply, like, photo, ...) of a jf2 or mf2 entry.
+* `ParseThis\jf2_references()` and `ParseThis\jf2_location()` apply the `references` and `location` transformations to any jf2 object.
+Every function and class is documented in the source.
+= Upgrading from 1.x =
+Version 2.0.0 moved everything into the `ParseThis` namespace and dropped the `Parse_This_` prefix from class names (for example `Parse_This_MF2` is now `ParseThis\MF2`, and `Parse_This` is `ParseThis\Parser`). The old names that Post Kinds and Yarns use still work for now, as deprecated aliases:
+* Classes: `Parse_This`, `Parse_This_Discovery`, `Parse_This_MF2`, `Parse_This_MF2_Utils` and `REST_Parse_This`.
+* Functions: `mf2_to_jf2()`, `jf2_to_mf2()`, `post_type_discovery()`, `pt_load_domdocument()` and `seconds_to_iso8601()`.
+Other old global names are no longer defined. Please switch to the namespaced names.
+= Using Parse This from another plugin =
+The recommended way is to require the Parse This plugin rather than bundle a copy. On WordPress 6.5 and later, add `Requires Plugins: parse-this` to your plugin's header. On older WordPress and ClassicPress, which don't read that header, check that Parse This is loaded and new enough before using it:
+    add_action( 'plugins_loaded', function () {
+        if ( ! defined( 'PARSE_THIS_VERSION' ) || version_compare( PARSE_THIS_VERSION, '2.0.0', '<' ) ) {
+            // Show a notice asking for Parse This 2.0.0 or later, and skip the features that need it.
+            return;
+        }
+        // Use ParseThis\Parser and the rest here.
+    }, 11 );
+`PARSE_THIS_VERSION` is the version of the copy of Parse This that loaded. It isn't defined by copies older than 2.0.0, so an older copy bundled in another plugin shows up as missing. The `parse_this_loaded` action fires, with the version, once Parse This has loaded.
+= Bundling Parse This in another plugin =
+If you do bundle it, copy the plugin into your plugin (for example under `lib/parse-this/`) and load it only if the standalone plugin hasn't already, from `plugins_loaded` at priority 10 or later:
+    add_action( 'plugins_loaded', function () {
+        if ( ! function_exists( 'parse_this_loader' ) ) {
+            require_once __DIR__ . '/lib/parse-this/parse-this.php';
+            parse_this_loader();
+        }
+    }, 11 );
+The standalone plugin loads at priority 9, so when it is active it is used instead of your copy. Every function is also wrapped in `function_exists()` and classes are loaded by an autoloader, so if two copies do load, the first one wins.
+Copies of Parse This 1.x bundled in other plugins keep working alongside 2.0: when the standalone plugin is active, their calls to the old names listed under "Upgrading from 1.x" are served by the standalone plugin.
 == Frequently Asked Questions ==
+= What is jf2? =
+jf2 is a JSON format derived from microformats2, but simpler: single values aren't wrapped in arrays, and types drop the `h-` prefix. See the [jf2 specification](https://jf2.spec.indieweb.org/).
+= Why does a page return only a title and a URL? =
+That page has no microformats, JSON-LD or useful meta tags, or it blocks automated requests. The **Tools > Parse This** page shows exactly what was parsed for a URL.
+= Which copy is used when several plugins bundle Parse This? =
+The first one loaded. If the standalone plugin is active, it is that one. See "Bundling Parse This in another plugin" above.
+= Does it work with ClassicPress? =
+Yes. It is tested with ClassicPress 2.7 on PHP 7.4 to 8.3.
 == Changelog ==
+= 2.0.0 ( 2026-10-03 ) =
+A major update. Please read "Upgrading from 1.x" if another plugin of yours uses Parse This.
+Requirements:
+* Requires PHP 7.4 and WordPress 6.2, or ClassicPress 2.x. Tested up to WordPress 7.1 and PHP 8.5.
+Changes to be aware of:
+* Everything is in the `ParseThis` namespace, and class names drop the `Parse_This_` prefix (`Parse_This` is now `ParseThis\Parser`). The old names Post Kinds and Yarns use still work, as deprecated aliases.
+* Output: nested objects with a URL move to `refs`; authors are always cards; RSS and Atom items use `post-type` (not `post_type`); unknown microformats properties are kept; and fetched results carry `_code` and `_source_format`.
+* `fetch()` returns a `WP_Error` for HTTP error pages (`not_found`, `unauthorized`, `forbidden`, `http_error`) instead of parsing them; a 410 Gone page is still parsed.
+* The REST endpoint and the Tools > Parse This page require the `edit_posts` capability (filterable with `parse_this_rest_capability`), and its parameters are validated.
+* Raw source data (`_meta`, `_jsonld` and so on) is only included with the new `debug` argument, not whenever `WP_DEBUG` is on.
+* Plugins that use Parse This should require it rather than bundle it: see "Using Parse This from another plugin". `PARSE_THIS_VERSION` and the `parse_this_loaded` action help with that.
+* The Instagram parser and the `ifset()` helper are removed.
+New:
+* Microformats always come first; JSON-LD, meta tags and the REST API only fill gaps. The `require_content` argument controls when a summary is enough.
+* Microformats: choose the item a busy page is about; the full authorship algorithm, with feed entries inheriting the feed's author; reviews as an h-entry with `review-of`, `rating`, `best` and `worst` (as Post Kinds publishes them); complete h-event, h-review and h-recipe parsing; `follow-of`; and every value of repeated properties.
+* Links with a fragment parse just that element; WordPress comment links fall back to the site's REST API.
+* JSON-LD: reviews, products, recipes, and Article and Event subtypes, preferred over the WebPage node SEO plugins add.
+* Feeds and JSON served with the wrong content type are recognized. JSON Feed items get plain text, a `post-type` and absolute URLs.
+* Discovery finds mf2 JSON alternates, `rel=feed` links, RSS 1.0, multi-value `rel` attributes and JSON Feeds advertised as `application/json`, and follows permanent redirects.
+* PHP's own HTML5 parser is used on PHP 8.4 and later: several times faster, and it handles invalid markup as browsers do (`parse_this_native_html_parser` turns it off).
+* The `always_arrays` argument returns Microsub-style arrays.
+* New filters: `parse_this_rest_api_jf2_type`, `parse_this_url_shorteners`, `parse_this_max_requests`, `parse_this_cache_lifetime`, `parse_this_rest_capability` and `parse_this_native_html_parser`.
+Fixes:
+* More than 50 bugs, many of them fatal errors on PHP 8, across RSS and Atom, the WordPress REST API, JSON-LD, meta tags, microformats, JSON Feed, X (Twitter), YouTube and feed discovery.
+* Content HTML no longer loses the text before its first tag, and escaped text (`&lt;code&gt;`) no longer turns into markup.
+* REST API posts are dated from their GMT dates; YouTube pages are read in full; titles that only repeat the content are dropped; names and ratings of "0" are kept; post types follow Post Type Discovery.
+Performance:
+* Feeds are downloaded once rather than twice; only link-shortener URLs in summaries are expanded; REST API tags and site details need far fewer requests; followed author pages are fetched once per request; REST endpoint results are cached for 15 minutes (`nocache` and `parse_this_cache_lifetime`).
+Security:
+* Output from fetched pages is sanitized (URLs limited to http and https, tags stripped from plain text, a safe set of HTML tags in content); one parse makes at most 10 further requests; the debug page sends its nonce in a header; plugin files exit when loaded outside WordPress; the OPML class handles invalid input safely.
+Developers:
+* Core's `fetch_feed()` is used for RSS and Atom; all requests go through `ParseThis\pt_remote_get()`.
+* The bundled php-mf2 (0.5.0) and masterminds/html5 (2.11.0) are updated, and polyfills WordPress 6.2 provides are removed.
+* Every function, class and hook is documented, and the plugin is tested on WordPress 6.2, the latest WordPress and ClassicPress 2.7 with PHP 7.4 to 8.5.
 = 1.0.1 ( 2021-04-02 ) =
 …
 = 1.0.0 ( 2020-12-15 ) =
 * First Official Release. Prior to this point it was in a point release.
+== Upgrade Notice ==
+= 2.0.0 =
+A major update: classes and functions move to the ParseThis namespace (the old names Post Kinds and Yarns use still work), the output format changes in places, and the REST endpoint now requires the edit_posts capability. Requires PHP 7.4 and WordPress 6.2.

indieweb-post-kinds/trunk/readme.txt

-              r3067251
+              r3738687
 Contributors: dshanske
 Tags: indieweb, interaction, posts, webmention, share, like, scrobble
 Stable tag: 3.7.3
 Requires at least: 4.9.9
 Requires PHP: 7.0
 Tested up to: 6.5
+Stable tag: 4.0.0
+Requires at least: 6.2
+Requires PHP: 7.4
+Tested up to: 7.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 Many sites will not need all of the kinds set up. What kinds of posts you wish to publish are specific to your needs.
+Post Kinds requires PHP 7.4 or later and WordPress 6.2 or later. It also supports ClassicPress 2.7.3 or later.
 == Screenshots ==
 …
 == Upgrade Notice ==
+= 4.0.0 =
+Requires PHP 7.4 and WordPress 6.2 or ClassicPress 2.7.3. Response data is now escaped, changing some display helpers; stored post data upgrades in the background. Posts from apps and the REST API now get the Default Kind (Note unless changed), not Article. See the changelog.
 = 3.7.0 =
 …
 either a response to something, such as a URL, or a more passive type of post where you are recording/logging something you did, for
 example, watched a movie.
+When you write a post in the Classic Editor, choose its kind in the Kind box. For kinds that respond to something, fill in the Response Properties box:
+ * **URL** - the page you are responding to. When you leave this field, the plugin fetches the page and fills in the other fields from it where it can. You can edit or clear anything it fills in.
+ * **Name** - the title of what you are responding to.
+ * **RSVP** and **Rating** - shown only for the kinds that use them: RSVP for RSVPs, and a rating for reviews, listens, watches, reads, plays and similar.
+ * **Details** - more about what you are responding to: a summary, quote or caption (plain text), the site name, publication or album, when it was published and updated, its tags (separated by semicolons) and a featured image URL. For listens, watches, photos and similar, it also has the duration, or a start and end time.
+ * **Author** - the name, URL and photo of the author or artist. Separate several authors with semicolons.
+ * **Upload or Attach Media** - for photo, video and audio posts, attaches a file from the media library.
+ * **Clear** - empties every field.
+The plugin uses these fields to display the response above your post's content, marked up with [microformats](https://microformats.org/wiki/h-entry) so other sites can read it.
 = How do I interact with other sites? =
 …
 However if you are interested in creating your own there is functionality around it.
 register_post_kind(
         'reply',
+        register_post_kind(
+                'reply',
                 array(
+                        'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ), // Name for one instance of the kind
+                        'name'            => __( 'Replies', 'indieweb-post-kinds' ), // General name for the kind plural
+                        'verb'            => __( 'Replied to', 'indieweb-post-kinds' ), // The string for the verb or action (liked this)
+                        'property'        => 'in-reply-to', // microformats 2 property
+                        'format'          => 'link', // Post Format that maps to this
+                        'description'     => __( 'a reply to content typically on another site', 'indieweb-post-kinds' ),
+                        'description-url' => 'http://indieweb.org/reply',
+                        'title'           => false, // Should this kind have an explicit title
+                        'show'            => true, // Show in Settings
+                        )
+                        'singular_name'   => __( 'Reply', 'indieweb-post-kinds' ), // Name for one instance of the kind.
+                        'name'            => __( 'Replies', 'indieweb-post-kinds' ), // General name for the kind, plural.
+                        'verb'            => __( 'Replied to', 'indieweb-post-kinds' ), // The verb or action, such as "Liked".
+                        'property'        => 'in-reply-to', // Microformats 2 property.
+                        'format'          => 'link', // Post format that maps to this kind.
+                        'description'     => __( 'a reply to content typically on another site', 'indieweb-post-kinds' ),
+                        'description_url' => 'http://indieweb.org/reply',
+                        'title'           => false, // Whether this kind should have an explicit title.
+                        'show'            => true, // Whether to show the kind in Settings.
+                )
 );
 Add a function with your kind in the above format, hooking it in the init hook and it will add the Kind to the system.
+        );
+Call it from a function hooked to `init` and it will add the Kind to the system. The [developer notes](https://github.com/dshanske/indieweb-post-kinds/blob/trunk/develop.txt) list the other arguments.
 = Can I enable one of the Kinds you plan to offer in future? =
 …
 `set_post_kind_visibility( $slug, $show = true )` - If you add this function in early on, it will change the visibility of a kind.
 = Can I create archives for each kind? ==
+= Can I create archives for each kind? =
 Post Kinds automatically handles the display of archives of individual types. So to view all the posts marked as "note", for example, one could visit the URL http://www.YOURSITE.COM/kind/note/.
 Simply replace YOURSITE.COM with your particular site name and the particular post kind name to access the others.
+To use another word than "kind" in these URLs, for example in your own language, set the Kind base on Settings > Permalinks. Links to the old URLs then stop working, as when the category base changes.
 You can also add the date /kind/note/2018/12/24 to see date-based archives.
+For archives if you add exclude_kind as a query variable it will exclude specific kinds from the query `?exclude=kind&exclude_terms=note`. You can also do this as /exclude/kind/note,checkin as it accepts multiple values
 There is also a special photo photo included, using ?kind_photos=1 or /photos or /photos/yyyy or /photos/yyyy/mm or /photos/kind/note or any other taxonomy. This will use the photo enhancements introduced in 3.4.0 to only show photos from
+To leave specific kinds out of an archive, use `?exclude=kind&exclude_terms=note` or /exclude/kind/note,checkin, which accepts several kinds.
+There is also a special photo archive, using ?kind_photos=1 or /photos or /photos/yyyy or /photos/yyyy/mm or /photos/kind/note or any other taxonomy. This will use the photo enhancements introduced in 3.4.0 to only show photos from
 all types of posts.
 …
 == Theme Support ==
+Post Kinds automatically adds information to `the_content` and `the_excerpt` filter. Being as this is inside the content block, which may or may not be desirable, you may remove these filters as noted
+below and call `kind_display` directly. This will allow it to appear outside the content block. To remove the automatic display, add the following to your theme.
+        * `add_filter( 'kind_content_display', '__return_false' );`
+The functions `has_post_kind`, `set_post_kind`, and `set_post_kind` will allow you to manipulate the kind settings in a post. `get_post_kind_string` will return the display name of a kind.
+If you want to customize the look of the display, you can create a directory in your theme called `kind_views`, copy the file from the views directory of the plugin, and modify it. This will persist
+through future plugin updates.
+Post Kinds works with most themes without changes. It adds the response (what you replied to, liked, listened to and so on) to the post's content and excerpt, and to feeds.
+To place the response somewhere else in your theme, turn off the automatic display and call `kind_display()` in your template where you want it:
+        add_filter( 'kind_content_display', '__return_false' );
+Many kinds have no title. In templates that list posts, `kind_get_the_title()` returns the post's title, or generates one from the kind and what it responds to.
+To change how a kind looks, create a `kind_views` folder in your theme, copy the view from the plugin's `views` folder into it, and edit the copy. It persists through plugin updates, but it doesn't receive fixes: compare it with the plugin's views after upgrading.
+To style responses, target the `.response` wrapper that each view uses, and `.kind-embed` around embedded content.
+The template functions, hooks and view variables are listed in the [developer notes](https://github.com/dshanske/indieweb-post-kinds/blob/trunk/develop.txt).
 == Changelog ==
+* 3.7.3 ( 2024-04-09 ) =
+= 4.0.0 ( 2026-10-10 ) =
+* Raise the minimum requirements to PHP 7.4 and WordPress 6.2, and declare ClassicPress 2.7.3 support
+* The `kind` field in the REST API now has a description and lists the valid kinds; an unknown kind is rejected with `rest_invalid_param`
+* When the old IndieWeb Taxonomy plugin is active, activation now stops with a translatable message and deactivates Post Kinds itself, instead of a file that isn't a plugin
+* The Default Kind setting applies to every new post without a kind, including posts from apps, the REST API, Quick Draft and scheduled drafts, which used to get Article. Set Default Kind to Article to keep the old behaviour. A translated site no longer gets a stray copy of the Article kind
+* Escape response data in views, the editor, widgets and settings; summaries are displayed as plain text
+* Sanitize input from the editor, the media modal's artist fields, settings and widgets; citation summaries are saved as plain text
+* An RSVP can now be cleared in the editor
+* Fix the Response Properties box disappearing for every kind after another box was collapsed while editing a note or article; it can no longer be hidden through Screen Options, since the editor shows it only for kinds that use it
+* Kind icons can be resized from a theme with any rule, such as `.svg-icon { width: 1rem; height: 1rem; }`. The inline style is gone, the plugin's styles have no specificity, and icons have a default size where the stylesheet doesn't load, such as feed readers
+* Deleting the plugin removes its settings and scheduled events, on every site of a multisite network. Posts, their kinds and their response data are kept
+* Several authors are saved as one h-card each, pairing the semicolon-separated names, URLs and photos by position, and every author is displayed. Lists of authors from Micropub or link previews are shown and filled in too. Authors saved by earlier versions are read the same way. An author with a URL but no photo is linked, and clearing the author fields removes the authors
+* Add a Kind base setting to Settings > Permalinks, to change the `kind` in kind archive URLs such as /kind/like/, and the `kind_base_slug` filter
+* Fix durations calculated from the start and end times never being shown; `calculate_duration()` now also accepts date objects
+* Require the edit_posts capability for the post-kinds/1.0/fields REST route; an unknown kind returns a 404
+* Add a background upgrade that moves and repairs stored citations and records the media in each post; `wp post-kinds upgrade` runs it on demand (`--dry-run`, `--post=<id>`)
+* Fix citations losing their type when viewed (a checkin lost its h-card, for example) and nesting inside themselves when saved again; the upgrade repairs existing posts
+* Fix old citations stored as a plain URL being lost when viewed, and a PHP 8 fatal error when MF2_Post read very old response data
+* Reading a post no longer writes to the database or downloads remote photos
+* Performance: the media scan on save covers posts only and reads the content once; attachment lookups are cached; the photos archive and the home page kind filter use simpler queries; the settings page only writes kind terms that changed; icons, time zone offsets and permalink kinds are cached; the media fragment script loads only where there is audio or video, deferred
+* The Kind Post widget prints nothing when it has no posts, instead of an unclosed wrapper
+* New kind terms are named after the kind rather than its slug
+* Feed change: The RSS and Atom feeds use WordPress's own templates instead of copies, and other plugins' feed handlers are no longer removed. Posts without a title have an empty title element instead of none, so the Atom feed is valid; turn on "Automatically add the Kind to the Title" to fill it in. Dates are written in UTC. In comment feeds, comments on untitled posts name the post.
+* Deprecated: The global functions `display_formatted_datetime()`, `divide_datetime()`, `build_datetime()`, `get_datetime_offset()`, `divide_interval()` and `build_interval()`. Use the `Kind_Time` methods of the same names. The global names still work but report a deprecation notice when debugging is on, and they will be removed in the next major release (5.0.0). Custom views copied into a theme may call them, so update those to the `Kind_Time` methods.
+* Display change: Custom views copied into a theme's `kind_views` folder keep their old code. Copy them again from the plugin's `views` folder, or escape their output.
+* Display change: Citation summaries are plain text, marked up as `p-summary` instead of `e-summary`. `Kind_View::get_summary()` returns the summary markup.
+* Display change: `Kind_View::get_hcard()`, `get_cite_title()`, `get_site_name()`, `get_embed()`, `get_url_link()` and `display_duration()` return escaped markup; HTML passed as a name is shown as text.
+* Display change: `kind_get_the_title()` escapes the content before the `kind_get_the_title_content` filter.
+* Display change: `Kind_View::rsvp_text()` takes optional URL and name arguments and returns the full sentence. Called with only a type, it still returns a printf-ready string. The RSVP strings have changed, so translations need updating.
+* Display change: `Kind_View::rating_text()` ignores non-numeric ratings and shows at most 10 stars.
+* Upgrade change: Published posts with no kind are given one, based on their stored response properties, or Article. If the home page shows only selected kinds, Article is added to them so those posts stay; posts given another kind, such as Like, follow the selection.
+* Upgrade change: Until the background upgrade reaches them, older posts may be missing from the photos archive; `wp post-kinds upgrade` finishes it at once.
+* Removed: The `kind_photo_shortcode_exclude` filter, which never ran.
+* Behaviour change: `MF2_Post::get_images()` no longer imports remote photos into the media library; it returns media library attachments only.
+* Deprecated: The `MF2_Post` class. Use `Kind_Post`. Creating an `MF2_Post` reports a deprecation notice when debugging is on; the class will be removed in a future major version.
+= 3.7.3 ( 2024-04-09 ) =
 * Ensure widget array is instantiated

indieweb-post-kinds/trunk/templates/reply-author.php

-              r2399112
+              r3738687
+<?php
+/**
+ * Author tab of the Post Kinds metabox.
+ *
+ * Included by reply-metabox.php.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ *
+ * @var array $cite The citation, normalized by Kind_Post::normalize_cite().
+ */
+defined( 'ABSPATH' ) || exit;
+?>
         <div id="kind-author" class="hide-if-js">
         <h4> <?php _e( 'Information on the Author or Artist of the Piece', 'indieweb-post-kinds' ); ?></h4>
                 <?php _e( '(Multiple Entries separated by semicolon)', 'indieweb-post-kinds' ); ?><BR />
+        <h4> <?php esc_html_e( 'Information on the Author or Artist of the Piece', 'indieweb-post-kinds' ); ?></h4>
+                <?php esc_html_e( '(Multiple Entries separated by semicolon)', 'indieweb-post-kinds' ); ?><BR />
         <p class="field-row">
         <label for="cite_author_name" class="three-quarters">
                 <?php _e( 'Author', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_author_name" id="cite_author_name" class="widefat" value="<?php echo $cite['author']['name']; ?>" />
+                <?php esc_html_e( 'Author', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_author_name" id="cite_author_name" class="widefat" value="<?php echo esc_attr( $cite['author']['name'] ); ?>" />
         </label>
         </p>
         <p class="field-row">
         <label for="cite_author_url" class="three-quarters">
                 <?php _e( 'Author URL', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_author_url" id="cite_author_url" class="widefat" value="<?php echo $cite['author']['url']; ?>" />
+                <?php esc_html_e( 'Author URL', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_author_url" id="cite_author_url" class="widefat" value="<?php echo esc_attr( $cite['author']['url'] ); ?>" />
         </label>
         </p>
         <p class="field-row">
         <label for="cite_author_photo" class="three-quarters">
                 <?php _e( 'Author Photo URL', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_author_photo" id="cite_author_photo" class="widefat" value="<?php echo $cite['author']['photo']; ?>" />
+                <?php esc_html_e( 'Author Photo URL', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_author_photo" id="cite_author_photo" class="widefat" value="<?php echo esc_attr( $cite['author']['photo'] ); ?>" />
         </label>
         </p>

indieweb-post-kinds/trunk/templates/reply-details.php

-              r2399112
+              r3738687
+<?php
+/**
+ * Details tab of the Post Kinds metabox.
+ *
+ * Included by reply-metabox.php; includes reply-time.php.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ *
+ * @var Kind_Post $kind_post The post being edited.
+ * @var array     $cite      The citation, normalized by Kind_Post::normalize_cite().
+ */
+defined( 'ABSPATH' ) || exit;
+?>
 <div id="kind-details" class="hide-if-js">
         <h4><?php _e( 'Information on what you are responding to', 'indieweb-post-kinds' ); ?></h4>
+                <h4><?php esc_html_e( 'Information on what you are responding to', 'indieweb-post-kinds' ); ?></h4>
         <label for="cite_summary">
                 <?php _e( 'Summary/Quote/Caption', 'indieweb-post-kinds' ); ?>
         <textarea name="cite_summary" id="cite_summary" data-role="none" class="widefat"><?php echo $cite['summary']; ?></textarea>
+                <?php esc_html_e( 'Summary/Quote/Caption', 'indieweb-post-kinds' ); ?>
+        <textarea name="cite_summary" id="cite_summary" data-role="none" class="widefat"><?php echo esc_textarea( html_entity_decode( wp_strip_all_tags( (string) $cite['summary'] ), ENT_QUOTES, get_bloginfo( 'charset' ) ) ); ?></textarea>
         </label>
         <p class="field-row">
         <label for="cite_publication" class="three-quarters">
                 <?php _e( 'Site Name/Publication/Album', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_publication" id="cite_publication" class="widefat" value="<?php echo $cite['publication']; ?>" />
+                <?php esc_html_e( 'Site Name/Publication/Album', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_publication" id="cite_publication" class="widefat" value="<?php echo esc_attr( $cite['publication'] ); ?>" />
         </label>
         </p>
         <p class="field-row">
                         <?php echo Kind_Metabox::kind_the_time( 'cite_published', __( 'Published/Released', 'indieweb-post-kinds' ), $cite['published'], 'published' ); ?>
                 <?php echo Kind_Metabox::kind_the_time( 'cite_updated', __( 'Updated', 'indieweb-post-kinds' ), $cite['updated'], 'updated' ); ?>
+                        <?php echo Kind_Metabox::kind_the_time( 'cite_published', __( 'Published/Released', 'indieweb-post-kinds' ), $cite['published'], 'published' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
+                <?php echo Kind_Metabox::kind_the_time( 'cite_updated', __( 'Updated', 'indieweb-post-kinds' ), $cite['updated'], 'updated' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
         </p>
         <label for="cite_tags">
                 <?php _e( 'Tags (semicolon separated)', 'indieweb-post-kinds' ); ?>
         <textarea name="cite_tags" id="cite_tags" data-role="none" class="widefat"><?php echo $cite['category'] ?></textarea>
+                <?php esc_html_e( 'Tags (semicolon separated)', 'indieweb-post-kinds' ); ?>
+        <textarea name="cite_tags" id="cite_tags" data-role="none" class="widefat"><?php echo esc_textarea( $cite['category'] ); ?></textarea>
         </label>
         <p class="field-row">
         <label for="cite_featured" class="three-quarters">
                 <?php _e( 'Featured Image', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_featured" id="cite_featured" class="widefat" value="<?php echo $cite['featured']; ?>" />
+                <?php esc_html_e( 'Featured Image', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_featured" id="cite_featured" class="widefat" value="<?php echo esc_attr( $cite['featured'] ); ?>" />
         </label>
         </p>

indieweb-post-kinds/trunk/templates/reply-metabox.php

-              r3001401
+              r3738687
 <?php
+/**
+ * Post Kinds metabox for the Classic Editor.
+ *
+ * Loaded by Kind_Metabox::reply_metabox(). It sets up $kind_post, $kind, $type
+ * and $cite, then includes reply-details.php and reply-author.php, which use them.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ */
+defined( 'ABSPATH' ) || exit;
 wp_nonce_field( 'replykind_metabox', 'replykind_metabox_nonce' );
 $kind_post = new Kind_Post( get_the_ID() );
 …
+}
+if ( empty( $cite['url'] ) && array_key_exists( 'kindurl', $_GET ) ) {
+        $cite['url'] = esc_url_raw( $_GET['kindurl'] );
+// phpcs:disable WordPress.Security.NonceVerification.Recommended -- Prefills the URL on the new post screen; nothing is saved.
+if ( empty( $cite['url'] ) && isset( $_GET['kindurl'] ) && is_string( $_GET['kindurl'] ) ) {
+        $cite['url'] = sanitize_url( wp_unslash( $_GET['kindurl'] ) );
+}
+// phpcs:enable WordPress.Security.NonceVerification.Recommended
 $attachment = 0;
 …
 if ( in_array( $kind, array( 'audio', 'video', 'photo' ) ) ) {
         $attachment = attachment_url_to_postid( $cite['url'] );
+        $attachment = empty( $cite['url'] ) ? 0 : Kind_Post::get_attachment_id( $cite['url'] );
         if ( $attachment ) {
                 $attachment_post = new Kind_Post( $attachment );
 …
 ?>
 <a href="#kind-details" class="show-kind-details button hide-if-no-js"><?php _e( 'Details', 'indieweb-post-kinds' ); ?></a>
 <a href="#kind-author" class="show-kind-author-details button hide-if-no-js"><?php _e( 'Author', 'indieweb-post-kinds' ); ?></a>
 <a id="add-kind-media" class="button hide-if-no-js hidden" href="javascript:;">Upload or Attach Media</a>
 <button class="clear-kindmeta-button button hide-if-no-js"><?php _e( 'Clear', 'indieweb-post-kinds' ); ?></button>
+<a href="#kind-details" class="show-kind-details button hide-if-no-js"><?php esc_html_e( 'Details', 'indieweb-post-kinds' ); ?></a>
+<a href="#kind-author" class="show-kind-author-details button hide-if-no-js"><?php esc_html_e( 'Author', 'indieweb-post-kinds' ); ?></a>
+<a id="add-kind-media" class="button hide-if-no-js hidden" href="javascript:;"><?php esc_html_e( 'Upload or Attach Media', 'indieweb-post-kinds' ); ?></a>
+<button class="clear-kindmeta-button button hide-if-no-js"><?php esc_html_e( 'Clear', 'indieweb-post-kinds' ); ?></button>
 <p class="field-row">
         <label for="cite_url" class="three-quarters">
                 <?php _e( 'URL', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_url" id="cite_url" class="widefat" value="<?php echo $cite['url']; ?>" />
+                <?php esc_html_e( 'URL', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_url" id="cite_url" class="widefat" value="<?php echo esc_attr( $cite['url'] ); ?>" />
         </label>
 </p>
 <p class="field-row">
         <label for="cite_name" class="three-quarters">
                 <?php _e( 'Name', 'indieweb-post-kinds' ); ?>
                         <input type="text" name="cite_name" id="cite_name" class="widefat" value="<?php echo $cite['name']; ?>" />
+                <?php esc_html_e( 'Name', 'indieweb-post-kinds' ); ?>
+                        <input type="text" name="cite_name" id="cite_name" class="widefat" value="<?php echo esc_attr( $cite['name'] ); ?>" />
         </label>
 </p>
 <p class="field-row hide-if-js" id="rsvp-option">
         <?php echo Kind_Metabox::rsvp_select( $kind_post->get( 'rsvp' ) ); ?>
+        <?php echo Kind_Metabox::rsvp_select( $kind_post->get( 'rsvp' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::rsvp_select() escapes its output. ?>
 </p>
 <p class="field-row hide-if-js" id="rating-option">
         <?php echo Kind_Metabox::rating_select( $kind_post->get( 'rating' ) ); ?>
+        <?php echo Kind_Metabox::rating_select( $kind_post->get( 'rating' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::rating_select() escapes its output. ?>
 </p>
 <p id="kind-media hide-if-no-js">
 …
         } elseif ( wp_attachment_is( 'audio', $attachment ) ) {
                 $view = new Kind_Media_View( $attachment, 'audio' );
                 echo $view->get();
+                echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
         } elseif ( wp_attachment_is( 'video', $attachment ) ) {
                 $view = new Kind_Media_View( $attachment, 'video' );
                 echo $view->get();
+                echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+        }
+}
 ?>
         </div>
         <input type="hidden" id="cite_media" name="cite_media" value="<?php echo $attachment; ?>" >
+        <input type="hidden" id="cite_media" name="cite_media" value="<?php echo absint( $attachment ); ?>" >
 </p>

indieweb-post-kinds/trunk/templates/reply-time.php

-              r2399112
+              r3738687
+<?php $duration = divide_interval( $kind_post->get_duration() ); ?>
+<?php
+/**
+ * Duration fields of the Post Kinds metabox.
+ *
+ * Included by reply-details.php.
+ *
+ * @package Post_Kinds
+ * @since   3.0.0
+ *
+ * @var Kind_Post $kind_post The post being edited.
+ */
+defined( 'ABSPATH' ) || exit;
+$duration = Kind_Time::divide_interval( $kind_post->get_duration() ); ?>
 <div id="kind-time" class="hide-if-js">
         <h4><?php _e( 'Duration', 'indieweb-post-kinds' ); ?></h4>
+        <h4><?php esc_html_e( 'Duration', 'indieweb-post-kinds' ); ?></h4>
         <p class="field-row">
         <label for="duration" class="eighth">
                 <?php _e( 'Years', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_years" id="duration_years" size="3" value="<?php echo $duration['Y']; ?>" />
+                <?php esc_html_e( 'Years', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_years" id="duration_years" size="3" value="<?php echo absint( $duration['Y'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Months', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_months" id="duration_months" size="2" min="0" max="12" value="<?php echo $duration['M']; ?>" />
+                <?php esc_html_e( 'Months', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_months" id="duration_months" size="2" min="0" max="12" value="<?php echo absint( $duration['M'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Days', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_days" id="duration_days" size="2" min="0" max="30" value="<?php echo $duration['D']; ?>" />
+                <?php esc_html_e( 'Days', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_days" id="duration_days" size="2" min="0" max="30" value="<?php echo absint( $duration['D'] ); ?>" />
         </label>
         <p>
         <p class="field-row">
         <label for="duration" class="eighth">
                 <?php _e( 'Hours', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_hours" id="duration_hours" size="2" min="0" max="12" value="<?php echo $duration['H']; ?>" />
+                <?php esc_html_e( 'Hours', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_hours" id="duration_hours" size="2" min="0" max="12" value="<?php echo absint( $duration['H'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Minutes', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_minutes" id="duration_minutes" size="2" min="0" max="60" value="<?php echo $duration['I']; ?>" />
+                <?php esc_html_e( 'Minutes', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_minutes" id="duration_minutes" size="2" min="0" max="60" value="<?php echo absint( $duration['I'] ); ?>" />
         </label>
         <label for="duration" class="eighth">
                 <?php _e( 'Seconds', 'indieweb-post-kinds' ); ?>
                         <input type="number" name="duration_seconds" id="duration_seconds" size="2" min="0" max="60" value="<?php echo $duration['S']; ?>" />
+                <?php esc_html_e( 'Seconds', 'indieweb-post-kinds' ); ?>
+                        <input type="number" name="duration_seconds" id="duration_seconds" size="2" min="0" max="60" value="<?php echo absint( $duration['S'] ); ?>" />
         </label>
         </p>
         <h4> <?php _e( 'Start Time and End Time will be Used to Calculate Duration if Duration Not Set.', 'indieweb-post-kinds' ); ?> </h4>
+        <h4> <?php esc_html_e( 'Start Time and End Time will be Used to Calculate Duration if Duration Not Set.', 'indieweb-post-kinds' ); ?> </h4>
         <p class="field-row">
                 <?php echo Kind_Metabox::kind_the_time( 'mf2_start', __( 'Start Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'start' ), 'start' ); ?>
                 <?php echo Kind_Metabox::kind_the_time( 'mf2_end', __( 'End Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'end' ), 'end' ); ?>
         </p>
+                                <?php echo Kind_Metabox::kind_the_time( 'mf2_start', __( 'Start Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'start' ), 'start' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
+                                <?php echo Kind_Metabox::kind_the_time( 'mf2_end', __( 'End Time', 'indieweb-post-kinds' ), $kind_post->get_datetime_property( 'end' ), 'end' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Metabox::kind_the_time() escapes its output. ?>
+                </p>
 </div>

indieweb-post-kinds/trunk/views/kind-article.php

-              r1828595
+              r3738687
 <?php
 /*
  * Article Template
+/**
+ * Article view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.4.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;

indieweb-post-kinds/trunk/views/kind-audio.php

-              r2406063
+              r3738687
 <?php
 /*
  * Audio Template
+/**
+ * Audio view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+$audios = $kind_post->get_audio();
+$duration = null;
+defined( 'ABSPATH' ) || exit;
+$audios      = $kind_post->get_audio();
+$duration    = null;
 $publication = null;
 …
         if ( 1 === count( $audios ) && 0 !== $audios[0] ) {
                 $audio_attachment = new Kind_Post( $audios[0] );
                 $cite = mf2_to_jf2( $audio_attachment->get_cite() );
+                $cite             = \ParseThis\mf2_to_jf2( $audio_attachment->get_cite() );
                 if ( ! $cite ) {
                         $cite = array();
 …
                         $author = Kind_View::get_hcard( $cite['author'] );
                 } else {
                         $author    = null;
+                        $author = null;
+                }
                 if ( array_key_exists( 'duration', $cite ) ) {
 …
 <section class="response">
 <header>
+<?php echo Kind_Taxonomy::get_before_kind( 'audio' );
+<?php
+echo Kind_Taxonomy::get_before_kind( 'audio' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( isset( $cite['name'] ) ) {
         echo sprintf( '<span>%1s</a>', $cite['name'] );
+        printf( '<span class="p-name">%1$s</span>', esc_html( $cite['name'] ) );
+}
 if ( $duration ) {
         printf( '(%1$s)', $duration );
+        printf( '(%1$s)', $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+}
 ?>
 …
 <?php
 if ( $embed ) {
         printf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
 } elseif ( $audios ) {
         $view = new Kind_Media_View( $audios, 'audio' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}

indieweb-post-kinds/trunk/views/kind-bookmark.php

-              r2467905
+              r3738687
 <?php
 /*
  * Bookmark Template
+/**
+ * Bookmark view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'bookmark' );
+echo Kind_Taxonomy::get_before_kind( 'bookmark' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $cite['url'] ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $cite['url'], $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', esc_html( $cite['name'] ) );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', esc_html( $cite['publication'] ) );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 <?php
 if ( ! empty( $embed ) ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
 } elseif ( ! empty( $cite['summary'] ) ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+} else {
+        echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-checkin.php

-              r2459401
+              r3738687
 <?php
 /*
  * Checkin Template
+/**
+ * Checkin view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'checkin' );
+echo Kind_Taxonomy::get_before_kind( 'checkin' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( empty( $cite['name'] ) ) {
 …
+        }
         if ( ! empty( $url ) ) {
                 echo sprintf( '<a href="%1s" class="u-checkin h-card">%2s</a>', $url, $cite['name'] );
+                printf( '<a href="%1$s" class="u-checkin h-card">%2$s</a>', esc_url( $url ), esc_html( $cite['name'] ) );
         } else {
                 echo sprintf( '<span class="h-card p-checkin">%1s</span>', $cite['name'] );
+                printf( '<span class="h-card p-checkin">%1$s</span>', esc_html( $cite['name'] ) );
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        }
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-drink.php

-              r2459401
+              r3738687
 <?php
 /*
  * Drink Template
+/**
+ * Drink view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'drink' );
+echo Kind_Taxonomy::get_before_kind( 'drink' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        }
+        if ( array_key_exists( 'publication', $cite ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-eat.php

-              r3001401
+              r3738687
 <?php
 /*
  * Eat Template
+/**
+ * Eat view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
+}
 $rating  = $kind_post->get( 'rating', true );
+$rating = $kind_post->get( 'rating', true );
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'eat' );
+echo Kind_Taxonomy::get_before_kind( 'eat' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 if ( $rating ) {
         echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+}
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-event.php

-              r2459401
+              r3738687
 <?php
 /*
  * Event Template
+/**
+ * Event view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   3.2.0
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'event' );
 echo get_the_title();
+echo Kind_Taxonomy::get_before_kind( 'event' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
+the_title();
 ?>
 </header>
 <?php
 $start = $kind_post->get( 'start' );
+$end = $kind_post->get( 'end' );
+$timestring = '<p>%1$s: <time class="%2$s" datetime="%3$s">%4$s</time></p>';
+$end   = $kind_post->get( 'end' );
 if ( $start ) {
         printf( $timestring, __( 'Start', 'indieweb-post-kinds' ), 'dt-start', $start->format( DATE_W3C ), display_formatted_datetime( $start ) );
+}
+        printf( '<p>%1$s: <time class="dt-start" datetime="%2$s">%3$s</time></p>', esc_html__( 'Start', 'indieweb-post-kinds' ), esc_attr( $start->format( DATE_W3C ) ), esc_html( Kind_Time::display_formatted_datetime( $start ) ) );
+}
 if ( $end ) {
         printf( $timestring, __( 'End', 'indieweb-post-kinds' ), 'dt-end', $end->format( DATE_W3C ), display_formatted_datetime( $end ) );
+}
+        printf( '<p>%1$s: <time class="dt-end" datetime="%2$s">%3$s</time></p>', esc_html__( 'End', 'indieweb-post-kinds' ), esc_attr( $end->format( DATE_W3C ) ), esc_html( Kind_Time::display_formatted_datetime( $end ) ) );
+}
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-favorite.php

-              r2455262
+              r3738687
 <?php
 /*
  * Favorite Template
+/**
+ * Favorite view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'favorite' );
+echo Kind_Taxonomy::get_before_kind( 'favorite' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-issue.php

-              r2467905
+              r3738687
 <?php
 /*
  * Issue Template
+/**
+ * Issue view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'issue' );
+echo Kind_Taxonomy::get_before_kind( 'issue' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-itinerary.php

-              r2387393
+              r3738687
 <?php
 /*
  * Event Template
+/**
+ * Itinerary view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   3.2.0
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 $itineraries = $kind_post->get( 'itinerary', false );
+$itineraries = is_array( $itineraries ) ? $itineraries : array();
+foreach( $itineraries as $key => $value ) {
+        $itineraries [ $key ] = mf2_to_jf2( $value );
+foreach ( $itineraries as $key => $value ) {
+        $leg = \ParseThis\mf2_to_jf2( $value );
+        // Each field is shown as text; fill in any that are missing.
+        foreach ( array( 'operator', 'number', 'transit-type', 'origin', 'destination', 'departure', 'arrival' ) as $field ) {
+                $leg[ $field ] = ( isset( $leg[ $field ] ) && is_scalar( $leg[ $field ] ) ) ? (string) $leg[ $field ] : '';
+        }
+        $itineraries[ $key ] = $leg;
+}
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'itinerary' );
 echo get_the_title();
+echo Kind_Taxonomy::get_before_kind( 'itinerary' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
+the_title();
 ?>
 </header>
 <?php
 foreach( $itineraries as $itinerary ) {
 ?>
    <div class="h-leg p-itinerary">
                 <h3><span class="p-operator"><?php echo $itinerary['operator']; ?></span>
                 <span class="p-number"><?php echo $itinerary['number']; ?></span></h3>
                 <data class="p-transit-type" value="<?php echo $itinerary['transit-type']; ?>">
    <ul>
+foreach ( $itineraries as $itinerary ) {
+        ?>
+        <div class="h-leg p-itinerary">
+                <h3><span class="p-operator"><?php echo esc_html( $itinerary['operator'] ); ?></span>
+                <span class="p-number"><?php echo esc_html( $itinerary['number'] ); ?></span></h3>
+                <data class="p-transit-type" value="<?php echo esc_attr( $itinerary['transit-type'] ); ?>"></data>
+        <ul>
         <li>
                 <?php _e( 'Departs: ', 'indieweb-post-kinds' ); ?>
                 <span class="p-origin"><?php echo $itinerary['origin']; ?></span>
                 <time class="dt-departure" datetime="<?php echo $itinerary['departure']; ?>"><?php echo display_formatted_datetime( $itinerary['departure'] ); ?></time>
+                <?php esc_html_e( 'Departs: ', 'indieweb-post-kinds' ); ?>
+                <span class="p-origin"><?php echo esc_html( $itinerary['origin'] ); ?></span>
+                <time class="dt-departure" datetime="<?php echo esc_attr( $itinerary['departure'] ); ?>"><?php echo esc_html( Kind_Time::display_formatted_datetime( $itinerary['departure'] ) ); ?></time>
         </li>
         <li>
                 <?php _e( 'Arrives: ', 'indieweb-post-kinds' ); ?>
                 <span class="p-destination"><?php echo $itinerary['destination']; ?></span>
                 <time class="dt-arrival" datetime="<?php echo $itinerary['arrival']; ?>"><?php echo display_formatted_datetime( $itinerary['arrival'] ); ?></time>
+                <?php esc_html_e( 'Arrives: ', 'indieweb-post-kinds' ); ?>
+                <span class="p-destination"><?php echo esc_html( $itinerary['destination'] ); ?></span>
+                <time class="dt-arrival" datetime="<?php echo esc_attr( $itinerary['arrival'] ); ?>"><?php echo esc_html( Kind_Time::display_formatted_datetime( $itinerary['arrival'] ) ); ?></time>
         </li>
    </ul>
    </div>
 <?php
+        </ul>
+        </div>
+        <?php
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-jam.php

-              r2467905
+              r3738687
 <?php
 /*
   Jam Template
+/**
+ * Jam view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'jam' );
+echo Kind_Taxonomy::get_before_kind( 'jam' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( $author ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo __( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>';
+                echo esc_html__( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( $duration ) {
                 echo Kind_View::display_duration( $duration );
+                echo Kind_View::display_duration( $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-like.php

-              r2467905
+              r3738687
 <?php
 /*
  * Like Template
+/**
+ * Like view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'like' );
+echo Kind_Taxonomy::get_before_kind( 'like' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( ! empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-listen.php

-              r3001401
+              r3738687
 <?php
 /*
   Listen Template
+/**
+ * Listen view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 $title     = Kind_View::get_cite_title( $cite );
 $duration  = $kind_post->get( 'duration', true );
 $rating  = $kind_post->get( 'rating', true );
+$rating    = $kind_post->get( 'rating', true );
 if ( ! $duration ) {
                 $duration = calculate_duration( $kind_post->get( 'start' ), $kind_post->get( 'end' ) );
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'listen' );
+echo Kind_Taxonomy::get_before_kind( 'listen' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( $author ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo __( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>';
+                echo esc_html__( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( $duration ) {
                 echo '(' . Kind_View::display_duration( $duration ) . ')';
+                echo '(' . Kind_View::display_duration( $duration ) . ')'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>
+<?php if ( $rating ) {
+        echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+} ?>
+<?php
+if ( $rating ) {
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
+?>
 <?php
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 ?>

indieweb-post-kinds/trunk/views/kind-note.php

-              r1828595
+              r3738687
 <?php
 /*
  * Note Template
+/**
+ * Note view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.4.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;

indieweb-post-kinds/trunk/views/kind-photo.php

-              r2459401
+              r3738687
 <?php
 /*
  * Photo Template
+/**
+ * Photo view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( $photos ) {
         $embed = null;
 …
         if ( 1 === count( $photos ) ) {
                 $photos_attachment = new Kind_Post( $photos[0] );
                 $cite = $photos_attachment->get_cite();
                 $cite = $photos_attachment->normalize_cite( $cite );
                 $author = Kind_View::get_hcard( $cite['author'] );
+                $cite              = $photos_attachment->get_cite();
+                $cite              = $photos_attachment->normalize_cite( $cite );
+                $author            = Kind_View::get_hcard( $cite['author'] );
+        }
+}
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'photo' );
+echo Kind_Taxonomy::get_before_kind( 'photo' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! empty( $cite['name'] ) ) {
         echo sprintf( '<span>%1s</span>', $cite['name'] );
+        printf( '<span class="p-name">%1$s</span>', esc_html( $cite['name'] ) );
+}
 ?>
 …
 <?php
 if ( $embed ) {
         printf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
 } elseif ( $photos ) {
         $view = new Kind_Media_View( $photos, 'photo' );
+        echo $view->get();
+} ?>
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
+?>
 </section>

indieweb-post-kinds/trunk/views/kind-read.php

-              r3001401
+              r3738687
 <?php
 /*
  * Read Template
+/**
+ * Read view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
+}
 $read   = $kind_post->get( 'read-status', true );
 $rating  = $kind_post->get( 'rating', true );
+$rating = $kind_post->get( 'rating', true );
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'read' );
+echo Kind_Taxonomy::get_before_kind( 'read' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $read ) {
                 echo sprintf( ' - <span class="p-read-status">%1s</span>', Kind_View::read_text( $read ) );
+                printf( ' - <span class="p-read-status">%1$s</span>', esc_html( Kind_View::read_text( $read ) ) );
+        }
+        if ( ! empty( $url ) ) {
+                echo sprintf( '<a href="%1s" class="p-name u-url">%2s</a>', $url, $cite['name'] );
+        } else {
+                echo sprintf( '<span class="p-name">%1s</span>', $cite['name'] );
+        echo Kind_View::get_cite_title( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        if ( $author ) {
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
+        if ( $author ) {
+                echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        }
+        if ( empty( $cite['publication'] ) ) {
+                echo sprintf( ' <em>(<span class="p-publication">%1s</span>)</em>', $cite['publication'] );
+        $site_name = Kind_View::get_site_name( $cite );
+        if ( $site_name ) {
+                echo ' <em>(' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) && ! empty( $cite['summary'] ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 if ( $rating ) {
         echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
 …
 if ( $photos && ! has_post_thumbnail( get_the_ID() ) ) {
         $view = new Kind_Media_View( $photos, 'photo' );
         echo $view->get();
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-rsvp.php

-              r2394107
+              r3738687
 <?php
 /*
  * RSVP Template
+/**
+ * RSVP view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
         return;
+}
 $title  = isset( $cite['name'] ) ? $cite['name'] : $url;
 $rsvp   = $kind_post->get( 'rsvp', true );
+$title = isset( $cite['name'] ) ? $cite['name'] : $url;
+$rsvp  = $kind_post->get( 'rsvp', true );
 ?>
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'rsvp' );
+echo Kind_Taxonomy::get_before_kind( 'rsvp' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $rsvp ) {
                 echo '<data class="p-rsvp" value="' . $rsvp . '">' . sprintf( Kind_View::rsvp_text( $rsvp ), $url, $title ) . '</data>';
+                echo '<data class="p-rsvp" value="' . esc_attr( $rsvp ) . '">' . Kind_View::rsvp_text( $rsvp, $url, $title ) . '</data>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::rsvp_text() escapes the URL and name.
+        }
+}
 …
 <?php
 if ( $embed ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
 } elseif ( array_key_exists( 'summary', $cite ) ) {
         echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+} else {
+        echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+}
 // Close Response
+// Close Response.
 ?>
 </section>

indieweb-post-kinds/trunk/views/kind-video.php

-              r2459401
+              r3738687
 <?php
 /*
  * Video Template
+/**
+ * Video view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+$videos = $kind_post->get_video();
+defined( 'ABSPATH' ) || exit;
+$videos   = $kind_post->get_video();
 $duration = null;
 if ( is_array( $videos ) ) {
         if ( 1 === count( $videos ) && 0 !== $videos[0] ) {
                 $video_attachment = new Kind_Post( $videos[0] );
                 $cite = $video_attachment->get_cite();
                 $cite = $video_attachment->normalize_cite( $cite );
                 $author = Kind_View::get_hcard( $cite['author'] );
+                $cite             = $video_attachment->get_cite();
+                $cite             = $video_attachment->normalize_cite( $cite );
+                $author           = Kind_View::get_hcard( $cite['author'] );
                 if ( array_key_exists( 'duration', $cite ) ) {
                         $duration = Kind_View::display_duration( $cite['duration'] );
 …
+}
 $first_photo = null;
 if ( is_countable( $photos ) ) {
+if ( is_array( $photos ) && ! empty( $photos ) ) {
         $first_photo = $photos[0];
+}
 if ( is_array( $cite ) && ! $videos ) {
         if ( ! $embed ) {
                 $view = new Kind_Media_View( $url, 'video' );
+                $view  = new Kind_Media_View( $url, 'video' );
                 $embed = $view->get();
+        }
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'video' );
+echo Kind_Taxonomy::get_before_kind( 'video' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( isset( $cite['name'] ) ) {
         echo sprintf( '<span>%1s</a>', $cite['name'] );
+        printf( '<span class="p-name">%1$s</span>', esc_html( $cite['name'] ) );
+}
 if ( $author ) {
         echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+        echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+}
 if ( $duration ) {
         printf( '(%1$s)', $duration );
+        printf( '(%1$s)', $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+}
 …
 <?php
 if ( $embed ) {
         printf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
+        printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
 } elseif ( $videos ) {
         $poster = wp_get_attachment_image_url( $first_photo, 'full' );
         $view = new Kind_Media_View( $videos, 'video' );
         echo $view->get();
+        $view   = new Kind_Media_View( $videos, 'video' );
+        echo $view->get(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_Media_View::get() returns core gallery, audio or video shortcode markup.
+}
 ?>

indieweb-post-kinds/trunk/views/kind-watch.php

-              r3001401
+              r3738687
 <?php
 /*
   Watch Template
+/**
+ * Watch view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.6.1
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 if ( ! $cite ) {
 …
 $title     = Kind_View::get_cite_title( $cite, $url );
 $duration  = $kind_post->get( 'duration', true );
 $rating  = $kind_post->get( 'rating', true );
+$rating    = $kind_post->get( 'rating', true );
 if ( ! $duration ) {
         $duration = calculate_duration( $kind_post->get( 'start' ), $kind_post->get( 'end' ) );
 …
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( 'watch' );
+echo Kind_Taxonomy::get_before_kind( 'watch' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( $author ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo __( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>';
+                echo esc_html__( ' from ', 'indieweb-post-kinds' ) . '<em>' . $site_name . '</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( $duration ) {
                 echo Kind_View::display_duration( $duration );
+                echo Kind_View::display_duration( $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+        }
+}
 …
 if ( $cite ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>
+<?php if ( $rating ) {
+        echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+} ?>
+<?php
+if ( $rating ) {
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
+?>

indieweb-post-kinds/trunk/views/kind.php

-              r3001401
+              r3738687
 <?php
+/*
+  Default Template
+ *      The Goal of this Template is to be a general all-purpose model that will be replaced by customization in other templates
+/**
+ * Default view, used for any kind without its own view.
+ *
+ * Rendered by Kind_View::get_view_part(). To change it, copy this file into a
+ * kind_views folder in your theme; see develop.txt.
+ *
+ * @package Post_Kinds
+ * @since   2.3.0
+ *
+ * @var Kind_Post    $kind_post The post being displayed.
+ * @var string       $kind      The kind's slug, such as 'like'.
+ * @var string       $type      The kind's microformats property, such as 'like-of'.
+ * @var array        $cite      The citation, normalized by Kind_Post::normalize_cite(),
+ *                              so every key is present. 'name' falls back to the URL.
+ * @var string       $url       The cited URL.
+ * @var string|false $author    The cited authors as h-card markup, listed as in "Ann, Bob and Cat", or false if there are none.
+ * @var string       $embed     Embed markup for the cited URL, or an empty string.
+ * @var int[]|false  $photos    Attachment IDs of the post's photos, from Kind_Post::get_photo().
+ * @var array        $args      Arguments passed to Kind_View::get_view_part(); 'post_id' is the post's ID.
  */
+defined( 'ABSPATH' ) || exit;
 $site_name = Kind_View::get_site_name( $cite );
 …
                 $duration = calculate_duration( $kind_post->get( 'start' ), $kind_post->get( 'end' ) );
+}
 $rsvp = $kind_post->get( 'rsvp', true );
+$rsvp   = $kind_post->get( 'rsvp', true );
 $rating = $kind_post->get( 'rating', true );
 …
+}
 // Add in the appropriate type
+// Add in the appropriate type.
 if ( ! empty( $type ) ) {
         $type = ( empty( $url ) ? 'p-' : 'u-' ) . $type;
 …
 ?>
 <section class="h-cite response <?php echo $type; ?> ">
+<section class="h-cite response <?php echo esc_attr( $type ); ?>">
 <header>
 <?php
 echo Kind_Taxonomy::get_before_kind( $kind );
+echo Kind_Taxonomy::get_before_kind( $kind ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- get_before_kind() escapes the kind name; the icon is the plugin's own SVG.
 if ( ! $embed ) {
         if ( $title ) {
                 echo $title;
+                echo $title; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_cite_title() escapes its output.
+        }
         if ( ! empty( $author ) ) {
                 echo ' ' . __( 'by', 'indieweb-post-kinds' ) . ' ' . $author;
+                echo ' ' . esc_html__( 'by', 'indieweb-post-kinds' ) . ' ' . $author; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- h-cards from Kind_View::get_hcard(), which escapes them.
+        }
         if ( $site_name ) {
                 echo '<em> (' . $site_name . ')</em>';
+                echo '<em> (' . $site_name . ')</em>'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_site_name() escapes its output.
+        }
         if ( in_array( $kind, array( 'jam', 'listen', 'play', 'read', 'watch', 'audio', 'video' ) ) ) {
                 if ( $duration ) {
                         echo ' ' . Kind_View::display_duration( $duration );
+                        echo ' ' . Kind_View::display_duration( $duration ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::display_duration() escapes its output.
+                }
+        }
 …
 if ( $cite && is_array( $cite ) ) {
         if ( $embed ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $embed );
         } elseif ( array_key_exists( 'summary', $cite ) ) {
                 echo sprintf( '<blockquote class="e-summary">%1s</blockquote>', $cite['summary'] );
+                printf( '<blockquote class="e-summary">%1$s</blockquote>', $embed ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- oEmbed or media markup generated by WordPress core.
+        } else {
+                echo Kind_View::get_summary( $cite ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Kind_View::get_summary() escapes its output.
+        }
+}
 // Close Response
+// Close Response.
 ?>
 </section>
+<?php if ( $rsvp && in_array( $kind, array( 'rsvp' ) ) ) {
+        echo 'RSVP <span class="p-rsvp">' . $rsvp . '</span>';
+<?php
+if ( $rsvp && in_array( $kind, array( 'rsvp' ) ) ) {
+        echo esc_html__( 'RSVP', 'indieweb-post-kinds' ) . ' <span class="p-rsvp">' . esc_html( $rsvp ) . '</span>';
+}
 if ( $rating ) {
+        echo '<data class="p-rating" value="' . $rating . '">' . sprintf( Kind_View::rating_text( $rating ), $url, $title ) . '</data>';
+} ?>
+        echo '<data class="p-rating" value="' . esc_attr( $rating ) . '">' . esc_html( Kind_View::rating_text( $rating ) ) . '</data>';
+}
+?>
 <?php

Context Navigation

Legend:

Download in other formats: