From a07fe59f830c3f625db47c5003c4962768b6ca17 Mon Sep 17 00:00:00 2001
From: Jakob Kuki <jakobkuki@gmail.com>
Date: Thu, 30 May 2019 16:14:12 -0700
Subject: [PATCH] Add provider to tip compliment Fixes brave/brave-browser#4586

---
 browser/ui/webui/brave_tip_ui.cc                           | 7 +++++--
 .../brave_rewards/resources/tip/actions/tip_actions.ts     | 5 +++--
 .../brave_rewards/resources/tip/components/tipSite.tsx     | 6 +++---
 .../brave_rewards/resources/tip/reducers/tip_reducer.ts    | 4 ++--
 components/resources/brave_components_strings.grd          | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/browser/ui/webui/brave_tip_ui.cc b/browser/ui/webui/brave_tip_ui.cc
index fe257c9bde1f..1262bccad58f 100644
--- a/browser/ui/webui/brave_tip_ui.cc
+++ b/browser/ui/webui/brave_tip_ui.cc
@@ -347,7 +347,7 @@ void RewardsTipDOMHandler::OnRecurringTipSaved(
 }
 
 void RewardsTipDOMHandler::TweetTip(const base::ListValue *args) {
-  DCHECK_EQ(args->GetSize(), 2U);
+  DCHECK_EQ(args->GetSize(), 3U);
 
   if (!rewards_service_)
     return;
@@ -359,10 +359,13 @@ void RewardsTipDOMHandler::TweetTip(const base::ListValue *args) {
   std::string tweet_id;
   if (!args->GetString(1, &tweet_id))
     return;
+  std::string provider;
+  if (!args->GetString(2, &provider))
+     return;
 
   // Share the tip comment/compliment on Twitter.
   std::string comment = l10n_util::GetStringFUTF8(
-      IDS_BRAVE_REWARDS_LOCAL_COMPLIMENT_TWEET, base::UTF8ToUTF16(name));
+      IDS_BRAVE_REWARDS_LOCAL_COMPLIMENT_TWEET, base::UTF8ToUTF16(name), base::UTF8ToUTF16(provider));
   std::string hashtag = l10n_util::GetStringUTF8(
       IDS_BRAVE_REWARDS_LOCAL_COMPLIMENT_TWEET_HASHTAG);
   std::map<std::string, std::string> share_url_args;
diff --git a/components/brave_rewards/resources/tip/actions/tip_actions.ts b/components/brave_rewards/resources/tip/actions/tip_actions.ts
index 705f0a935887..0a056d3674db 100644
--- a/components/brave_rewards/resources/tip/actions/tip_actions.ts
+++ b/components/brave_rewards/resources/tip/actions/tip_actions.ts
@@ -9,9 +9,10 @@ import { types } from '../constants/tip_types'
 
 export const onCloseDialog = () => action(types.ON_CLOSE_DIALOG)
 
-export const onTweet = (name: string, tweetId: string) => action(types.ON_TWEET, {
+export const onTweet = (name: string, tweetId: string, provider: string) => action(types.ON_TWEET, {
   name,
-  tweetId
+  tweetId,
+  provider
 })
 
 export const onPublisherBanner = (data: RewardsTip.Publisher) => action(types.ON_PUBLISHER_BANNER, {
diff --git a/components/brave_rewards/resources/tip/components/tipSite.tsx b/components/brave_rewards/resources/tip/components/tipSite.tsx
index 06d4fcf87019..b5c9b5816a05 100644
--- a/components/brave_rewards/resources/tip/components/tipSite.tsx
+++ b/components/brave_rewards/resources/tip/components/tipSite.tsx
@@ -25,14 +25,14 @@ class TipSite extends React.Component<Props, {}> {
 
   onTweet = () => {
     let name = this.props.publisher.name
-    if (this.props.publisher.provider === 'twitter') {
+    let provider = this.props.publisher.provider
+    if (provider === 'twitter') {
       const url = this.props.url
       if (url && url.length > 0) {
         name = `@${url.replace(/^.*\/(.*)$/, '$1')}`
       }
     }
-
-    this.actions.onTweet(name, '')
+    this.actions.onTweet(name, '', provider)
     this.actions.onCloseDialog()
   }
 
diff --git a/components/brave_rewards/resources/tip/reducers/tip_reducer.ts b/components/brave_rewards/resources/tip/reducers/tip_reducer.ts
index e8267d24ec7a..c7d626c2a21f 100644
--- a/components/brave_rewards/resources/tip/reducers/tip_reducer.ts
+++ b/components/brave_rewards/resources/tip/reducers/tip_reducer.ts
@@ -24,7 +24,6 @@ export const defaultState: RewardsTip.State = {
 
 const publishersReducer: Reducer<RewardsTip.State> = (state: RewardsTip.State = defaultState, action) => {
   const payload = action.payload
-
   switch (action.type) {
     case types.ON_CLOSE_DIALOG:
       state = { ...state }
@@ -34,7 +33,8 @@ const publishersReducer: Reducer<RewardsTip.State> = (state: RewardsTip.State =
     case types.ON_TWEET:
       chrome.send('brave_rewards_tip.tweetTip', [
         payload.name,
-        payload.tweetId
+        payload.tweetId,
+        payload.provider
       ])
       break
     case types.ON_PUBLISHER_BANNER: {
diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
index 17bf3be3af90..aeadddb328c8 100644
--- a/components/resources/brave_components_strings.grd
+++ b/components/resources/brave_components_strings.grd
@@ -260,7 +260,7 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_GRANT_ALREADY_CLAIMED_TEXT" desc="">Sorry, it appears that this grant has already been claimed.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_NEXT_DATE" desc="Description of the date in the donation box">Next monthly tip date</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_COMPLIMENT_TWEET" desc="">
-        I just tipped <ph name="NAME">$1<ex>user</ex></ph> using the Brave Browser. Check it out at https://brave.com/tips.
+        I just tipped <ph name="NAME">$1<ex>user</ex></ph> on <ph name="PROVIDER">$2<ex>site</ex></ph> using the Brave Browser. Check it out at https://brave.com/tips.
       </message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_COMPLIMENT_TWEET_HASHTAG" desc="">TipWithBrave</message>