Skip to content

Commit bde6800

Browse files
authored
Merge pull request #125 from PiotrIw/fix_issues
v1.5.60 - fix issues
2 parents 837330d + 6180445 commit bde6800

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

docs/administration/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ Administracja
33

44
.. toctree::
55

6-
install
76
deploy
87
fixtures

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"python": ("https://docs.python.org/3/", None),
5252
"django": (
5353
"https://docs.djangoproject.com/en/dev/",
54-
"http://docs.djangoproject.com/en/dev/_objects/",
54+
"https://docs.djangoproject.com/en/dev/_objects/",
5555
),
5656
"sphinx": ("https://sphinx.readthedocs.io/en/master/", None),
5757
"grappelli": ("https://django-grappelli.readthedocs.io/en/latest/", None),
@@ -126,8 +126,8 @@
126126
import sphinx_rtd_theme
127127

128128
html_theme = "sphinx_rtd_theme"
129-
130129
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
130+
131131
except ImportError:
132132
html_theme = "default"
133133

feder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# PEP 396: The __version__ attribute's value SHOULD be a string.
2-
__version__ = "1.5.58"
2+
__version__ = "1.5.60"
33

44

55
# Compatibility to eg. django-rest-framework

feder/letters/views.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -764,17 +764,20 @@ def get_letter(self, headers, eml_manifest, text, eml_data, **kwargs):
764764
else:
765765
message_type = Letter.MESSAGE_TYPES.regular
766766

767+
# Truncate subject to fit the title field max_length (200 characters)
768+
subject = headers["subject"][:200] if headers.get("subject") else ""
769+
767770
if Letter.objects.filter(
768771
email_from=headers["from"][0] if headers.get("from") else None,
769772
email_to=headers["to"][0] if headers.get("to") else None,
770773
message_id_header=headers["message_id"],
771-
title=headers["subject"],
774+
title=subject,
772775
).exists():
773776
letter_to_add = Letter.objects.filter(
774777
email_from=headers["from"][0] if headers.get("from") else None,
775778
email_to=headers["to"][0] if headers.get("to") else None,
776779
message_id_header=headers["message_id"],
777-
title=headers["subject"],
780+
title=subject,
778781
).first()
779782
letter_to_add.spam_check()
780783
logger.info(f"Request skipped, letter exists: {letter_to_add.pk}")
@@ -788,7 +791,7 @@ def get_letter(self, headers, eml_manifest, text, eml_data, **kwargs):
788791
message_id_header=headers["message_id"],
789792
record=Record.objects.create(case=case),
790793
message_type=message_type,
791-
title=headers["subject"],
794+
title=subject,
792795
body=text["content"],
793796
html_body=text.get("html_content", ""),
794797
quote=text["quote"],

0 commit comments

Comments
 (0)