Skip to content
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

[FIX] Email notifications settings not being honored on new DMs #23574

Merged
merged 14 commits into from
Dec 20, 2021
Merged

[FIX] Email notifications settings not being honored on new DMs #23574

Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fb3505a
fixed users not receiving emails
ostjen Oct 27, 2021
246ef84
lint
ostjen Oct 27, 2021
fe8db6c
small change
ostjen Oct 27, 2021
383c078
typo
ostjen Oct 27, 2021
222e561
Merge branch 'develop' into email_notifications_fix
ostjen Nov 24, 2021
bd7fdb9
stopped searching for members with preferences at each iteration
ostjen Nov 24, 2021
aee238e
fixes + tests
ostjen Nov 25, 2021
e487b4c
removed file
ostjen Nov 25, 2021
5050ff3
switched from upsert to update
ostjen Nov 29, 2021
b8c066a
fixed user pref tests
ostjen Nov 29, 2021
a4c192a
Merge branch 'develop' into email_notifications_fix
ostjen Dec 9, 2021
84d22db
fixed merge conflict
ostjen Dec 9, 2021
74601fb
Merge remote-tracking branch 'origin/develop' into email_notification…
sampaiodiego Dec 17, 2021
322a03c
Apply suggestions from code review
sampaiodiego Dec 17, 2021
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: 3 additions & 1 deletion app/lib/server/functions/createDirectRoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { callbacks } from '../../../callbacks/server';
import { Rooms, Subscriptions } from '../../../models/server';
import { settings } from '../../../settings/server';
import { getDefaultSubscriptionPref } from '../../../utils/server';
import { Users } from '../../../models';
ostjen marked this conversation as resolved.
Show resolved Hide resolved

const generateSubscription = (fname, name, user, extra) => ({
alert: false,
Expand Down Expand Up @@ -90,13 +91,14 @@ export const createDirectRoom = function(members, roomExtraData = {}, options =
} else {
members.forEach((member) => {
const otherMembers = sortedMembers.filter(({ _id }) => _id !== member._id);
const memberWithPreferences = Users.findOneByUsername(member.username, { fields: { username: 1, 'settings.preferences': 1 } });
ostjen marked this conversation as resolved.
Show resolved Hide resolved

Subscriptions.upsert({ rid, 'u._id': member._id }, {
...options.creator === member._id && { $set: { open: true } },
$setOnInsert: generateSubscription(
getFname(otherMembers),
getName(otherMembers),
member,
memberWithPreferences,
{
...options.subscriptionExtra,
...options.creator !== member._id && { open: members.length > 2 },
Expand Down