From 5351cf8aee02793bf02f294e8fb5724c969e7926 Mon Sep 17 00:00:00 2001 From: Max Erenberg <> Date: Wed, 5 Jan 2022 01:28:05 -0500 Subject: [PATCH] Revert "don't subscribe club reps to csc-general" This reverts commit fa05c4ad4a751a4bffd17143cac014d890056531. --- .../members/AddMemberTransaction.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ceod/transactions/members/AddMemberTransaction.py b/ceod/transactions/members/AddMemberTransaction.py index 6362588..abbfc1f 100644 --- a/ceod/transactions/members/AddMemberTransaction.py +++ b/ceod/transactions/members/AddMemberTransaction.py @@ -111,16 +111,14 @@ class AddMemberTransaction(AbstractTransaction): yield 'failed_to_send_welcome_message: ' + str(err) break - # don't subscribe club reps to csc-general - if self.terms: - try: - user.subscribe_to_mailing_list(self.new_member_list) - yield 'subscribe_to_mailing_list' - except UserAlreadySubscribedError: - pass - except Exception as err: - logger.warning('subscribe_to_mailing_list failed:\n' + traceback.format_exc()) - yield 'failed_to_subscribe_to_mailing_list: ' + str(err) + try: + user.subscribe_to_mailing_list(self.new_member_list) + yield 'subscribe_to_mailing_list' + except UserAlreadySubscribedError: + pass + except Exception as err: + logger.warning('subscribe_to_mailing_list failed:\n' + traceback.format_exc()) + yield 'failed_to_subscribe_to_mailing_list: ' + str(err) try: self.mail_srv.announce_new_user(user, self.finished_operations)