Changeset 2876912

Timestamp:

03/09/2023 05:57:30 AM (17 months ago)

Author:

jeremyfelt

Message:

Update to version 1.5.0 from GitHub

Location:

shortnotes

Files:

• tags/1.5.0 (copied) (copied from shortnotes/trunk)
• tags/1.5.0/LICENSE (modified) (1 diff)
• tags/1.5.0/includes/post-type-note.php (modified) (8 diffs)
• tags/1.5.0/includes/share-on-mastodon.php (modified) (4 diffs)
• tags/1.5.0/includes/webmention.php (modified) (3 diffs)
• tags/1.5.0/languages/shortnotes.pot (modified) (4 diffs)
• tags/1.5.0/plugin.php (modified) (2 diffs)
• tags/1.5.0/readme.txt (modified) (2 diffs)
• trunk/LICENSE (modified) (1 diff)
• trunk/includes/post-type-note.php (modified) (8 diffs)
• trunk/includes/share-on-mastodon.php (modified) (4 diffs)
• trunk/includes/webmention.php (modified) (3 diffs)
• trunk/languages/shortnotes.pot (modified) (4 diffs)
• trunk/plugin.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

shortnotes/tags/1.5.0/LICENSE

@@ -1 +1 @@
 Shortnotes - A WordPress plugin.
 
-Copyright 2021-2022 by Jeremy Felt
+Copyright 2021-202 by Jeremy Felt
 
 This program is free software; you can redistribute it and/or modify

shortnotes/tags/1.5.0/includes/post-type-note.php

@@ -162 +162 @@
  *       function from the `allowed_block_types` filter won't cause any trouble.
  *
- * @param array    $allowed_block_types A list of allowed block types.
- * @param \WP_Post $post                The current note.
+ * @param .
+ * @param \WP_Post $post                The current note.
  * @return array A modified list of allowed block types.
  */
