@streamlayer/feature-gamification 1.25.4 → 1.26.0

package/lib/background.d.ts

@@ -48,6 +48,7 @@ export declare class GamificationBackground {
     /** subscription to opened question (vote percentage) */
     questionSubscription?: ReturnType<typeof queries.questionSubscription>;
     advertisement?: ReturnType<typeof advertisement>;
+    withPickHistory: WritableAtom<boolean>;
     storage: GamificationStorage;
     private notifications;
     private log;

package/lib/background.js

@@ -1,7 +1,8 @@
-import { ApiStore, SingleStore, createSingleStore } from '@streamlayer/sdk-web-interfaces';
+import { ApiStore, SingleStore, createSingleStore, eventBus, } from '@streamlayer/sdk-web-interfaces';
 import { createLogger } from '@streamlayer/sdk-web-logger';
 import { QuestionStatus, QuestionType } from '@streamlayer/sdk-web-types';
 import '@streamlayer/sdk-web-core/store';
+import { AdUnit, NotificationEnabled } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
 import * as queries from './queries';
 import { detail } from './detail';
 import { advertisement } from './advertisement';
@@ -43,6 +44,7 @@ export class GamificationBackground {
     /** subscription to opened question (vote percentage) */
     questionSubscription;
     advertisement;
+    withPickHistory;
     storage;
     notifications;
     log;
@@ -58,10 +60,11 @@ export class GamificationBackground {
         this.moderationId = new SingleStore(createSingleStore(undefined), 'moderationId').getStore();
         this.interactiveAllowed = new SingleStore(createSingleStore(InteractiveAllowed.DISALLOWED), 'interactiveAllowed').getStore();
         this.openedQuestionId = new SingleStore(createSingleStore(undefined), 'openedQuestionId').getStore();
+        this.withPickHistory = createSingleStore(false);
         this.notifications = instance.notifications;
         this.moderation = new ApiStore(queries.$moderation(this.slStreamId, instance.transport), 'gamification:moderation');
         const onlyBetPack = !!instance.sdk.options.get().betPack;
-        this.feedList = new ApiStore(queries.$feedList(this.slStreamId, this.interactiveAllowed, this.userId, this.organizationId, this.storage, onlyBetPack, instance.transport), 'gamification:feedList');
+        this.feedList = new ApiStore(queries.$feedList(this.slStreamId, this.interactiveAllowed, this.userId, this.organizationId, this.storage, onlyBetPack, this.withPickHistory, instance.transport), 'gamification:feedList');
         this.betPack = new ApiStore(queries.$betPack(this.slStreamId, this.userId, this.organizationId, this.storage, instance.transport), 'gamification:betPack');
         this.activeQuestionId = queries.$activeQuestion(this.slStreamId, onlyBetPack, instance.transport);
         this.openedQuestion = detail(instance.transport, this.openedQuestionId, this.feedList.getStore());
@@ -191,6 +194,21 @@ export class GamificationBackground {
         }));
         this.cancels.add(this.activeQuestionId.subscribe((item, prevItem) => {
             if (item.data?.feedItem && item.data?.feedItem?.id !== prevItem?.data?.feedItem?.id) {
+                const question = item.data.feedItem;
+                const flags = {
+                    eventId: this.slStreamId.get(),
+                    userId: this.userId.get(),
+                    organizationId: this.organizationId.get(),
+                };
+                eventBus.emit('poll', {
+                    action: 'received',
+                    payload: {
+                        isAd: question?.attributes?.adUnit != AdUnit.UNSET,
+                        questionId: question.id,
+                        questionType: question.attributes?.type,
+                    },
+                });
+                this.storage.saveQuestionReceived(flags, question.id);
                 instance.onQuestionActivate({
                     stage: 'activate',
                     id: item.data.feedItem.id,
@@ -198,7 +216,7 @@ export class GamificationBackground {
                         prefix: 'notification',
                         entity: item.data.feedItem.id,
                     })),
-                    hasNotification: true,
+                    hasNotification: item.data?.question?.notification?.enabled === NotificationEnabled.NOTIFICATION_ENABLED,
                     type: item.data.feedItem.type,
                 });
             }
@@ -210,7 +228,7 @@ export class GamificationBackground {
                         prefix: 'notification',
                         entity: prevItem.data.feedItem.id,
                     })),
