Merge pull request #43 from asdfdotdev/development

Version 1.7.0
asdfdotdev · Apr 3, 2020 · 6d57637 · 6d57637
2 parents 936cfed + ac07144
commit 6d57637
Show file tree

Hide file tree

Showing 29 changed files with 6,472 additions and 8,303 deletions.
diff --git a/.babel.config.js b/.babel.config.js
@@ -0,0 +1,31 @@
+module.exports = {
+  presets: [
+    [
+      "@babel/preset-env",
+      {
+        "modules": "commonjs",
+        "useBuiltIns" : "usage",
+        "corejs": "3.0.0",
+      }
+    ],
+    [
+      "@babel/preset-react",
+      {
+        development: process.env.NODE_ENV === "development",
+      },
+    ],
+  ],
+  plugins: [
+    '@babel/plugin-transform-object-assign',
+    '@babel/plugin-transform-runtime',
+    '@babel/plugin-transform-modules-commonjs',
+    '@babel/plugin-transform-arrow-functions',
+    '@babel/plugin-transform-async-to-generator',
+    '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-proposal-object-rest-spread',
+    '@babel/plugin-proposal-export-default-from',
+    [
+      '@babel/plugin-proposal-decorators', { 'legacy': true }
+    ]
+  ]
+}
diff --git a/.babelrc b/.babelrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,10 @@
-dist: trusty
+dist: xenial
 
 language: php
 
+services:
+  - mysql
+
 notifications:
   email:
     on_success: never
@@ -18,7 +21,11 @@ cache:
 
 matrix:
   include:
-    - php: 7.4snapshot
+    - php: 7.4
+      env: WP_VERSION=nightly CODE_STYLES=phpcs
+    - php: 7.4
+      env: WP_VERSION=5.4 CODE_STYLES=phpcs
+    - php: 7.3
       env: WP_VERSION=nightly CODE_STYLES=phpcs
     - php: 7.3
       env: WP_VERSION=5.3 CODE_STYLES=phpcs
@@ -42,6 +49,8 @@ matrix:
       env: WP_VERSION=nightly PHP_UNIT=6
     - php: 5.6
       env: WP_VERSION=nightly PHP_UNIT=5
+    - php: 5.6
+      env: WP_VERSION=5.4 PHP_UNIT=5
     - php: 5.6
       env: WP_VERSION=5.3 PHP_UNIT=5
     - php: 5.6

diff --git a/README.md b/README.md
@@ -10,12 +10,12 @@ To download just the plugin (without the developer extras in this repo) check ou
 
 ### Compatibility
 
