always use main social network url

plugins/Referrers/API.php

@@ -320,7 +320,7 @@ class API extends \Piwik\Plugin\API
 
         $dataTable->filter('ColumnCallbackDeleteRow', array('label', function ($url) { return !isSocialUrl($url); }));
 
-        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url'));
+        $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'url', __NAMESPACE__ . '\getSocialMainUrl'));
         $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\getSocialNetworkFromDomain'));
 
         $this->setSocialIdSubtables($dataTable);
@@ -530,4 +530,4 @@ class API extends \Piwik\Plugin\API
         }
     }
 
-}
+}
\ No newline at end of file

plugins/Referrers/functions.php

@@ -29,6 +29,26 @@ function getPathFromUrl($url)
     return $path;
 }
 
+/**
+ * Returns the main url of the social network the given url matches
+ *
+ * @param string  $url
+ *
+ * @return string
+ */
+function getSocialMainUrl($url)
+{
+    $social  = getSocialNetworkFromDomain($url);
+    foreach (Common::getSocialUrls() AS $domain => $name) {
+
+        if($name == $social) {
+
+            return $domain;
+        }
+    }
+    return $url;
+}
+
 /**
  * Get's social network name from URL.
  *

tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml

@@ -29,7 +29,7 @@
 				<sum_visit_length>361</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
-				<url>fb.me</url>
+				<url>facebook.com</url>
 				<logo>plugins/Referrers/images/socials/facebook.com.png</logo>
 			</row>
 			<row>
@@ -82,4 +82,4 @@
 		</result>
 		<result date="2010-12-16" />
 	</result>
-</results>
+</results>
\ No newline at end of file

tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml

@@ -10,7 +10,7 @@
 			<bounce_count>1</bounce_count>
 			<nb_visits_converted>0</nb_visits_converted>
 			<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-			<url>fb.me</url>
+			<url>facebook.com</url>
 			<logo>plugins/Referrers/images/socials/facebook.com.png</logo>
 		</row>
 		<row>
@@ -100,4 +100,4 @@
 			<logo>plugins/Referrers/images/socials/facebook.com.png</logo>
 		</row>
 	</result>
-</results>
+</results>
\ No newline at end of file

tests/PHPUnit/Plugins/ReferrersTest.php

@@ -187,7 +187,6 @@ class ReferrersTest extends PHPUnit_Framework_TestCase
 
     /**
      * @group Plugins
-     * @group Social
      *
      * @dataProvider getSocialsLogoFromUrlTestData
      */