-                    hasNotification: true,
+                    hasNotification: prevItem.data?.question?.notification?.enabled === NotificationEnabled.NOTIFICATION_ENABLED,
                     type: prevItem.data.feedItem.type,
                 });
             }

package/lib/detail.d.ts

@@ -2,13 +2,17 @@ import type { Transport } from '@streamlayer/sdk-web-api';
 import { FeedItem, ExtendedQuestion } from '@streamlayer/sdk-web-types';
 import { ReadableAtom } from 'nanostores';
 import { type GamificationBackground } from './background';
+export type DetailEvent = 'video-rendered' | `video-quartile-${25 | 50 | 75}` | 'muted' | 'unmuted' | 'replayed' | 'played' | 'ended' | 'banner-showed';
 export declare const detail: (transport: Transport, $openedQuestionId: ReadableAtom<{
     questionId: string;
     question?: FeedItem & {
         openedFrom?: "list" | "notification";
     };
 } | undefined>, $feedList: ReturnType<GamificationBackground["feedList"]["getStore"]>) => {
-    $store: ReadableAtom<Omit<import("@streamlayer/sdk-web-types").RecursiveOmitHelper<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedItem, "$typeName">, "$typeName"> | undefined>;
+    $store: ReadableAtom<(Omit<import("@streamlayer/sdk-web-types").RecursiveOmitHelper<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedItem, "$typeName">, "$typeName"> & {
+        fireEvent: (event: DetailEvent) => void;
+        isEventFired: (event: DetailEvent) => boolean;
+    }) | undefined>;
     $extendedStore: import("@nanostores/query").FetcherStore<Omit<import("@streamlayer/sdk-web-types").RecursiveOmitHelper<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").ExtendedQuestion, "$typeName">, "$typeName">, any>;
     updateExtendedQuestion: (question: ExtendedQuestion | undefined) => void;
 };

package/lib/detail.js

