Skip to content

Commit 1b8e701

Browse files
authored
Merge pull request #28 from JonDevOps/claude/messages
Direct messages between members, 18 and over
2 parents 73ba0f4 + 55aae98 commit 1b8e701

17 files changed

Lines changed: 569 additions & 7 deletions

File tree

‎firestore.indexes.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,20 @@
195195
"order": "DESCENDING"
196196
}
197197
]
198+
},
199+
{
200+
"collectionGroup": "conversations",
201+
"queryScope": "COLLECTION",
202+
"fields": [
203+
{
204+
"fieldPath": "memberIds",
205+
"arrayConfig": "CONTAINS"
206+
},
207+
{
208+
"fieldPath": "lastMessageAt",
209+
"order": "DESCENDING"
210+
}
211+
]
198212
}
199213
],
200214
"fieldOverrides": []

‎firestore.rules‎

Lines changed: 90 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -859,15 +859,16 @@ service cloud.firestore {
859859
allow read, delete: if isOwner(userId);
860860
allow create, update: if isOwner(userId) && (
861861
(docId == 'notificationPrefs'
862-
&& request.resource.data.keys().hasOnly(['follows', 'groupMembers', 'groupActivity', 'requests', 'following', 'meetingReminders', 'replies', 'mentions'])
862+
&& request.resource.data.keys().hasOnly(['follows', 'groupMembers', 'groupActivity', 'requests', 'following', 'meetingReminders', 'replies', 'mentions', 'messages'])
863863
&& (!('follows' in request.resource.data) || request.resource.data.follows is bool)
864864
&& (!('groupMembers' in request.resource.data) || request.resource.data.groupMembers is bool)
865865
&& (!('groupActivity' in request.resource.data) || request.resource.data.groupActivity is bool)
866866
&& (!('requests' in request.resource.data) || request.resource.data.requests is bool)
867867
&& (!('following' in request.resource.data) || request.resource.data.following is bool)
868868
&& (!('meetingReminders' in request.resource.data) || request.resource.data.meetingReminders is bool)
869869
&& (!('replies' in request.resource.data) || request.resource.data.replies is bool)
870-
&& (!('mentions' in request.resource.data) || request.resource.data.mentions is bool))
870+
&& (!('mentions' in request.resource.data) || request.resource.data.mentions is bool)
871+
&& (!('messages' in request.resource.data) || request.resource.data.messages is bool))
871872
// The feed's followed topics, muted and blocked members (FeedPrefs in src/lib/types.ts)
872873
|| (docId == 'feedPrefs'
873874
&& request.resource.data.keys().hasOnly(['topics', 'mutedIds', 'blockedIds', 'privateAccount'])
@@ -889,6 +890,76 @@ service cloud.firestore {
889890
&& request.resource.data.read is bool;
890891
}
891892

893+
// ---- Direct messages (/messages), for members 18 and over ----
894+
895+
// A member's birth date, entered once on /messages and never changed,
896+
// so they can't move it to get past the age limit. Only they can read it.
897+
match /ages/{userId} {
898+
allow read: if isOwner(userId);
899+
allow create: if isOwner(userId)
900+
&& request.resource.data.keys().hasOnly(['birthDate', 'confirmedAt'])
901+
&& request.resource.data.birthDate is timestamp
902+
&& request.resource.data.birthDate < request.time
903+
&& request.resource.data.birthDate > timestamp.date(1900, 1, 1)
904+
&& request.resource.data.confirmedAt == request.time;
905+
allow update, delete: if false;
906+
}
907+
908+
// 18 years, counting leap days, have passed since their birth date
909+
function isAdult(userId) {
910+
let agePath = /databases/$(database)/documents/ages/$(userId);
911+
return exists(agePath) && get(agePath).data.birthDate + duration.value(6575, 'd') <= request.time;
912+
}
913+
914+
// Two members can message when both are adults, verified (the sender),
915+
// and neither has blocked the other
916+
function canMessage(otherId) {
917+
return isVerified() && isAdult(request.auth.uid) && isAdult(otherId)
918+
&& !hasBlocked(otherId, request.auth.uid) && !hasBlocked(request.auth.uid, otherId);
919+
}
920+
921+
// A conversation between two members is named "<uid>_<uid>", the two
922+
// uids sorted, so there's one per pair
923+
match /conversations/{conversationId} {
924+
allow read: if request.auth != null && resource.data.memberIds.hasAny([request.auth.uid]);
925+
allow create: if request.auth != null
926+
&& request.resource.data.keys().hasOnly(['memberIds', 'createdAt', 'lastMessageAt', 'lastMessageText', 'lastSenderId', 'readAt'])
927+
&& request.resource.data.memberIds.size() == 2
928+
&& request.resource.data.memberIds.hasAny([request.auth.uid])
929+
&& request.resource.data.memberIds[0] < request.resource.data.memberIds[1]
930+
&& conversationId == request.resource.data.memberIds[0] + '_' + request.resource.data.memberIds[1]
931+
&& canMessage(request.resource.data.memberIds[0] == request.auth.uid ? request.resource.data.memberIds[1] : request.resource.data.memberIds[0])
932+
&& request.resource.data.createdAt == request.time;
933+
// Members update the latest-message preview with each message, and
934+
// when they last read it
935+
allow update: if request.auth != null && resource.data.memberIds.hasAny([request.auth.uid])
936+
&& changedKeys().hasOnly(['lastMessageAt', 'lastMessageText', 'lastSenderId', 'readAt'])
937+
&& (!changedKeys().hasAny(['lastMessageAt', 'lastMessageText', 'lastSenderId'])
938+
|| (request.resource.data.lastSenderId == request.auth.uid && request.resource.data.lastMessageAt == request.time
939+
&& request.resource.data.lastMessageText is string && request.resource.data.lastMessageText.size() <= 140))
940+
&& request.resource.data.get('readAt', {}).keys().hasOnly(resource.data.memberIds)
941+
&& request.resource.data.get('readAt', {}).diff(resource.data.get('readAt', {})).affectedKeys().hasOnly([request.auth.uid]);
942+
allow delete: if false;
943+
944+
match /messages/{messageId} {
945+
allow read: if request.auth != null
946+
&& get(/databases/$(database)/documents/conversations/$(conversationId)).data.memberIds.hasAny([request.auth.uid]);
947+
allow create: if request.auth != null
948+
&& request.resource.data.keys().hasOnly(['senderId', 'text', 'createdAt'])
949+
&& request.resource.data.senderId == request.auth.uid
950+
&& request.resource.data.text is string && request.resource.data.text.size() > 0 && request.resource.data.text.size() <= 2000
951+
&& !hasBlockedWord(request.resource.data.text)
952+
&& request.resource.data.createdAt == request.time
953+
&& !isSuspended(request.auth.uid)
954+
// getAfter: the first message is saved with its conversation
955+
&& getAfter(/databases/$(database)/documents/conversations/$(conversationId)).data.memberIds.hasAny([request.auth.uid])
956+
&& canMessage(conversationId.replace(request.auth.uid, '').replace('_', ''));
957+
allow update: if false;
958+
// Senders can take back their own messages
959+
allow delete: if request.auth != null && resource.data.senderId == request.auth.uid;
960+
}
961+
}
962+
892963
// Private reports about members or their posts
893964
// (src/components/ReportUserButton.tsx). Members can only file them;
894965
// moderators read them on /moderation and close them once handled.
@@ -902,7 +973,7 @@ service cloud.firestore {
902973
&& request.resource.data.closedAt == request.time;
903974
allow delete: if false;
904975
allow create: if request.auth != null
905-
&& request.resource.data.keys().hasOnly(['reporterId', 'reportedUserId', 'postId', 'replyId', 'reason', 'details', 'page', 'status', 'createdAt'])
976+
&& request.resource.data.keys().hasOnly(['reporterId', 'reportedUserId', 'postId', 'replyId', 'conversationId', 'messageId', 'messageText', 'reason', 'details', 'page', 'status', 'createdAt'])
906977
&& request.resource.data.reporterId == request.auth.uid
907978
&& request.resource.data.reportedUserId is string
908979
&& request.resource.data.reportedUserId != request.auth.uid
@@ -913,7 +984,22 @@ service cloud.firestore {
913984
&& request.resource.data.status == 'open'
914985
&& request.resource.data.createdAt == request.time
915986
&& (!('replyId' in request.resource.data) || 'postId' in request.resource.data)
916-
&& (!('postId' in request.resource.data) || isReportingPost(reportId));
987+
&& (!('postId' in request.resource.data) || isReportingPost(reportId))
988+
&& (!('messageId' in request.resource.data) || isReportingMessage(reportId));
989+
}
990+
991+
// A message report is named "<messageId>_<reporter's uid>" and carries a
992+
// copy of that one message, so moderators can judge it without reading
993+
// the conversation. Only someone in the conversation can report it.
994+
function isReportingMessage(reportId) {
995+
let data = request.resource.data;
996+
let message = get(/databases/$(database)/documents/conversations/$(data.conversationId)/messages/$(data.messageId)).data;
997+
return data.conversationId is string && data.messageId is string
998+
&& reportId == data.messageId + '_' + request.auth.uid
999+
&& get(/databases/$(database)/documents/conversations/$(data.conversationId)).data.memberIds.hasAny([request.auth.uid])
1000+
&& message.senderId == data.reportedUserId
1001+
&& data.messageText == message.text
1002+
&& !('postId' in data);
9171003
}
9181004

9191005
// A post report is named "<postId>_<reporter's uid>", and a reply report

‎functions/src/feed.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const KEEP_DAYS = 60;
99

1010
export type FeedType = 'follow' | 'group_join' | 'group_leave' | 'checkin' | 'task_added' | 'task_done'
1111
| 'request' | 'request_accepted' | 'solo_project' | 'reminder'
12-
| 'follow_request' | 'reply' | 'moderation' | 'appeal' | 'mention';
12+
| 'follow_request' | 'reply' | 'moderation' | 'appeal' | 'mention' | 'message';
1313

1414
export interface FeedEntry {
1515
/** The member whose feed it goes in */

‎functions/src/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ export { onMemberPostWritten } from './post-checks.js';
1919
export { onReplyWritten } from './replies.js';
2020
export { onAppealWritten } from './appeals.js';
2121
export { onWriterApplication, onArticleWritten } from './writing.js';
22+
export { onDirectMessage } from './messages.js';

‎functions/src/messages.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { onDocumentCreated } from 'firebase-functions/v2/firestore';
2+
import { getMembers, writeFeed } from './feed.js';
3+
4+
/**
5+
* Tells the other member about a new direct message. One notification per
6+
* conversation, replaced by the latest, and without the message text, so
7+
* private messages don't sit in the activity feed.
8+
*/
9+
export const onDirectMessage = onDocumentCreated('conversations/{conversationId}/messages/{messageId}', async event => {
10+
const message = event.data?.data();
11+
const { conversationId } = event.params;
12+
if (typeof message?.senderId !== 'string') return;
13+
const recipientId = conversationId.split('_').find(id => id !== message.senderId);
14+
if (!recipientId) return;
15+
const members = await getMembers([message.senderId]);
16+
await writeFeed(event.id, [{
17+
recipientId, type: 'message', actorId: message.senderId, notify: true, category: 'messages',
18+
message: `${members.get(message.senderId)?.username ?? 'A member'} sent you a message`,
19+
link: `/messages?with=${message.senderId}`,
20+
key: `message-${conversationId}`,
21+
}], members);
22+
});

‎functions/src/prefs.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export const PREF_DEFAULTS = {
1212
meetingReminders: false,
1313
replies: true,
1414
mentions: true,
15+
messages: true,
1516
};
1617
export type PrefId = keyof typeof PREF_DEFAULTS;
1718

0 commit comments

Comments
 (0)