@streamlayer/feature-gamification 0.36.0 → 0.37.0

package/lib/background.js

@@ -75,12 +75,10 @@ export class GamificationBackground {
         });
         this.feedSubscription = queries.feedSubscription(this.slStreamId, instance.transport);
         this.feedSubscription.addListener('feed-subscription-active-question', (response) => {
-            window.requestAnimationFrame(() => {
-                const $activeQuestionId = this.activeQuestionId.getStore();
-                if ($activeQuestionId) {
-                    $activeQuestionId.mutate(response.data?.attributes);
-                }
-            });
+            const $activeQuestionId = this.activeQuestionId.getStore();
+            if ($activeQuestionId) {
+                $activeQuestionId.mutate(response.data?.attributes);
+            }
         });
         // refresh moderation if question empty, it`s mean that moderation was changed
         this.feedSubscription.addListener('moderation update', (response) => {

package/lib/deepLink.d.ts

@@ -5,7 +5,7 @@ type DeepLinkData = {
     loading?: boolean;
     error?: string;
 };
-export declare const deepLink: (transport: Transport, $eventId: ReadableAtom<string | undefined>, $userId: ReadableAtom<string | undefined>) => {
+export declare const deepLink: (transport: Transport, $eventId: ReadableAtom<string | undefined>, $externalEventId: ReadableAtom<string | undefined>, $userId: ReadableAtom<string | undefined>) => {
     $store: import("nanostores").MapStore<DeepLinkData>;
     fetch: typeof fetch;
 };

package/lib/deepLink.js

@@ -1,27 +1,37 @@
 import { createMapStore } from '@streamlayer/sdk-web-interfaces';
-import { DEEP_LINK_USER_ID, DEEP_LINK_EVENT_ID } from '@streamlayer/sdk-web-core';
+import { DEEP_LINK_USER_ID, DEEP_LINK_EVENT_ID, DEEP_LINK_EXTERNAL_EVENT_ID, } from '@streamlayer/sdk-web-core';
 import { onMount } from 'nanostores';
 import { $deepLink, generateShortLink } from './queries/deepLink';
-export const deepLink = (transport, $eventId, $userId) => {
+const createUrlParams = (prevParams, data) => {
+    const url = new URLSearchParams(prevParams);
+    for (const [key, value] of Object.entries(data)) {
+        url.append(key, value);
+    }
+    return url.toString();
+};
+export const deepLink = (transport, $eventId, $externalEventId, $userId) => {
     const $store = createMapStore({});
     onMount($store, () => {
-        const $branchLink = $deepLink(transport, [$eventId]);
+        const $branchLink = $deepLink(transport, [$eventId, $externalEventId]);
         const cancel = $branchLink.subscribe(async ({ data, error, loading }) => {
             const mobileDeepLink = error ? 'https://masters.com' : data?.url;
-            const userId = $userId.get();
-            const eventId = $eventId.get();
-            if (!loading && mobileDeepLink && userId && eventId) {
+            const userId = $userId.get() || '';
+            const eventId = $eventId.get() || '';
+            const externalEventId = $externalEventId.get() || '';
+            const urlParamsData = {
+                [DEEP_LINK_USER_ID]: userId,
+                [DEEP_LINK_EVENT_ID]: eventId,
+                [DEEP_LINK_EXTERNAL_EVENT_ID]: externalEventId,
+            };
+            if (!loading && mobileDeepLink) {
                 $store.setKey('loading', true);
                 let search = window.location.search;
                 let hash = window.location.hash;
                 if ((search && hash) || hash) {
-                    const params = new URLSearchParams(search);
-                    userId && params.append(DEEP_LINK_USER_ID, userId);
-                    eventId && params.append(DEEP_LINK_EVENT_ID, eventId);
-                    search = `?${params.toString()}`;
+                    search = `?${createUrlParams(search, urlParamsData)}`;
                 }
                 else {
-                    hash = `#${`${DEEP_LINK_EVENT_ID}=${eventId}&${DEEP_LINK_USER_ID}=${userId}`}`;
+                    hash = `#${createUrlParams('', urlParamsData)}`;
                 }
                 const desktopLink = window.location.origin + window.location.pathname + search + hash;
                 const shortLink = await generateShortLink(transport, { web: desktopLink, mobile: mobileDeepLink });

package/lib/gamification.js

@@ -63,7 +63,7 @@ export class Gamification extends AbstractFeature {
         this.closeFeature = () => instance.sdk.closeFeature(true);
         this.openFeature = () => instance.sdk.openFeature(FeatureType.GAMES);
         this.openedQuestion = this.background.openedQuestion;
-        this.deepLink = deepLink(this.transport, this.background.slStreamId, this.background.userId);
+        this.deepLink = deepLink(this.transport, this.background.slStreamId, instance.stores.providerStreamId.getStore(), this.background.userId);
         this.leaderboardList = leaderboard(this.transport, this.background.slStreamId, this.background.userId, this.friends);
         this.status.subscribe((status) => {
             if (status === FeatureStatus.Ready) {
@@ -230,6 +230,7 @@ export class Gamification extends AbstractFeature {
                     const instantView = {
                         heading: question.data.question.notification.title,
                         body: question.data.question.notification.body,
+                        imageMode: question.data.question.notification.imageMode,
                         image: optionsValue?.image,
                         video: {
                             id: optionsValue?.video?.id || '',
@@ -261,6 +262,7 @@ export class Gamification extends AbstractFeature {
                         image: question.data.question.notification?.image,
                         account: optionsValue?.tweetMeta?.account || '',
                         accountVerified: !!optionsValue?.tweetMeta?.accountVerified,
+                        tweet: optionsValue?.tweetMeta?.tweet,
                     };
                     this.notifications.add({
                         type: NotificationType.QUESTION,

package/lib/queries/deepLink.d.ts

@@ -2,7 +2,8 @@ import type { Transport } from '@streamlayer/sdk-web-api';
 import { ReadableAtom } from 'nanostores';
 import { DeepLink } from '@streamlayer/sl-eslib/sdkSettings/client/client_pb';
 type EventId = ReadableAtom<string | undefined>;
-export declare const $deepLink: (transport: Transport, params: [EventId]) => import("@nanostores/query").FetcherStore<DeepLink | undefined, any>;
+type ExternalEventId = ReadableAtom<string | undefined>;
+export declare const $deepLink: (transport: Transport, params: [EventId, ExternalEventId]) => import("@nanostores/query").FetcherStore<DeepLink | undefined, any>;
 export declare const generateShortLink: (transport: Transport, { web, mobile }: {
     web: string;
     mobile: string;

package/lib/queries/deepLink.js

@@ -6,11 +6,13 @@ export const $deepLink = (transport, params) => {
         params,
     });
     return transport.nanoquery.createFetcherStore(queryKey, {
-        fetcher: async (_, __, eventId) => {
+        fetcher: async (_, __, eventId, externalEventId) => {
             if (!eventId) {
                 return {};
             }
-            const res = await client.generateDeepLink({ data: { eventId: eventId } });
+            const res = await client.generateDeepLink({
+                data: { gamification: true, externalEventId: externalEventId, eventId: eventId },
+            });
             return res.data?.attributes;
         },
     });

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "peerDependencies": {
     "@bufbuild/protobuf": "^1.6.0",
     "@fastify/deepmerge": "*",
-    "@streamlayer/sl-eslib": "^5.66.0",
+    "@streamlayer/sl-eslib": "^5.67.0",
     "nanostores": "^0.9.5",
-    "@streamlayer/sdk-web-api": "^0.21.0",
-    "@streamlayer/sdk-web-core": "^0.19.0",
-    "@streamlayer/sdk-web-interfaces": "^0.20.2",
-    "@streamlayer/sdk-web-logger": "^0.5.13",
-    "@streamlayer/sdk-web-notifications": "^0.13.8",
-    "@streamlayer/sdk-web-storage": "^0.4.0",
-    "@streamlayer/sdk-web-types": "^0.22.0"
+    "@streamlayer/sdk-web-api": "^0.21.1",
+    "@streamlayer/sdk-web-core": "^0.20.0",
+    "@streamlayer/sdk-web-interfaces": "^0.20.3",
+    "@streamlayer/sdk-web-logger": "^0.5.14",
+    "@streamlayer/sdk-web-notifications": "^0.13.9",
+    "@streamlayer/sdk-web-storage": "^0.4.1",
+    "@streamlayer/sdk-web-types": "^0.22.1"
   },
   "devDependencies": {
     "tslib": "^2.6.2"