@streamlayer/feature-gamification 0.33.5 → 0.34.0

package/lib/background.js

@@ -71,6 +71,16 @@ export class GamificationBackground {
                 }
             });
         });
+        // refresh moderation if question empty, it`s mean that moderation was changed
+        this.feedSubscription.addListener('moderation update', (response) => {
+            window.requestAnimationFrame(() => {
+                if (response.data?.attributes?.question === undefined) {
+                    if (response.data?.attributes?.moderation) {
+                        this.moderation.invalidate();
+                    }
+                }
+            });
+        });
         this.feedSubscription.connect();
     }
     /**

package/lib/deepLink.js

@@ -9,7 +9,17 @@ export const deepLink = (transport, $eventId, $userId) => {
             const mobileDeepLink = error ? 'https://masters.com' : data?.url;
             if (!loading && mobileDeepLink) {
                 $store.setKey('loading', true);
-                const desktopLink = `${window.location.host + window.location.pathname}%23sl_eid=${$eventId.get()}&sl_uid=${$userId.get()}`;
+                let search = window.location.search;
+                let hash = window.location.hash;
+                if ((search && hash) || hash) {
+                    const params = new URLSearchParams(search);
+                    params.append('slprms', `sl_eid=${$eventId.get()}:sl_uid=${$userId.get()}`);
+                    search = `?${params.toString()}`;
+                }
+                else {
+                    hash = `#slprms::${`sl_eid=${$eventId.get()}:sl_uid=${$userId.get()}`}`;
+                }
+                const desktopLink = window.location.origin + window.location.pathname + search + hash;
                 const shortLink = await generateShortLink(transport, { web: desktopLink, mobile: mobileDeepLink });
                 $store.set({
                     data: shortLink.data?.link,

package/lib/detail.js

@@ -22,8 +22,9 @@ const mergeQuestion = deepmerge({ mergeArray });
 export const detail = (transport, $openedQuestionId, $feedList) => {
     const $store = computed([$openedQuestionId, $feedList], (openedQuestion, feedList) => {
         if (openedQuestion) {
-            if (feedList.data) {
-                return feedList.data.find((item) => item.id === openedQuestion);
+            const question = feedList.data?.find((item) => item.id === openedQuestion);
+            if (question) {
+                return question;
             }
             else {
                 console.error('Feed list is not loaded yet. Issue with the opened question.');
@@ -36,6 +37,7 @@ export const detail = (transport, $openedQuestionId, $feedList) => {
         loading: undefined,
         error: undefined,
     });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     $store.subscribe(async (item) => {
         if (item) {
             if (item.type === 'question') {
@@ -49,13 +51,13 @@ export const detail = (transport, $openedQuestionId, $feedList) => {
     });
     const updateExtendedQuestion = (question) => {
         const currentQuestion = $extendedStore.get().data;
-        if (currentQuestion) {
+        if (currentQuestion && question?.answers) {
             /**
              * We do not merge youVoted property, because it
              * can be overwritten by the subscription response,
              * which does not include user-specific data.
              */