-function filter_allowed_block_types( $allowed_block_types, $post ) {
+function filter_allowed_block_types( $allowed_block_types, $post ) {
     if ( get_slug() === $post->post_type ) {
         return array(
@@ -205 +205 @@
  * @return string Generated subtitle.
  */
-function generate_sub_title( $html ) {
+function generate_sub_title(  {
     $sub_title = wp_strip_all_tags( $html );
 
@@ -225 +225 @@
  * @return string The formatted title.
  */
-function get_formatted_title( $post_data ) {
+function get_formatted_title(  {
     $blocks = parse_blocks( $post_data['post_content'] );
 
@@ -241 +241 @@
 
             // A paragraph has been found, we're moving on and using it for the title.
+
+
+
+
+
             break;
         } elseif ( 'core/image' === $block['blockName'] ) {
@@ -279 +284 @@
  * @return array $post_data A modified list of post data.
  */
-function filter_wp_insert_post_data( $post_data ) {
+function filter_wp_insert_post_data(  {
     if ( get_slug() !== $post_data['post_type'] ) {
         return $post_data;
@@ -304 +309 @@
  * @return string Markup to use for a u-in-reply-to.
  */
-function get_reply_to_markup( $post ) {
+function get_reply_to_markup(  {
     if ( get_slug() !== $post->post_type ) {
         return '';
@@ -366 +371 @@
  * @return string The content, possibly prepended with additional markup.
  */
-function prepend_reply_to_markup( $content ) {
+function prepend_reply_to_markup(  {
     if ( is_admin() ) {
         return $content;
@@ -378 +383 @@
     return $content;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

shortnotes/tags/1.5.0/includes/share-on-mastodon.php

@@ -11 +11 @@
 
 add_filter( 'share_on_mastodon_status', __NAMESPACE__ . '\filter_status_text', 10, 2 );
+
 
 /**
@@ -39 +40 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * Retrieve the reply to ID for a Mastodon status URL.
  *
@@ -45 +64 @@
  */
 function get_reply_to_id( string $url ) : int {
-    $url_parts = wp_parse_url( $url );
+    $site_host = wp_parse_url( home_url(), PHP_URL_HOST );
+    $url_host  = wp_parse_url( $url, PHP_URL_HOST );
+    $url_path  = wp_parse_url( $url, PHP_URL_PATH );
 
-    if ( ! isset( $url_parts['path'] ) ) {
+    if ( !  ) {
         return 0;
     }
 
-    $result = wp_remote_head( $url );
+    if ( $site_host === $url_host ) {
+        $path_parts = explode( '/', trim( $url_path, '/' ) );
+        $post_name  = array_pop( $path_parts ); // Huge assumptions are okay with me!
+        $post_id    = Note\get_note_by_post_name( $post_name );
 
-    if ( is_wp_error( $result ) ) {
+        // No note was found.
+        if ( ! $post_id ) {
+            return 0;
+        }
+
+        // Override the URL with the note's previously stored Mastodon URL.
+        $url = get_post_meta( $post_id, '_share_on_mastodon_url', true );
+
+        if ( ! $url ) {
+            return 0;
+        }
+
+        $url_path = wp_parse_url( $url, PHP_URL_PATH );
+
+        if ( ! $url_path ) {
+            return 0;
+        }
+    } elseif ( false === is_mastodon_server( $url ) ) {
         return 0;
     }
 
-    $server = strtolower( wp_remote_retrieve_header( $result, 'server' ) );
-
-    if ( 'mastodon' !== $server ) {
-        return 0;
-    }
-
-    $path_parts = explode( '/', trim( $url_parts['path'], '/' ) );
+    $path_parts = explode( '/', trim( $url_path, '/' ) );
 
     if ( 2 !== count( $path_parts ) || ! is_numeric( $path_parts[1] ) ) {
@@ -79 +114 @@
  * @return string The modified status text.
  */
-function filter_status_text( $status, $post ) {
-    $status = apply_filters( 'the_content', $post->post_content ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
-    $status = trim( $status );
-    $status = convert_anchors( $status );
-
-    $status = str_replace( '<p>', '', $status );
-    $status = substr_replace( $status, ' ', strrpos( $status, '</p>' ), 4 );
-    $status = str_replace( '</p>', "\n\n", $status );
-
-    // Do what the plugin does to the title, but to the rendered content.
-    $status = wp_strip_all_tags(
-        html_entity_decode( $status, ENT_QUOTES | ENT_HTML5, get_bloginfo( 'charset' ) ) // Avoid double-encoded HTML entities.
-    );
-
-    // Remove more than two contiguous line breaks. Thanks, wpautop!
-    $status = preg_replace( "/\n\n+/", "\n\n", $status );
-
-    add_filter(
-        'share_on_mastodon_toot_args',
-        function( $args ) use ( $post ) {
-            return filter_args( $args, $post );
-        }
-    );
+function filter_status_text( string $status, \WP_Post $post ): string {
+    $status = Note\transform_content( $post->post_content );
 
     return $status;
 }
-
-/**
- * Parse and move anchors to the end of post content.
- *
- * @param string $html The post content.
- * @return string Modified post content.
- */
-function convert_anchors( string $html ) : string {
-    preg_match_all( '/<a\s+(?:[^>]*?\s+)?href=(["\'])(.*?)\1/', $html, $matches );
-
-    $links = array_filter(
-        $matches[2],
-        function( $link ) {
-            return wp_parse_url( $link, PHP_URL_HOST );
-        }
-    );
-
-    return $html . implode( ' ', $links );
-}

shortnotes/tags/1.5.0/includes/webmention.php

@@ -18 +18 @@
  * @param int $post_id The post ID of the note.
  */
-function schedule( $post_id ) {
+function schedule( $post_id ) {
     if ( defined( 'WP_IMPORTING' ) || false === class_exists( 'Webmention_Sender' ) ) {
         return;
@@ -33 +33 @@
  * @param int $post_id The post ID of the note.
  */
-function send( $post_id ) {
+function send( $post_id ) {
     $post = get_post( $post_id );
 
@@ -49 +49 @@
  * @return array A modified list of URLs.
  */
-function filter_webmention_links( $urls, $post_id ) {
+function filter_webmention_links(  {
     $post = get_post( $post_id );
 

shortnotes/tags/1.5.0/languages/shortnotes.pot

@@ -1 @@
-# Copyright (C) 2022 jeremyfelt
+# Copyright (C) 202 jeremyfelt
 # This file is distributed under the same license as the Shortnotes plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Shortnotes 1.3.1\n"
+"Project-Id-Version: Shortnotes 1.\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/shortnotes\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-11-23T22:57:51+00:00\n"
+"POT-Creation-Date: 202+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
@@ -20 +20 @@
 
 #. Plugin URI of the plugin
-msgid "https://github.com/jeremyfelt/shortnotes"
+msgid "https://"
 msgstr ""
 
@@ -144 +144 @@
 msgstr ""
 
-#: includes/post-type-note.php:245
+#: includes/post-type-note.php:2
 msgid "Image posted on"
 msgstr ""
 
-#: includes/post-type-note.php:247
+#: includes/post-type-note.php:2
 msgid "Images posted on"
 msgstr ""
 
-#: includes/post-type-note.php:320
+#: includes/post-type-note.php:32
 msgid "this post"
 msgstr ""
 
-#: includes/post-type-note.php:334
+#: includes/post-type-note.php:33
 msgid "In reply to:"
 msgstr ""

shortnotes/tags/1.5.0/plugin.php

@@ -2 +2 @@
 /**
  * Plugin Name:     Shortnotes
- * Plugin URI:      https://github.com/jeremyfelt/shortnotes
+ * Plugin URI:      https://
  * Description:     Add a notes post type to WordPress. For your short notes.
  * Author:          jeremyfelt
@@ -8 +8 @@
  * Text Domain:     shortnotes
  * Domain Path:     /languages
- * Version:         1.4.0
+ * Version:         1..0
  *
  * @package shortnotes

shortnotes/tags/1.5.0/readme.txt

@@ -4 +4 @@
 Requires at least: 5.6
 Tested up to: 6.1
-Stable tag: 1.4.0
+Stable tag: 1..0
 License: GPLv2 or Later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 
 ## Changelog
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ### 1.4.0

shortnotes/trunk/LICENSE

@@ -1 +1 @@
 Shortnotes - A WordPress plugin.
 
-Copyright 2021-2022 by Jeremy Felt
+Copyright 2021-202 by Jeremy Felt
 
 This program is free software; you can redistribute it and/or modify

shortnotes/trunk/includes/post-type-note.php

@@ -162 +162 @@
  *       function from the `allowed_block_types` filter won't cause any trouble.
  *
- * @param array    $allowed_block_types A list of allowed block types.
- * @param \WP_Post $post                The current note.
+ * @param .
+ * @param \WP_Post $post                The current note.
  * @return array A modified list of allowed block types.
  */
-function filter_allowed_block_types( $allowed_block_types, $post ) {
+function filter_allowed_block_types( $allowed_block_types, $post ) {
     if ( get_slug() === $post->post_type ) {
         return array(
@@ -205 +205 @@
  * @return string Generated subtitle.
  */
-function generate_sub_title( $html ) {
+function generate_sub_title(  {
     $sub_title = wp_strip_all_tags( $html );
 
@@ -225 +225 @@
  * @return string The formatted title.
  */
-function get_formatted_title( $post_data ) {
+function get_formatted_title(  {
     $blocks = parse_blocks( $post_data['post_content'] );
 
@@ -241 +241 @@
 
             // A paragraph has been found, we're moving on and using it for the title.
+
+
+
+
+
             break;
         } elseif ( 'core/image' === $block['blockName'] ) {
@@ -279 +284 @@
  * @return array $post_data A modified list of post data.
  */
-function filter_wp_insert_post_data( $post_data ) {
+function filter_wp_insert_post_data(  {
     if ( get_slug() !== $post_data['post_type'] ) {
         return $post_data;
@@ -304 +309 @@
  * @return string Markup to use for a u-in-reply-to.
  */
-function get_reply_to_markup( $post ) {
+function get_reply_to_markup(  {
     if ( get_slug() !== $post->post_type ) {
         return '';
@@ -366 +371 @@
  * @return string The content, possibly prepended with additional markup.
  */
-function prepend_reply_to_markup( $content ) {
+function prepend_reply_to_markup(  {
     if ( is_admin() ) {
         return $content;
@@ -378 +383 @@
     return $content;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

shortnotes/trunk/includes/share-on-mastodon.php

@@ -11 +11 @@
 
 add_filter( 'share_on_mastodon_status', __NAMESPACE__ . '\filter_status_text', 10, 2 );
+
 
 /**
@@ -39 +40 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * Retrieve the reply to ID for a Mastodon status URL.
  *
@@ -45 +64 @@
  */
 function get_reply_to_id( string $url ) : int {
-    $url_parts = wp_parse_url( $url );
+    $site_host = wp_parse_url( home_url(), PHP_URL_HOST );
+    $url_host  = wp_parse_url( $url, PHP_URL_HOST );
+    $url_path  = wp_parse_url( $url, PHP_URL_PATH );
 
-    if ( ! isset( $url_parts['path'] ) ) {
+    if ( !  ) {
         return 0;
     }
 
-    $result = wp_remote_head( $url );
+    if ( $site_host === $url_host ) {
+        $path_parts = explode( '/', trim( $url_path, '/' ) );
+        $post_name  = array_pop( $path_parts ); // Huge assumptions are okay with me!
+        $post_id    = Note\get_note_by_post_name( $post_name );
 
-    if ( is_wp_error( $result ) ) {
+        // No note was found.
+        if ( ! $post_id ) {
+            return 0;
+        }
+
+        // Override the URL with the note's previously stored Mastodon URL.
+        $url = get_post_meta( $post_id, '_share_on_mastodon_url', true );
+
+        if ( ! $url ) {
+            return 0;
+        }
+
+        $url_path = wp_parse_url( $url, PHP_URL_PATH );
+
+        if ( ! $url_path ) {
+            return 0;
+        }
+    } elseif ( false === is_mastodon_server( $url ) ) {
         return 0;
     }
 
-    $server = strtolower( wp_remote_retrieve_header( $result, 'server' ) );
-
-    if ( 'mastodon' !== $server ) {
-        return 0;
-    }
-
-    $path_parts = explode( '/', trim( $url_parts['path'], '/' ) );
+    $path_parts = explode( '/', trim( $url_path, '/' ) );
 
     if ( 2 !== count( $path_parts ) || ! is_numeric( $path_parts[1] ) ) {
@@ -79 +114 @@
  * @return string The modified status text.
  */
-function filter_status_text( $status, $post ) {
-    $status = apply_filters( 'the_content', $post->post_content ); // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
-    $status = trim( $status );
-    $status = convert_anchors( $status );
-
-    $status = str_replace( '<p>', '', $status );
-    $status = substr_replace( $status, ' ', strrpos( $status, '</p>' ), 4 );
-    $status = str_replace( '</p>', "\n\n", $status );
-
-    // Do what the plugin does to the title, but to the rendered content.
-    $status = wp_strip_all_tags(
-        html_entity_decode( $status, ENT_QUOTES | ENT_HTML5, get_bloginfo( 'charset' ) ) // Avoid double-encoded HTML entities.
-    );
-
-    // Remove more than two contiguous line breaks. Thanks, wpautop!
-    $status = preg_replace( "/\n\n+/", "\n\n", $status );
-
-    add_filter(
-        'share_on_mastodon_toot_args',
-        function( $args ) use ( $post ) {
-            return filter_args( $args, $post );
-        }
-    );
+function filter_status_text( string $status, \WP_Post $post ): string {
+    $status = Note\transform_content( $post->post_content );
 
     return $status;
 }
-
-/**
- * Parse and move anchors to the end of post content.
- *
- * @param string $html The post content.
- * @return string Modified post content.
- */
-function convert_anchors( string $html ) : string {
-    preg_match_all( '/<a\s+(?:[^>]*?\s+)?href=(["\'])(.*?)\1/', $html, $matches );
-
-    $links = array_filter(
-        $matches[2],
-        function( $link ) {
-            return wp_parse_url( $link, PHP_URL_HOST );
-        }
-    );
-
-    return $html . implode( ' ', $links );
-}

shortnotes/trunk/includes/webmention.php

@@ -18 +18 @@
  * @param int $post_id The post ID of the note.
  */
-function schedule( $post_id ) {
+function schedule( $post_id ) {
     if ( defined( 'WP_IMPORTING' ) || false === class_exists( 'Webmention_Sender' ) ) {
         return;
@@ -33 +33 @@
  * @param int $post_id The post ID of the note.
  */
-function send( $post_id ) {
+function send( $post_id ) {
     $post = get_post( $post_id );
 
@@ -49 +49 @@
  * @return array A modified list of URLs.
  */
-function filter_webmention_links( $urls, $post_id ) {
+function filter_webmention_links(  {
     $post = get_post( $post_id );
 

shortnotes/trunk/languages/shortnotes.pot

@@ -1 @@
-# Copyright (C) 2022 jeremyfelt
+# Copyright (C) 202 jeremyfelt
 # This file is distributed under the same license as the Shortnotes plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Shortnotes 1.3.1\n"
+"Project-Id-Version: Shortnotes 1.\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/shortnotes\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-11-23T22:57:51+00:00\n"
+"POT-Creation-Date: 202+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
@@ -20 +20 @@
 
 #. Plugin URI of the plugin
-msgid "https://github.com/jeremyfelt/shortnotes"
+msgid "https://"
 msgstr ""
 
@@ -144 +144 @@
 msgstr ""
 
-#: includes/post-type-note.php:245
+#: includes/post-type-note.php:2
 msgid "Image posted on"
 msgstr ""
 
-#: includes/post-type-note.php:247
+#: includes/post-type-note.php:2
 msgid "Images posted on"
 msgstr ""
 
-#: includes/post-type-note.php:320
+#: includes/post-type-note.php:32
 msgid "this post"
 msgstr ""
 
-#: includes/post-type-note.php:334
+#: includes/post-type-note.php:33
 msgid "In reply to:"
 msgstr ""

shortnotes/trunk/plugin.php

@@ -2 +2 @@
 /**
  * Plugin Name:     Shortnotes
- * Plugin URI:      https://github.com/jeremyfelt/shortnotes
+ * Plugin URI:      https://
  * Description:     Add a notes post type to WordPress. For your short notes.
  * Author:          jeremyfelt
@@ -8 +8 @@
  * Text Domain:     shortnotes
  * Domain Path:     /languages
- * Version:         1.4.0
+ * Version:         1..0
  *
  * @package shortnotes

shortnotes/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.6
 Tested up to: 6.1
-Stable tag: 1.4.0
+Stable tag: 1..0
 License: GPLv2 or Later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 
 ## Changelog
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ### 1.4.0