Move service handlers into independent directories & rename

joedolson · Jan 26, 2025 · 0127c99 · 0127c99
1 parent 4d43869
commit 0127c99
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 10 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -18,5 +18,5 @@
 
 	<exclude-pattern>*/node_modules/*</exclude-pattern>
 	<exclude-pattern>*/vendor/*</exclude-pattern>
-	<exclude-pattern>*/classes/class-wp-oauth.php</exclude-pattern>
+	<exclude-pattern>*/services/x/class-wp-oauth.php</exclude-pattern>
 </ruleset>
diff --git a/src/classes/class-wpt-bluesky-api.php → ...ervices/bluesky/class-wpt-bluesky-api.php b/src/classes/class-wpt-bluesky-api.php → ...ervices/bluesky/class-wpt-bluesky-api.php
diff --git a/src/wpt-post-to-bluesky.php → src/services/bluesky/post.php b/src/wpt-post-to-bluesky.php → src/services/bluesky/post.php
@@ -13,7 +13,7 @@
 	exit;
 } // Exit if accessed directly.
 
-require_once plugin_dir_path( __FILE__ ) . 'classes/class-wpt-bluesky-api.php';
+require_once plugin_dir_path( __FILE__ ) . 'class-wpt-bluesky-api.php';
 
 /**
  * Upload media to Bluesky API.

diff --git a/src/wp-to-twitter-bluesky.php → src/services/bluesky/settings.php b/src/wp-to-twitter-bluesky.php → src/services/bluesky/settings.php
diff --git a/src/classes/class-wpt-mastodon-api.php → ...vices/mastodon/class-wpt-mastodon-api.php b/src/classes/class-wpt-mastodon-api.php → ...vices/mastodon/class-wpt-mastodon-api.php
diff --git a/src/wpt-post-to-mastodon.php → src/services/mastodon/post.php b/src/wpt-post-to-mastodon.php → src/services/mastodon/post.php
@@ -13,7 +13,7 @@
 	exit;
 } // Exit if accessed directly.
 
-require_once plugin_dir_path( __FILE__ ) . 'classes/class-wpt-mastodon-api.php';
+require_once plugin_dir_path( __FILE__ ) . 'class-wpt-mastodon-api.php';
 
 /**
  * Upload media to Mastodon API.

diff --git a/src/wp-to-twitter-mastodon.php → src/services/mastodon/settings.php b/src/wp-to-twitter-mastodon.php → src/services/mastodon/settings.php
diff --git a/src/classes/class-tmhoauth.php → src/services/x/class-tmhoauth.php b/src/classes/class-tmhoauth.php → src/services/x/class-tmhoauth.php
diff --git a/src/classes/class-wp-oauth.php → src/services/x/class-wp-oauth.php b/src/classes/class-wp-oauth.php → src/services/x/class-wp-oauth.php
diff --git a/src/classes/class-wpt-twitteroauth.php → src/services/x/class-wpt-twitteroauth.php b/src/classes/class-wpt-twitteroauth.php → src/services/x/class-wpt-twitteroauth.php
diff --git a/src/wpt-post-to-twitter.php → src/services/x/post.php b/src/wpt-post-to-twitter.php → src/services/x/post.php
diff --git a/src/wp-to-twitter-x.php → src/services/x/settings.php b/src/wp-to-twitter-x.php → src/services/x/settings.php
@@ -106,7 +106,7 @@ function wpt_oauth_connection( $auth = false, $api = '2' ) {
 			);
 			$client   = new Client( $settings );
 		} else {
-			require_once plugin_dir_path( __FILE__ ) . 'classes/class-wpt-twitteroauth.php';
+			require_once plugin_dir_path( __FILE__ ) . 'class-wpt-twitteroauth.php';
 			$connection            = new Wpt_TwitterOAuth( $ack, $acs, $ot, $ots );
 			$connection->useragent = get_option( 'blogname' ) . ' ' . home_url();
 			$client                = $connection;

diff --git a/src/wp-to-twitter.php b/src/wp-to-twitter.php
@@ -64,15 +64,15 @@
 require_once plugin_dir_path( __FILE__ ) . 'includes/ajax.php';
 require_once plugin_dir_path( __FILE__ ) . 'wpt-functions.php';
 // Service post handlers.
-require_once plugin_dir_path( __FILE__ ) . 'wpt-post-to-twitter.php';
-require_once plugin_dir_path( __FILE__ ) . 'wpt-post-to-mastodon.php';
-require_once plugin_dir_path( __FILE__ ) . 'wpt-post-to-bluesky.php';
+require_once plugin_dir_path( __FILE__ ) . 'services/x/post.php';
+require_once plugin_dir_path( __FILE__ ) . 'services/mastodon/post.php';
+require_once plugin_dir_path( __FILE__ ) . 'services/bluesky/post.php';
 // URL Shortening.
 require_once plugin_dir_path( __FILE__ ) . 'wp-to-twitter-shorteners.php';
 // Service settings.
-require_once plugin_dir_path( __FILE__ ) . 'wp-to-twitter-x.php';
-require_once plugin_dir_path( __FILE__ ) . 'wp-to-twitter-mastodon.php';
-require_once plugin_dir_path( __FILE__ ) . 'wp-to-twitter-bluesky.php';
+require_once plugin_dir_path( __FILE__ ) . 'services/x/settings.php';
+require_once plugin_dir_path( __FILE__ ) . 'services/mastodon/settings.php';
+require_once plugin_dir_path( __FILE__ ) . 'services/bluesky/settings.php';
 require_once plugin_dir_path( __FILE__ ) . 'wp-to-twitter-manager.php';
 // Template generation.
 require_once plugin_dir_path( __FILE__ ) . 'wpt-truncate.php';