emails robustness
This commit is contained in:
parent
eac67fed13
commit
5b20e95347
|
@ -47,7 +47,14 @@ def email_recv(request):
|
||||||
content = msg.get_payload(decode=True)
|
content = msg.get_payload(decode=True)
|
||||||
|
|
||||||
if python_version < (3,):
|
if python_version < (3,):
|
||||||
content = content.decode('utf-8')
|
try:
|
||||||
|
content = content.decode('utf-8')
|
||||||
|
except DjangoUnicodeDecodeError:
|
||||||
|
encoding = chardet.detect(content)['encoding']
|
||||||
|
content = content.decode(encoding)
|
||||||
|
|
||||||
|
if content == None:
|
||||||
|
content = ""
|
||||||
|
|
||||||
addr = settings.REPLY_EMAIL
|
addr = settings.REPLY_EMAIL
|
||||||
pos = addr.find('@')
|
pos = addr.find('@')
|
||||||
|
|
|
@ -20,7 +20,7 @@ class Message(PonyConfModel):
|
||||||
token = models.CharField(max_length=64, default=generate_message_token, unique=True)
|
token = models.CharField(max_length=64, default=generate_message_token, unique=True)
|
||||||
|
|
||||||
author = models.ForeignKey(User)
|
author = models.ForeignKey(User)
|
||||||
content = models.TextField()
|
content = models.TextField(blank=True)
|
||||||
system = models.BooleanField(default=False)
|
system = models.BooleanField(default=False)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user