From 3dadf3d268b0f9e2f6e6315680585d866ad23a33 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Sat, 24 Oct 2020 21:58:48 -0500
Subject: [PATCH] Updated StatusSharePopover and navigator.canShare()
 functionality
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated:
- StatusSharePopover links and urls
- navigator.canShare() functionality in StatusContainer
---
 .../popover/status_share_popover.js           | 25 +++++++++++++------
 .../gabsocial/containers/status_container.js  |  9 +++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/javascript/gabsocial/components/popover/status_share_popover.js b/app/javascript/gabsocial/components/popover/status_share_popover.js
index 1068858a..74f23f66 100644
--- a/app/javascript/gabsocial/components/popover/status_share_popover.js
+++ b/app/javascript/gabsocial/components/popover/status_share_popover.js
@@ -41,8 +41,12 @@ class StatusSharePopover extends ImmutablePureComponent {
   render() {
     const { intl, status } = this.props
 
-    const mailToHref = !status ? undefined : `mailto:?subject=Gab&body=${status.get('url')}`
+    if (!status) return <div />
 
+    const encodedStatusUrl = encodeURIComponent(status.get('url'))
+    const mailToHref = `mailto:?subject=Gab&body=${encodedStatusUrl}`
+    const content = status.get('contentHtml')
+    
     return (
       <PopoverLayout
         width={360}
@@ -60,6 +64,7 @@ class StatusSharePopover extends ImmutablePureComponent {
             color='black'
             backgroundColor='secondary'
             onClick={this.handleCopy}
+            title={intl.formatMessage(messages.copy)}
             className={[_s.jcCenter, _s.aiCenter, _s.mr15, _s.px10].join(' ')}
           />
           <Button
@@ -68,7 +73,8 @@ class StatusSharePopover extends ImmutablePureComponent {
             iconClassName={_s.inheritFill}
             color='white'
             backgroundColor='none'
-            href='sms://?body=Hello'
+            href={`sms:+&body=${encodedStatusUrl}`}
+            title='Share via text message'
             className={[_s.jcCenter, _s.aiCenter, _s.mr15, _s.px10, _s.bgSMS].join(' ')}
           />
           <Button
@@ -77,7 +83,8 @@ class StatusSharePopover extends ImmutablePureComponent {
             iconClassName={_s.inheritFill}
             color='white'
             backgroundColor='none'
-            href='https://www.facebook.com/sharer/sharer.php?u=#url'
+            href={`https://www.facebook.com/sharer/sharer.php?u=${encodedStatusUrl}`}
+            title='Share on Facebook'
             className={[_s.jcCenter, _s.aiCenter, _s.mr15, _s.px10, _s.bgFacebook].join(' ')}
           />
           <Button
@@ -86,7 +93,8 @@ class StatusSharePopover extends ImmutablePureComponent {
             iconClassName={_s.inheritFill}
             color='white'
             backgroundColor='none'
-            href='https://twitter.com/intent/tweet?url=gab.com'
+            href={`https://twitter.com/intent/tweet?url=${encodedStatusUrl}`}
+            title='Share on Twitter'
             className={[_s.jcCenter, _s.aiCenter, _s.mr15, _s.px10, _s.bgTwitter].join(' ')}
           />
           <Button
@@ -95,7 +103,8 @@ class StatusSharePopover extends ImmutablePureComponent {
             iconClassName={_s.inheritFill}
             color='white'
             backgroundColor='none'
-            href='https://telegram.me/share/?url=gab.com'
+            href={`https://telegram.me/share/?url=${encodedStatusUrl}`}
+            title='Share on Telegram'
             className={[_s.jcCenter, _s.aiCenter, _s.mr15, _s.px10, _s.bgTelegram].join(' ')}
           />
           <Button
@@ -104,7 +113,8 @@ class StatusSharePopover extends ImmutablePureComponent {
             iconClassName={_s.inheritFill}
             color='white'
             backgroundColor='none'
-            href='http://www.reddit.com/submit?url=gab.com&title=Post%20to%20Reddit%20via%20URL'
+            href={`http://www.reddit.com/submit?url=${encodedStatusUrl}&title=Gab`}
+            title='Share on Reddit'
             className={[_s.jcCenter, _s.aiCenter, _s.px10, _s.mr15, _s.bgReddit].join(' ')}
           />
           <Button
@@ -113,7 +123,8 @@ class StatusSharePopover extends ImmutablePureComponent {
             iconClassName={_s.inheritFill}
             color='white'
             backgroundColor='black'
-            href='mailto:?body=gab.com'
+            href={mailToHref}
+            title='Share via email'
             className={[_s.jcCenter, _s.aiCenter, _s.mr10, _s.px10].join(' ')}
           />
         </div>
diff --git a/app/javascript/gabsocial/containers/status_container.js b/app/javascript/gabsocial/containers/status_container.js
index c1e89bc6..89ba5093 100644
--- a/app/javascript/gabsocial/containers/status_container.js
+++ b/app/javascript/gabsocial/containers/status_container.js
@@ -303,15 +303,14 @@ const mapDispatchToProps = (dispatch) => ({
   },
 
   onShare (targetRef, status) {
-    if (!!navigator && navigator.share) {
-      console.log("CAN SHARE")
+    if (!!navigator && navigator.share && navigator.canShare()) {
       const url = status.get('url')
       navigator.share({
         url,
-        title: 'Test title',
-        text: 'Check out gab',
+        title: 'Check out this post on Gab',
+        text: 'Check out this post on Gab',
       }).then(() => {
-        console.log('Successful share')
+        //
       }).catch((error) => {
         console.log('Error sharing', error)
       })