Skip to content

fix(notifications): er7mny b2a ya saleh #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MoBahgat010 merged 2 commits into from
Dec 13, 2025
Merged

fix(notifications): er7mny b2a ya saleh #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2faabab
fix(notifications): er7mny b2a ya saleh
MoBahgat010 Dec 13, 2025
021f3d1
fix(notifications): er7mny b2a ya saleh
MoBahgat010 Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/expo/expo.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ describe('FCMService', () => {
body: 'Tweet content',
data: {
tweet_id: 'tweet-123',
type: 'tweet',
user_id: undefined,
},
},
]);
Expand Down Expand Up @@ -499,6 +501,8 @@ describe('FCMService', () => {
expect.objectContaining({
data: {
tweet_id: 'tweet-123',
type: 'tweet',
user_id: undefined,
},
}),
])
Expand Down
30 changes: 23 additions & 7 deletions src/expo/expo.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class FCMService {
return {
title: 'Yapper',
body: `@${payload.follower_username || 'Someone'} followed you!`,
data: { user_id: payload.follower_id },
data: { user_id: payload.follower_id, type: 'user' },
};
case NotificationType.MENTION: {
let content = payload.tweet?.content;
Expand All @@ -140,22 +140,34 @@ export class FCMService {
return {
title: `Mentioned by ${payload.mentioned_by?.name || 'Someone'}:`,
body: content || 'You were mentioned in a post',
data: { tweet_id: payload.tweet?.id || payload.tweet?.tweet_id },
data: {
tweet_id: payload.tweet?.id || payload.tweet?.tweet_id,
user_id: payload.mentioned_by?.id,
type: 'tweet',
},
};
}
case NotificationType.REPLY:
return {
title: `${payload.replier?.name || 'Someone'} replied:`,
body: payload.reply_tweet?.content || 'replied to your post',
data: { tweet_id: payload.reply_tweet?.id || payload.reply_tweet?.tweet_id },
data: {
tweet_id: payload.reply_tweet?.id || payload.reply_tweet?.tweet_id,
user_id: payload.replier?.id,
type: 'tweet',
},
};
case NotificationType.QUOTE:
return {
title: 'Yapper',
body: `@${payload.quoted_by?.username || 'Someone'} quoted your post${
payload.quote?.content ? ` and said: ${payload.quote.content}` : ''
}`,
data: { tweet_id: payload.quote?.id || payload.quote?.tweet_id },
data: {
tweet_id: payload.quote?.id || payload.quote?.tweet_id,
user_id: payload.quoted_by?.id,
type: 'tweet',
},
};
case NotificationType.LIKE: {
const liker_name = payload.liker?.name || payload.likers?.[0]?.name || 'Someone';
Expand All @@ -166,7 +178,7 @@ export class FCMService {
return {
title: `Liked by ${liker_name}`,
body: liked_tweet_content,
data: { tweet_id: liked_tweet_id },
data: { tweet_id: liked_tweet_id, user_id: payload.liker?.id, type: 'tweet' },
};
}
case NotificationType.REPOST: {
Expand All @@ -177,14 +189,18 @@ export class FCMService {
return {
title: `Reposted by ${reposter_name}:`,
body: reposted_tweet_content,
data: { tweet_id: reposted_tweet_id },
data: {
tweet_id: reposted_tweet_id,
user_id: payload.reposter?.id,
type: 'tweet',
},
};
}
case NotificationType.MESSAGE:
return {
title: payload.sender?.name || 'New Message',
body: payload.content || 'You have a new message',
data: { chat_id: payload.chat_id },
data: { chat_id: payload.chat_id, type: 'chat' },
};
default:
return {
Expand Down