■ ■ ■ ■ ■ ■
changedetectionio/store.py
| skipped 552 lines |
| 553 | 553 | | for uuid, watch in self.data['watching'].items(): |
| 554 | 554 | | try: |
| 555 | 555 | | # If it's all the same to the system settings, then prefer system notification settings |
| 556 | | - | if watch.get('notification_body') == default_notification_body and \ |
| | 556 | + | # include \r\n -> \n incase they already hit submit and the browser put \r in |
| | 557 | + | if watch.get('notification_body').replace('\r\n', '\n') == default_notification_body.replace('\r\n', '\n') and \ |
| 557 | 558 | | watch.get('notification_format') == default_notification_format and \ |
| 558 | | - | watch.get('notification_title') == default_notification_title and \ |
| | 559 | + | watch.get('notification_title').replace('\r\n', '\n') == default_notification_title.replace('\r\n', '\n') and \ |
| 559 | 560 | | watch.get('notification_urls') == self.__data['settings']['application']['notification_urls']: |
| 560 | 561 | | watch['notification_use_default'] = True |
| 561 | 562 | | else: |
| skipped 4 lines |
