feat: add onMessageWritten cloud function, notification settings screen, user repo cleanup
This commit is contained in:
null
parent
4dad0e774e
commit
1f777e827d
|
|
@ -22,6 +22,7 @@ class SettingsDataStore @Inject constructor(
|
|||
|
||||
private val DAILY_REMINDER = booleanPreferencesKey("daily_reminder")
|
||||
private val PARTNER_ANSWERED = booleanPreferencesKey("partner_answered")
|
||||
private val CHAT_MESSAGE = booleanPreferencesKey("chat_message")
|
||||
private val STREAK_REMINDER = booleanPreferencesKey("streak_reminder")
|
||||
private val QUIET_HOURS = booleanPreferencesKey("quiet_hours")
|
||||
private val QUIET_HOURS_START_HOUR = intPreferencesKey("quiet_hours_start_hour")
|
||||
|
|
@ -35,6 +36,7 @@ class SettingsDataStore @Inject constructor(
|
|||
AppSettings(
|
||||
dailyReminderEnabled = prefs[DAILY_REMINDER] ?: true,
|
||||
partnerAnsweredEnabled = prefs[PARTNER_ANSWERED] ?: true,
|
||||
chatMessageEnabled = prefs[CHAT_MESSAGE] ?: true,
|
||||
streakReminderEnabled = prefs[STREAK_REMINDER] ?: false,
|
||||
quietHoursEnabled = prefs[QUIET_HOURS] ?: false,
|
||||
quietHours = QuietHours(
|
||||
|
|
@ -55,6 +57,9 @@ class SettingsDataStore @Inject constructor(
|
|||
override suspend fun setPartnerAnswered(enabled: Boolean) =
|
||||
dataStore.edit { it[PARTNER_ANSWERED] = enabled }.let {}
|
||||
|
||||
override suspend fun setChatMessage(enabled: Boolean) =
|
||||
dataStore.edit { it[CHAT_MESSAGE] = enabled }.let {}
|
||||
|
||||
override suspend fun setStreakReminder(enabled: Boolean) =
|
||||
dataStore.edit { it[STREAK_REMINDER] = enabled }.let {}
|
||||
|
||||
|
|
|
|||
|
|
@ -133,6 +133,22 @@ class FirestoreUserDataSource @Inject constructor(private val db: FirebaseFirest
|
|||
.addOnFailureListener { cont.resumeWithException(it) }
|
||||
}
|
||||
|
||||
suspend fun updateNotificationPrefs(
|
||||
uid: String,
|
||||
partnerAnswered: Boolean,
|
||||
chatMessage: Boolean
|
||||
): Unit = suspendCancellableCoroutine { cont ->
|
||||
userRef(uid).set(
|
||||
mapOf(
|
||||
"notifPartnerAnswered" to partnerAnswered,
|
||||
"notifChatMessage" to chatMessage
|
||||
),
|
||||
SetOptions.merge()
|
||||
)
|
||||
.addOnSuccessListener { cont.resume(Unit) }
|
||||
.addOnFailureListener { cont.resumeWithException(it) }
|
||||
}
|
||||
|
||||
suspend fun deleteUserData(uid: String): Unit =
|
||||
suspendCancellableCoroutine { cont ->
|
||||
userRef(uid).delete()
|
||||
|
|
|
|||
|
|
@ -36,6 +36,9 @@ class UserRepositoryImpl @Inject constructor(
|
|||
metadata: TokenRegistrar.DeviceMetadata
|
||||
) = dataSource.storeTokenMetadata(uid, token, metadata)
|
||||
|
||||
override suspend fun updateNotificationPrefs(uid: String, partnerAnswered: Boolean, chatMessage: Boolean) =
|
||||
dataSource.updateNotificationPrefs(uid, partnerAnswered, chatMessage)
|
||||
|
||||
override suspend fun clearCoupleId(uid: String) = dataSource.clearCoupleId(uid)
|
||||
|
||||
override suspend fun deleteUserData(uid: String) = dataSource.deleteUserData(uid)
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ enum class ThemeMode {
|
|||
data class AppSettings(
|
||||
val dailyReminderEnabled: Boolean = true,
|
||||
val partnerAnsweredEnabled: Boolean = true,
|
||||
val chatMessageEnabled: Boolean = true,
|
||||
val streakReminderEnabled: Boolean = false,
|
||||
val quietHoursEnabled: Boolean = false,
|
||||
val quietHours: QuietHours = QuietHours(),
|
||||
|
|
@ -28,6 +29,7 @@ interface SettingsRepository {
|
|||
val settings: Flow<AppSettings>
|
||||
suspend fun setDailyReminder(enabled: Boolean)
|
||||
suspend fun setPartnerAnswered(enabled: Boolean)
|
||||
suspend fun setChatMessage(enabled: Boolean)
|
||||
suspend fun setStreakReminder(enabled: Boolean)
|
||||
suspend fun setQuietHours(enabled: Boolean)
|
||||
suspend fun setQuietHours(quietHours: QuietHours)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ interface UserRepository {
|
|||
suspend fun hasProfile(uid: String): Boolean
|
||||
suspend fun storeFcmToken(uid: String, token: String)
|
||||
suspend fun storeTokenMetadata(uid: String, token: String, metadata: TokenRegistrar.DeviceMetadata)
|
||||
suspend fun updateNotificationPrefs(uid: String, partnerAnswered: Boolean, chatMessage: Boolean)
|
||||
suspend fun clearCoupleId(uid: String)
|
||||
suspend fun deleteUserData(uid: String)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@ package app.closer.ui.settings
|
|||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import app.closer.domain.repository.AuthRepository
|
||||
import app.closer.domain.repository.SettingsRepository
|
||||
import app.closer.domain.repository.UserRepository
|
||||
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||
import javax.inject.Inject
|
||||
import kotlinx.coroutines.flow.SharingStarted
|
||||
|
|
@ -52,13 +54,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
|
|||
data class NotificationSettingsUiState(
|
||||
val dailyReminderEnabled: Boolean = true,
|
||||
val partnerAnsweredEnabled: Boolean = true,
|
||||
val chatMessageEnabled: Boolean = true,
|
||||
val streakReminderEnabled: Boolean = false,
|
||||
val quietHoursEnabled: Boolean = false
|
||||
)
|
||||
|
||||
@HiltViewModel
|
||||
class NotificationSettingsViewModel @Inject constructor(
|
||||
private val settingsRepository: SettingsRepository
|
||||
private val settingsRepository: SettingsRepository,
|
||||
private val authRepository: AuthRepository,
|
||||
private val userRepository: UserRepository
|
||||
) : ViewModel() {
|
||||
|
||||
val uiState: StateFlow<NotificationSettingsUiState> = settingsRepository.settings
|
||||
|
|
@ -66,16 +71,41 @@ class NotificationSettingsViewModel @Inject constructor(
|
|||
NotificationSettingsUiState(
|
||||
dailyReminderEnabled = s.dailyReminderEnabled,
|
||||
partnerAnsweredEnabled = s.partnerAnsweredEnabled,
|
||||
chatMessageEnabled = s.chatMessageEnabled,
|
||||
streakReminderEnabled = s.streakReminderEnabled,
|
||||
quietHoursEnabled = s.quietHoursEnabled
|
||||
)
|
||||
}
|
||||
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), NotificationSettingsUiState())
|
||||
|
||||
fun toggleDailyReminder(on: Boolean) = viewModelScope.launch { settingsRepository.setDailyReminder(on) }
|
||||
fun togglePartnerAnswered(on: Boolean) = viewModelScope.launch { settingsRepository.setPartnerAnswered(on) }
|
||||
fun toggleStreakReminder(on: Boolean) = viewModelScope.launch { settingsRepository.setStreakReminder(on) }
|
||||
fun toggleQuietHours(on: Boolean) = viewModelScope.launch { settingsRepository.setQuietHours(on) }
|
||||
fun toggleDailyReminder(on: Boolean) = viewModelScope.launch {
|
||||
settingsRepository.setDailyReminder(on)
|
||||
}
|
||||
|
||||
fun togglePartnerAnswered(on: Boolean) = viewModelScope.launch {
|
||||
settingsRepository.setPartnerAnswered(on)
|
||||
syncNotifPrefs(partnerAnswered = on, chatMessage = uiState.value.chatMessageEnabled)
|
||||
}
|
||||
|
||||
fun toggleChatMessage(on: Boolean) = viewModelScope.launch {
|
||||
settingsRepository.setChatMessage(on)
|
||||
syncNotifPrefs(partnerAnswered = uiState.value.partnerAnsweredEnabled, chatMessage = on)
|
||||
}
|
||||
|
||||
fun toggleStreakReminder(on: Boolean) = viewModelScope.launch {
|
||||
settingsRepository.setStreakReminder(on)
|
||||
}
|
||||
|
||||
fun toggleQuietHours(on: Boolean) = viewModelScope.launch {
|
||||
settingsRepository.setQuietHours(on)
|
||||
}
|
||||
|
||||
private fun syncNotifPrefs(partnerAnswered: Boolean, chatMessage: Boolean) {
|
||||
val uid = authRepository.currentUserId ?: return
|
||||
viewModelScope.launch {
|
||||
runCatching { userRepository.updateNotificationPrefs(uid, partnerAnswered, chatMessage) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
|
|
@ -142,6 +172,13 @@ fun NotificationSettingsScreen(
|
|||
onCheckedChange = viewModel::togglePartnerAnswered
|
||||
)
|
||||
Divider(modifier = Modifier.padding(horizontal = 16.dp), thickness = 0.5.dp)
|
||||
NotifToggleRow(
|
||||
label = "New chat message",
|
||||
description = "Notify me when my partner sends a message",
|
||||
checked = state.chatMessageEnabled,
|
||||
onCheckedChange = viewModel::toggleChatMessage
|
||||
)
|
||||
Divider(modifier = Modifier.padding(horizontal = 16.dp), thickness = 0.5.dp)
|
||||
NotifToggleRow(
|
||||
label = "Shared rhythm reminder",
|
||||
description = "Remind me to keep our shared rhythm going",
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|||
};
|
||||
})();
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.health = exports.onGameSessionUpdate = exports.onUserDelete = exports.acceptInviteCallable = exports.leaveCoupleCallable = exports.onCoupleLeave = exports.onAnswerWritten = exports.assignDailyQuestionCallable = exports.assignDailyQuestion = exports.createDateMatchOnMutualLove = exports.checkDeviceIntegrity = exports.unlockDueMemoryCapsules = exports.sendChallengeDayReminders = exports.sendGentleReminderCallable = exports.sendPartnerAnsweredNotification = exports.sendDailyQuestionReminder = exports.syncEntitlement = exports.revenueCatWebhook = void 0;
|
||||
exports.health = exports.onGameSessionUpdate = exports.onUserDelete = exports.acceptInviteCallable = exports.leaveCoupleCallable = exports.onCoupleLeave = exports.onMessageWritten = exports.onAnswerWritten = exports.assignDailyQuestionCallable = exports.assignDailyQuestion = exports.createDateMatchOnMutualLove = exports.checkDeviceIntegrity = exports.unlockDueMemoryCapsules = exports.sendChallengeDayReminders = exports.sendGentleReminderCallable = exports.sendPartnerAnsweredNotification = exports.sendDailyQuestionReminder = exports.syncEntitlement = exports.revenueCatWebhook = void 0;
|
||||
const functions = __importStar(require("firebase-functions"));
|
||||
const admin = __importStar(require("firebase-admin"));
|
||||
// Initialize the Admin SDK once for every function in this codebase.
|
||||
|
|
@ -63,6 +63,8 @@ Object.defineProperty(exports, "assignDailyQuestion", { enumerable: true, get: f
|
|||
Object.defineProperty(exports, "assignDailyQuestionCallable", { enumerable: true, get: function () { return assignDailyQuestion_1.assignDailyQuestionCallable; } });
|
||||
var onAnswerWritten_1 = require("./questions/onAnswerWritten");
|
||||
Object.defineProperty(exports, "onAnswerWritten", { enumerable: true, get: function () { return onAnswerWritten_1.onAnswerWritten; } });
|
||||
var onMessageWritten_1 = require("./questions/onMessageWritten");
|
||||
Object.defineProperty(exports, "onMessageWritten", { enumerable: true, get: function () { return onMessageWritten_1.onMessageWritten; } });
|
||||
var onCoupleLeave_1 = require("./couples/onCoupleLeave");
|
||||
Object.defineProperty(exports, "onCoupleLeave", { enumerable: true, get: function () { return onCoupleLeave_1.onCoupleLeave; } });
|
||||
var leaveCoupleCallable_1 = require("./couples/leaveCoupleCallable");
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,sDAAuC;AAEvC,qEAAqE;AACrE,8EAA8E;AAC9E,gFAAgF;AAChF,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC5B,KAAK,CAAC,aAAa,EAAE,CAAA;AACvB,CAAC;AAED,iEAA+D;AAAtD,sHAAA,iBAAiB,OAAA;AAC1B,6DAA2D;AAAlD,kHAAA,eAAe,OAAA;AACxB,uDAGkC;AAFhC,sHAAA,yBAAyB,OAAA;AACzB,4HAAA,+BAA+B,OAAA;AAEjC,yFAAuF;AAA9E,wIAAA,0BAA0B,OAAA;AACnC,+DAGsC;AAFpC,0HAAA,yBAAyB,OAAA;AACzB,wHAAA,uBAAuB,OAAA;AAEzB,wEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,2DAAqE;AAA5D,8HAAA,2BAA2B,OAAA;AACpC,uEAGwC;AAFtC,0HAAA,mBAAmB,OAAA;AACnB,kIAAA,2BAA2B,OAAA;AAE7B,+DAA6D;AAApD,kHAAA,eAAe,OAAA;AACxB,yDAAuD;AAA9C,8GAAA,aAAa,OAAA;AACtB,qEAAmE;AAA1D,0HAAA,mBAAmB,OAAA;AAC5B,uEAAqE;AAA5D,4HAAA,oBAAoB,OAAA;AAC7B,qDAAmD;AAA1C,4GAAA,YAAY,OAAA;AACrB,mEAAiE;AAAxD,0HAAA,mBAAmB,OAAA;AAE5B;;;GAGG;AACU,QAAA,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AACxC,CAAC,CAAC,CAAA"}
|
||||
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,sDAAuC;AAEvC,qEAAqE;AACrE,8EAA8E;AAC9E,gFAAgF;AAChF,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC5B,KAAK,CAAC,aAAa,EAAE,CAAA;AACvB,CAAC;AAED,iEAA+D;AAAtD,sHAAA,iBAAiB,OAAA;AAC1B,6DAA2D;AAAlD,kHAAA,eAAe,OAAA;AACxB,uDAGkC;AAFhC,sHAAA,yBAAyB,OAAA;AACzB,4HAAA,+BAA+B,OAAA;AAEjC,yFAAuF;AAA9E,wIAAA,0BAA0B,OAAA;AACnC,+DAGsC;AAFpC,0HAAA,yBAAyB,OAAA;AACzB,wHAAA,uBAAuB,OAAA;AAEzB,wEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,2DAAqE;AAA5D,8HAAA,2BAA2B,OAAA;AACpC,uEAGwC;AAFtC,0HAAA,mBAAmB,OAAA;AACnB,kIAAA,2BAA2B,OAAA;AAE7B,+DAA6D;AAApD,kHAAA,eAAe,OAAA;AACxB,iEAA+D;AAAtD,oHAAA,gBAAgB,OAAA;AACzB,yDAAuD;AAA9C,8GAAA,aAAa,OAAA;AACtB,qEAAmE;AAA1D,0HAAA,mBAAmB,OAAA;AAC5B,uEAAqE;AAA5D,4HAAA,oBAAoB,OAAA;AAC7B,qDAAmD;AAA1C,4GAAA,YAAY,OAAA;AACrB,mEAAiE;AAAxD,0HAAA,mBAAmB,OAAA;AAE5B;;;GAGG;AACU,QAAA,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC3D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AACxC,CAAC,CAAC,CAAA"}
|
||||
|
|
@ -48,7 +48,7 @@ const admin = __importStar(require("firebase-admin"));
|
|||
exports.onAnswerWritten = functions.firestore
|
||||
.document('couples/{coupleId}/daily_question/{date}/answers/{userId}')
|
||||
.onCreate(async (snap, context) => {
|
||||
var _a, _b, _c;
|
||||
var _a, _b, _c, _d;
|
||||
const { coupleId, date, userId } = context.params;
|
||||
const db = admin.firestore();
|
||||
const coupleDoc = await db.collection('couples').doc(coupleId).get();
|
||||
|
|
@ -88,6 +88,12 @@ exports.onAnswerWritten = functions.firestore
|
|||
console.log(`[onAnswerWritten] no FCM tokens for partner ${partnerId}`);
|
||||
return;
|
||||
}
|
||||
// Respect the partner's notification preference (opt-out; default is enabled).
|
||||
const notifEnabled = (_d = partnerUserDoc.data()) === null || _d === void 0 ? void 0 : _d.notifPartnerAnswered;
|
||||
if (notifEnabled === false) {
|
||||
console.log(`[onAnswerWritten] partner ${partnerId} has partner-answered notifications off`);
|
||||
return;
|
||||
}
|
||||
const answerData = snap.data();
|
||||
const questionId = typeof answerData.questionId === 'string' ? answerData.questionId : '';
|
||||
const payload = {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"version":3,"file":"onAnswerWritten.js","sourceRoot":"","sources":["../../src/questions/onAnswerWritten.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"onAnswerWritten.js","sourceRoot":"","sources":["../../src/questions/onAnswerWritten.ts"],"names":[],"mappings":"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"}
|
||||
|
|
@ -0,0 +1,123 @@
|
|||
"use strict";
|
||||
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
||||
if (k2 === undefined) k2 = k;
|
||||
var desc = Object.getOwnPropertyDescriptor(m, k);
|
||||
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
||||
desc = { enumerable: true, get: function() { return m[k]; } };
|
||||
}
|
||||
Object.defineProperty(o, k2, desc);
|
||||
}) : (function(o, m, k, k2) {
|
||||
if (k2 === undefined) k2 = k;
|
||||
o[k2] = m[k];
|
||||
}));
|
||||
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
||||
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
||||
}) : function(o, v) {
|
||||
o["default"] = v;
|
||||
});
|
||||
var __importStar = (this && this.__importStar) || (function () {
|
||||
var ownKeys = function(o) {
|
||||
ownKeys = Object.getOwnPropertyNames || function (o) {
|
||||
var ar = [];
|
||||
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
||||
return ar;
|
||||
};
|
||||
return ownKeys(o);
|
||||
};
|
||||
return function (mod) {
|
||||
if (mod && mod.__esModule) return mod;
|
||||
var result = {};
|
||||
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
||||
__setModuleDefault(result, mod);
|
||||
return result;
|
||||
};
|
||||
})();
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.onMessageWritten = void 0;
|
||||
const functions = __importStar(require("firebase-functions"));
|
||||
const admin = __importStar(require("firebase-admin"));
|
||||
/**
|
||||
* Firestore trigger that notifies the other partner when a chat message is
|
||||
* sent in a question thread.
|
||||
*
|
||||
* Path: couples/{coupleId}/question_threads/{threadId}/messages/{messageId}
|
||||
*
|
||||
* Respects the recipient's `notifChatMessage` preference (default: enabled).
|
||||
*/
|
||||
exports.onMessageWritten = functions.firestore
|
||||
.document('couples/{coupleId}/question_threads/{threadId}/messages/{messageId}')
|
||||
.onCreate(async (snap, context) => {
|
||||
var _a, _b, _c, _d;
|
||||
const { coupleId, threadId, messageId } = context.params;
|
||||
const db = admin.firestore();
|
||||
const messageData = snap.data();
|
||||
const authorId = typeof messageData.authorUserId === 'string' ? messageData.authorUserId : null;
|
||||
if (!authorId) {
|
||||
console.warn(`[onMessageWritten] no authorUserId on message ${messageId}`);
|
||||
return;
|
||||
}
|
||||
const coupleDoc = await db.collection('couples').doc(coupleId).get();
|
||||
if (!coupleDoc.exists) {
|
||||
console.warn(`[onMessageWritten] couple ${coupleId} not found`);
|
||||
return;
|
||||
}
|
||||
const userIds = ((_b = (_a = coupleDoc.data()) === null || _a === void 0 ? void 0 : _a.userIds) !== null && _b !== void 0 ? _b : []);
|
||||
const partnerId = userIds.find((uid) => uid !== authorId);
|
||||
if (!partnerId) {
|
||||
console.warn(`[onMessageWritten] no partner found for couple ${coupleId}`);
|
||||
return;
|
||||
}
|
||||
const partnerUserDoc = await db.collection('users').doc(partnerId).get();
|
||||
// Respect the partner's notification preference (opt-out; default is enabled).
|
||||
const notifEnabled = (_c = partnerUserDoc.data()) === null || _c === void 0 ? void 0 : _c.notifChatMessage;
|
||||
if (notifEnabled === false) {
|
||||
console.log(`[onMessageWritten] partner ${partnerId} has chat notifications off`);
|
||||
return;
|
||||
}
|
||||
const tokens = [];
|
||||
if (partnerUserDoc.exists) {
|
||||
const legacyToken = (_d = partnerUserDoc.data()) === null || _d === void 0 ? void 0 : _d.fcmToken;
|
||||
if (typeof legacyToken === 'string' && legacyToken.length > 0) {
|
||||
tokens.push(legacyToken);
|
||||
}
|
||||
}
|
||||
const tokenSnapshot = await db
|
||||
.collection('users')
|
||||
.doc(partnerId)
|
||||
.collection('fcmTokens')
|
||||
.get();
|
||||
tokenSnapshot.docs.forEach((doc) => {
|
||||
var _a;
|
||||
const t = (_a = doc.data()) === null || _a === void 0 ? void 0 : _a.token;
|
||||
if (typeof t === 'string' && t.length > 0 && !tokens.includes(t)) {
|
||||
tokens.push(t);
|
||||
}
|
||||
});
|
||||
if (tokens.length === 0) {
|
||||
console.log(`[onMessageWritten] no FCM tokens for partner ${partnerId}`);
|
||||
return;
|
||||
}
|
||||
const payload = {
|
||||
notification: {
|
||||
title: 'Your partner sent a message',
|
||||
body: 'Tap to read and reply.',
|
||||
},
|
||||
data: {
|
||||
type: 'chat_message',
|
||||
coupleId,
|
||||
threadId,
|
||||
},
|
||||
};
|
||||
const sendResults = await Promise.allSettled(tokens.map((token) => admin.messaging().send(Object.assign(Object.assign({}, payload), { token }))));
|
||||
const failures = [];
|
||||
sendResults.forEach((result, index) => {
|
||||
if (result.status === 'rejected') {
|
||||
failures.push(`${tokens[index]}: ${String(result.reason)}`);
|
||||
}
|
||||
});
|
||||
if (failures.length > 0) {
|
||||
console.error(`[onMessageWritten] some notifications failed:`, failures);
|
||||
}
|
||||
console.log(`[onMessageWritten] notified partner ${partnerId} for thread ${threadId} in couple ${coupleId}`);
|
||||
});
|
||||
//# sourceMappingURL=onMessageWritten.js.map
|
||||
|
|
@ -0,0 +1 @@
|
|||
{"version":3,"file":"onMessageWritten.js","sourceRoot":"","sources":["../../src/questions/onMessageWritten.ts"],"names":[],"mappings":"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"}
|
||||
|
|
@ -26,6 +26,7 @@ export {
|
|||
assignDailyQuestionCallable,
|
||||
} from './questions/assignDailyQuestion'
|
||||
export { onAnswerWritten } from './questions/onAnswerWritten'
|
||||
export { onMessageWritten } from './questions/onMessageWritten'
|
||||
export { onCoupleLeave } from './couples/onCoupleLeave'
|
||||
export { leaveCoupleCallable } from './couples/leaveCoupleCallable'
|
||||
export { acceptInviteCallable } from './couples/acceptInviteCallable'
|
||||
|
|
|
|||
|
|
@ -62,6 +62,13 @@ export const onAnswerWritten = functions.firestore
|
|||
return
|
||||
}
|
||||
|
||||
// Respect the partner's notification preference (opt-out; default is enabled).
|
||||
const notifEnabled = partnerUserDoc.data()?.notifPartnerAnswered
|
||||
if (notifEnabled === false) {
|
||||
console.log(`[onAnswerWritten] partner ${partnerId} has partner-answered notifications off`)
|
||||
return
|
||||
}
|
||||
|
||||
const answerData = snap.data() as Partial<Record<string, unknown>>
|
||||
const questionId = typeof answerData.questionId === 'string' ? answerData.questionId : ''
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
import * as functions from 'firebase-functions'
|
||||
import * as admin from 'firebase-admin'
|
||||
|
||||
/**
|
||||
* Firestore trigger that notifies the other partner when a chat message is
|
||||
* sent in a question thread.
|
||||
*
|
||||
* Path: couples/{coupleId}/question_threads/{threadId}/messages/{messageId}
|
||||
*
|
||||
* Respects the recipient's `notifChatMessage` preference (default: enabled).
|
||||
*/
|
||||
export const onMessageWritten = functions.firestore
|
||||
.document('couples/{coupleId}/question_threads/{threadId}/messages/{messageId}')
|
||||
.onCreate(async (snap, context) => {
|
||||
const { coupleId, threadId, messageId } = context.params as {
|
||||
coupleId: string
|
||||
threadId: string
|
||||
messageId: string
|
||||
}
|
||||
|
||||
const db = admin.firestore()
|
||||
const messageData = snap.data() as Partial<Record<string, unknown>>
|
||||
const authorId = typeof messageData.authorUserId === 'string' ? messageData.authorUserId : null
|
||||
if (!authorId) {
|
||||
console.warn(`[onMessageWritten] no authorUserId on message ${messageId}`)
|
||||
return
|
||||
}
|
||||
|
||||
const coupleDoc = await db.collection('couples').doc(coupleId).get()
|
||||
if (!coupleDoc.exists) {
|
||||
console.warn(`[onMessageWritten] couple ${coupleId} not found`)
|
||||
return
|
||||
}
|
||||
|
||||
const userIds = (coupleDoc.data()?.userIds ?? []) as string[]
|
||||
const partnerId = userIds.find((uid) => uid !== authorId)
|
||||
if (!partnerId) {
|
||||
console.warn(`[onMessageWritten] no partner found for couple ${coupleId}`)
|
||||
return
|
||||
}
|
||||
|
||||
const partnerUserDoc = await db.collection('users').doc(partnerId).get()
|
||||
|
||||
// Respect the partner's notification preference (opt-out; default is enabled).
|
||||
const notifEnabled = partnerUserDoc.data()?.notifChatMessage
|
||||
if (notifEnabled === false) {
|
||||
console.log(`[onMessageWritten] partner ${partnerId} has chat notifications off`)
|
||||
return
|
||||
}
|
||||
|
||||
const tokens: string[] = []
|
||||
if (partnerUserDoc.exists) {
|
||||
const legacyToken = partnerUserDoc.data()?.fcmToken
|
||||
if (typeof legacyToken === 'string' && legacyToken.length > 0) {
|
||||
tokens.push(legacyToken)
|
||||
}
|
||||
}
|
||||
|
||||
const tokenSnapshot = await db
|
||||
.collection('users')
|
||||
.doc(partnerId)
|
||||
.collection('fcmTokens')
|
||||
.get()
|
||||
tokenSnapshot.docs.forEach((doc) => {
|
||||
const t = doc.data()?.token
|
||||
if (typeof t === 'string' && t.length > 0 && !tokens.includes(t)) {
|
||||
tokens.push(t)
|
||||
}
|
||||
})
|
||||
|
||||
if (tokens.length === 0) {
|
||||
console.log(`[onMessageWritten] no FCM tokens for partner ${partnerId}`)
|
||||
return
|
||||
}
|
||||
|
||||
const payload: admin.messaging.MessagingPayload = {
|
||||
notification: {
|
||||
title: 'Your partner sent a message',
|
||||
body: 'Tap to read and reply.',
|
||||
},
|
||||
data: {
|
||||
type: 'chat_message',
|
||||
coupleId,
|
||||
threadId,
|
||||
},
|
||||
}
|
||||
|
||||
const sendResults = await Promise.allSettled(
|
||||
tokens.map((token) =>
|
||||
admin.messaging().send({ ...payload, token } as admin.messaging.Message)
|
||||
)
|
||||
)
|
||||
|
||||
const failures: string[] = []
|
||||
sendResults.forEach((result, index) => {
|
||||
if (result.status === 'rejected') {
|
||||
failures.push(`${tokens[index]}: ${String(result.reason)}`)
|
||||
}
|
||||
})
|
||||
|
||||
if (failures.length > 0) {
|
||||
console.error(`[onMessageWritten] some notifications failed:`, failures)
|
||||
}
|
||||
|
||||
console.log(
|
||||
`[onMessageWritten] notified partner ${partnerId} for thread ${threadId} in couple ${coupleId}`
|
||||
)
|
||||
})
|
||||
|
|
@ -6,6 +6,8 @@ export interface UserDoc {
|
|||
fcmToken?: string
|
||||
hasPremium: boolean
|
||||
createdAt: FirebaseFirestore.Timestamp
|
||||
notifPartnerAnswered?: boolean
|
||||
notifChatMessage?: boolean
|
||||
}
|
||||
|
||||
export interface CoupleDoc {
|
||||
|
|
|
|||
Loading…
Reference in New Issue