@@ -1,6 +1,16 @@
 import { batched } from 'nanostores';
 import { $questionByUser } from './queries';
 export const detail = (transport, $openedQuestionId, $feedList) => {
+    const firedEvents = new Map();
+    const fireEvent = (id, event) => {
+        if (!firedEvents.has(id)) {
+            firedEvents.set(id, new Set());
+        }
+        firedEvents.get(id)?.add(event);
+    };
+    const isEventFired = (id, event) => {
+        return firedEvents.get(id)?.has(event) ?? false;
+    };
     const $store = batched([$openedQuestionId, $feedList], () => {
         const openedQuestion = $openedQuestionId.get();
         if (!openedQuestion) {
@@ -8,15 +18,25 @@ export const detail = (transport, $openedQuestionId, $feedList) => {
         }
         const question = $feedList.get().data?.find((item) => item.id === openedQuestion?.questionId);
         const openedFrom = openedQuestion?.question?.openedFrom;
+        const questionId = openedQuestion.questionId;
         if (question) {
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             question.openedFrom = openedFrom;
-            return question;
+            return Object.assign(question, {
+                fireEvent: (event) => fireEvent(questionId, event),
+                isEventFired: (event) => isEventFired(questionId, event),
+            });
+        }
+        if (openedQuestion.question) {
+            return Object.assign(openedQuestion.question, {
+                fireEvent: (event) => fireEvent(questionId, event),
+                isEventFired: (event) => isEventFired(questionId, event),
+            });
         }
-        return openedQuestion.question;
+        return undefined;
     });
-    const $storeQuestionId = batched($store, (item) => (item && item.type === 'question' ? item.id : undefined));
+    const $storeQuestionId = batched($store, (item) => item?.id);
     const $extendedStore = $questionByUser($storeQuestionId, transport);
     const updateExtendedQuestion = (question) => {
         const currentQuestion = $extendedStore.get().data;

package/lib/gamification.d.ts

@@ -3,6 +3,7 @@ import { type GamesOverlaySettings, FeedItem, PlainMessage } from '@streamlayer/
 import type { GetApiResponseType } from '@streamlayer/sdk-web-api';
 import '@streamlayer/sdk-web-core/store';
 import { WritableAtom } from 'nanostores';
+import { UserAccountInfo } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
 import * as queries from './queries';
 import { leaderboard } from './leaderboard';
 import { deepLink } from './deepLink';
@@ -50,6 +51,7 @@ export declare class Gamification extends AbstractFeature<'games', PlainMessage<
     activeQuestionId: GamificationBackground['activeQuestionId'];
     openedQuestionId: GamificationBackground['openedQuestionId'];
     advertisement: GamificationBackground['advertisement'];
+    withPickHistory: GamificationBackground['withPickHistory'];
     onboardingProcessed: WritableAtom<boolean>;
     friendsTabEnabled: WritableAtom<boolean>;
     skipOnboarding: boolean;
@@ -78,6 +80,7 @@ export declare class Gamification extends AbstractFeature<'games', PlainMessage<
     openUser: (friendId: string) => Promise<void>;
     closeUser: () => void;
     openOnboarding: () => void;
+    sendWebhookEvent: (questionId: string, userAccountInfo: UserAccountInfo) => Promise<import("@streamlayer/sl-eslib/sdkSettings/organization/webhooks/organization.webhooks_pb").SendWebhookEventResponse>;
     /**
      * Show in-app notification for active question
      * for interactive questions we show notification only if interactiveAllowed

package/lib/gamification.js

@@ -4,7 +4,7 @@ import { QuestionStatus, QuestionType, FeatureType, SilenceSetting, PickHistoryS
 import { NotificationType } from '@streamlayer/sdk-web-notifications';
 import '@streamlayer/sdk-web-core/store';
 import { onStart } from 'nanostores';
-import { AdUnit, FactoidMediaMode, NotificationUseContentTexts, } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
+import { AdUnit, FactoidMediaMode, NotificationEnabled, NotificationUseContentTexts, } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
 import * as queries from './queries';
 import * as actions from './queries/actions';
 import { leaderboard } from './leaderboard';
@@ -53,6 +53,7 @@ export class Gamification extends AbstractFeature {
     activeQuestionId;
     openedQuestionId;
     advertisement;
+    withPickHistory;
     onboardingProcessed;
     friendsTabEnabled;
     skipOnboarding;
@@ -77,6 +78,7 @@ export class Gamification extends AbstractFeature {
         this.feedList = this.background.feedList;
         this.betPack = this.background.betPack;
         this.currentUserId = this.background.userId;
+        this.withPickHistory = this.background.withPickHistory;
         this.onboardingProcessed = createSingleStore(!instance.sdk.withAuth);
         this.leaderboardId = new SingleStore(createSingleStore(this.settings.getValue('pinnedLeaderboardId')), 'pinnedLeaderboardId').getStore();
         this.notifications = instance.notifications;
@@ -113,11 +115,6 @@ export class Gamification extends AbstractFeature {
         this.cancels.add(this.onboardingStatus.$store.listen(this.checkInteractiveFlag));
         this.cancels.add(this.background.moderation.getStore().listen(this.checkInteractiveFlag));
         this.cancels.add(this.settings.subscribe(this.checkInteractiveFlag));
-        this.cancels.add(this.onboardingStatus.$store.listen((status, prevStatus) => {
-            if (prevStatus === undefined || status !== OnboardingStatus.Unset) {
-                this.background.activeQuestionId.invalidate();
-            }
-        }));
         this.background.activeQuestionId.listen(this.showInApp);
         this.friendsTabEnabled = createSingleStore(false);
         this.cancels.add(instance.sdk.options.subscribe((data) => {
@@ -351,17 +348,13 @@ export class Gamification extends AbstractFeature {
                 }
             }
             if (questionIndex === -1) {
-                feedList.unshift(feedItem);
-                eventBus.emit('poll', {
-                    action: 'received',
-                    payload: {
-                        isAd: feedItem.attributes?.adUnit == AdUnit.UNSET,
-                        questionId: feedItem.id,
-                        questionType: feedItem.attributes?.type,
-                    },
-                });
+                if (this.feedList.isEnabled()) {
+                    feedList.unshift(feedItem);
+                }
+            }
+            if (this.feedList.isEnabled()) {
+                this.feedList.getStore().mutate(feedList);
             }
-            this.feedList.getStore().mutate(feedList);
         }));
     };
     // not used
@@ -392,7 +385,7 @@ export class Gamification extends AbstractFeature {
                 action: 'voted',
                 payload: {
                     questionId,
-                    isAd: question?.adUnit == AdUnit.UNSET,
+                    isAd: question?.adUnit == AdUnit.STANDART || question?.promotion?.adUnit == AdUnit.STANDART,
                     questionType: question.type,
                 },
             });
@@ -414,19 +407,22 @@ export class Gamification extends AbstractFeature {
         const extendedQuestionBeforeVote = { ...(data.get().data || {}) };
         const updateQuestionAndFieldList = () => {
             const feedList = this.feedList.getValues().data;
-            if (!feedList) {
-                return;
-            }
-            const questionIndex = feedList.findIndex((item) => item.id === questionId);
-            const poll = feedList[questionIndex];
-            const question = poll?.attributes?.attributes.case === 'question' && poll.attributes.attributes.value;
+            const questionIndex = feedList?.findIndex((item) => item.id === questionId);
+            const poll = questionIndex && questionIndex >= 0 && feedList ? feedList[questionIndex] : undefined;
+            const question = (poll?.attributes?.attributes.case === 'question' && poll?.attributes?.attributes.value) ||
+                extendedQuestionBeforeVote;
+            const isAd = poll?.attributes?.adUnit == AdUnit.STANDART ||
+                poll?.attributes?.adPromotion?.adUnit == AdUnit.STANDART ||
+                extendedQuestionBeforeVote?.adUnit == AdUnit.STANDART ||
+                extendedQuestionBeforeVote?.promotion?.adUnit == AdUnit.STANDART;
+            const questionType = poll?.attributes?.type || extendedQuestionBeforeVote?.type;
             if (question) {
                 eventBus.emit('poll', {
                     action: 'voted',
                     payload: {
-                        isAd: poll.attributes?.adUnit == AdUnit.UNSET,
+                        isAd,
                         questionId,
-                        questionType: question.questionType,
+                        questionType,
                     },
                 });
                 const extendedQuestion = data.get().data;
@@ -436,18 +432,20 @@ export class Gamification extends AbstractFeature {
                     const votedAnswerIdx = extendedQuestion.answers.findIndex((answer) => answer.id === answerId);
                     const votedAnswer = extendedQuestion.answers[votedAnswerIdx];
                     const percentsEqual = extendedQuestion.answers.every(({ percentageDecimal }, index) => percentageDecimal === extendedQuestionBeforeVote?.answers[index].percentageDecimal);
-                    // @ts-ignore
-                    feedList[questionIndex].attributes.attributes.value.answerId = answerId;
-                    // @ts-ignore
-                    feedList[questionIndex].attributes.attributes.value.openForVoting = false;
-                    // @ts-ignore
-                    feedList[questionIndex].attributes.attributes.value.text = votedAnswer?.text || '';
-                    if (correctAnswer) {
+                    if (feedList && questionIndex && questionIndex >= 0) {
                         // @ts-ignore
-                        feedList[questionIndex].attributes.attributes.value.status =
-                            correctAnswer.id === answerId ? PickHistoryStatus.WON : PickHistoryStatus.LOST;
+                        feedList[questionIndex].attributes.attributes.value.answerId = answerId;
+                        // @ts-ignore
+                        feedList[questionIndex].attributes.attributes.value.openForVoting = false;
+                        // @ts-ignore
+                        feedList[questionIndex].attributes.attributes.value.text = votedAnswer?.text || '';
+                        if (correctAnswer) {
+                            // @ts-ignore
+                            feedList[questionIndex].attributes.attributes.value.status =
+                                correctAnswer.id === answerId ? PickHistoryStatus.WON : PickHistoryStatus.LOST;
+                        }
+                        this.feedList.getStore().mutate([...feedList]);
                     }
-                    this.feedList.getStore().mutate([...feedList]);
                     extendedQuestion.answers[votedAnswerIdx].correct = correctAnswer?.id === answerId;
                     extendedQuestion.answers[votedAnswerIdx].youVoted = true;
                     if (percentsEqual) {
@@ -495,12 +493,16 @@ export class Gamification extends AbstractFeature {
             animateHiding: false,
         });
         let questionType = question?.attributes?.type;
-        let hasBanner = question?.attributes?.adUnit === AdUnit.STANDART && !!question?.attributes?.adPromotion?.banner?.imageUrl;
+        let hasBanner = (question?.attributes?.adUnit === AdUnit.STANDART ||
+            question?.attributes?.adPromotion?.adUnit === AdUnit.STANDART) &&
+            !!question?.attributes?.adPromotion?.banner?.imageUrl;
         if (!questionType && !openedFromBetPack) {
             const feedList = this.feedList.getStore().value?.data || [];
             const itemFromFeed = feedList.find((item) => item.id === questionId)?.attributes;
             questionType = itemFromFeed?.type;
-            hasBanner = itemFromFeed?.adUnit === AdUnit.STANDART && !!itemFromFeed?.adPromotion?.banner?.imageUrl;
+            hasBanner =
+                (itemFromFeed?.adUnit === AdUnit.STANDART || itemFromFeed?.adPromotion?.adUnit === AdUnit.STANDART) &&
+                    !!itemFromFeed?.adPromotion?.banner?.imageUrl;
         }
         const flags = {
             eventId: this.background.slStreamId.get() || '',
@@ -512,7 +514,7 @@ export class Gamification extends AbstractFeature {
             payload: {
                 questionId,
                 questionType,
-                isAd: question?.attributes?.adUnit == AdUnit.UNSET,
+                isAd: question?.attributes?.adUnit != AdUnit.UNSET,
                 questionOpenedFrom: question?.openedFrom === 'bet-pack' ? 'list' : question?.openedFrom,
                 hasBanner,
             },
@@ -523,7 +525,7 @@ export class Gamification extends AbstractFeature {
                 payload: {
                     questionId,
                     questionType,
-                    isAd: question?.attributes?.adUnit == AdUnit.UNSET,
+                    isAd: question?.attributes?.adUnit != AdUnit.UNSET,
                     questionOpenedFrom: question?.openedFrom === 'bet-pack' ? 'list' : question?.openedFrom,
                 },
             });
@@ -606,6 +608,14 @@ export class Gamification extends AbstractFeature {
             payload: {},
         });
     };
+    sendWebhookEvent = (questionId, userAccountInfo) => {
+        return actions.sendWebhookEvent(this.transport, {
+            eventId: this.background.slStreamId.get(),
+            questionId,
+            userId: this.background.userId.get(),
+            userAccountInfo,
+        });
+    };
     /**
      * Show in-app notification for active question
      * for interactive questions we show notification only if interactiveAllowed
@@ -613,6 +623,9 @@ export class Gamification extends AbstractFeature {
      * skipping questions with inAppSilence === ON
      */
     showInApp = (question) => {
+        if (question.loading) {
+            return;
+        }
         const onboardingStatus = this.onboardingStatus.$store.get();
         const isAdUnit = question?.data?.question?.adUnit === AdUnit.STANDART;
         if (question && question.data && (isAdUnit || (onboardingStatus && onboardingStatus !== OnboardingStatus.Unset))) {
@@ -622,31 +635,36 @@ export class Gamification extends AbstractFeature {
                 !question.data.question.marketClosed) {
                 if (InteractiveQuestionTypes.has(question.data.question.type)) {
                     if ((this.isInteractiveAllowed || isAdUnit) && question.data.question.notification !== undefined) {
-                        this.notifications.add({
-                            type: NotificationType.QUESTION,
-                            action: () => this.openQuestion(question.data?.question?.id, question.data?.feedItem),
-                            close: () => this.closeQuestion(question.data?.question?.id),
-                            autoHideDuration: 1000 * 60,
-                            id: this.background.getCurrentSessionId({
-                                prefix: 'notification',
-                                entity: question.data.question.id,
-                            }),
-                            emitEvent: true,
-                            data: {
-                                questionId: question.data.question.id,
-                                questionType: question.data.question.type,
-                                question: {
-                                    title: question.data.question.notification.title,
-                                },
-                                inApp: {
-                                    notification: question.data.question.notification,
-                                    appearance: question.data.question.appearance,
-                                    sponsorship: question.data.question.sponsorship,
-                                    adUnit: question.data.question?.adUnit,
-                                    sponsorLogo: question.data.question.promotion?.sponsor?.logo,
+                        if (question.data.question.notification.enabled === NotificationEnabled.NOTIFICATION_ENABLED) {
+                            this.notifications.add({
+                                type: NotificationType.QUESTION,
+                                action: () => this.openQuestion(question.data?.question?.id, question.data?.feedItem),
+                                close: () => this.closeQuestion(question.data?.question?.id),
+                                autoHideDuration: 1000 * 60,
+                                id: this.background.getCurrentSessionId({
+                                    prefix: 'notification',
+                                    entity: question.data.question.id,
+                                }),
+                                emitEvent: true,
+                                data: {
+                                    questionId: question.data.question.id,
+                                    questionType: question.data.question.type,
+                                    question: {
+                                        title: question.data.question.notification.title,
+                                    },
+                                    inApp: {
+                                        notification: question.data.question.notification,
+                                        appearance: question.data.question.appearance,
+                                        sponsorship: question.data.question.sponsorship,
+                                        adUnit: question.data.question?.adUnit,
+                                        sponsorLogo: question.data.question.promotion?.sponsor?.logo,
+                                    },
                                 },
-                            },
-                        });
+                            });
+                        }
+                        else {
+                            this.openQuestion(question.data?.question?.id, question.data?.feedItem);
+                        }
                     }
                 }
                 else if (question.data.question.type === QuestionType.FACTOID) {

package/lib/onboarding.js

@@ -139,9 +139,6 @@ export const onboarding = (service, background, transport, notifications, option
         else {
             service.onboardingProcessed.set(true);
         }
-        if (onboardingStatus === OnboardingStatus.Completed) {
-            background.activeQuestionId.invalidate(); // verified, it's necessary
-        }
         storage.setOnboardingInstantOpen({
             userId: background.userId.get() || '',
             organizationId: background.organizationId.get() || '',

package/lib/queries/actions.d.ts

@@ -1,7 +1,14 @@
 import type { Transport } from '@streamlayer/sdk-web-api';
+import { UserAccountInfo } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
 export declare const submitAnswer: (transport: Transport, data: {
     questionId: string;
     answerId: string;
 }) => Promise<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").SubmitAnswerResponse>;
 export declare const submitInplay: (transport: Transport, eventId: string) => Promise<import("@bufbuild/protobuf").Message<"streamlayer.interactive.feed.SubmitInplayResponse">>;
 export declare const skipQuestion: (transport: Transport, questionId: string) => Promise<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").SkipQuestionResponse>;
+export declare const sendWebhookEvent: (transport: Transport, opts: {
+    eventId?: string;
+    questionId: string;
+    userId?: string;
+    userAccountInfo: UserAccountInfo;
+}) => Promise<import("@streamlayer/sl-eslib/sdkSettings/organization/webhooks/organization.webhooks_pb").SendWebhookEventResponse>;

package/lib/queries/actions.js

@@ -1,5 +1,7 @@
 import { ConnectError, Code } from '@connectrpc/connect';
 import { Feed } from '@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb';
+import { UserAccountInfo } from '@streamlayer/sl-eslib/interactive/interactive.common_pb';
+import { OrganizationWebhooks, WebhookEvent, WebhookNotificationType, } from '@streamlayer/sl-eslib/sdkSettings/organization/webhooks/organization.webhooks_pb';
 import { ERROR } from '../constants';
 export const submitAnswer = async (transport, data) => {
     const { client, createRequestOptions } = transport.createPromiseClient(Feed, { method: 'submitAnswer' });
@@ -25,3 +27,31 @@ export const skipQuestion = (transport, questionId) => {
     const contextValues = createRequestOptions({ retryAttempts: 0 });
     return client.skipQuestion({ data: { id: questionId } }, { contextValues });
 };
+const userAccountInfoToNotificationType = (info) => {
+    switch (info) {
+        case UserAccountInfo.PHONE:
+            return WebhookNotificationType.PHONE;
+        case UserAccountInfo.EMAIL:
+            return WebhookNotificationType.MAIL;
+        default:
+            return WebhookNotificationType.UNSET;
+    }
+};
+export const sendWebhookEvent = (transport, opts) => {
+    const { client, createRequestOptions } = transport.createPromiseClient(OrganizationWebhooks, {
+        method: 'sendWebhookEvent',
+    });
+    const contextValues = createRequestOptions({ retryAttempts: 0 });
+    return client.sendWebhookEvent({
+        eventId: opts.eventId,
+        questionId: opts.questionId,
+        data: {
+            event: WebhookEvent.CLICK_BUTTON,
+            notificationType: userAccountInfoToNotificationType(opts.userAccountInfo),
+            userId: opts.userId,
+            description: '',
+            metadata: {},
+            customFields: {},
+        },
+    }, { contextValues });
+};

package/lib/queries/index.d.ts

@@ -441,8 +441,7 @@ export declare const getPromotionDetail: (promoId: string, transport: Transport)
     promotion: import("@streamlayer/sl-eslib/interactive/interactive.common_pb").QuestionOptions_PromotionOptions | undefined;
     notification: import("@streamlayer/sl-eslib/interactive/interactive.common_pb").QuestionNotification | undefined;
 } | undefined>;
-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>, $interactiveAllowed: ReadableAtom<InteractiveAllowed>, $slUserId: ReadableAtom<string | undefined>, $slOrganizationId: ReadableAtom<string | undefined>, storage: GamificationStorage, onlyBetPack: boolean, transport: Transport) => import("@nanostores/query").FetcherStore<Omit<import("@streamlayer/sdk-web-types").RecursiveOmitHelper<FeedItem, "$typeName">, "$typeName">[], any>;
+export declare const $feedList: ($slStreamId: ReadableAtom<string | undefined>, $interactiveAllowed: ReadableAtom<InteractiveAllowed>, $slUserId: ReadableAtom<string | undefined>, $slOrganizationId: ReadableAtom<string | undefined>, storage: GamificationStorage, onlyBetPack: boolean, $withPickHistory: ReadableAtom<boolean>, transport: Transport) => import("@nanostores/query").FetcherStore<Omit<import("@streamlayer/sdk-web-types").RecursiveOmitHelper<FeedItem, "$typeName">, "$typeName">[], any>;
 export declare const $activePromotionId: ($slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<{
     id: string;
     question: {

package/lib/queries/index.js

@@ -115,28 +115,14 @@ export const getPromotionDetail = async (promoId, transport) => {
     const promotion = options?.options.case === 'promotion' ? options?.options.value : undefined;
     return { id: question.id, question, promotion, notification };
 };
-export const $pickHistory = (slStreamId, transport) => {
-    const { client, queryKey } = transport.createPromiseClient(Feed, { method: 'pickHistory', params: [slStreamId] });
-    return transport.nanoquery.createFetcherStore(queryKey, {
-        fetcher: async (_, __, eventId) => {
-            if (!eventId) {
-                return [];
-            }
-            const res = await client.pickHistory({
-                eventId: eventId,
-            });
-            return res.data?.map(({ attributes }) => attributes);
-        },
-    });
-};
-export const $feedList = ($slStreamId, $interactiveAllowed, $slUserId, $slOrganizationId, storage, onlyBetPack, transport) => {
+export const $feedList = ($slStreamId, $interactiveAllowed, $slUserId, $slOrganizationId, storage, onlyBetPack, $withPickHistory, transport) => {
     const { client, queryKey } = transport.createPromiseClient(Feed, {
         method: 'list',
-        params: [$slStreamId, $interactiveAllowed, onlyBetPack ? 'true' : ''],
+        params: [$slStreamId, $interactiveAllowed, onlyBetPack ? 'true' : '', $withPickHistory],
     });
     return transport.nanoquery.createFetcherStore(queryKey, {
-        fetcher: async (_, __, slStreamId, interactiveAllowed, onlyBetPack) => {
-            if (!slStreamId || onlyBetPack) {
+        fetcher: async (_, __, slStreamId, interactiveAllowed, onlyBetPack, withPickHistory) => {
+            if (!slStreamId || onlyBetPack || !withPickHistory) {
                 return [];
             }
             const res = await client.list({
@@ -158,7 +144,7 @@ export const $feedList = ($slStreamId, $interactiveAllowed, $slUserId, $slOrgani
                     eventBus.emit('poll', {
                         action: 'received',
                         payload: {
-                            isAd: question.attributes?.adUnit == AdUnit.UNSET,
+                            isAd: question.attributes?.adUnit != AdUnit.UNSET,
                             questionId: question.id,
                             questionType: question.attributes?.type,
                         },
@@ -194,7 +180,7 @@ export const $activePromotionId = ($slStreamId, transport) => {
                 },
             });
             const feedItem = res.data?.[0];
-            if (feedItem.type === 'promotion') {
+            if (feedItem?.type === 'promotion') {
                 return getPromotionDetail(feedItem.id, transport);
             }
             return undefined;
@@ -251,7 +237,7 @@ export const $betPack = ($slStreamId, $slUserId, $slOrganizationId, storage, tra
                         eventBus.emit('poll', {
                             action: 'received',
                             payload: {
-                                isAd: question?.adUnit == AdUnit.UNSET,
+                                isAd: question?.adUnit != AdUnit.UNSET,
                                 questionId: question.id,
                                 questionType: question.type,
                             },

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "1.25.4",
+  "version": "1.26.0",
   "peerDependencies": {
     "@bufbuild/protobuf": "^2.2.2",
     "@fastify/deepmerge": "^2.0.0",
     "@streamlayer/sl-eslib": "^5.229.1",
     "uuid": "^11.1.0",
     "nanostores": "^1.1.0",
-    "@streamlayer/sdk-web-api": "^1.16.4",
-    "@streamlayer/sdk-web-core": "^1.21.4",
-    "@streamlayer/sdk-web-interfaces": "^1.9.12",
-    "@streamlayer/sdk-web-logger": "^1.0.106",
-    "@streamlayer/sdk-web-notifications": "^1.3.68",
-    "@streamlayer/sdk-web-storage": "^1.0.106",
-    "@streamlayer/sdk-web-types": "^1.17.4"
+    "@streamlayer/sdk-web-api": "^1.16.6",
+    "@streamlayer/sdk-web-interfaces": "^1.9.14",
+    "@streamlayer/sdk-web-logger": "^1.0.108",
+    "@streamlayer/sdk-web-notifications": "^1.3.70",
+    "@streamlayer/sdk-web-core": "^1.21.6",
+    "@streamlayer/sdk-web-storage": "^1.0.108",
+    "@streamlayer/sdk-web-types": "^1.17.6"
   },
   "devDependencies": {
     "tslib": "^2.7.0"
@@ -23,24 +23,28 @@
   "typings": "./lib/index.d.ts",
   "exports": {
     ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js",
       "module": "./lib/index.js",
-      "require": "./lib/index.js",
-      "types": "./lib/index.d.ts"
+      "default": "./lib/index.js"
     },
     "./gamification": {
+      "types": "./lib/gamification.d.ts",
+      "import": "./lib/gamification.js",
       "module": "./lib/gamification.js",
-      "require": "./lib/gamification.js",
-      "types": "./lib/gamification.d.ts"
+      "default": "./lib/gamification.js"
     },
     "./externalAd": {
+      "types": "./lib/advertisement/externalAd/index.d.ts",
+      "import": "./lib/advertisement/externalAd/index.js",
       "module": "./lib/advertisement/externalAd/index.js",
-      "require": "./lib/advertisement/externalAd/index.js",
-      "types": "./lib/advertisement/externalAd/index.d.ts"
+      "default": "./lib/advertisement/externalAd/index.js"
     },
     "./highlights": {
+      "types": "./lib/highlights.d.ts",
+      "import": "./lib/highlights.js",
       "module": "./lib/highlights.js",
-      "require": "./lib/highlights.js",
-      "types": "./lib/highlights.d.ts"
+      "default": "./lib/highlights.js"
     }
   },
   "files": [