Merge pull request #19 from circuscode/develop

Develop

Author: circuscode

.github/workflows/deploy-env-dev.yml

@@ -17,7 +17,7 @@ jobs:
         username: ${{ secrets.FTP_USER_GITHUBDEPLOY }}
         password: ${{ secrets.FTP_PASSWORD_GITHUBDEPLOY }}
         protocol: ftp
-        server-dir: unmus/dev/wordpress/wp-content/plugins/mathilda/
+        server-dir: ${{ vars.FTP_PATH_DEV }}
         exclude: |
           **/.git*
           **/.git*/**

.github/workflows/deploy-env-public.yml

@@ -17,7 +17,7 @@ jobs:
         username: ${{ secrets.FTP_USER_GITHUBDEPLOY }}
         password: ${{ secrets.FTP_PASSWORD_GITHUBDEPLOY }}
         protocol: ftp
-        server-dir: unmus/public/wordpress/wp-content/plugins/mathilda/
+        server-dir: ${{ vars.FTP_PATH_PUBLIC }}
         exclude: |
           **/.git*
           **/.git*/**

mathilda.php

@@ -4,7 +4,7 @@
 Plugin Name:  Mathilda
 Plugin URI:   https://www.unmus.de/wordpress-plugin-mathilda/
 Description:  Mathilda copies your tweets from Twitter to WordPress.
-Version:	  0.11
+Version:	  0.12
 Author:       Marco Hitschler
 Author URI:   https://www.unmus.de/
 License:      GPL3
@@ -74,7 +74,7 @@ function mathilda_activate () {
 	add_option('mathilda_tweets_count', "0");
 	add_option('mathilda_activated', "1");
 	add_option('mathilda_database_version', "1");
-	add_option('mathilda_plugin_version', "13");
+	add_option('mathilda_plugin_version', "15");
 	add_option('mathilda_import', "0");
 	add_option('mathilda_slug_is_changed', "0");
 	add_option('mathilda_cron_period', "900");
@@ -95,6 +95,7 @@ function mathilda_activate () {
 	add_option('mathilda_import_subprocess_running', "0");
 	add_option('mathilda_load_process_running',"0");
 	add_option('mathilda_import_filesize_max',"409600");
+	add_option('mathilda_cron_status',"0");
 
 	/* Create Mathilda Tables */
 
