Merge branch 'upstreamdevelop-test-prs-381-382-401' into develop-test-upstream-prs-381-382-401

Author: richard67

src/js/services/linkedin.js

@@ -2,8 +2,6 @@
 
 module.exports = function(shariff) {
   var url = encodeURIComponent(shariff.getURL())
-  var title = encodeURIComponent(shariff.getTitle())
-  var descr = encodeURIComponent(shariff.getMeta('description'))
   return {
     popup: true,
     shareText: {
@@ -63,6 +61,6 @@ module.exports = function(shariff) {
       'tr': 'LinkedIn\'ta paylaş',
       'zh': '在LinkedIn上分享'
     },
-    shareUrl: 'https://www.linkedin.com/shareArticle?mini=true&summary=' + descr + '&title=' + title + '&url=' + url
+    shareUrl: 'https://www.linkedin.com/sharing/share-offsite/?url=' + url
   }
 }

src/js/services/twitter.js

@@ -23,12 +23,16 @@ module.exports = function(shariff) {
 
   var title = shariff.getTitle()
 
-  // 120 is the max character count left after twitters automatic url shortening with t.co
-  shareUrl.query.text = abbreviateText(title, 120)
   shareUrl.query.url = shariff.getURL()
   if (shariff.options.twitterVia !== null) {
     shareUrl.query.via = shariff.options.twitterVia
   }
+  // From Twitters documentation (May 2021):
+  // The length of your passed Tweet text should not exceed 280 characters
+  // when combined with any passed hashtags, via, or url parameters.
+  var remainingTextLength = (280 - (shareUrl.query.via || '').length - (shareUrl.query.url || '').length)
+  shareUrl.query.text = abbreviateText(title, remainingTextLength)
+
   delete shareUrl.search
 
   return {

src/js/services/whatsapp.js

@@ -6,7 +6,7 @@ module.exports = function(shariff) {
   var title = shariff.getTitle()
 
   return {
-    popup: false,
+    popup: true,
     shareText: {
       'bg': 'cподеляне',
       'cs': 'sdílet',
@@ -64,6 +64,6 @@ module.exports = function(shariff) {
       'tr': 'Whatsapp\'ta paylaş',
       'zh': '在Whatsapp上分享'
     },
-    shareUrl: 'whatsapp://send?text=' + encodeURIComponent(title) + '%20' + url + shariff.getReferrerTrack()
+    shareUrl: 'https://api.whatsapp.com/send?text=' + encodeURIComponent(title) + '%20' + url + shariff.getReferrerTrack()
   }
 }