@streamlayer/feature-gamification 1.16.10 → 1.16.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/background.js +48 -30
  2. package/lib/detail.js +15 -7
  3. package/lib/gamification.js +7 -1
  4. package/lib/queries/deepLink.js +1 -1
  5. package/lib/queries/index.js +31 -16
  6. package/lib/queries/moderation.js +1 -1
  7. package/package.json +8 -8
package/lib/background.js CHANGED
@@ -4,7 +4,6 @@ import { QuestionStatus, QuestionType } from '@streamlayer/sdk-web-types';
4
4
  import '@streamlayer/sdk-web-core/store';
5
5
  import * as queries from './queries';
6
6
  import { detail } from './detail';
7
- import { advertisement } from './advertisement';
8
7
  import { GamificationStorage } from './storage';
9
8
  export var InteractiveAllowed;
10
9
  (function (InteractiveAllowed) {
@@ -68,32 +67,49 @@ export class GamificationBackground {
68
67
  this.cancels.add(this.openedQuestionId.listen((item) => {
69
68
  this.log.debug({ item }, 'received question');
70
69
  if (item?.questionId) {
70
+ this.log.info('cleanup on close question');
71
+ if (this.questionSubscription !== undefined) {
72
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
73
+ instance.transport.removeSubscription(this.questionSubscription);
74
+ this.questionSubscription = undefined;
75
+ }
71
76
  this.questionSubscription = queries.questionSubscription(item.questionId, instance.transport);
72
- this.questionSubscription.addListener('feed-subscription-opened-question', async (response) => {
77
+ this.questionSubscription.addListener('feed-subscription-opened-question', (response) => {
73
78
  const question = response.data?.attributes?.question;
74
79
  this.openedQuestion.updateExtendedQuestion(question);
75
80
  if (question?.type === QuestionType.PREDICTION &&
76
81
  (question.status === QuestionStatus.ACTIVE || question.status === QuestionStatus.RESOLVED)) {
77
82
  const betPackData = this.betPack.getValues().data?.data || {};
78
83
  const betPackItem = betPackData?.[question.id];
79
- if (betPackItem || Object.keys(betPackData).length < 5) {
80
- const data = queries.$questionByUser(question.id, this.transport);
81
- const cancel = data.subscribe(() => { });
82
- await data.get().promise;
83
- // if question is not in the feed list, get extended question data from the server
84
- let extendedQuestion = data.get().data;
85
- if (!extendedQuestion) {
86
- extendedQuestion = await queries.questionByUser(question.id, this.transport);
87
- }
88
- cancel();
89
- window.requestAnimationFrame(() => {
90
- data.invalidate();
84
+ if (betPackItem) {
85
+ const answers = [];
86
+ const sortedPrev = betPackItem.answers.sort((a, b) => {
87
+ return a.id > b.id ? 1 : -1;
91
88
  });
89
+ const sortedNew = question.answers.sort((a, b) => {
90
+ return a.id > b.id ? 1 : -1;
91
+ });
92
+ for (let i = 0; i < sortedPrev.length; i++) {
93
+ answers.push({
94
+ ...sortedPrev[i],
95
+ ...sortedNew[i],
96
+ correct: sortedPrev[i].correct,
97
+ youVoted: sortedPrev[i].youVoted,
98
+ pointsEarned: sortedPrev[i].pointsEarned,
99
+ });
100
+ }
92
101
  this.betPack.getStore().mutate({
93
102
  timestamp: Date.now(),
94
103
  data: {
95
104
  ...betPackData,
96
- [question.id]: extendedQuestion,
105
+ [question.id]: {
106
+ ...betPackItem,
107
+ status: question.status,
108
+ marketClosed: question.marketClosed,
109
+ activatedAt: question.activatedAt,
110
+ answerSetAt: question.answerSetAt,
111
+ answers,
112
+ },
97
113
  },
98
114
  });
99
115
  }
@@ -117,21 +133,23 @@ export class GamificationBackground {
117
133
  (question.status === QuestionStatus.ACTIVE || question.status === QuestionStatus.RESOLVED)) {
118
134
  const betPackData = this.betPack.getValues().data?.data || {};
119
135
  const betPackItem = betPackData?.[question.id];
120
- if (betPackItem || Object.keys(betPackData).length < 5) {
121
- const data = queries.$questionByUser(question.id, this.transport);
122
- // order of operations is important here
123
- const cancel = data.subscribe(() => { });
124
- await data.get().promise;
125
- // if question is not in the feed list, get extended question data from the server
126
- let extendedQuestion = data.get().data;
127
- if (!extendedQuestion) {
128
- extendedQuestion = await queries.questionByUser(question.id, this.transport);
129
- }
130
- cancel();
131
- window.requestAnimationFrame(() => {
132
- data.invalidate();
136
+ if (betPackItem) {
137
+ this.betPack.getStore().mutate({
138
+ timestamp: Date.now(),
139
+ data: {
140
+ ...betPackData,
141
+ [question.id]: {
142
+ ...betPackItem,
143
+ status: question.status,
144
+ marketClosed: question.marketClosed,
145
+ activatedAt: question.activatedAt,
146
+ answerSetAt: question.answerSetAt,
147
+ },
148
+ },
133
149
  });
134
- // get extended question data and mark as dirty
150
+ }
151
+ else if (!betPackItem && Object.keys(betPackData).length < 5) {
152
+ const extendedQuestion = await queries.questionByUser(question.id, this.transport);
135
153
  this.betPack.getStore().mutate({
136
154
  timestamp: Date.now(),
137
155
  data: {
@@ -215,7 +233,7 @@ export class GamificationBackground {
215
233
  };
216
234
  });
217
235
  if (!onlyBetPack) {
218
- this.advertisement = advertisement(this.slStreamId, this.feedSubscription, instance);
236
+ // this.advertisement = advertisement(this.slStreamId, this.feedSubscription, instance)
219
237
  }
220
238
  }
221
239
  /**
package/lib/detail.js CHANGED
@@ -22,16 +22,24 @@ export const detail = (transport, $openedQuestionId, $feedList) => {
22
22
  const currentQuestion = $extendedStore.get().data;
23
23
  const mergeQuestionAnswers = (currentAnswers, newAnswers) => {
24
24
  if (!currentAnswers || !newAnswers) {
25
- return currentAnswers || newAnswers || [];
25
+ return (currentAnswers || newAnswers || []).sort((a, b) => {
26
+ return a.id > b.id ? 1 : -1;
27
+ });
26
28
  }
29
+ const sortedPrev = currentAnswers.sort((a, b) => {
30
+ return a.id > b.id ? 1 : -1;
31
+ });
32
+ const sortedNew = newAnswers.sort((a, b) => {
33
+ return a.id > b.id ? 1 : -1;
34
+ });
27
35
  const answers = [];
28
- for (let i = 0; i < currentAnswers.length; i++) {
36
+ for (let i = 0; i < sortedPrev.length; i++) {
29
37
  answers.push({
30
- ...currentAnswers[i],
31
- ...newAnswers[i],
32
- correct: currentAnswers[i].correct,
33
- youVoted: currentAnswers[i].youVoted,
34
- pointsEarned: currentAnswers[i].pointsEarned,
38
+ ...sortedPrev[i],
39
+ ...sortedNew[i],
40
+ correct: sortedPrev[i].correct,
41
+ youVoted: sortedPrev[i].youVoted,
42
+ pointsEarned: sortedPrev[i].pointsEarned,
35
43
  });
36
44
  }
37
45
  return answers;
package/lib/gamification.js CHANGED
@@ -190,6 +190,7 @@ export class Gamification extends AbstractFeature {
190
190
  let extendedQuestion = data.get().data;
191
191
  if (!extendedQuestion) {
192
192
  extendedQuestion = await questionByUser(id, this.transport);
193
+ data.mutate(extendedQuestion);
193
194
  }
194
195
  cancel();
195
196
  window.requestAnimationFrame(() => {
@@ -301,7 +302,12 @@ export class Gamification extends AbstractFeature {
301
302
  status: prev.attributes.attributes.value.status,
302
303
  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
303
304
  // @ts-ignore
304
- openForVoting: prev.attributes.attributes.value.openForVoting,
305
+ openForVoting:
306
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
307
+ // @ts-ignore
308
+ prev.attributes.attributes.value.openForVoting === false
309
+ ? false
310
+ : feedItem.attributes.attributes.value.openForVoting,
305
311
  },
306
312
  },
307
313
  },
package/lib/queries/deepLink.js CHANGED
@@ -21,7 +21,7 @@ export const $deepLink = (transport, params) => {
21
21
  }
22
22
  },
23
23
  dedupeTime: 1000 * 60 * 60 * 24, // 24 hours
24
- refetchInterval: 0,
24
+ refetchInterval: Infinity,
25
25
  });
26
26
  };
27
27
  export const generateShortLink = (transport, { web, mobile }) => {
package/lib/queries/index.js CHANGED
@@ -24,7 +24,7 @@ export const $activeQuestion = (slStreamId, onlyBetPack, transport) => {
24
24
  return res.data?.attributes;
25
25
  },
26
26
  dedupeTime: 1000 * 60 * 10, // 10 minutes
27
- refetchInterval: 0,
27
+ refetchInterval: Infinity,
28
28
  });
29
29
  };
30
30
  export const getFeedItem = async (questionId, transport) => {
@@ -67,17 +67,29 @@ export const questionByUser = async ($questionId, transport) => {
67
67
  });
68
68
  return res.data?.attributes?.question;
69
69
  };
70
+ const storeCache = new Map();
70
71
  export const $questionByUser = ($questionId, transport) => {
71
- const { client, queryKey } = transport.createPromiseClient(Feed, { method: 'questionByUser', params: [$questionId] });
72
- return transport.nanoquery.createFetcherStore(queryKey, {
73
- fetcher: async (_, __, questionId) => {
74
- const res = await client.questionByUser({
75
- questionId: questionId,
76
- });
77
- return res.data?.attributes?.question;
78
- },
79
- dedupeTime: 1000 * 60 * 5,
72
+ const { client, queryKey, queryKeyStr } = transport.createPromiseClient(Feed, {
73
+ method: 'questionByUser',
74
+ params: [$questionId],
80
75
  });
76
+ if (storeCache.has(queryKeyStr)) {
77
+ return storeCache.get(queryKeyStr);
78
+ }
79
+ else {
80
+ const store = transport.nanoquery.createFetcherStore(queryKey, {
81
+ fetcher: async (_, __, questionId) => {
82
+ const res = await client.questionByUser({
83
+ questionId: questionId,
84
+ });
85
+ return res.data?.attributes?.question;
86
+ },
87
+ dedupeTime: Infinity,
88
+ refetchInterval: Infinity,
89
+ });
90
+ storeCache.set(queryKeyStr, store);
91
+ return store;
92
+ }
81
93
  };
82
94
  export const getPromotionDetail = async (promoId, transport) => {
83
95
  if (!promoId) {
@@ -146,8 +158,8 @@ export const $feedList = ($slStreamId, $interactiveAllowed, $slUserId, $slOrgani
146
158
  }
147
159
  return res.data;
148
160
  },
149
- dedupeTime: 0,
150
- refetchInterval: 0,
161
+ dedupeTime: Infinity,
162
+ refetchInterval: Infinity,
151
163
  });
152
164
  };
153
165
  export const $activePromotionId = ($slStreamId, transport) => {
@@ -177,8 +189,8 @@ export const $activePromotionId = ($slStreamId, transport) => {
177
189
  }
178
190
  return undefined;
179
191
  },
180
- dedupeTime: 0,
181
- refetchInterval: 0,
192
+ dedupeTime: Infinity,
193
+ refetchInterval: Infinity,
182
194
  });
183
195
  };
184
196
  export { $userSummary, $leaderboardList } from './leaderboard';
@@ -235,11 +247,14 @@ export const $betPack = ($slStreamId, $slUserId, $slOrganizationId, storage, tra
235
247
  });
236
248
  storage.saveQuestionReceived(flags, question.id);
237
249
  }
250
+ question.answers = question.answers.sort((a, b) => {
251
+ return a.id > b.id ? 1 : -1;
252
+ });
238
253
  return { ...acc, [question.id]: question };
239
254
  }, {}),
240
255
  };
241
256
  },
242
- dedupeTime: 0,
243
- refetchInterval: 0,
257
+ dedupeTime: Infinity,
258
+ refetchInterval: Infinity,
244
259
  });
245
260
  };
package/lib/queries/moderation.js CHANGED
@@ -8,7 +8,7 @@ export const $moderation = (slStreamId, transport) => {
8
8
  });
9
9
  return res.data?.attributes;
10
10
  },
11
- refetchInterval: 0,
11
+ refetchInterval: Infinity,
12
12
  dedupeTime: 1000 * 60 * 60,
13
13
  });
14
14
  };
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "@streamlayer/feature-gamification",
3
- "version": "1.16.10",
3
+ "version": "1.16.11",
4
4
  "peerDependencies": {
5
5
  "@bufbuild/protobuf": "^1.10.0",
6
6
  "@fastify/deepmerge": "^2.0.0",
7
7
  "@streamlayer/sl-eslib": "^5.149.1",
8
8
  "uuid": "^11.1.0",
9
9
  "nanostores": "^0.11.4",
10
- "@streamlayer/sdk-web-api": "^1.8.10",
11
- "@streamlayer/sdk-web-core": "^1.11.12",
12
- "@streamlayer/sdk-web-interfaces": "^1.5.1",
13
- "@streamlayer/sdk-web-logger": "^1.0.57",
14
- "@streamlayer/sdk-web-notifications": "^1.3.19",
15
- "@streamlayer/sdk-web-storage": "^1.0.57",
16
- "@streamlayer/sdk-web-types": "^1.10.14"
10
+ "@streamlayer/sdk-web-api": "^1.8.11",
11
+ "@streamlayer/sdk-web-core": "^1.11.13",
12
+ "@streamlayer/sdk-web-interfaces": "^1.5.2",
13
+ "@streamlayer/sdk-web-logger": "^1.0.58",
14
+ "@streamlayer/sdk-web-notifications": "^1.3.20",
15
+ "@streamlayer/sdk-web-storage": "^1.0.58",
16
+ "@streamlayer/sdk-web-types": "^1.10.15"
17
17
  },
18
18
  "devDependencies": {
19
19
  "tslib": "^2.7.0"