Remove Revision::getRevisionText from ApiQueryDeletedrevs

[lhc/web/wiklou.git] / includes / api / ApiQueryExternalLinks.php

diff --git a/includes/api/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php
index 6c219d4..b5731a3 100644 (file)
--- a/includes/api/ApiQueryExternalLinks.php
+++ b/includes/api/ApiQueryExternalLinks.php
@@ -37,6 +37,7 @@ class ApiQueryExternalLinks extends ApiQueryBase {
                }
 
                $params = $this->extractRequestParams();
+               $db = $this->getDB();
 
                $query = $params['query'];
                $protocol = ApiQueryExtLinksUsage::getProtocolPrefix( $params['protocol'] );
@@ -49,26 +50,64 @@ class ApiQueryExternalLinks extends ApiQueryBase {
                $this->addTables( 'externallinks' );
                $this->addWhereFld( 'el_from', array_keys( $this->getPageSet()->getGoodTitles() ) );
 
-               $whereQuery = $this->prepareUrlQuerySearchString( $query, $protocol );
-
-               if ( $whereQuery !== null ) {
-                       $this->addWhere( $whereQuery );
-               }
+               $orderBy = [];
 
                // Don't order by el_from if it's constant in the WHERE clause
                if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) {
-                       $this->addOption( 'ORDER BY', 'el_from' );
+                       $orderBy[] = 'el_from';
                }
 
-               // If we're querying all protocols, use DISTINCT to avoid repeating protocol-relative links twice
-               if ( $protocol === null ) {
-                       $this->addOption( 'DISTINCT' );
+               if ( $query !== null && $query !== '' ) {
+                       if ( $protocol === null ) {
+                               $protocol = 'http://';
+                       }
+
+                       // Normalize query to match the normalization applied for the externallinks table
+                       $query = Parser::normalizeLinkUrl( $protocol . $query );
+
+                       $conds = LinkFilter::getQueryConditions( $query, [
+                               'protocol' => '',
+                               'oneWildcard' => true,
+                               'db' => $db
+                       ] );
+                       if ( !$conds ) {
+                               $this->dieWithError( 'apierror-badquery' );
+                       }
+                       $this->addWhere( $conds );
+                       if ( !isset( $conds['el_index_60'] ) ) {
+                               $orderBy[] = 'el_index_60';
+                       }
+               } else {
+                       $orderBy[] = 'el_index_60';
+
+                       if ( $protocol !== null ) {
+                               $this->addWhere( 'el_index_60' . $db->buildLike( "$protocol", $db->anyString() ) );
+                       } else {
+                               // We're querying all protocols, filter out duplicate protocol-relative links
+                               $this->addWhere( $db->makeList( [
+                                       'el_to NOT' . $db->buildLike( '//', $db->anyString() ),
+                                       'el_index_60 ' . $db->buildLike( 'http://', $db->anyString() ),
+                               ], LIST_OR ) );
+                       }
                }
 
+               $orderBy[] = 'el_id';
+               $this->addOption( 'ORDER BY', $orderBy );
+               $this->addFields( $orderBy ); // Make sure
+
                $this->addOption( 'LIMIT', $params['limit'] + 1 );
-               $offset = $params['offset'] ?? 0;
-               if ( $offset ) {
-                       $this->addOption( 'OFFSET', $params['offset'] );
+
+               if ( $params['continue'] !== null ) {
+                       $cont = explode( '|', $params['continue'] );
+                       $this->dieContinueUsageIf( count( $cont ) !== count( $orderBy ) );
+                       $i = count( $cont ) - 1;
+                       $cond = $orderBy[$i] . ' >= ' . $db->addQuotes( rawurldecode( $cont[$i] ) );
+                       while ( $i-- > 0 ) {
+                               $field = $orderBy[$i];
+                               $v = $db->addQuotes( rawurldecode( $cont[$i] ) );
+                               $cond = "($field > $v OR ($field = $v AND $cond))";
+                       }
+                       $this->addWhere( $cond );
                }
 
                $res = $this->select( __METHOD__ );
@@ -78,7 +117,7 @@ class ApiQueryExternalLinks extends ApiQueryBase {
                        if ( ++$count > $params['limit'] ) {
                                // We've reached the one extra which shows that
                                // there are additional pages to be had. Stop here...
-                               $this->setContinueEnumParameter( 'offset', $offset + $params['limit'] );
+                               $this->setContinue( $orderBy, $row );
                                break;
                        }
                        $entry = [];
@@ -90,12 +129,20 @@ class ApiQueryExternalLinks extends ApiQueryBase {
                        ApiResult::setContentValue( $entry, 'url', $to );
                        $fit = $this->addPageSubItem( $row->el_from, $entry );
                        if ( !$fit ) {
-                               $this->setContinueEnumParameter( 'offset', $offset + $count - 1 );
+                               $this->setContinue( $orderBy, $row );
                                break;
                        }
                }
        }
 
+       private function setContinue( $orderBy, $row ) {
+               $fields = [];
+               foreach ( $orderBy as $field ) {
+                       $fields[] = strtr( $row->$field, [ '%' => '%25', '|' => '%7C' ] );
+               }
+               $this->setContinueEnumParameter( 'continue', implode( '|', $fields ) );
+       }
+
        public function getCacheMode( $params ) {
                return 'public';
        }
@@ -109,8 +156,7 @@ class ApiQueryExternalLinks extends ApiQueryBase {
                                ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
                                ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
                        ],
-                       'offset' => [
-                               ApiBase::PARAM_TYPE => 'integer',
+                       'continue' => [
                                ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
                        ],
                        'protocol' => [