@@ -208,6 +209,7 @@ function mathilda_delete () {
 		delete_option('mathilda_import_subprocess_running');
 		delete_option('mathilda_load_process_running');
 		delete_option('mathilda_import_filesize_max');
+		delete_option('mathilda_cron_status');
 
 		/* Delete Tables */
 

mathilda_cron.php

@@ -503,7 +503,10 @@ function mathilda_cron_script() {
 Update Meta 
 */
 
-if($initial_load == 0) { update_option('mathilda_initial_load', 1); }
+if($initial_load == 0) { 
+	update_option('mathilda_initial_load', 1); 
+	update_option('mathilda_cron_status', 1); 
+}
 $latest_tweet=mathilda_latest_tweet();
 $number_of_tweets=mathilda_tweets_count();
 $number_of_select=mathilda_select_count();

mathilda_database.php

@@ -462,6 +462,7 @@ function mathilda_reset_data() {
 		update_option('mathilda_import_subprocess_running',0);
 		update_option('mathilda_load_process_running',0);
 		update_option('mathilda_import_interval', "86400");
+		update_option('mathilda_cron_status',"0");
 
 		global $wpdb;
 		$table_name=$wpdb->prefix . 'mathilda_tweets';

mathilda_schedule.php

@@ -48,7 +48,9 @@ function mathilda_import_interval( $schedules ) {
 function mathilda_cron_execute_tweetload() {
 
 	$initial_load = get_option('mathilda_initial_load');
-	if($initial_load==1) {
+	$cron_status=get_option('mathilda_cron_status');
+
+	if($initial_load==1 && $cron_status==1) {
 		mathilda_cron_script();
 	}
 }

mathilda_tools.php

@@ -34,6 +34,7 @@ function mathilda_tools_controller() {
 	$handbook_show=false;
 	$mathilda_reset=false;
 	$import_break=false;
+	$cron_status=false;
 
 	// Load Tweets
   	if(isset($_GET['cron'])) {
@@ -42,6 +43,13 @@ function mathilda_tools_controller() {
  		$run_cron=true;
  		}	
  	}
+	// Cron Status
+	if(isset($_GET['cronstatus'])) {
+		if($_GET['cronstatus']=='true')
+		{
+		$cron_status=true;
+		}	
+	}
 	// Scripting
 	if(isset($_GET['scripting'])) {
 		if($_GET['scripting']=='true')
@@ -148,6 +156,8 @@ function mathilda_tools_controller() {
 function mathilda_tools() {
 
 	/* Dynamic Labels */
+
+	/* Import Status */
 	$label_import_botton="";
 	$label_import_status=get_option('mathilda_import_running');
 	if($label_import_status==0) {
@@ -156,6 +166,15 @@ function mathilda_tools() {
 		$label_import_botton="Status!";
 	}
 
+	/* cron Status */
+	$label_cronstatus_button="";
+	$label_cronstatus_status=get_option('mathilda_cron_status');
+	if($label_cronstatus_status==0) {
+		$label_cronstatus_button="Activate!";
+	} else {
+		$label_cronstatus_button="Deactivate!";
+	}
+
 	/* Headline */
 	echo '<h1 class="mathilda_tools_headline">Tweets</h1>
 	<p class="mathilda_tools_description">Mathilda Tools</p>';
@@ -193,6 +212,36 @@ function mathilda_tools() {
 		}
 	}
 
+	// Auto Load
+	if(isset($_GET['cronstatus'])) {
+		if($_GET['cronstatus']=='true')
+		{
+			$autoload_status=get_option('mathilda_cron_status');
+			if($autoload_status) {
+				update_option('mathilda_cron_status','0');
+				$label_cronstatus_button="Activate!";
+				echo '<div class="updated fade">
+				<p><strong>Auto Load has been deactivated.</strong></p> 
+				</div>';
+			} else {
+
+				$initial_load = get_option('mathilda_initial_load');
+				if($initial_load==1) {
+					update_option('mathilda_cron_status','1');
+					$label_cronstatus_button="Deactivate!";
+					echo '<div class="updated fade">
+					<p><strong>Auto Load has been activated.</strong></p> 
+					</div>';
+				} else {
+					echo '<div class="notice notice-warning is-dismissible">
+					<p><strong>Auto Load can still not be activated. You have to run an initial load manually first (Load Tweets).</strong></p> 
+					</div>';
+				}
+
+			}
+		}
+	}
+
 	// Embed Reset
 	if(isset($_GET['resetisconfirmed'])) {
 		if($_GET['resetisconfirmed']=='true')
@@ -226,6 +275,16 @@ function mathilda_tools() {
 	<a class="button" href="'.admin_url().'tools.php?page=mathilda-tools-menu&cron=true" >Run!</a>
 	</td>
 	</tr>
+
+	<!-- Status Cron -->
+	<tr valign="top">
+	<th scope="row">
+	<label for="cron">Auto Load</label>
+	</th>
+	<td>
+	<a class="button" href="'.admin_url().'tools.php?page=mathilda-tools-menu&cronstatus=true">'.$label_cronstatus_button.'</a>
+	</td>
+	</tr>
 	
 	<!-- Load Twitter Export -->
 	<tr valign="top">

mathilda_update.php

@@ -194,6 +194,19 @@ function mathilda_update () {
 		add_option('mathilda_import_filesize_max',"409600");
 	}
 
+	/* Update Process Version 0.12 */
+	if($mathilda_previous_version==14) {
+		update_option('mathilda_plugin_version', "15");
+		$cron_status='';
+		$initial_load = get_option('mathilda_initial_load');
+		if($initial_load==1) {
+			$cron_status=1;
+		} else {
+			$cron_status=0;
+		}
+		add_option('mathilda_cron_status',$cron_status);
+	}
+
 }
 add_action( 'plugins_loaded', 'mathilda_update' );
 

mathilda_utilities.php

@@ -291,7 +291,18 @@ function mathilda_healthy_check() {
 
         $output.='<br/>';
 
-        // 4. Info
+      // 4. Info
+      $cron_status=get_option('mathilda_cron_status');
+      if($cron_status==0) {
+            $output.='Auto Load is deactive.';
+      }
+      else {
+            $output.='Auto Load is active.';
+      }
+      
+      $output.='<br/>';
+
+        // 5. Info
         $tweets_loaded=mathilda_tweets_count();
         if($tweets_loaded==0) {
             $output.='No Tweets are loaded.';

readme.md

@@ -6,7 +6,7 @@ Mathilda copies your tweets from Twitter to WordPress continuously.
 
 Mathilda is trying to give you back some control of your tweets. The plugin copies your tweets from Twitter continuously and saves them into the WordPress database. The tweets can be displayed on the blog chronologically (but do not have to). Indeed, Twitter is also blogging, micro-blogging so to speak.  
 
-## Functions
+## Features
 
 * Copy your tweets back
 * Copy your tweeted images back
@@ -16,6 +16,10 @@ Mathilda is trying to give you back some control of your tweets. The plugin copi
 * Export your tweets as CSV file
 * Languague: English, German (only FrontEnd)
 
+## Future of this Plugin
+
+As Twitter has decided to discontinue free access to the Twitter API, I have stopped using Twitter. This will also impact the future of this plugin. In the medium term the api request function to copy tweets will be removed from the plugin. Displaying of already received tweet data and the import of DSGVO Data Export will be further supported and maintained. The plugin features will be reduced to minimum. At the present time, the plugin is still be able to execute API Calls as the plugin is using the Twitter API Standard v1.1, which still is usable without payment. But that can change at any time.
+
 ## Installation
 
 1. Download the plugin from the WordPress Plugin Repository
@@ -30,23 +34,6 @@ Mathilda is trying to give you back some control of your tweets. The plugin copi
 4. Run the initial load (Tools/Tweets)
 5. Create a WordPress page (page slug must match mathilda slug) 
 
-## CSS classes
-
-All mathilda UI elements can be addressed with individual CSS selectors. Please use your debugger to find the right classes. 
-
-## Mathilda API
-
-WordPress Action: mathilda_tweets_updated (fired on tweet update)
-
-## Data & Files
-
-Mathilda creates 4 folders within wp-content/uploads.
-
-* mathilda-twitterapi = Archive of the Twitter API data
-* mathilda-images = Tweet Image Folder
-* mathilda-export = Export Directory 
-* mathilda-import = Import Directory 
-
 ## Supported Tweet Types
 
 Following tweet types are supported.
@@ -66,12 +53,33 @@ Following tweet objects are supported.
 * Mentions
 * Galleries
 
-## Mathilda Cron Jobs @ WordPress
+## Architecture
+
+Data storage and process logic is separated from the WordPress Framework. The tweets are not saved in the table wp_posts. And Mathilda is not registering a custom post type for the tweets as well.
+
+## CSS classes
+
+All mathilda UI elements can be addressed with individual CSS selectors. Please use your debugger to find the right classes. 
+
+## Data & Files
+
+Mathilda creates 4 folders within wp-content/uploads.
+
+* mathilda-twitterapi = Archive of the Twitter API data
+* mathilda-images = Tweet Image Folder
+* mathilda-export = Export Directory 
+* mathilda-import = Import Directory 
+
+## wpCrons
 
 * Autoload Tweets (every 15 minutes, customizable)
 * Get Embedding Code from External Source (every 15 minutes, customizable)
 * Import Tweets (every Minute, if Import is running)
 
+## Mathilda API
+
+WordPress Action: mathilda_tweets_updated (fired on tweet update)
+
 ## Frequently Asked Questions
 
 ### Which Tweets are displayed in the blog?
@@ -137,10 +145,6 @@ Backlinks to Twitter will be declared as nofollow. This affects Hashtags, Mentio
 ## How to split large JSON files?
 [JSON Splitter](https://www.unmus.de/wp-content/uploads/Mathilda-JSON-File-Split-EN.pdf) 
 
-## Live Demo
-
-[Here!](https://www.unmus.de/tweets/)
-
 ## Branches
 
 This repository follows the git-flow workflow to a large extent.
@@ -152,10 +156,9 @@ This repository follows the git-flow workflow to a large extent.
 
 Hotfix and release branches will not be applied.
 
-## Unterstanding the Deployment
+## Live Demo
 
-Releases in the WordPress Plugin Directory will be processed via SVN. 
-The Version-to-Ship will be created manually on GitHub. See Release Section.
+[Here!](https://www.unmus.de/tweets/)
 
 ## Built With
 
@@ -172,6 +175,11 @@ This project is licensed under the GPL3 License.
 
 ## Changelog
 
+### 0.12 "Alfred"
+
+* April 2023
+* Feature: Deactivate regular API Request
+
 ### 0.11 "Alice"
 
 * October 2020