Merge branch 'refs/heads/koni/dev/issue-task-share-leaderboard' into …

…telegram-dev-02
Koniverse · Jun 10, 2024 · 1dffba5 · 1dffba5
2 parents 786b349 + d010c22
commit 1dffba5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/packages/extension-koni-ui/src/Popup/Home/Mission/TaskItem.tsx b/packages/extension-koni-ui/src/Popup/Home/Mission/TaskItem.tsx
@@ -121,7 +121,6 @@ const _TaskItem = ({ actionReloadPoint, className, task }: Props): React.ReactEl
           console.error('shareLeaderboard', e);
         }
       }
-
       apiSDK.finishTask(taskId, extrinsicHash, networkKey)
         .finally(() => {
           setTaskLoading(false);
@@ -143,7 +142,7 @@ const _TaskItem = ({ actionReloadPoint, className, task }: Props): React.ReactEl
             const startEnv = shareLeaderboard.start_time;
             const endEnv = shareLeaderboard.end_time;
 
-            urlRedirect = await apiSDK.getShareTwitterURL(startEnv, endEnv, shareLeaderboard.content, shareLeaderboard.content_no_template, shareLeaderboard.url);
+            urlRedirect = await apiSDK.getShareTwitterURL(startEnv, endEnv, shareLeaderboard.content, task.gameId ?? 0, shareLeaderboard.url);
           }
 
           telegramConnector.openLink(urlRedirect);

diff --git a/packages/extension-koni-ui/src/connector/booka/sdk.ts b/packages/extension-koni-ui/src/connector/booka/sdk.ts
@@ -337,21 +337,26 @@ export class BookaSdk {
     return `http://x.com/share?text=${content}&url=${linkApp}`;
   }
 
-  async getShareTwitterURL (startDate: string, endDate: string, content: string, contentNoTemplate: string, url: string) {
+  async getShareTwitterURL (startDate: string, endDate: string, content: string, gameId: number, url: string) {
     const start = formatDateFully(new Date(startDate));
     const end = formatDateFully(new Date(endDate));
-    const leaderBoard = await this.postRequest<LeaderboardPerson[]>(`${GAME_API_HOST}/api/game/leader-board`, { startDate: start, endDate: end, limit: 1 });
+    const leaderBoard = await this.postRequest<LeaderboardPerson[]>(`${GAME_API_HOST}/api/game/leader-board`,
+      {
+        startDate: start,
+        endDate: end,
+        gameId: gameId,
+        limit: 1 });
 
     const personMine = leaderBoard.find((item) => item.mine);
-    let contentShare = contentNoTemplate;
+    let contentShare = '';
 
     if (personMine) {
-      contentShare = populateTemplateString(content, personMine);
+      contentShare = `text=${populateTemplateString(content, personMine)}%0A&`;
     }
 
     const linkShare = `${url}?startApp=${this.account?.info.inviteCode || 'booka'}`;
 
-    return `http://x.com/share?text=${contentShare}%0A&url=${linkShare}`;
+    return `http://x.com/share?${contentShare}url=${linkShare}`;
   }
 
   async fetchReferalList () {

diff --git a/packages/extension-koni-ui/src/connector/booka/types.ts b/packages/extension-koni-ui/src/connector/booka/types.ts
@@ -90,7 +90,6 @@ export enum TaskHistoryStatus {
 
 export interface ShareLeaderboard {
   content: string;
-  content_no_template: string;
   url: string;
   start_time: string;
   end_time: string;