Merge branch 'trunk' into dependabot/npm_and_yarn/simple-icons-11.5.0

Gruntfile.js

@@ -64,6 +64,7 @@ module.exports = function (grunt) {
 					files  : { // Dictionary of files.
 
           					'static/css/indieweb.css': 'sass/main.scss',       // 'destination': 'source'
+          					'static/css/indieweb-minimal.css': 'sass/min.scss',       // 'destination': 'source'
 					        'static/css/indieweb-bw.css': 'sass/main-bw.scss',
 					        'static/css/indieweb-admin.css': 'sass/main-admin.scss'
 					}

includes/class-hcard-author-widget.php

@@ -16,8 +16,8 @@ public function __construct() {
 			'HCard_Widget',                // Base ID
 			'Author Profile H-Card Widget',        // Name
 			array(
-				'classname'   => 'hcard_widget',
-				'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
+				'classname'             => 'hcard_widget',
+				'description'           => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
 				'show_instance_in_rest' => true,
 			)
 		);

includes/class-hcard-user.php

@@ -55,7 +55,7 @@ public static function silos() {
 			),
 			'twitter'   => array(
 				'baseurl' => 'https://twitter.com/%s',
-				'display' => __( 'Twitter username (without @)', 'indieweb' ),
+				'display' => __( 'X/Twitter username (without @)', 'indieweb' ),
 			),
 			'facebook'  => array(
 				'baseurl' => 'https://www.facebook.com/%s',
@@ -73,6 +73,15 @@ public static function silos() {
 				'baseurl' => 'https://www.flickr.com/people/%s',
 				'display' => __( 'Flickr username', 'indieweb' ),
 			),
+			'bluesky'   => array(
+				'baseurl' => 'https://bsky.app/profile/%s',
+				'display' => __( 'Bluesky Username', 'indieweb' ),
+			),
+
+			'reddit'    => array(
+				'baseurl' => 'https://reddit.com/user/%s',
+				'display' => __( 'Reddit Username', 'indieweb' ),
+			),
 			'mastodon'  => array(
 				'baseurl' => '%s',
 				'display' => __( 'Mastodon Server (URL)', 'indieweb' ),
@@ -254,9 +263,13 @@ public static function clean_url( $string ) {
 		if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
 			return false;
 		}
+		$host = wp_parse_url( $url, PHP_URL_HOST );
+		if ( ! $host ) {
+			return false;
+		}
 		// Rewrite these to https as needed
 		$secure = apply_filters( 'iwc_rewrite_secure', array( 'facebook.com', 'twitter.com', 'github.com' ) );
-		if ( in_array( preg_replace( '/^www\./', '', wp_parse_url( $url, PHP_URL_HOST ) ), $secure, true ) ) {
+		if ( in_array( preg_replace( '/^www\./', '', $host ), $secure, true ) ) {
 			$url = preg_replace( '/^http:/i', 'https:', $url );
 		}
 		$url = esc_url_raw( $url );

includes/class-relme-domain-icon-map.php

@@ -30,8 +30,8 @@ class Rel_Me_Domain_Icon_Map {
 		'primal.net'          => 'nostr',
 		'habla.news'          => 'nostr',
 		'nostr.band'          => 'nostr',
-		'bsky.app'            => 'bsky',
-		'bsky.social'         => 'bsky'
+		'bsky.app'            => 'bluesky',
+		'bsky.social'         => 'bluesky',
 
 	);
 

includes/class-relme-widget.php

@@ -13,7 +13,7 @@ public function __construct() {
 			'RelMe_Widget',
 			__( 'Show My Profiles on Other Sites', 'indieweb' ),
 			array(
-				'description' => __( 'Adds automatic rel-me URLs based on default author profile information. Rel=me links are links to your presence on other websites and visually appear like many social link widgets', 'indieweb' ),
+				'description'           => __( 'Adds automatic rel-me URLs based on default author profile information. Rel=me links are links to your presence on other websites and visually appear like many social link widgets', 'indieweb' ),
 				'show_instance_in_rest' => true,
 			)
 		);

indieweb.php

@@ -5,7 +5,7 @@
  * Description: Interested in connecting your WordPress site to the IndieWeb?
  * Author: IndieWebCamp WordPress Outreach Club
  * Author URI: https://indieweb.org/WordPress_Outreach_Club
- * Version: 4.0.2
+ * Version: 4.0.4
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
  * Text Domain: indieweb
@@ -177,7 +177,7 @@ public static function register_plugins() {
 				'slug' => 'pubsubhubbub',
 			),
 			array(
-				'slug' => 'classic-editor',
+				'slug' => 'indieblocks',
 			),
 		);
 		return $plugin_array;

languages/wordpress-indieweb.pot

@@ -1,15 +1,15 @@
-# Copyright (C) 2023 IndieWebCamp WordPress Outreach Club
+# Copyright (C) 2024 IndieWebCamp WordPress Outreach Club
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: IndieWeb 4.0.2\n"
+"Project-Id-Version: IndieWeb 4.0.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wordpress-indieweb\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-11-24T15:11:27+00:00\n"
+"POT-Creation-Date: 2024-03-09T15:17:03+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.9.0\n"
 "X-Domain: indieweb\n"
@@ -126,7 +126,7 @@ msgid "Github username"
 msgstr ""
 
 #: includes/class-hcard-user.php:58
-msgid "Twitter username (without @)"
+msgid "X/Twitter username (without @)"
 msgstr ""
 
 #: includes/class-hcard-user.php:62
@@ -146,107 +146,115 @@ msgid "Flickr username"
 msgstr ""
 
 #: includes/class-hcard-user.php:78
+msgid "Bluesky Username"
+msgstr ""
+
+#: includes/class-hcard-user.php:83
+msgid "Reddit Username"
+msgstr ""
+
+#: includes/class-hcard-user.php:87
 msgid "Mastodon Server (URL)"
 msgstr ""
 
-#: includes/class-hcard-user.php:100
+#: includes/class-hcard-user.php:109
 msgid "Telephone"
 msgstr ""
 
-#: includes/class-hcard-user.php:101
+#: includes/class-hcard-user.php:110
 msgid "PGP Key (URL)"
 msgstr ""
 
-#: includes/class-hcard-user.php:108
+#: includes/class-hcard-user.php:117
 msgid "Street Address"
 msgstr ""
 
-#: includes/class-hcard-user.php:109
+#: includes/class-hcard-user.php:118
 msgid "Street Number and Name"
 msgstr ""
 
-#: includes/class-hcard-user.php:112
+#: includes/class-hcard-user.php:121
 msgid "Extended Address"
 msgstr ""
 
-#: includes/class-hcard-user.php:113
+#: includes/class-hcard-user.php:122
 msgid "Apartment/Suite/Room Name/Number if any"
 msgstr ""
 
-#: includes/class-hcard-user.php:116
+#: includes/class-hcard-user.php:125
 msgid "Locality"
 msgstr ""
 
-#: includes/class-hcard-user.php:117
+#: includes/class-hcard-user.php:126
 msgid "City/State/Village"
 msgstr ""
 
-#: includes/class-hcard-user.php:120
+#: includes/class-hcard-user.php:129
 msgid "Region"
 msgstr ""
 
-#: includes/class-hcard-user.php:121
+#: includes/class-hcard-user.php:130
 msgid "State/County/Province"
 msgstr ""
 
-#: includes/class-hcard-user.php:124
+#: includes/class-hcard-user.php:133
 msgid "Postal Code"
 msgstr ""
 
-#: includes/class-hcard-user.php:125
+#: includes/class-hcard-user.php:134
 msgid "Postal Code, such as Zip Code"
 msgstr ""
 
-#: includes/class-hcard-user.php:128
-#: includes/class-hcard-user.php:129
+#: includes/class-hcard-user.php:137
+#: includes/class-hcard-user.php:138
 msgid "Country Name"
 msgstr ""
 
-#: includes/class-hcard-user.php:138
+#: includes/class-hcard-user.php:147
 msgid "Job Title"
 msgstr ""
 
-#: includes/class-hcard-user.php:139
+#: includes/class-hcard-user.php:148
 msgid "Title or Role"
 msgstr ""
 
-#: includes/class-hcard-user.php:142
+#: includes/class-hcard-user.php:151
 msgid "Organization"
 msgstr ""
 
-#: includes/class-hcard-user.php:143
+#: includes/class-hcard-user.php:152
 msgid "Affiliated Organization"
 msgstr ""
 
-#: includes/class-hcard-user.php:146
+#: includes/class-hcard-user.php:155
 msgid "Honorific Prefix"
 msgstr ""
 
-#: includes/class-hcard-user.php:147
+#: includes/class-hcard-user.php:156
 msgid "e.g. Mrs., Mr. Dr."
 msgstr ""
 
-#: includes/class-hcard-user.php:154
+#: includes/class-hcard-user.php:163
 msgid "Address"
 msgstr ""
 
-#: includes/class-hcard-user.php:155
+#: includes/class-hcard-user.php:164
 msgid "Fill in all fields you wish displayed."
 msgstr ""
 
-#: includes/class-hcard-user.php:162
+#: includes/class-hcard-user.php:171
 msgid "Additional Profile Information"
 msgstr ""
 
-#: includes/class-hcard-user.php:163
+#: includes/class-hcard-user.php:172
 msgid "Fill in all fields you are wish displayed."
 msgstr ""
 
-#: includes/class-hcard-user.php:168
+#: includes/class-hcard-user.php:177
 msgid "Other Sites"
 msgstr ""
 
-#: includes/class-hcard-user.php:168
+#: includes/class-hcard-user.php:177
 msgid "Other profiles without their own field in your user profile (One URL per line)"
 msgstr ""
 

package.json

@@ -16,7 +16,7 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-sass": "^2.0.0",
     "grunt-wp-readme-to-markdown": "~2.1.0",
-    "simple-icons": "^11.5"
+    "simple-icons": "^11.6.0"
   },
   "license": "MIT",
   "bugs": {

phpcs.xml

@@ -9,7 +9,7 @@
 	<exclude-pattern>*/includes/class-connekt-plugin-installer.php</exclude-pattern>
 	<exclude-pattern>*/vendor/*</exclude-pattern>
 	<rule ref="PHPCompatibility"/>
-	<config name="testVersion" value="5.6-"/>
+	<config name="testVersion" value="7.2-"/>
 	<rule ref="WordPress-Core" />
 	<rule ref="WordPress.Files.FileName">
 	<properties>

readme.md

@@ -5,7 +5,7 @@
 **Requires at least:** 4.7  
 **Requires PHP:** 5.6  
 **Tested up to:** 6.4  
-**Stable tag:** 4.0.2  
+**Stable tag:** 4.0.4  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 
@@ -79,6 +79,16 @@ One could certainly download, install, and activate some or all of these plugins
 
 Project maintained on github at [indieweb/wordpress-indieweb](https://github.com/indieweb/wordpress-indieweb).
 
+### 4.0.4 ###
+* Profile setting for reddit was missing a /
+
+### 4.0.3 ###
+* Refresh icons
+* Add minimal CSS file
+* Replace Bluesky with now official icon
+* Add user profile setting for bluesky and reddit as both are now supported by Bridgy
+* Fix null check
+
 ### 4.0.2 ###
 * Refresh icons
 * Add bluesky and nostr icon manually per prior request

readme.txt

@@ -5,7 +5,7 @@ Tags: indieweb, webmention, POSSE, indieauth
 Requires at least: 4.7
 Requires PHP: 5.6
 Tested up to: 6.4
-Stable tag: 4.0.2
+Stable tag: 4.0.4
 License: MIT
 License URI: http://opensource.org/licenses/MIT
 
@@ -79,6 +79,16 @@ One could certainly download, install, and activate some or all of these plugins
 
 Project maintained on github at [indieweb/wordpress-indieweb](https://github.com/indieweb/wordpress-indieweb).
 
+= 4.0.4 =
+* Profile setting for reddit was missing a /
+
+= 4.0.3 =
+* Refresh icons
+* Add minimal CSS file
+* Replace Bluesky with now official icon
+* Add user profile setting for bluesky and reddit as both are now supported by Bridgy
+* Fix null check
+
 = 4.0.2 =
 * Refresh icons
 * Add bluesky and nostr icon manually per prior request

sass/_simple-icons-min.scss

@@ -0,0 +1,46 @@
+// Brand colors from simpleicons.org
+.relme li a {
+
+	.svg-blogger                       {
+		color: #FF5722;
+	}
+	.svg-bluesky                       {
+		color: #0285FF;
+	}
+	.svg-facebook                      {
+		color: #0866FF;
+	}
+	.svg-flickr                        {
+		color: #0063DC;
+	}
+	.svg-github                        {
+		color: #181717;
+	}
+	.svg-instagram                     {
+		color: #E4405F;
+	}
+	.svg-mastodon                      {
+		color: #6364FF;
+	}
+	.svg-medium                        {
+		color: #000000;
+	}
+	.svg-microdotblog                  {
+		color: #FF8800;
+	}
+	.svg-reddit                        {
+		color: #FF4500;
+	}
+	.svg-swarm                         {
+		color: #FFA633;
+	}
+	.svg-tumblr                        {
+		color: #36465D;
+	}
+	.svg-twitter                       {
+		color: #1D9BF0;
+	}
+	.svg-wordpress                     {
+		color: #21759B;
+	}
+}