Changeset 2941971

Timestamp:

07/23/2023 04:57:24 AM (2 years ago)

Author:

Kelson

Message:

0.3.3 remove TinyURL and confirm works with WP 6.3

Location:

unwrap-shortlinks/trunk

Files:

• readme.md (modified) (4 diffs)
• unwrap-shortlinks.php (modified) (3 diffs)

unwrap-shortlinks/trunk/readme.md

@@ -1 +1 @@
 # Unwrap Shortlinks
 
-Stable tag: 0.3.2  
+Stable tag: 0.3.3  
 Tags: urls, links, classicpress  
-Tested up to: 6.2  
+Tested up to: 6.3  
 Contributors: Kelson  
 License: GPLv2 or later
@@ -21 +21 @@
 * wp.me
 * tmblr.co
-* tinyurl.com
 * goo.gl
 * dlvr.it
@@ -27 +26 @@
 * qr.ae
 * aka.ms
+
+NOTE: tinyurl.com has been removed from the list because they are blocking automated requests. (See changelog)
 
 ## Installation
@@ -60 +61 @@
 ## Changelog
 
+### [0.3.3]
+* tinyurl.com is screening requests using Cloudflare, and a simple curl request is no longer allowed through. Removing it from the list.
+
 ### [0.3.2] - 2022-10-29
 * Tested up through 6.1, clean up headers, no functional changes.

unwrap-shortlinks/trunk/unwrap-shortlinks.php

@@ -4 +4 @@
  Plugin URI: https://codeberg.org/kvibber/unwrap-shortlinks
  Description: Follow shortened links (t.co, bit.ly, etc) and expand them so that your blog post will point directly to the destination.
- Version: 0.3.2
+ Version: 0.3.3
  Requires at least: 3.0
  Requires CP: 1.0
@@ -17 +17 @@
 
 function ktv_unwrap_shortlinks($content) {
-    preg_match_all('/\b(https?:\/\/(?:t\.co|bit\.ly|j\.mp|ow\.ly|is\.gd|trib\.al|buff\.ly|tmblr\.co|wp\.me|tinyurl\.com|goo\.gl|dlvr\.it|fb\.me|qr\.ae|aka\.ms)\/[^\s"\'<>]+)\b/', $content, $matches, PREG_PATTERN_ORDER);
+    preg_match_all('/\b(https?:\/\/(?:t\.co|bit\.ly|j\.mp|ow\.ly|is\.gd|trib\.al|buff\.ly|tmblr\.co|wp\.me|goo\.gl|dlvr\.it|fb\.me|qr\.ae|aka\.ms)\/[^\s"\'<>]+)\b/', $content, $matches, PREG_PATTERN_ORDER);
     foreach ($matches[1] as $link) {
         $getlink = ktv_unwrap_shortlinks_replace($link, 5);
@@ -38 +38 @@
         // TODO Is it also a redirector? Do we have iterations left?
         // If so, try to follow that one!
-        if( $countdown > 0 && preg_match('/\b(https?:\/\/(?:t\.co|bit\.ly|j\.mp|ow\.ly|is\.gd|trib\.al|buff\.ly|tmblr\.co|wp\.me|tinyurl\.com|goo\.gl|dlvr\.it|fb\.me|qr\.ae|aka\.ms)\/[^\s"\'<>]+)\b/', $finalURL) ) {
+        if( $countdown > 0 && preg_match('/\b(https?:\/\/(?:t\.co|bit\.ly|j\.mp|ow\.ly|is\.gd|trib\.al|buff\.ly|tmblr\.co|wp\.me|goo\.gl|dlvr\.it|fb\.me|qr\.ae|aka\.ms)\/[^\s"\'<>]+)\b/', $finalURL) ) {
             return ktv_unwrap_shortlinks_replace($finalURL, $countdown - 1);
         } else {