-            for (const answer of question?.answers || []) {
+            for (const answer of question.answers) {
                 if (answer.youVoted !== true) {
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-ignore

package/lib/gamification.js

@@ -81,27 +81,26 @@ export class Gamification extends AbstractFeature {
                     question.data.question?.bypassNotifications?.inAppSilence !== SilenceSetting.ON &&
                     question.data.question.status === QuestionStatus.ACTIVE) {
                     if (GamificationQuestionTypes.has(question.data.question.type)) {
+                        const onboardingEnabled = this.background.moderation.getStore().value?.data?.options?.onboardingEnabled;
                         const optInEnabled = this.settings.getValues().inplayGame?.titleCard?.optIn;
                         const onboardingCompleted = onboardingStatus === OnboardingStatus.Completed;
-                        if (optInEnabled !== undefined) {
-                            if (!optInEnabled || onboardingCompleted) {
-                                this.notifications.add({
-                                    type: NotificationType.QUESTION,
-                                    action: () => question.data?.question && this.openQuestion(question.data.question.id),
-                                    close: () => question.data?.question && this.closeQuestion(question.data.question.id),
-                                    autoHideDuration: 1000 * 60,
-                                    id: this.background.getCurrentSessionId({
-                                        prefix: 'notification',
-                                        entity: question.data.question.id,
-                                    }),
-                                    data: {
-                                        questionType: question.data.question.type,
-                                        question: {
-                                            title: question.data.question.notification.title,
-                                        },
+                        if (!onboardingEnabled || onboardingCompleted || optInEnabled !== true) {
+                            this.notifications.add({
+                                type: NotificationType.QUESTION,
+                                action: () => question.data?.question && this.openQuestion(question.data.question.id),
+                                close: () => question.data?.question && this.closeQuestion(question.data.question.id),
+                                autoHideDuration: 1000 * 60,
+                                id: this.background.getCurrentSessionId({
+                                    prefix: 'notification',
+                                    entity: question.data.question.id,
+                                }),
+                                data: {
+                                    questionType: question.data.question.type,
+                                    question: {
+                                        title: question.data.question.notification.title,
                                     },
-                                });
-                            }
+                                },
+                            });
                         }
                     }
                     else if (question.data.question.type === QuestionType.FACTOID) {
@@ -226,6 +225,10 @@ export class Gamification extends AbstractFeature {
     };
     openQuestion = (questionId) => {
         this.openFeature();
+        this.notifications.close(this.background.getCurrentSessionId({
+            prefix: 'notification',
+            entity: questionId,
+        }));
         return this.background.openQuestion(questionId);
     };
     closeQuestion = (questionId) => {

package/lib/onboarding.js

@@ -22,6 +22,7 @@ export var OnboardingStatus;
 const showOnboardingInApp = (service, background, notifications, storage) => {
     const { inplayGame } = service.featureSettings.get();
     const notificationId = background.getCurrentSessionId({ prefix: 'onboarding' });
+    // type safe check
     if (inplayGame) {
         notifications.add({
             type: NotificationType.ONBOARDING,
@@ -30,12 +31,10 @@ const showOnboardingInApp = (service, background, notifications, storage) => {
             close: () => {
                 notifications.markAsViewed(notificationId);
             },
-            delay: 1000,
+            persistent: true,
             autoHideDuration: 1000000,
             data: {
                 questionType: QuestionType.UNSET,
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
                 onboarding: {
                     ...inplayGame,
                     instantOpen: !storage.getOnboardingInstantOpen({
@@ -52,7 +51,7 @@ const showOnboardingInApp = (service, background, notifications, storage) => {
  * check onboarding status, sync with browser cache
  * retrieve onboarding settings from api
  */
-const onboardingProcess = ($store, background, service, storage, listeners) => {
+const onboardingProcess = ($store, background, service, notifications, storage, listeners) => {
     try {
         const userId = background.userId.get();
         if (!userId) {
@@ -75,8 +74,8 @@ const onboardingProcess = ($store, background, service, storage, listeners) => {
         if (moderation === undefined || inplayGame === undefined) {
             return;
         }
-        const onboardingEnabled = !!moderation?.options?.onboardingEnabled && inplayGame?.enable;
-        const optIn = !!inplayGame?.titleCard?.optIn;
+        const onboardingEnabled = moderation?.options?.onboardingEnabled;
+        const optIn = inplayGame?.titleCard?.optIn;
         if (onboardingEnabled) {
             if (optIn) {
                 $store.set(OnboardingStatus.Required);
@@ -92,6 +91,8 @@ const onboardingProcess = ($store, background, service, storage, listeners) => {
             else {
                 $store.set(OnboardingStatus.Disabled);
             }
+            // close previous onboarding notification, f.e moderation was disabled onboarding
+            notifications.close(background.getCurrentSessionId({ prefix: 'onboarding' }), false);
         }
     }
     catch (error) {
@@ -118,21 +119,21 @@ export const onboarding = (service, background, transport, notifications) => {
         });
     });
     const listeners = [];
-    onboardingProcess($store, background, service, storage, listeners);
+    onboardingProcess($store, background, service, notifications, storage, listeners);
     if ($store.get() !== OnboardingStatus.Completed) {
         listeners.push(background.userId.listen((userId) => {
             if (userId) {
-                void onboardingProcess($store, background, service, storage, listeners);
+                onboardingProcess($store, background, service, notifications, storage, listeners);
             }
         }));
         listeners.push(background.moderation.listen((value) => {
             if (value.data) {
-                void onboardingProcess($store, background, service, storage, listeners);
+                onboardingProcess($store, background, service, notifications, storage, listeners);
             }
         }));
         listeners.push(service.featureSettings.listen((value) => {
             if (value) {
-                void onboardingProcess($store, background, service, storage, listeners);
+                onboardingProcess($store, background, service, notifications, storage, listeners);
             }
         }));
     }

package/lib/queries/deepLink.d.ts

@@ -6,5 +6,5 @@ export declare const $deepLink: (transport: Transport, params: [EventId]) => imp
 export declare const generateShortLink: (transport: Transport, { web, mobile }: {
     web: string;
     mobile: string;
-}) => Promise<import("@streamlayer/sl-eslib/shortLinks/client_pb").GenerateResponse>;
+}) => Promise<import("@streamlayer/sl-eslib/shortLinks/linksClient_pb").GenerateResponse>;
 export {};

package/lib/queries/deepLink.js

@@ -1,5 +1,5 @@
 import { Client } from '@streamlayer/sl-eslib/sdkSettings/client/client_connect';
-import { Client as ShortLinkClient } from '@streamlayer/sl-eslib/shortLinks/client_connect';
+import { LinksClient } from '@streamlayer/sl-eslib/shortLinks/linksClient_connect';
 export const $deepLink = (transport, params) => {
     const { client, queryKey } = transport.createPromiseClient(Client, {
         method: 'generateDeepLink',
@@ -16,6 +16,6 @@ export const $deepLink = (transport, params) => {
     });
 };
 export const generateShortLink = (transport, { web, mobile }) => {
-    const { client } = transport.createPromiseClient(ShortLinkClient, { method: 'generate' });
+    const { client } = transport.createPromiseClient(LinksClient, { method: 'generate' });
     return client.generate({ web, mobile });
 };

package/lib/queries/index.d.ts

@@ -327,6 +327,7 @@ export declare const questionSubscription: (questionId: string, transport: Trans
     };
 }, QuestionSubscriptionRequest, QuestionSubscriptionResponse, "subscription" | "votingSubscription" | "questionSubscription" | "feedSubscription", ((request: import("@bufbuild/protobuf").PartialMessage<SubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions | undefined) => AsyncIterable<SubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<VotingSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions | undefined) => AsyncIterable<VotingSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<QuestionSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions | undefined) => AsyncIterable<QuestionSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions | undefined) => AsyncIterable<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse>)>;
 export declare const getQuestionByUser: (questionId: string, transport: Transport) => Promise<import("@streamlayer/sdk-web-types").ExtendedQuestion | undefined>;
+export declare const getQuestionDetail: (questionId: string, transport: Transport) => Promise<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").Question | undefined>;
 export declare const $questionByUser: ($questionId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<import("@streamlayer/sdk-web-types").ExtendedQuestion | undefined, any>;
 export declare const $pickHistory: (slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<(import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").PickHistory | undefined)[], any>;
 export declare const $feedList: (slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedItem[], any>;

package/lib/queries/index.js

@@ -43,6 +43,13 @@ export const getQuestionByUser = async (questionId, transport) => {
     });
     return res.data?.attributes?.question;
 };
+export const getQuestionDetail = async (questionId, transport) => {
+    const { client } = transport.createPromiseClient(Feed, { method: 'getQuestion', params: [questionId] });
+    const res = await client.getQuestion({
+        id: questionId,
+    });
+    return res.data?.attributes;
+};
 export const $questionByUser = ($questionId, transport) => {
     const { client, queryKey } = transport.createPromiseClient(Feed, { method: 'questionByUser', params: [$questionId] });
     return transport.nanoquery.createFetcherStore(queryKey, {

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "0.33.5",
+  "version": "0.34.0",
   "peerDependencies": {
-    "@bufbuild/protobuf": "^1.4.2",
-    "@streamlayer/sl-eslib": "^5.61.1",
+    "@bufbuild/protobuf": "^1.6.0",
     "@fastify/deepmerge": "*",
+    "@streamlayer/sl-eslib": "^5.63.3",
     "nanostores": "^0.9.5",
-    "@streamlayer/sdk-web-api": "^0.1.0",
-    "@streamlayer/sdk-web-core": "^0.0.1",
+    "@streamlayer/sdk-web-api": "^0.18.0",
+    "@streamlayer/sdk-web-core": "^0.17.8",
     "@streamlayer/sdk-web-interfaces": "^0.18.21",
-    "@streamlayer/sdk-web-logger": "^0.0.1",
-    "@streamlayer/sdk-web-notifications": "^0.0.6",
-    "@streamlayer/sdk-web-storage": "^0.0.4",
-    "@streamlayer/sdk-web-types": "^0.1.0"
+    "@streamlayer/sdk-web-logger": "^0.5.10",
+    "@streamlayer/sdk-web-notifications": "^0.13.4",
+    "@streamlayer/sdk-web-storage": "^0.3.10",
+    "@streamlayer/sdk-web-types": "^0.20.1"
   },
   "devDependencies": {
     "tslib": "^2.6.2"