Skip to content

Commit 1a82b13

Browse files
committed
Package updates, removed tickets and sponsors sections
1 parent 0144f9a commit 1a82b13

11 files changed

Lines changed: 2852 additions & 2209 deletions

functions/package-lock.json

Lines changed: 524 additions & 610 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

functions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"start:src": "npm run build:src -- --watch"
1919
},
2020
"dependencies": {
21-
"@google-cloud/storage": "^7.11.0",
21+
"@google-cloud/storage": "^7.17.1",
2222
"express": "^4.19.2",
23-
"firebase-admin": "^12.1.0",
24-
"firebase-functions": "^5.0.1",
23+
"firebase-admin": "^13.5.0",
24+
"firebase-functions": "^6.4.0",
2525
"moment": "^2.30.1",
2626
"node-fetch": "^3.3.2"
2727
},

functions/src/notifications.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { getFirestore } from 'firebase-admin/firestore';
44
// https://github.com/import-js/eslint-plugin-import/issues/1810
55
// eslint-disable-next-line import/no-unresolved
6-
import { getMessaging, MessagingPayload } from 'firebase-admin/messaging';
6+
import { getMessaging, Message, MessagingPayload } from 'firebase-admin/messaging';
77
import * as functions from 'firebase-functions/v1';
88

99
const REMOVE_TOKEN_ERROR = [
@@ -56,8 +56,12 @@ export const sendGeneralNotification = functions.firestore
5656
}
5757

5858
const tokensToRemove = [];
59-
const messagingResponse = await getMessaging().sendToDevice(tokens, payload);
60-
messagingResponse.results.forEach((result, index) => {
59+
const messages: Message[] = tokens.map((token) => ({
60+
token,
61+
...payload
62+
}));
63+
const messagingResponse = await getMessaging().sendEach(messages);
64+
messagingResponse.responses.forEach((result, index) => {
6165
const error = result.error;
6266
if (error) {
6367
functions.logger.error(`Failure sending notification to ${tokens[index]}`, error);

functions/src/save-user-data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { auth } from 'firebase-functions';
1+
import { auth } from 'firebase-functions/v1';
22
import { getFirestore } from 'firebase-admin/firestore';
33

44
export const saveUserData = auth.user().onCreate((userRecord) => {

functions/src/schedule-notifications.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { DocumentData, DocumentSnapshot, getFirestore } from 'firebase-admin/firestore';
44
// https://github.com/import-js/eslint-plugin-import/issues/1810
55
// eslint-disable-next-line import/no-unresolved
6-
import { getMessaging, MessagingPayload } from 'firebase-admin/messaging';
6+
import { getMessaging, Message, MessagingPayload } from 'firebase-admin/messaging';
77
import * as functions from 'firebase-functions/v1';
88
import moment from 'moment';
99

@@ -62,8 +62,12 @@ const sendPushNotificationToUsers = async (userIds: string[], payload: Messaging
6262
const tokens = Object.keys(tokensToUsers);
6363

6464
const tokensToRemove = {};
65-
const messagingResponse = await getMessaging().sendToDevice(tokens, payload);
66-
messagingResponse.results.forEach((result, index) => {
65+
const messages: Message[] = tokens.map((token) => ({
66+
token,
67+
...payload
68+
}));
69+
const messagingResponse = await getMessaging().sendEach(messages);
70+
messagingResponse.responses.forEach((result, index) => {
6771
const error = result.error;
6872
if (error) {
6973
functions.logger.error('Failure sending notification to', tokens[index], error);

0 commit comments

Comments
 (0)