Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2025-01-03 19:57:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust error message to debug Yandex mail issue

Browse Source
This commit is contained in:
rubenwardy 2023-07-06 17:04:59 +01:00
parent 2494121615
commit e446e9011a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/tasks/emails.py
View File

@ -13,7 +13,7 @@
# #
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
import smtplib
import typing import typing
from typing import Dict from typing import Dict
@ -201,11 +201,16 @@ def send_pending_notifications():
db.session.commit() db.session.commit()
if len(to_send) > 1: try:
send_notification_digest(to_send, user.locale or "en") if len(to_send) > 1:
elif len(to_send) > 0: send_notification_digest(to_send, user.locale or "en")
send_single_email(to_send[0], user.locale or "en") elif len(to_send) > 0:
send_single_email(to_send[0], user.locale or "en")
except smtplib.SMTPDataError as e:
if "Message rejected under suspicion of SPAM" in str(e):
raise Exception(f"Failed to send email to {user.username} due to yandex spam filter") from e
else:
raise e
@celery.task() @celery.task()
def send_bulk_email(subject: str, text: str, html=None): def send_bulk_email(subject: str, text: str, html=None):