remove duplicate url values

6 years ago · 4959ec15f2
--- a/lib/XRay/Formats/Mf2.php
+++ b/lib/XRay/Formats/Mf2.php
@ -323,16 +323,20 @@ class Mf2 extends Format {
  }

  private static function collectArrayURLValues($properties, $item, &$data, &$refs, &$http) {
    $keys = [];

    foreach($properties as $p) {
      if(array_key_exists($p, $item['properties'])) {
        foreach($item['properties'][$p] as $v) {
          if(is_string($v) && self::isURL($v)) {
            if(!array_key_exists($p, $data)) $data[$p] = [];
            $data[$p][] = $v;
            $keys[] = $p;
          }
          elseif(self::isMicroformat($v) && ($u=self::getPlaintext($v, 'url')) && self::isURL($u)) {
            if(!array_key_exists($p, $data)) $data[$p] = [];
            $data[$p][] = $u;
            $keys[] = $p;
            // parse the object and put the result in the "refs" object
            $ref = self::parse(['items'=>[$v]], $u, $http);
            if($ref) {
@ -340,7 +344,12 @@ class Mf2 extends Format {
            }
          }
        }
      }      
      }
    }

    // Remove duplicate values
    foreach(array_unique($keys) as $key) {
      $data[$key] = array_unique($data[$key]);
    }
  }

--- a/tests/ParseTest.php
+++ b/tests/ParseTest.php
@ -660,4 +660,28 @@ class ParseTest extends PHPUnit_Framework_TestCase {
    $this->assertObjectNotHasAttribute('photo', $data->data);
  }

  public function testDuplicateReplyURLValues() {
    $url = 'http://source.example.com/duplicate-in-reply-to-urls';
    $response = $this->parse(['url' => $url]);

    $body = $response->getContent();
    $this->assertEquals(200, $response->getStatusCode());
    $data = json_decode($body, true);

    $this->assertEquals('http://example.com/100', $data['data']['in-reply-to'][0]);
    $this->assertEquals(1, count($data['data']['in-reply-to']));
  }

  public function testDuplicateLikeOfURLValues() {
    $url = 'http://source.example.com/duplicate-like-of-urls';
    $response = $this->parse(['url' => $url]);

    $body = $response->getContent();
    $this->assertEquals(200, $response->getStatusCode());
    $data = json_decode($body, true);

    $this->assertEquals('http://example.com/100', $data['data']['like-of'][0]);
    $this->assertEquals(1, count($data['data']['like-of']));
  }

 }
--- a/tests/data/source.example.com/duplicate-in-reply-to-urls
+++ b/tests/data/source.example.com/duplicate-in-reply-to-urls
@ -0,0 +1,19 @@
 HTTP/1.1 200 OK
 Server: Apache
 Date: Wed, 09 Dec 2015 03:29:14 GMT
 Content-Type: text/html; charset=utf-8
 Connection: keep-alive

 <html>
  <head>
    <title>Test</title>
  </head>
  <body class="h-entry">
    <a href="http://example.com/100" class="u-in-reply-to">in reply to</a>
    <div class="u-in-reply-to h-cite">
      <a href="http://example.com/100" class="u-url">this post</a>
    </div>
    <p class="e-content">This page has duplicate in-reply-to values.</p>
    <a href="/duplicate-in-reply-to-urls" class="u-url">permalink</a>
  </body>
 </html>
--- a/tests/data/source.example.com/duplicate-like-of-urls
+++ b/tests/data/source.example.com/duplicate-like-of-urls
@ -0,0 +1,19 @@
 HTTP/1.1 200 OK
 Server: Apache
 Date: Wed, 09 Dec 2015 03:29:14 GMT
 Content-Type: text/html; charset=utf-8
 Connection: keep-alive

 <html>
  <head>
    <title>Test</title>
  </head>
  <body class="h-entry">
    liked
    <a href="http://example.com/100" class="u-like-of">a post</a>
    <div class="u-like-of h-cite">
      <a href="http://example.com/100" class="u-url">this post</a>
    </div>
    <a href="/duplicate-like-of-urls" class="u-url">permalink</a>
  </body>
 </html>