Set the proper link for unsub newsletter (#1503)
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
This commit is contained in:
parent
81eb56e213
commit
4f2b624cc7
|
@ -42,9 +42,11 @@ class UnsubscribeLink:
|
||||||
class UnsubscribeEncoder:
|
class UnsubscribeEncoder:
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def encode(
|
def encode(
|
||||||
action: UnsubscribeAction, data: Union[int, UnsubscribeOriginalData]
|
action: UnsubscribeAction,
|
||||||
|
data: Union[int, UnsubscribeOriginalData],
|
||||||
|
force_web: bool = False,
|
||||||
) -> UnsubscribeLink:
|
) -> UnsubscribeLink:
|
||||||
if config.UNSUBSCRIBER:
|
if config.UNSUBSCRIBER and not force_web:
|
||||||
return UnsubscribeLink(UnsubscribeEncoder.encode_mailto(action, data), True)
|
return UnsubscribeLink(UnsubscribeEncoder.encode_mailto(action, data), True)
|
||||||
return UnsubscribeLink(UnsubscribeEncoder.encode_url(action, data), False)
|
return UnsubscribeLink(UnsubscribeEncoder.encode_url(action, data), False)
|
||||||
|
|
||||||
|
|
|
@ -27,13 +27,15 @@ def send_newsletter_to_user(newsletter, user) -> (bool, str):
|
||||||
comm_alias_id = comm_alias.id
|
comm_alias_id = comm_alias.id
|
||||||
|
|
||||||
unsubscribe_oneclick = unsubscribe_link
|
unsubscribe_oneclick = unsubscribe_link
|
||||||
if via_email:
|
if via_email and comm_alias_id > -1:
|
||||||
unsubscribe_oneclick = UnsubscribeEncoder.encode(
|
unsubscribe_oneclick = UnsubscribeEncoder.encode(
|
||||||
UnsubscribeAction.DisableAlias, comm_alias_id
|
UnsubscribeAction.DisableAlias,
|
||||||
)
|
comm_alias_id,
|
||||||
|
force_web=True,
|
||||||
|
).link
|
||||||
|
|
||||||
send_email(
|
send_email(
|
||||||
comm_alias.email,
|
comm_email,
|
||||||
newsletter.subject,
|
newsletter.subject,
|
||||||
text_template.render(
|
text_template.render(
|
||||||
user=user,
|
user=user,
|
||||||
|
|
Loading…
Reference in New Issue