One more place to fix

Author: arunshenoy99

includes/Images/ImageService.php

@@ -113,7 +113,7 @@ public function optimize_image( $image_url, $original_file_path ) {
 		$monthly_request_count = ( '' !== $monthly_request_count ) ? intval( $monthly_request_count ) : null;
 		$monthly_limit         = ( '' !== $monthly_limit ) ? intval( $monthly_limit ) : null;
 		if ( null !== $monthly_request_count && null !== $monthly_limit ) {
-			$settings                  = ImageSettings::get();
+			$settings                  = ImageSettings::get( $this->container, true );
 			$settings['monthly_usage'] = array(
 				'monthlyRequestCount' => $monthly_request_count,
 				'maxRequestsPerMonth' => $monthly_limit,
@@ -232,7 +232,7 @@ public function optimize_image( $image_url, $original_file_path ) {
 	 * Permanently ban the site from accessing image optimization.
 	 */
 	private function ban_site() {
-		$settings                      = ImageSettings::get();
+		$settings                      = ImageSettings::get( $this->container, true );
 		$settings['banned_status']     = true;
 		$settings['bulk_optimization'] = false;
 		$settings['auto_optimized_uploaded_images']['enabled']                    = false;
@@ -504,7 +504,7 @@ public function get_monthly_usage_limit() {
 			);
 		}
 
-		$settings                  = ImageSettings::get( false );
+		$settings                  = ImageSettings::get( $this->container, false );
 		$settings['monthly_usage'] = $body;
 		ImageSettings::update( $settings, $this->container );
 

includes/Images/ImageSettings.php

@@ -72,6 +72,7 @@ private static function get_default_settings( $container = null ) {
 	 * @param \NewfoldLabs\WP\Container\Container $container Dependency injection container.
 	 */
 	public function __construct( $container ) {
+		$this->container        = $container;
 		$this->default_settings = self::get_default_settings( $container );
 		$this->register_settings( $container );
 		$this->initialize_settings();
@@ -407,11 +408,12 @@ public static function get_monthly_usage() {
 	/**
 	 * Retrieves the image optimization settings.
 	 *
-	 * @param bool $call_worker Whether to fetch the latest monthly usage from the worker. Default is true.
+	 * @param \NewfoldLabs\WP\Container\Container|null $container   Dependency injection container (optional).
+	 * @param bool                                     $call_worker Whether to fetch the latest monthly usage from the worker. Default is true.
 	 *
 	 * @return array The current image optimization settings, including monthly usage and banned status.
 	 */
-	public static function get( $call_worker = true ) {
+	public static function get( $container, $call_worker = true ) {
 		$settings = get_option( self::SETTING_KEY, array() );
 
 		if ( ! is_array( $settings ) ) {
@@ -423,7 +425,7 @@ public static function get( $call_worker = true ) {
 		}
 
 		if ( $call_worker && ( empty( $settings['monthly_usage'] ) || ! is_array( $settings['monthly_usage'] ) ) ) {
-			$usage_data = ( new ImageService() )->get_monthly_usage_limit( true );
+			$usage_data = ( new ImageService( $container ) )->get_monthly_usage_limit( true );
 			if ( ! is_wp_error( $usage_data ) ) {
 				$settings['monthly_usage'] = $usage_data;
 				update_option( self::SETTING_KEY, $settings );