Changeset 10518

Timestamp:

12/15/2020 06:24:56 PM (3 years ago)

Author:

iandunn

Message:

Events: Bump the COVID-19 impact expiration to June 2021.

See ​https://wordpress.slack.com/archives/C037W5S7X/p1607096717134300

Location:

sites/trunk/api.wordpress.org/public_html/events/1.0

Files:

• index.php (modified) (3 diffs)
• tests/test-index.php (modified) (1 diff)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -38 +38 @@
     defined( 'WEEK_IN_SECONDS' ) or define( 'WEEK_IN_SECONDS', 7 * DAY_IN_SECONDS );
 
+    /*
+     * Increase range during COVID-19 to mitigate event deserts.
+     *
+     * This is just a guess, and needs to be re-evaluated before it expires.
+     */
+    define( 'COVID_IMPACT_EXPIRATION', strtotime( 'June 30 2021' ) );
+
     // The test suite just needs the functions defined and doesn't want any headers or output
     if ( defined( 'RUNNING_TESTS' ) && RUNNING_TESTS ) {
@@ -769 +776 @@
     );
 
-    /*
-     * Increase range during COVID-19 to mitigate event deserts.
-     *
-     * See https://make.wordpress.org/core/2020/04/02/showing-online-wordcamps-in-the-events-widget/#comment-38480
-     */
-    if ( time() < strtotime( 'December 31 2020' ) ) {
+    if ( time() < COVID_IMPACT_EXPIRATION ) {
         $event_distances['wordcamp'] = 600;
     }
@@ -1353 +1355 @@
     global $wpdb, $cache_group, $cache_life;
 
-    // Re-evaluate pinning after July, per https://make.wordpress.org/core/2020/04/02/showing-online-wordcamps-in-the-events-widget/#comment-38480.
-    if ( $current_time >= strtotime( 'December 31 2020' ) ) {
+    if ( $current_time >= COVID_IMPACT_EXPIRATION ) {
         return $events;
     }

sites/trunk/api.wordpress.org/public_html/events/1.0/tests/test-index.php

@@ -836 +836 @@
             'input' => array( 'ip' => '80.95.186.144' ),
             'expected' => array(
-                'description' => 'antrim',
-                'latitude'    => '54.700',
-                'longitude'   => '-6.200',
+                'description' => 'belfast',
+                'latitude'    => '54.583',
+                'longitude'   => '-5.933',
                 'country'     => 'GB',
                 'internal'    => true,