Merge branch 'develop' into trunk

Author: dkotter

.github/workflows/cypress.yml

@@ -18,7 +18,7 @@ jobs:
         core:
           - { name: 'WP latest', version: 'latest' }
           - { name: 'WP trunk', version: 'WordPress/WordPress#master' }
-          - { name: 'WP minimum', version: 'WordPress/WordPress#5.2' }
+          - { name: 'WP minimum', version: 'WordPress/WordPress#5.3' }
 
     steps:
       - name: Checkout

.github/workflows/eslint.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: install node v12
-      uses: actions/setup-node@v1
+    - name: install node v16
+      uses: actions/setup-node@v3
       with:
-        node-version: 12
+        node-version: 16
     - name: npm install
       run: npm install
     - name: Run eslint

CHANGELOG.md

@@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased] - TBD
 
+## [1.2.0] - 2022-09-28
+**Note that this release bumps the WordPress minimum from 4.9 to 5.3.**
+
+### Added
+- Add AutoTweet panel in editor sidebar and pre-publish panel to manage enabling/disabling tweet on publish (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@linawiezkowiak](https://github.com/linawiezkowiak), [@oszkarnagy](https://github.com/oszkarnagy), [@cadic](https://github.com/cadic) via [#177](https://github.com/10up/autoshare-for-twitter/pull/177)).
+
+### Changed
+- Bump minimum required WordPress version to 5.3 (props [@iamdharmesh](https://github.com/iamdharmesh) via [#177](https://github.com/10up/autoshare-for-twitter/pull/177)).
+- Updates in CONTRIBUTING.md file (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#172](https://github.com/10up/autoshare-for-twitter/pull/172)).
+- Update plugin icons (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul) via [#174](https://github.com/10up/autoshare-for-twitter/pull/174)).
+
+### Security
+- Bump `terser` from 4.3.1 to 4.8.1 (props [@dependabot](https://github.com/apps/dependabot) via [#184](https://github.com/10up/autoshare-for-twitter/pull/184)).
+
 ## [1.1.2] - 2022-06-24
 ### Added
 - Cypress E2E tests (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@Sidsector9](https://github.com/Sidsector9) via [#167](https://github.com/10up/autoshare-for-twitter/pull/167)).
@@ -125,6 +139,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Initial closed source release (props [@scottlee](https://github.com/scottlee/)).
 
 [Unreleased]: https://github.com/10up/autoshare-for-twitter/compare/trunk...develop
+[1.2.0]: https://github.com/10up/autoshare-for-twitter/compare/1.1.2...1.2.0
 [1.1.2]: https://github.com/10up/autoshare-for-twitter/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/10up/autoshare-for-twitter/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/10up/autoshare-for-twitter/compare/1.0.6...1.1.0

CONTRIBUTING.md

@@ -29,7 +29,7 @@ The develop branch is the development branch which means it contains the next ve
 ## Release instructions
 
 1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
-1. Version bump: Bump the version number in `autoshare-for-twitter.php`, `readme.txt`, `package-lock.json`, `package.json`, and `composer.json`(`autoloader-suffix` config option) if it does not already reflect the version being released.
+1. Version bump: Bump the version number in `autoshare-for-twitter.php`, `readme.txt`, `package-lock.json`, `package.json`, and `composer.json`(`autoloader-suffix` config option) if it does not already reflect the version being released. In `autoshare-for-twitter.php` update both the plugin "Version:" property and the plugin `AUTOSHARE_FOR_TWITTER_VERSION` constant.
 1. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`.
 1. Props: update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
 1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.

CREDITS.md

@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Scott Lee (@scottlee)](https://github.com/scottlee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Lina Wiezkowiak (@linawiezkowiak)](https://github.com/linawiezkowiak), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Thrijith Thankachan (@thrijith)](https://github.com/thrijith), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1).
+[Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [John Watkins (@johnwatkins0)](https://github.com/johnwatkins0), [Scott Lee (@scottlee)](https://github.com/scottlee), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ricky Lee Whittemore (@rickalee)](https://github.com/rickalee), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Lina Wiezkowiak (@linawiezkowiak)](https://github.com/linawiezkowiak), [Oszkar Nagy (@oszkarnagy)](https://github.com/oszkarnagy), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Thrijith Thankachan (@thrijith)](https://github.com/thrijith), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [GitHub Dependabot (@dependabot)](https://github.com/apps/dependabot).
 
 ## Libraries
 

README.md

@@ -57,7 +57,7 @@ add_filter( 'dt_blacklisted_meta', function( $blacklisted_metas ) {
 ## Requirements
 
 - PHP 7.2+
-- [WordPress](http://wordpress.org) 4.7+
+- [WordPress](http://wordpress.org) 5.3+
 
 ## Installation
 

assets/css/admin-autoshare-for-twitter.css

@@ -12,34 +12,16 @@
 	white-space: normal;
 }
 
-.autoshare-for-twitter-prepublish__checkbox .components-base-control__field, .autoshare-for-twitter-prepublish__checkbox-label {
-	display: flex;
-	align-items: center;
-}
-
-.autoshare-for-twitter-prepublish__checkbox .components-base-control__field {
+.autoshare-for-twitter-toggle-control {
 	margin-top: 0.5rem;
 }
 
-.autoshare-for-twitter-prepublish__checkbox-label svg {
-	margin-right: 0.5rem;
-}
-
-.autoshare-for-twitter-prepublish__message-label {
-	display: flex;
-	justify-content: space-between;
-}
-
-.autoshare-for-twitter-prepublish__checkbox-row input[type=checkbox].components-checkbox-control__input {
-	margin-right: 0.5rem;
-}
-
 .autoshare-for-twitter-prepublish__override-row {
 	padding: 0.5rem 0;
 }
 
 .autoshare-for-twitter-prepublish__override-row .components-button {
-	margin-bottom: 1rem;
+	margin-top: 0.5rem;
 }
 
 .autoshare-for-twitter-post-status {
@@ -142,3 +124,9 @@ tbody .autoshare-for-twitter-status-logo--enabled::before {
 tbody .autoshare-for-twitter-status-logo--disabled::before {
 	background-image: url('../images/twitter_disabled.svg');
 }
+
+.autoshare-for-twitter-pre-publish-panel svg.components-panel__icon,
+.autoshare-for-twitter-editor-panel svg.components-panel__icon{
+	width: 24px;
+	height: 24px;
+}

autoshare-for-twitter.php

@@ -3,8 +3,8 @@
  * Plugin Name:       Autoshare for Twitter
  * Description:       Automatically tweets the post title or custom message and a link to the post.
  * Disclaimer:        TWITTER, TWEET, RETWEET and the Twitter logo are trademarks of Twitter, Inc. or its affiliates.
- * Version:           1.1.2
- * Requires at least: 4.9
+ * Version:           1.2.0
+ * Requires at least: 5.3
  * Requires PHP:      7.2
  * Author:            10up
  * Author URI:        https://10up.com
@@ -20,7 +20,7 @@
 }
 
 define( 'AUTOSHARE_FOR_TWITTER', __FILE__ );
-define( 'AUTOSHARE_FOR_TWITTER_VERSION', '1.1.2' );
+define( 'AUTOSHARE_FOR_TWITTER_VERSION', '1.2.0' );
 define( 'AUTOSHARE_FOR_TWITTER_URL', plugin_dir_url( __FILE__ ) );
 define( 'AUTOSHARE_FOR_TWITTER_PATH', plugin_dir_path( __FILE__ ) );
 define( 'AUTOSHARE_FOR_TWITTER_INC', AUTOSHARE_FOR_TWITTER_PATH . 'includes/' );

composer.json

@@ -29,7 +29,7 @@
 	},
 	"minimum-stability": "dev",
 	"config": {
-		"autoloader-suffix": "10upAutoshareForTwitterV112",
+		"autoloader-suffix": "10upAutoshareForTwitterV120",
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true
 		}

includes/admin/post-meta.php

@@ -259,21 +259,25 @@ function get_tweet_status_message( $post ) {
 					// Translators: Placeholder is a date.
 					'message' => sprintf( __( 'Tweeted on %s', 'autoshare-for-twitter' ), $date ),
 					'url'     => $twitter_url,
+					'status'  => $status,
 				];
 
 			case 'error':
 				return [
 					'message' => __( 'Failed to tweet: ', 'autoshare-for-twitter' ) . $twitter_status['message'],
+					'status'  => $status,
 				];
 
 			case 'unknown':
 				return [
 					'message' => $twitter_status['message'],
+					'status'  => $status,
 				];
 
 			default:
 				return [
 					'message' => __( 'This post was not tweeted.', 'autoshare-for-twitter' ),
+					'status'  => $status,
 				];
 		}
 	}