Merge pull request #2502 from brave/panel-twip-screen-name

Twip from panel must use Twitter handle not name
brave · May 27, 2019 · 8f07fc0 · 8f07fc0
2 parents 323dddf + 87f3345
commit 8f07fc0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc
@@ -74,6 +74,8 @@ ExtensionFunction::ResponseAction BraveRewardsTipSiteFunction::Run() {
 
   auto params_dict = std::make_unique<base::DictionaryValue>();
   params_dict->SetString("publisherKey", params->publisher_key);
+  params_dict->SetString(
+      "url", contents ? contents->GetLastCommittedURL().spec() : std::string());
   ::brave_rewards::OpenTipDialog(contents, std::move(params_dict));
 
   return RespondNow(NoArguments());
@@ -143,6 +145,7 @@ void BraveRewardsTipTwitterUserFunction::OnTwitterPublisherInfoSaved(
 
   auto params_dict = std::make_unique<base::DictionaryValue>();
   params_dict->SetString("publisherKey", publisher_info->id);
+  params_dict->SetString("url", publisher_info->url);
 
   auto tweet_meta_data_dict = std::make_unique<base::DictionaryValue>();
   tweet_meta_data_dict->SetString("name", publisher_info->name);

diff --git a/components/brave_rewards/resources/tip/components/app.tsx b/components/brave_rewards/resources/tip/components/app.tsx
@@ -14,6 +14,7 @@ import TipTwitterUser from './tipTwitterUser'
 import * as rewardsActions from '../actions/tip_actions'
 
 interface TipDialogArgs {
+  url: string
   publisherKey: string
   tweetMetaData?: RewardsTip.TweetMetaData
 }
@@ -27,17 +28,19 @@ export class App extends React.Component<Props, {}> {
     return this.props.actions
   }
 
-  getTipBanner = (publisher: RewardsTip.Publisher, tweetMetaData?: RewardsTip.TweetMetaData) => {
+  getTipBanner = (url: string, publisher: RewardsTip.Publisher, tweetMetaData?: RewardsTip.TweetMetaData) => {
     if (tweetMetaData) {
       return (
         <TipTwitterUser
+          url={url}
           publisher={publisher}
           tweetMetaData={tweetMetaData}
         />
       )
     } else {
       return (
         <TipSite
+          url={url}
           publisher={publisher}
         />
       )
@@ -51,6 +54,7 @@ export class App extends React.Component<Props, {}> {
       return null
     }
 
+    const url = this.props.dialogArgs.url
     const tweetMetaData = this.props.dialogArgs.tweetMetaData
     const publisherKey = this.props.dialogArgs.publisherKey
     const publisher = publishers[publisherKey]
@@ -61,7 +65,7 @@ export class App extends React.Component<Props, {}> {
 
     return (
       <div>
-        {this.getTipBanner(publisher, tweetMetaData)}
+        {this.getTipBanner(url, publisher, tweetMetaData)}
       </div>
     )
   }

diff --git a/components/brave_rewards/resources/tip/components/tipSite.tsx b/components/brave_rewards/resources/tip/components/tipSite.tsx
@@ -14,6 +14,7 @@ import TransientTipOverlay from './transientTipOverlay'
 import * as rewardsActions from '../actions/tip_actions'
 
 interface Props extends RewardsTip.ComponentProps {
+  url: string
   publisher: RewardsTip.Publisher
 }
 
@@ -23,7 +24,15 @@ class TipSite extends React.Component<Props, {}> {
   }
 
   onTweet = () => {
-    this.actions.onTweet(this.props.publisher.name, '')
+    let name = this.props.publisher.name
+    if (this.props.publisher.provider === 'twitter') {
+      const url = this.props.url
+      if (url && url.length > 0) {
+        name = `@${url.replace(/^.*\/(.*)$/, '$1')}`
+      }
+    }
+
+    this.actions.onTweet(name, '')
     this.actions.onCloseDialog()
   }
 

diff --git a/components/brave_rewards/resources/tip/components/tipTwitterUser.tsx b/components/brave_rewards/resources/tip/components/tipTwitterUser.tsx
@@ -15,6 +15,7 @@ import * as rewardsActions from '../actions/tip_actions'
 import { getLocale } from '../../../../common/locale'
 
 interface Props extends RewardsTip.ComponentProps {
+  url: string
   publisher: RewardsTip.Publisher
   tweetMetaData: RewardsTip.TweetMetaData
 }