@streamlayer/feature-gamification 1.13.4 → 1.14.1

package/lib/advertisement/index.js

@@ -51,30 +51,31 @@ export const advertisement = ($slStreamId, $feedSubscription, instance) => {
     const $store = createMapStore({});
     const $activeAdvertisement = $activePromotionId($slStreamId, transport);
     const open = (options) => {
+        const payload = $store.get();
+        const id = payload.data?.question.id;
+        const type = payload.data?.promotion?.type;
+        if (!id) {
+            return;
+        }
+        eventBus.emit('advertisement', {
+            action: 'opened',
+            payload: {
+                id,
+                type,
+                hasBanner: adHasBanner(payload.data),
+                openedFrom: options?.fromNotification ? 'notification' : 'auto',
+            },
+        });
         if (options?.fromNotification) {
             $store.setKey('hasNotification', false);
-            const payload = $store.get();
-            const id = payload.data?.question.id;
-            const type = payload.data?.promotion?.type;
-            if (id) {
-                eventBus.emit('advertisement', {
-                    action: 'opened',
-                    payload: {
-                        id,
-                        type,
-                        hasBanner: adHasBanner(payload.data),
-                        openedFrom: 'notification',
-                    },
-                });
-                eventBus.emit('advertisement', {
-                    action: 'notification-opened',
-                    payload: {
-                        id,
-                        type,
-                        hasBanner: adHasBanner(payload.data),
-                    },
-                });
-            }
+            eventBus.emit('advertisement', {
+                action: 'notification-opened',
+                payload: {
+                    id,
+                    type,
+                    hasBanner: adHasBanner(payload.data),
+                },
+            });
         }
     };
     const markAsViewed = () => {

package/lib/background.d.ts

@@ -37,6 +37,7 @@ export declare class GamificationBackground {
     /** last active question in feed */
     activeQuestionId: ReturnType<typeof queries.$activeQuestion>;
     feedList: ApiStore<GetApiResponseType<typeof queries.$feedList>>;
+    betPack: ApiStore<GetApiResponseType<typeof queries.$betPack>>;
     /** moderation id */
     moderationId: ReadableAtom<string | undefined>;
     /** moderation */

package/lib/background.js

@@ -32,6 +32,7 @@ export class GamificationBackground {
     /** last active question in feed */
     activeQuestionId;
     feedList;
+    betPack;
     /** moderation id */
     moderationId;
     /** moderation */
@@ -57,6 +58,7 @@ export class GamificationBackground {
         this.notifications = instance.notifications;
         this.moderation = new ApiStore(queries.$moderation(this.slStreamId, instance.transport), 'gamification:moderation');
         this.feedList = new ApiStore(queries.$feedList(this.slStreamId, this.interactiveAllowed, instance.transport), 'gamification:feedList');
+        this.betPack = new ApiStore(queries.$betPack(this.slStreamId, instance.transport), 'gamification:betPack');
         this.activeQuestionId = queries.$activeQuestion(this.slStreamId, instance.transport);
         this.openedQuestion = detail(instance.transport, this.openedQuestionId, this.feedList.getStore());
         this.cancels.add(this.openedQuestionId.listen((item) => {
@@ -78,6 +80,33 @@ export class GamificationBackground {
             }
         }));
         this.feedSubscription = queries.feedSubscription(this.slStreamId, instance.transport);
+        this.cancels.add(this.feedSubscription.addListener('bet-pack-update', async (response) => {
+            const question = response.data?.attributes?.question;
+            if (question?.type === QuestionType.PREDICTION) {
+                const betPackData = this.betPack.getValues().data || {};
+                const betPackItem = betPackData?.[question.id];
+                if (betPackItem || Object.keys(betPackData).length < 5) {
+                    const data = queries.$questionByUser(question.id, this.transport);
+                    // order of operations is important here
+                    const cancel = data.subscribe(() => { });
+                    await data.get().promise;
+                    // if question is not in the feed list, get extended question data from the server
+                    let extendedQuestion = data.get().data;
+                    if (!extendedQuestion) {
+                        extendedQuestion = await queries.questionByUser(question.id, this.transport);
+                    }
+                    cancel();
+                    window.requestAnimationFrame(() => {
+                        data.invalidate();
+                    });
+                    // get extended question data and mark as dirty
+                    this.betPack.getStore().mutate({
+                        ...betPackData,
+                        [question.id]: extendedQuestion,
+                    });
+                }
+            }
+        }));
         this.cancels.add(this.feedSubscription.addListener('feed-subscription-active-question', (response) => {
             const activeQuestionId = this.activeQuestionId.get().data?.question?.id;
             const question = response.data?.attributes?.question;

package/lib/gamification.d.ts

@@ -25,6 +25,8 @@ export declare class Gamification extends AbstractFeature<'games', PlainMessage<
     userSummary: ReturnType<typeof summary>;
     /** feed list (pick history) */
     feedList: ApiStore<GetApiResponseType<typeof queries.$feedList>>;
+    /** list (pack) of predefined questions */
+    betPack: ApiStore<GetApiResponseType<typeof queries.$betPack>>;
     /** friends list */
     friends: ApiStore<GetApiResponseType<typeof queries.$friends>>;
     /** pinned leaderboard id */
@@ -65,6 +67,7 @@ export declare class Gamification extends AbstractFeature<'games', PlainMessage<
     checkInteractiveFlag: () => void;
     connect: () => void;
     disconnect: () => void;
+    betPackVote: (questionId: string, answerId: string) => Promise<void>;
     submitAnswer: (questionId: string, answerId: string) => Promise<void>;
     openQuestion: (questionId?: string, question?: FeedItem & {
         openedFrom?: "list" | "notification";

package/lib/gamification.js

@@ -29,6 +29,8 @@ export class Gamification extends AbstractFeature {
     userSummary;
     /** feed list (pick history) */
     feedList;
+    /** list (pack) of predefined questions */
+    betPack;
     /** friends list */
     friends;
     /** pinned leaderboard id */
@@ -71,6 +73,7 @@ export class Gamification extends AbstractFeature {
         this.openedQuestionId = this.background.openedQuestionId;
         this.storage = new GamificationStorage();
         this.feedList = this.background.feedList;
+        this.betPack = this.background.betPack;
         this.friends = new ApiStore(queries.$friends(this.background.userId, instance.transport), 'gamification:friends');
         this.currentUserId = this.background.userId;
         this.openedUser = createSingleStore(undefined);
@@ -325,6 +328,33 @@ export class Gamification extends AbstractFeature {
         this.background.feedSubscription.removeListener('feed-subscription-prediction-close');
         this.background.feedSubscription.removeListener('feed-subscription-questions-list');
     };
+    betPackVote = async (questionId, answerId) => {
+        await this.submitAnswer(questionId, answerId);
+        const betPackList = { ...this.betPack.getValues().data };
+        const question = betPackList?.[questionId];
+        if (question) {
+            question.answers = betPackList[questionId].answers.map((answer) => {
+                if (answer.id === answerId) {
+                    return {
+                        ...answer,
+                        youVoted: true,
+                    };
+                }
+                return answer;
+            });
+            eventBus.emit('poll', {
+                action: 'voted',
+                payload: {
+                    questionId,
+                    questionType: question.type,
+                },
+            });
+            this.betPack.getStore().mutate({
+                ...betPackList,
+                [questionId]: question,
+            });
+        }
+    };
     submitAnswer = async (questionId, answerId) => {
         const data = $questionByUser(questionId, this.transport);
         const cancel = data.subscribe(() => { });

package/lib/queries/index.d.ts

@@ -116,6 +116,12 @@ export declare const feedSubscription: ($slStreamId: ReadableAtom<string | undef
             readonly O: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse;
             readonly kind: import("@bufbuild/protobuf").MethodKind.ServerStreaming;
         };
+        readonly betPack: {
+            readonly name: "BetPack";
+            readonly I: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").BetPackRequest;
+            readonly O: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").BetPackResponse;
+            readonly kind: import("@bufbuild/protobuf").MethodKind.Unary;
+        };
     };
 }, SubscriptionRequest, SubscriptionResponse, "subscription" | "votingSubscription" | "questionSubscription" | "feedSubscription", ((request: import("@bufbuild/protobuf").PartialMessage<SubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<SubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<VotingSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<VotingSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<QuestionSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<QuestionSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse>)>;
 export declare const votingSubscription: (params: {
@@ -232,6 +238,12 @@ export declare const votingSubscription: (params: {
             readonly O: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse;
             readonly kind: import("@bufbuild/protobuf").MethodKind.ServerStreaming;
         };
+        readonly betPack: {
+            readonly name: "BetPack";
+            readonly I: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").BetPackRequest;
+            readonly O: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").BetPackResponse;
+            readonly kind: import("@bufbuild/protobuf").MethodKind.Unary;
+        };
     };
 }, VotingSubscriptionRequest, VotingSubscriptionResponse, "subscription" | "votingSubscription" | "questionSubscription" | "feedSubscription", ((request: import("@bufbuild/protobuf").PartialMessage<SubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<SubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<VotingSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<VotingSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<QuestionSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<QuestionSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse>)>;
 export declare const questionSubscription: (questionId: string, transport: Transport) => import("packages/sdk-web-api/lib/grpc/subscription").ServerStreamSubscription<import("@bufbuild/protobuf").ServiceType, import("@bufbuild/protobuf").Message<import("@bufbuild/protobuf").AnyMessage>, import("@bufbuild/protobuf").Message<import("@bufbuild/protobuf").AnyMessage>, never, never> | import("packages/sdk-web-api/lib/grpc/subscription").ServerStreamSubscription<{
@@ -345,6 +357,12 @@ export declare const questionSubscription: (questionId: string, transport: Trans
             readonly O: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse;
             readonly kind: import("@bufbuild/protobuf").MethodKind.ServerStreaming;
         };
+        readonly betPack: {
+            readonly name: "BetPack";
+            readonly I: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").BetPackRequest;
+            readonly O: typeof import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").BetPackResponse;
+            readonly kind: import("@bufbuild/protobuf").MethodKind.Unary;
+        };
     };
 }, QuestionSubscriptionRequest, QuestionSubscriptionResponse, "subscription" | "votingSubscription" | "questionSubscription" | "feedSubscription", ((request: import("@bufbuild/protobuf").PartialMessage<SubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<SubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<VotingSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<VotingSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<QuestionSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<QuestionSubscriptionResponse>) | ((request: import("@bufbuild/protobuf").PartialMessage<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionRequest>, options?: import("@connectrpc/connect").CallOptions) => AsyncIterable<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedSubscriptionResponse>)>;
 export declare const getQuestionByUser: (questionId: string, transport: Transport) => Promise<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").ExtendedQuestion | undefined>;
@@ -416,3 +434,4 @@ export declare const $activePromotionId: ($slStreamId: ReadableAtom<string | und
 export { $userSummary, $leaderboardList } from './leaderboard';
 export { $friends } from './friends';
 export { $moderation } from './moderation';
+export declare const $betPack: ($slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<Record<string, import("@bufbuild/protobuf").PlainMessage<import("@streamlayer/sl-eslib/interactive/interactive.common_pb").ExtendedQuestion>> | null, any>;

package/lib/queries/index.js

@@ -170,3 +170,32 @@ export const $activePromotionId = ($slStreamId, transport) => {
 export { $userSummary, $leaderboardList } from './leaderboard';
 export { $friends } from './friends';
 export { $moderation } from './moderation';
+export const $betPack = ($slStreamId, transport) => {
+    const { client, queryKey } = transport.createPromiseClient(Feed, {
+        method: 'betPack',
+        params: [$slStreamId],
+    });
+    return transport.nanoquery.createFetcherStore(queryKey, {
+        fetcher: async (_, __, slStreamId) => {
+            if (!slStreamId) {
+                return null;
+            }
+            const res = await client.betPack({
+                eventId: slStreamId,
+                types: [QuestionType.PREDICTION],
+                statuses: [QuestionStatus.ACTIVE, QuestionStatus.RESOLVED],
+                limit: 5,
+                sort: {
+                    field: 'activated_at',
+                    order: 'asc',
+                },
+            });
+            if (!res.data || !res.data.length) {
+                return null;
+            }
+            return res.data?.reduce((acc, item) => item?.attributes?.question?.id ? { ...acc, [item.attributes.question.id]: item.attributes.question } : acc, {});
+        },
+        dedupeTime: 0,
+        refetchInterval: 0,
+    });
+};

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "1.13.4",
+  "version": "1.14.1",
   "peerDependencies": {
     "@bufbuild/protobuf": "^1.10.0",
     "@fastify/deepmerge": "^2.0.0",
-    "@streamlayer/sl-eslib": "^5.130.0",
+    "@streamlayer/sl-eslib": "^5.149.1",
     "nanostores": "^0.10.3",
-    "@streamlayer/sdk-web-api": "^1.6.21",
-    "@streamlayer/sdk-web-interfaces": "^1.4.8",
-    "@streamlayer/sdk-web-logger": "^1.0.42",
-    "@streamlayer/sdk-web-core": "^1.9.4",
-    "@streamlayer/sdk-web-notifications": "^1.3.4",
-    "@streamlayer/sdk-web-storage": "^1.0.42",
-    "@streamlayer/sdk-web-types": "^1.9.4"
+    "@streamlayer/sdk-web-api": "^1.7.1",
+    "@streamlayer/sdk-web-interfaces": "^1.4.10",
+    "@streamlayer/sdk-web-core": "^1.10.1",
+    "@streamlayer/sdk-web-logger": "^1.0.44",
+    "@streamlayer/sdk-web-notifications": "^1.3.6",
+    "@streamlayer/sdk-web-storage": "^1.0.44",
+    "@streamlayer/sdk-web-types": "^1.10.1"
   },
   "devDependencies": {
     "tslib": "^2.7.0"