-[![WordPress Compatibility](https://img.shields.io/badge/WordPress-4.7_to_5.3-blue.svg?logo=wordpress)](https://wordpress.org/) [![PHP Compatibility](https://img.shields.io/badge/PHP-5.6_to_7.3-%238892BF.svg?logo=php)](https://php.net/)
+[![WordPress Compatibility](https://img.shields.io/badge/WordPress-4.7_to_5.4-blue.svg?logo=wordpress)](https://wordpress.org/) [![PHP Compatibility](https://img.shields.io/badge/PHP-5.6_to_7.4-%238892BF.svg?logo=php)](https://php.net/)
 
 utm.codes is developed for, and tested with, a variety of recent platform versions, including:
 
-- WordPress 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, and 5.3
-- PHP 5.6, 7.0, 7.1, 7.2, and 7.3
+- WordPress 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, and 5.4
+- PHP 5.6, 7.0, 7.1, 7.2, 7.3, and 7.4
 
 ## Branches
 

diff --git a/README.txt b/README.txt
@@ -3,9 +3,9 @@ Contributors: chrislarrycarl
 Donate link: https://utm.codes/pricing/
 Tags: analytics, utm codes, analytics, google analytics, campaign marketing, link generator
 Requires at least: 4.7.0
-Tested up to: 5.3
+Tested up to: 5.4.0
 Requires PHP: 5.6.0
-Stable tag: 1.6.3
+Stable tag: 1.7.0
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -34,7 +34,7 @@ For more information, videos, and helpful tips [visit the utm.codes website](htt
 - Supports adding additional custom parameters to links for improved versatility
 - Multi-user access within WordPress to share creation and management responsibilities
 - See your current link count in the admin dashboard "At a Glance"
-- Works with PHP 5.6, 7.0, 7.1, 7.2, and 7.3
+- Works with PHP 5.6, 7.0, 7.1, 7.2, 7.3, and 7.4
 - 100% Free and Open Source
 
 = Installation =
@@ -65,7 +65,7 @@ Shortening links requires a shortener be configured. Configure shortening under
 
 = Why is the create social links checkbox missing when I create a link?  =
 
-Batch social link creation requires selection of social networks. Select networks under Settings > utm.codes to create links for when batch creating social links.
+Batch social link creation requires selection of social networks. Select networks under Settings > utm.codes to create links for your preferred networks when batch creating social links.
 
 = What if I need custom parameters in my links? =
 
@@ -92,11 +92,16 @@ That isn't a question. But thank you.
 1. The links list provides easy access to search, filter, edit, and copy links
 2. Shorten links just by clicking the checkbox
 3. Create social links in batch just by clicking the checkbox
-4. Configure settings for link format, your favorite social networks, Bitly API key, and more
+4. Configure settings for link format, labels, link notes, your favorite social networks, and shortener
 5. See your link count in the WordPress dashboard "At a Glance"
 
 == Changelog ==
 
+= 1.7.0 =
+
+- Supports WordPress v5.4
+- New use your custom domain when shortening with Rebrandly
+
 = 1.6.3 =
 
 This release doesn't add new functionality, however, it does add a bit of needed housekeeping and increments tested up to for WordPress v5.3

diff --git a/_build/javascript/settings/select.js b/_build/javascript/settings/select.js
@@ -3,11 +3,19 @@
   $(function () {
 
     $('#utmdclink_shortener').on('change', function(event){
+
       if('none' !== $(this).val()) {
-        $('#utmdclink_shortener_api_row').removeClass("hidden");
+        $('#utmdclinks_shortener_api_row').removeClass("hidden");
       } else {
-        $('#utmdclink_shortener_api_row').addClass("hidden");
+        $('#utmdclinks_shortener_api_row').addClass("hidden");
       }
+
+      if('rebrandly' === $(this).val()) {
+        $('#utmdclinks_shortener_custom_domain_row').removeClass("hidden");
+      } else {
+        $('#utmdclinks_shortener_custom_domain_row').addClass("hidden");
+      }
+
     });
 
   });

diff --git a/_build/javascript/index.js → _build/javascript/utmdotcodes.js b/_build/javascript/index.js → _build/javascript/utmdotcodes.js
diff --git a/_build/styles/mixins/_slider.scss b/_build/styles/mixins/_slider.scss
@@ -43,7 +43,7 @@
 		&::-moz-focus-outer {
 			border: 0;
 		}
-		
+
 		&::-moz-range-track {
 			width: 100%;
 			height: $track_height;

diff --git a/_build/styles/partials/_dashboard.scss b/_build/styles/partials/_dashboard.scss
@@ -5,7 +5,7 @@
 	  	&::before {
 			content: "\f103" !important;
 			color: transparent !important;
-			background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0yMi4yMjIyMjIyMjIyMjIyMjUgLTIyLjIyMjIyMjIyMjIyMjIyNSAxNDQuNDQ0NDQ0NDQ0NDQ0NDYgMTU1LjU1NTU1NTU1NTU1NTU3IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTYuNjY2NjY2NjY2NjY2NjY0IC0xMS4xMTExMTExMTExMTExMSkgc2NhbGUoNS41NTU1NTU1NTU1NTU1NTUpIj48ZyBmaWxsPSIjODI4NzhjIj48cGF0aCBkPSJNMTUgMmMtMS42IDAtMy4xLjctNC4yIDEuNy44LjIgMS41LjUgMi4xLjkuNi0uNCAxLjMtLjYgMi4xLS42IDIuMiAwIDQgMS44IDQgNHY1YzAgMi4yLTEuOCA0LTQgNHMtNC0xLjgtNC00VjkuNWMtLjUtLjYtMS4yLTEtMi0xVjEzYzAgMy4zIDIuNyA2IDYgNnM2LTIuNyA2LTZWOGMwLTMuMy0yLjctNi02LTZ6Ij48L3BhdGg+PHBhdGggZD0iTTkgMjJjMS42IDAgMy4xLS43IDQuMi0xLjctLjgtLjItMS41LS41LTIuMS0uOS0uNi40LTEuMy42LTIuMS42LTIuMiAwLTQtMS44LTQtNHYtNWMwLTIuMiAxLjgtNCA0LTRzNCAxLjggNCA0djMuNWMuNS42IDEuMiAxIDIgMVYxMWMwLTMuMy0yLjctNi02LTZzLTYgMi43LTYgNnY1YzAgMy4zIDIuNyA2IDYgNnoiPjwvcGF0aD48L2c+PC9nPjwvc3ZnPg==") !important;
+			background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii0yMi4yMjIyMjIyMjIyMjIyMjUgLTIyLjIyMjIyMjIyMjIyMjIyNSAxNDQuNDQ0NDQ0NDQ0NDQ0NDYgMTU1LjU1NTU1NTU1NTU1NTU3IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTYuNjY2NjY2NjY2NjY2NjY0IC0xMS4xMTExMTExMTExMTExMSkgc2NhbGUoNS41NTU1NTU1NTU1NTU1NTUpIj48ZyBmaWxsPSIjODI4NzhjIj48cGF0aCBkPSJNMTUgMmMtMS42IDAtMy4xLjctNC4yIDEuNy44LjIgMS41LjUgMi4xLjkuNi0uNCAxLjMtLjYgMi4xLS42IDIuMiAwIDQgMS44IDQgNHY1YzAgMi4yLTEuOCA0LTQgNHMtNC0xLjgtNC00VjkuNWMtLjUtLjYtMS4yLTEtMi0xVjEzYzAgMy4zIDIuNyA2IDYgNnM2LTIuNyA2LTZWOGMwLTMuMy0yLjctNi02LTZ6Ij48L3BhdGg+PHBhdGggZD0iTTkgMjJjMS42IDAgMy4xLS43IDQuMi0xLjctLjgtLjItMS41LS41LTIuMS0uOS0uNi40LTEuMy42LTIuMS42LTIuMiAwLTQtMS44LTQtNHYtNWMwLTIuMiAxLjgtNCA0LTRzNCAxLjggNCA0djMuNWMuNS42IDEuMiAxIDIgMVYxMWMwLTMuMy0yLjctNi02LTZzLTYgMi43LTYgNnY1YzAgMy4zIDIuNyA2IDYgNnoiPjwvcGF0aD48L2c+PC9nPjwvc3ZnPg==) !important;
 			background-size: auto 100%;
 			background-repeat: no-repeat;
 		}

diff --git a/_build/styles/partials/_settings.scss b/_build/styles/partials/_settings.scss
@@ -112,7 +112,7 @@
 			appearance: none;
 			background-color: $white;
 			background-image:
-				url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%230084c4%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E'),
+				url(data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%230084c4%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E),
 				linear-gradient(to bottom, $white 0%, $wp_gray 100%);
 			background-repeat: no-repeat, repeat;
 			background-position: right 8px top 50%, 0 0;

diff --git a/_build/styles/core.scss → _build/styles/utmdotcodes.scss b/_build/styles/core.scss → _build/styles/utmdotcodes.scss
diff --git a/_test/README.md b/_test/README.md
@@ -17,11 +17,11 @@ The following will help get you up and running PHPUnit tests for the utm.codes p
 
 ### PHPUnit Tests
 
-PHPUnit tests support phpunit 5.7 (for PHP 5.6) and phpunit 6.5 (for PHP 7.0, 7.1, and 7.2)
+PHPUnit tests support PHPUnit 5.7 (for PHP 5.6), PHPUnit 6.5 (for PHP 7.0, 7.1, and 7.2), and PHPUnit 7.5 (for PHP 7.3, and 7.4).
 
 ### PHP Code Sniffer
 
-PHP Code Sniffer v3.3+ is recommended.
+PHP Code Sniffer v3.5+, and WordPress coding standards v2.2 are recommended.
 
 ## Initial Setup
 
@@ -33,7 +33,7 @@ To get started with composer [click here for installation details](https://getco
 
 ### 1. Installing WordPress Tests (Automated)
 
-The install script contained in `bin` will checkout the latest test suite from WordPress and configure your test database. 
+The install script contained in `bin` will checkout the latest test suite from WordPress and configure your test database.
 
 > Note: The install script is included here for convenience but can also be [generated by WP-CLI](https://developer.wordpress.org/cli/commands/scaffold/plugin-tests/).
 
@@ -48,6 +48,7 @@ Update the `config.inc.php` file to your needs:
 - **WP\_TEST\_DIR** - Path to the WordPress tests directory you setup in Step 1
 - **UTMDC\_PLUGIN\_DIR** - Path to the utm.codes plugin you're testing
 - **UTMDC\_BITLY\_API** - A valid Bitly API Generic Access Token
+- **UTMDC\_REBRANDLY]_API** - A valid Rebrandly API Token
 
 > Note: Rename to `config.inc.local.php` (ignored in .gitignore) for environment personalization.
 
@@ -61,11 +62,11 @@ Running as single site... To run multisite, use -c tests/phpunit/multisite.xml
 Not running ajax tests. To execute these, use --group ajax.
 Not running ms-files tests. To execute these, use --group ms-files.
 Not running external-http tests. To execute these, use --group external-http.
-PHPUnit 7.5.16 by Sebastian Bergmann and contributors.
+PHPUnit 7.5.20 by Sebastian Bergmann and contributors.
 
 .............................................................     61 / 61 (100%)
 
-Time: 33.63 seconds, Memory: 44.00 MB
+Time: 14.86 seconds, Memory: 40.00 MB
 
 OK (61 tests, 516 assertions)
 
@@ -78,7 +79,7 @@ Occasionally a newly installed test suite can throw the error:
 
 ```
 1) TestUtmDotCodesUnit::test_is_test
-UnexpectedValueException: RecursiveDirectoryIterator::__construct(/tmp/wordpress//wp-content/uploads): 
+UnexpectedValueException: RecursiveDirectoryIterator::__construct(/tmp/wordpress//wp-content/uploads):
 failed to open dir: No such file or directory
 ```
 

diff --git a/_test/tests/test-integration.php b/_test/tests/test-integration.php
@@ -965,7 +965,7 @@ function test_settings_register() {
 
 		$this->assertEquals(
 			count( $wp_registered_settings ),
-			9
+			12
 		);
 
 		$this->assertTrue( is_array( $wp_registered_settings['utmdclink_social'] ) );
@@ -1219,32 +1219,37 @@ function test_social_api_filter_hook() {
 		$default_networks = $plugin->get_social_networks();
 		$this->assertEquals(
 			$default_networks,
-			[
-				'behance'        => [ 'Behance', 'fab fa-behance' ],
-				'blogger'        => [ 'Blogger', 'fab fa-blogger-b' ],
-				'digg'           => [ 'Digg', 'fab fa-digg' ],
-				'discourse'      => [ 'Discourse', 'fab fa-discourse' ],
-				'facebook'       => [ 'Facebook', 'fab fa-facebook-f' ],
-				'flickr'         => [ 'Flickr', 'fab fa-flickr' ],
-				'github'         => [ 'GitHub', 'fab fa-github' ],
-				'goodreads'      => [ 'Goodreads', 'fab fa-goodreads-g' ],
-				'hacker-news'    => [ 'Hacker News', 'fab fa-hacker-news' ],
-				'instagram'      => [ 'Instagram', 'fab fa-instagram' ],
-				'linkedin'       => [ 'LinkedIn', 'fab fa-linkedin-in' ],
-				'medium'         => [ 'Medium', 'fab fa-medium-m' ],
-				'meetup'         => [ 'Meetup', 'fab fa-meetup' ],
-				'mix'            => [ 'Mix', 'fab fa-mix' ],
-				'pinterest'      => [ 'Pinterest', 'fab fa-pinterest-p' ],
-				'reddit'         => [ 'Reddit', 'fab fa-reddit-alien' ],
-				'stack-exchange' => [ 'Stack Exchange', 'fab fa-stack-exchange' ],
-				'stack-overflow' => [ 'Stack Overflow', 'fab fa-stack-overflow' ],
-				'tumblr'         => [ 'Tumblr', 'fab fa-tumblr' ],
-				'twitter'        => [ 'Twitter', 'fab fa-twitter' ],
-				'vimeo'          => [ 'Vimeo', 'fab fa-vimeo-v' ],
-				'xing'           => [ 'Xing', 'fab fa-xing' ],
-				'yelp'           => [ 'Yelp', 'fab fa-yelp' ],
-				'youtube'        => [ 'YouTube', 'fab fa-youtube' ],
-			]
+			array(
+				'behance'        => array( 'Behance', 'fab fa-behance' ),
+				'blogger'        => array( 'Blogger', 'fab fa-blogger-b' ),
+				'digg'           => array( 'Digg', 'fab fa-digg' ),
+				'discourse'      => array( 'Discourse', 'fab fa-discourse' ),
+				'facebook'       => array( 'Facebook', 'fab fa-facebook-f' ),
+				'flickr'         => array( 'Flickr', 'fab fa-flickr' ),
+				'github'         => array( 'GitHub', 'fab fa-github' ),
+				'goodreads'      => array( 'Goodreads', 'fab fa-goodreads-g' ),
+				'hacker-news'    => array( 'Hacker News', 'fab fa-hacker-news' ),
+				'instagram'      => array( 'Instagram', 'fab fa-instagram' ),
+				'linkedin'       => array( 'LinkedIn', 'fab fa-linkedin-in' ),
+				'medium'         => array( 'Medium', 'fab fa-medium-m' ),
+				'meetup'         => array( 'Meetup', 'fab fa-meetup' ),
+				'mix'            => array( 'Mix', 'fab fa-mix' ),
+				'odnoklassniki'  => array( 'Odnoklassniki', 'fab fa-odnoklassniki'),
+				'pinterest'      => array( 'Pinterest', 'fab fa-pinterest-p' ),
+				'reddit'         => array( 'Reddit', 'fab fa-reddit-alien' ),
+				'slack'          => array( 'Slack', 'fab fa-slack'),
+				'stack-exchange' => array( 'Stack Exchange', 'fab fa-stack-exchange' ),
+				'stack-overflow' => array( 'Stack Overflow', 'fab fa-stack-overflow' ),
+				'tumblr'         => array( 'Tumblr', 'fab fa-tumblr' ),
+				'twitter'        => array( 'Twitter', 'fab fa-twitter' ),
+				'vimeo'          => array( 'Vimeo', 'fab fa-vimeo-v' ),
+				'vk'             => array( 'VK', 'fab fa-vk'),
+				'weibo'          => array( 'Weibo', 'fab fa-weibo'),
+				'whatsapp'       => array( 'WhatsApp', 'fab fa-whatsapp'),
+				'xing'           => array( 'Xing', 'fab fa-xing' ),
+				'yelp'           => array( 'Yelp', 'fab fa-yelp' ),
+				'youtube'        => array( 'YouTube', 'fab fa-youtube' ),
+			)
 		);
 
 		add_filter(
@@ -1259,32 +1264,37 @@ function( $networks ) {
 		$modified_networks = $plugin->get_social_networks();
 		$this->assertEquals(
 			$modified_networks,
-			[
-				'behance'        => [ 'Behance', 'fab fa-behance' ],
-				'blogger'        => [ 'Blogger', 'fab fa-blogger-b' ],
+			array(
+				'behance'        => array( 'Behance', 'fab fa-behance' ),
+				'blogger'        => array( 'Blogger', 'fab fa-blogger-b' ),
 				'dev-to'         => [ 'Dev.to', 'fab fa-dev' ],
-				'digg'           => [ 'Digg', 'fab fa-digg' ],
-				'discourse'      => [ 'Discourse', 'fab fa-discourse' ],
-				'facebook'       => [ 'Facebook', 'fab fa-facebook-f' ],
-				'flickr'         => [ 'Flickr', 'fab fa-flickr' ],
-				'github'         => [ 'GitHub', 'fab fa-github' ],
-				'goodreads'      => [ 'Goodreads', 'fab fa-goodreads-g' ],
-				'hacker-news'    => [ 'Hacker News', 'fab fa-hacker-news' ],
-				'instagram'      => [ 'Instagram', 'fab fa-instagram' ],
-				'linkedin'       => [ 'LinkedIn', 'fab fa-linkedin-in' ],
-				'medium'         => [ 'Medium', 'fab fa-medium-m' ],
-				'meetup'         => [ 'Meetup', 'fab fa-meetup' ],
-				'pinterest'      => [ 'Pinterest', 'fab fa-pinterest-p' ],
-				'reddit'         => [ 'Reddit', 'fab fa-reddit-alien' ],
-				'stack-exchange' => [ 'Stack Exchange', 'fab fa-stack-exchange' ],
-				'stack-overflow' => [ 'Stack Overflow', 'fab fa-stack-overflow' ],
-				'tumblr'         => [ 'Tumblr', 'fab fa-tumblr' ],
-				'twitter'        => [ 'Twitter', 'fab fa-twitter' ],
-				'vimeo'          => [ 'Vimeo', 'fab fa-vimeo-v' ],
-				'xing'           => [ 'Xing', 'fab fa-xing' ],
-				'yelp'           => [ 'Yelp', 'fab fa-yelp' ],
-				'youtube'        => [ 'YouTube', 'fab fa-youtube' ],
-			]
+				'digg'           => array( 'Digg', 'fab fa-digg' ),
+				'discourse'      => array( 'Discourse', 'fab fa-discourse' ),
+				'facebook'       => array( 'Facebook', 'fab fa-facebook-f' ),
+				'flickr'         => array( 'Flickr', 'fab fa-flickr' ),
+				'github'         => array( 'GitHub', 'fab fa-github' ),
+				'goodreads'      => array( 'Goodreads', 'fab fa-goodreads-g' ),
+				'hacker-news'    => array( 'Hacker News', 'fab fa-hacker-news' ),
+				'instagram'      => array( 'Instagram', 'fab fa-instagram' ),
+				'linkedin'       => array( 'LinkedIn', 'fab fa-linkedin-in' ),
+				'medium'         => array( 'Medium', 'fab fa-medium-m' ),
+				'meetup'         => array( 'Meetup', 'fab fa-meetup' ),
+				'odnoklassniki'  => array( 'Odnoklassniki', 'fab fa-odnoklassniki'),
+				'pinterest'      => array( 'Pinterest', 'fab fa-pinterest-p' ),
+				'reddit'         => array( 'Reddit', 'fab fa-reddit-alien' ),
+				'slack'          => array( 'Slack', 'fab fa-slack'),
+				'stack-exchange' => array( 'Stack Exchange', 'fab fa-stack-exchange' ),
+				'stack-overflow' => array( 'Stack Overflow', 'fab fa-stack-overflow' ),
+				'tumblr'         => array( 'Tumblr', 'fab fa-tumblr' ),
+				'twitter'        => array( 'Twitter', 'fab fa-twitter' ),
+				'vimeo'          => array( 'Vimeo', 'fab fa-vimeo-v' ),
+				'vk'             => array( 'VK', 'fab fa-vk'),
+				'weibo'          => array( 'Weibo', 'fab fa-weibo'),
+				'whatsapp'       => array( 'WhatsApp', 'fab fa-whatsapp'),
+				'xing'           => array( 'Xing', 'fab fa-xing' ),
+				'yelp'           => array( 'Yelp', 'fab fa-yelp' ),
+				'youtube'        => array( 'YouTube', 'fab fa-youtube' ),
+			)
 		);
 	}
 

diff --git a/_test/tests/test-shorten-bitly.php b/_test/tests/test-shorten-bitly.php
@@ -62,7 +62,7 @@ function test_bitly_request() {
 
 		$this->assertTrue( $shortener instanceof \UtmDotCodes\Shorten );
 		$this->assertEquals( null, $shortener->get_error() );
-		$this->assertTrue( strpos( $shortener->get_response(), 'http://bit.ly/' ) !== false );
+		$this->assertTrue( strpos( $shortener->get_response(), 'https://bit.ly/' ) !== false );
 	}
 
 	/**