diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap index 1e0f1c2463..23e2e8876a 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap @@ -542,7 +542,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -686,7 +686,7 @@ Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-u -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -711,7 +711,7 @@ exports[`Email Preview API Read can read post email preview with email card and Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "23528", + "content-length": "23490", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -1171,7 +1171,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -1331,7 +1331,7 @@ Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-u -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -1356,7 +1356,7 @@ exports[`Email Preview API Read can read post email preview with fields 4: [head Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "28339", + "content-length": "28301", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -1843,7 +1843,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -1981,7 +1981,7 @@ Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-u -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -2019,7 +2019,7 @@ exports[`Email Preview API Read has custom content transformations for email com Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "23282", + "content-length": "23244", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -2842,7 +2842,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -2987,7 +2987,7 @@ Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-u -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -3025,7 +3025,7 @@ exports[`Email Preview API Read uses the newsletter provided through ?newsletter Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "24043", + "content-length": "24005", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -3874,7 +3874,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -4019,7 +4019,7 @@ Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=example-u -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -4057,7 +4057,7 @@ exports[`Email Preview API Read uses the posts newsletter by default 4: [headers Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "24043", + "content-length": "24005", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap index 329fe1c4f3..2dd028d35f 100644 --- a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap +++ b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap @@ -1046,7 +1046,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -1173,7 +1173,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -1636,7 +1636,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -1763,7 +1763,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -2226,7 +2226,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -2353,7 +2353,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -3493,1330 +3493,6 @@ http://127.0.0.1:2369/r/xxxxxx?m=member-uuid -  - - - - -", -} -`; - -exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts with feedback enabled 1 1`] = ` -Object { - "html": " - - - - - - This is a test post title - - - - Hello world - - - - - - - - - - -
  -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - -
-
- This is a test post title -
- - - - - - - - -
- By Joe Bloggs • date - - View in browser -
- View in browser -
-
- -

Hello world

- - -
-
- - - -
- - \\"More - - - - \\"Less - - - - \\"Comment\\" - -
- - - -
- - \\"More -

More like this

- - 		- - \\"Less -

Less like this

- - 		- - \\"Comment\\" -

Comment

- -
-
- - - - - - - - -
Ghost © 2024 – Unsubscribe
\\"Powered
-
- -
- 		 
- - -", - "plaintext": " - - - - - - - -  - - - - - - - - - - - - - - - - - -http://127.0.0.1:2369/ - - - - - - - - - -Ghost [http://127.0.0.1:2369/] - - -Daily newsletter [http://127.0.0.1:2369/] - - - - - - - - - - -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-4/] - - - - - - - - - -By Joe Bloggs • date - - -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-4/] - - - - -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-4/] - - - - - - - - - - - -Hello world - - - - - - - - - - - - - - - - - - - -http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid - - - -http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid - - - -http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments - - - - - - - - - - - -More like this - - -[http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/1/?uuid=member-uuid] - - - - - -Less like this - - -[http://127.0.0.1:2369/this-is-a-test-post-title-4/#/feedback/post-id/0/?uuid=member-uuid] - - - - - -Comment - - -[http://127.0.0.1:2369/this-is-a-test-post-title-4/#ghost-comments] - - - - - - - - - - - - - -Ghost © 2024 – Unsubscribe [http://127.0.0.1:2369/unsubscribe/?uuid=member-uuid&newsletter=requested-newsletter-uuid] - - - -https://ghost.org/?via=pbg-newsletter - - - - - - - - - - - -  - - - - -", -} -`; - -exports[`Batch sending tests Newsletter settings Shows 2 comment buttons for published posts without feedback enabled 1 1`] = ` -Object { - "html": " - - - - - - This is a test post title - - - - Hello world - - - - - - - - - - -
  -
- - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - -
-
- This is a test post title -
- - - - - - - - -
- By Joe Bloggs • date - - View in browser -
- View in browser -
-
- -

Hello world

- - -
-
- - - -
- - \\"Comment\\" - -
- - - -
- - \\"Comment\\" -

Comment

- -
-
- - - - - - - - -
Ghost © 2024 – Unsubscribe
\\"Powered
-
- -
- 		 
- - -", - "plaintext": " - - - - - - - -  - - - - - - - - - - - - - - - - - -http://127.0.0.1:2369/ - - - - - - - - - -Ghost [http://127.0.0.1:2369/] - - -Daily newsletter [http://127.0.0.1:2369/] - - - - - - - - - - -This is a test post title [http://127.0.0.1:2369/this-is-a-test-post-title-3/] - - - - - - - - - -By Joe Bloggs • date - - -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-3/] - - - - -View in browser [http://127.0.0.1:2369/this-is-a-test-post-title-3/] - - - - - - - - - - - -Hello world - - - - - - - - - - - - - - - - - - - -http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments - - - - - - - - - - - -Comment - - -[http://127.0.0.1:2369/this-is-a-test-post-title-3/#ghost-comments] - - - - - - - - - - - - - -Ghost © 2024 – Unsubscribe [unsubscribe_url] - - - -https://ghost.org/?via=pbg-newsletter - - - - - - - - - - -   @@ -7387,7 +6063,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -7549,7 +6225,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -8032,7 +6708,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -8194,7 +6870,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -8677,7 +7353,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -8839,7 +7515,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -9322,7 +7998,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -9484,7 +8160,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ @@ -9967,7 +8643,7 @@ table.body h2 span { - \\"Powered + \\"Powered @@ -10129,7 +8805,7 @@ Ghost © 2024 – Unsubscribe [unsubscribe_url] -https://ghost.org/?via=pbg-newsletter +https://ghost.org/ diff --git a/ghost/email-service/lib/email-templates/template-old.hbs b/ghost/email-service/lib/email-templates/template-old.hbs index 04afef190a..dae606efe0 100644 --- a/ghost/email-service/lib/email-templates/template-old.hbs +++ b/ghost/email-service/lib/email-templates/template-old.hbs @@ -212,7 +212,7 @@ {{#if showBadge }} - Powered by Ghost + Powered by Ghost {{/if}} diff --git a/ghost/email-service/lib/email-templates/template.hbs b/ghost/email-service/lib/email-templates/template.hbs index 5013ce39ba..b1ff41e63e 100644 --- a/ghost/email-service/lib/email-templates/template.hbs +++ b/ghost/email-service/lib/email-templates/template.hbs @@ -212,7 +212,7 @@ {{#if showBadge }} - Powered by Ghost + Powered by Ghost {{/if}} diff --git a/ghost/email-service/test/email-renderer.test.js b/ghost/email-service/test/email-renderer.test.js index 635beeb131..329560951c 100644 --- a/ghost/email-service/test/email-renderer.test.js +++ b/ghost/email-service/test/email-renderer.test.js @@ -1444,7 +1444,7 @@ describe('Email renderer', function () { `http://feedback-link.com/?score=1&uuid=%%{uuid}%%`, `http://feedback-link.com/?score=0&uuid=%%{uuid}%%`, `%%{unsubscribe_url}%%`, - `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fghost.org%2F%3Fvia%3Dpbg-newsletter%26source_tracking%3Dsite` + `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fghost.org%2F%3Fsource_tracking%3Dsite` ]); // Check uuid in replacements @@ -1499,7 +1499,7 @@ describe('Email renderer', function () { 'http://feedback-link.com/?score=1&uuid=%%{uuid}%%', 'http://feedback-link.com/?score=0&uuid=%%{uuid}%%', '%%{unsubscribe_url}%%', - 'https://ghost.org/?via=pbg-newsletter' + 'https://ghost.org/' ]); }); @@ -1554,7 +1554,7 @@ describe('Email renderer', function () { `http://feedback-link.com/?score=1&uuid=%%{uuid}%%`, `http://feedback-link.com/?score=0&uuid=%%{uuid}%%`, `%%{unsubscribe_url}%%`, - `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fghost.org%2F%3Fvia%3Dpbg-newsletter%26source_tracking%3Dsite` + `http://tracked-link.com/?m=%%{uuid}%%&url=https%3A%2F%2Fghost.org%2F%3Fsource_tracking%3Dsite` ]); // Check uuid in replacements