@mathrunet/masamune 2.8.2 → 2.8.3
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.
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
## [2.8.3](https://github.com/mathrunet/node_masamune/compare/v2.8.2...v2.8.3) (2024-09-13)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### chore
|
|
5
|
+
|
|
6
|
+
* Comments back. ([c792490](https://github.com/mathrunet/node_masamune/commit/c79249018320f02f965037e99120157892a4aa07))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
1
10
|
## [2.8.2](https://github.com/mathrunet/node_masamune/compare/v2.8.1...v2.8.2) (2024-09-13)
|
|
2
11
|
|
|
3
12
|
|
|
@@ -121,7 +121,6 @@ function sendNotification(_a) {
|
|
|
121
121
|
throw new functions.https.HttpsError("invalid-argument", "Either [token] or [topic], [targetCollectionPath], [targetDocumentPath] must be specified.");
|
|
122
122
|
}
|
|
123
123
|
if (targetToken !== undefined && targetToken !== null) {
|
|
124
|
-
console.log(`token send ${targetToken}`);
|
|
125
124
|
if (typeof targetToken === "string") {
|
|
126
125
|
targetToken = [targetToken];
|
|
127
126
|
}
|
|
@@ -134,7 +133,6 @@ function sendNotification(_a) {
|
|
|
134
133
|
}
|
|
135
134
|
for (let t in tokenList) {
|
|
136
135
|
try {
|
|
137
|
-
console.log(`send send`);
|
|
138
136
|
const messageId = yield admin.messaging().sendEachForMulticast({
|
|
139
137
|
notification: {
|
|
140
138
|
title: title,
|
|
@@ -263,11 +261,11 @@ function sendNotification(_a) {
|
|
|
263
261
|
do {
|
|
264
262
|
collection = yield firestore.cursor({ query: collectionRef, limit: 500, cursor: cursor }).get();
|
|
265
263
|
for (let doc of collection.docs) {
|
|
266
|
-
const
|
|
267
|
-
if (!(yield firestore.hasMatch({ data, conditions: targetConditions }))) {
|
|
264
|
+
const docData = doc.data();
|
|
265
|
+
if (!(yield firestore.hasMatch({ data: docData, conditions: targetConditions }))) {
|
|
268
266
|
continue;
|
|
269
267
|
}
|
|
270
|
-
const token = yield firestore.get({ data:
|
|
268
|
+
const token = yield firestore.get({ data: docData, field: targetTokenField });
|
|
271
269
|
if (typeof token === "string") {
|
|
272
270
|
tokens.push(token);
|
|
273
271
|
}
|
|
@@ -299,19 +297,14 @@ function sendNotification(_a) {
|
|
|
299
297
|
}
|
|
300
298
|
}
|
|
301
299
|
else if (targetDocumentPath !== undefined && targetDocumentPath !== null && targetTokenField != undefined && targetTokenField !== null) {
|
|
302
|
-
console.log("document");
|
|
303
300
|
const firestoreInstance = admin.firestore();
|
|
304
301
|
const documentRef = firestoreInstance.doc(targetDocumentPath);
|
|
305
302
|
const results = [];
|
|
306
303
|
const doc = yield documentRef.get();
|
|
307
304
|
const docData = doc.data();
|
|
308
|
-
console.log(docData);
|
|
309
305
|
if (docData) {
|
|
310
|
-
console.log(`exist data ${targetConditions}`);
|
|
311
306
|
if (yield firestore.hasMatch({ data: docData, conditions: targetConditions })) {
|
|
312
|
-
console.log(`match condition ${targetTokenField}`);
|
|
313
307
|
const token = yield firestore.get({ data: docData, field: targetTokenField });
|
|
314
|
-
console.log(`get token ${token}`);
|
|
315
308
|
const tokens = [];
|
|
316
309
|
if (typeof token === "string") {
|
|
317
310
|
tokens.push(token);
|
|
@@ -319,7 +312,6 @@ function sendNotification(_a) {
|
|
|
319
312
|
else if (Array.isArray(token)) {
|
|
320
313
|
tokens.push(...token);
|
|
321
314
|
}
|
|
322
|
-
console.log(`send ${title} ${body} ${tokens}`);
|
|
323
315
|
const res = yield sendNotification({
|
|
324
316
|
title: title,
|
|
325
317
|
body: body,
|
|
@@ -330,7 +322,6 @@ function sendNotification(_a) {
|
|
|
330
322
|
responseTokenList: responseTokenList,
|
|
331
323
|
targetToken: tokens,
|
|
332
324
|
});
|
|
333
|
-
console.log(`sent ${title} ${body} ${tokens}`);
|
|
334
325
|
results.push((_c = res.results) !== null && _c !== void 0 ? _c : []);
|
|
335
326
|
}
|
|
336
327
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../../src/lib/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAAmD;AACnD,sDAAwC;AACxC,uDAAyC;AACzC,oCAAsC;AAEtC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0EG;AACH,SAAsB,gBAAgB;yDAAC,EACnC,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,UAAU,EACV,KAAK,EACL,WAAW,EACX,WAAW,EACX,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,GAgBhB;;QACD,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,IAAI,CAAC;YACD,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,oBAAoB,KAAK,SAAS,IAAI,oBAAoB,KAAK,IAAI,CAAC,IAAI,CAAC,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,KAAK,IAAI,CAAC,EAAE,CAAC;gBAC3P,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,4FAA4F,CAAC,CAAC;YAC3J,CAAC;YACD,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;gBACpD,
|
|
1
|
+
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../../src/lib/functions/send_notification.ts"],"names":[],"mappings":"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"}
|