Skip to content

feat: allow users to control their sendgrid unsubscribe settings #526

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

Open
kueda wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: allow users to control their sendgrid unsubscribe settings #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1452ecf
feat: support activity_email_notification preference
kueda Jun 5, 2025
c3c0d25
feat: support email_suppressions in user put and get requests
kueda Jun 11, 2025
acfe2c2
fix: support feedback email suppression group
kueda Jun 11, 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
12 changes: 11 additions & 1 deletion lib/models/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const User = class User extends Model {
.field( "users.confirmed_at" )
.field( "users.confirmation_sent_at" )
.field( "users.time_zone" )
.field( "email" )
.field( "users.email" )
.field( "unconfirmed_email" )
.field( "locale" )
.field( "place_id" )
Expand All @@ -151,11 +151,13 @@ const User = class User extends Model {
.field( "user_blocks.blocked_user_id" )
.field( "pf.project_id", "pf_project_id" )
.field( "pf.position", "pf_position" )
.field( "es.suppression_type", "es_suppression_type" )
.from( "users" )
.left_join( "user_mutes", null, "users.id = user_mutes.user_id" )
.left_join( "user_blocks", null, "users.id = user_blocks.user_id" )
.left_join( "user_privileges", "up", "users.id = up.user_id" )
.left_join( "project_faves", "pf", "users.id = pf.user_id" )
.left_join( "email_suppressions", "es", "users.id = es.user_id" )
.where( "login = ?", login );
const { rows } = await pgClient.replica.query( query.toString( ) );
const userObject = _.mapValues( rows[0], v => v || null );
Expand Down Expand Up @@ -200,6 +202,14 @@ const User = class User extends Model {
)
)
);
userObject.email_suppression_types = _.compact(
_.uniq(
_.map(
_.sortBy( rows, "es_suppression_type" ),
r => r.es_suppression_type
)
)
);
delete userObject.pf_project_id;
delete userObject.pf_position;
userObject.monthly_supporter = (
Expand Down
18 changes: 18 additions & 0 deletions openapi/schema/request/users_update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@ module.exports = Joi.object( ).keys( {
is to delete the account.
` ),
description: Joi.string( ).valid( null ),
email_suppression_types: Joi
.array( ).items(
Joi.string( ).valid(
"account_emails",
"activity",
"blocks",
"bounces",
"donation_emails",
"feedback",
"invalid_emails",
"messages",
"news_from_inaturalist",
"spam_reports",
"transactional_emails",
"unsubscribes"
)
)
.description( "List of email suppression types" ),
faved_project_ids: Joi.array( ).items( Joi.number( ) )
.description( `
Ordered list of IDs of projects the user has faved. Order of IDs in
Expand Down
1 change: 1 addition & 0 deletions openapi/schema/response/private_user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = user.append( {
confirmation_sent_at: Joi.date( ).valid( null ),
data_transfer_consent: Joi.boolean( ).valid( true, null ),
email: Joi.string( ).valid( null ),
email_suppression_types: Joi.array( ).items( Joi.string( ) ).valid( null ),
locale: Joi.string( ).valid( null ),
login: Joi.string( ),
muted_user_ids: Joi.array( ).items(
Expand Down