Skip to content

Allow templating of email subjects - #6515

Merged
nickvergessen merged 5 commits into
masterfrom
templating-of-email-subjects
Oct 18, 2017
Merged

Allow templating of email subjects#6515
nickvergessen merged 5 commits into
masterfrom
templating-of-email-subjects

Conversation

@nickvergessen

@nickvergessennickvergessen commented Sep 15, 2017

Copy link
Copy Markdown
Member

No description provided.

@nickvergessennickvergessen added this to the Nextcloud 13 milestone Sep 15, 2017
MorrisJobke
MorrisJobke requested changes Sep 15, 2017
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unit tests fail

@MorrisJobkeMorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 18, 2017
@codecov

codecovBot commented Sep 18, 2017•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #6515 into master will increase coverage by 0.05%.
The diff coverage is 57.57%.

@@ Coverage Diff @@## master #6515 +/- ##
============================================
+ Coverage 53.36% 53.42% +0.05% - Complexity 22576 22578 +2 
============================================
Files 1409 1409 Lines 87338 87305 -33 Branches 1340 1340 ============================================
+ Hits 46611 46643 +32 + Misses 40727 40662 -65
Impacted FilesCoverage ΔComplexity Δ
lib/private/Share20/Manager.php86.65% <0%> (+0.28%)233 <0> (ø)⬇️
lib/private/Mail/Message.php93.02% <0%> (-2.44%)15 <0> (-4)
settings/Hooks.php0% <0%> (ø)14 <0> (ø)⬇️
lib/private/Mail/Mailer.php62.02% <100%> (+1.76%)24 <5> (+4)⬆️
core/Controller/LostController.php79.19% <100%> (-0.14%)32 <0> (ø)
apps/sharebymail/tests/ShareByMailProviderTest.php93.93% <100%> (+0.69%)27 <0> (ø)⬇️
settings/Controller/MailSettingsController.php67.21% <100%> (-0.53%)11 <0> (ø)
settings/Mailer/NewUserMailHelper.php75.36% <100%> (-0.36%)8 <0> (ø)
apps/sharebymail/lib/ShareByMailProvider.php58.59% <33.33%> (+0.29%)84 <0> (ø)⬇️
lib/private/Mail/EMailTemplate.php59.84% <50%> (-0.31%)43 <2> (+2)
... and 7 more

@nickvergessennickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 18, 2017
@nickvergessen
nickvergessenforce-pushed the templating-of-email-subjects branch from 8edfbf4 to dc57853CompareSeptember 18, 2017 12:38
LukasReschke
LukasReschke previously requested changes Sep 18, 2017
View reviewed changes

@LukasReschkeLukasReschke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autoloader is not up-to-date

@nickvergessen
nickvergessenforce-pushed the templating-of-email-subjects branch from aa35807 to a0278c6CompareSeptember 27, 2017 11:21
@nickvergessen

nickvergessen commented Sep 27, 2017

Copy link
Copy Markdown
MemberAuthor

Rebased, please review

@codecov-io

codecov-io commented Sep 27, 2017•
edited by codecov Bot
Loading

Copy link
Copy Markdown

Codecov Report

Merging #6515 into master will decrease coverage by 0.01%.
The diff coverage is 54.28%.

@@ Coverage Diff @@## master #6515 +/- ##
============================================
- Coverage 53.05% 53.03% -0.02% + Complexity 22688 22585 -103 
============================================
Files 1430 1417 -13 Lines 88218 87838 -380 Branches 1349 1340 -9 ============================================
- Hits 46801 46585 -216 + Misses 41417 41253 -164
Impacted FilesCoverage ΔComplexity Δ
lib/private/Share20/Manager.php86.65% <0%> (+0.28%)234 <0> (ø)⬇️
lib/private/Mail/Message.php89.58% <0%> (-5.54%)14 <1> (-4)
settings/Hooks.php0% <0%> (ø)14 <0> (ø)⬇️
settings/Controller/MailSettingsController.php67.21% <100%> (-0.53%)11 <0> (ø)
lib/private/Mail/Mailer.php62.02% <100%> (+1.76%)24 <5> (+4)⬆️
apps/sharebymail/tests/ShareByMailProviderTest.php93.93% <100%> (+0.69%)27 <0> (ø)⬇️
settings/Mailer/NewUserMailHelper.php75.36% <100%> (-0.36%)8 <0> (ø)
core/Controller/LostController.php79.19% <100%> (-0.14%)32 <0> (ø)
apps/sharebymail/lib/ShareByMailProvider.php58.59% <33.33%> (+0.29%)85 <0> (ø)⬇️
lib/private/Mail/EMailTemplate.php59.84% <50%> (-0.31%)43 <2> (+2)
... and 54 more

MorrisJobke
MorrisJobke requested changes Sep 27, 2017
View reviewed changes
Comment threadlib/private/Mail/Mailer.php
* if no-one has been passed.
*
* @param Message $message Message to send
* @param IMessage|Message $message Message to send

@MorrisJobkeMorrisJobkeSep 27, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMessage is fully enough here.

@nickvergessennickvergessenSep 27, 2017

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because we use methods of the non public api in here ;)

Comment threadlib/public/Mail/IMessage.php Outdated
* @return $this
* @since 13.0.0
*/
public function setTemplate(IEMailTemplate $emailTemplate);

@MorrisJobkeMorrisJobkeSep 27, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call it useTemplate() just to make it more clear why the template is passed in - to use it as base for the subject, html and plain body. And also write this in the description of the interface.

@nickvergessennickvergessenSep 27, 2017

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the same, but it only extracts them once, so when you change them later they are not updated anymore.
But I think set is also misleading there, suggestions welcome

@MorrisJobkeMorrisJobkeSep 27, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then still useTemplate() makes most sense and is fine - even if it is used only once.

@nickvergessennickvergessenSep 28, 2017

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done and rebased

@MorrisJobke

MorrisJobke commented Sep 27, 2017

Copy link
Copy Markdown
Member

Beside that it works nice 👍

@nickvergessen
nickvergessenforce-pushed the templating-of-email-subjects branch 2 times, most recently from cd7c701 to ce2284cCompareSeptember 28, 2017 08:50
MorrisJobke
MorrisJobke approved these changes Sep 28, 2017
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@nickvergessen
Allow templating of email subjects
f109c1a
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Set the subject with the email template to allow theming
8b37fe7
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Introduce a public interface for Message
c9af36a
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Set the data from the template
3119fd4
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Fix autoloading
cc798fd
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
nickvergessenforce-pushed the templating-of-email-subjects branch from ce2284c to cc798fdCompareOctober 18, 2017 13:12
@nickvergessen
nickvergessen merged commit bea04d1 into masterOct 18, 2017
@nickvergessen
nickvergessen deleted the templating-of-email-subjects branch October 18, 2017 13:41
R0Wi pushed a commit to R0Wi/server that referenced this pull request Nov 22, 2025
@dependabot@bigcat88
Build(deps): Bump axios from 1.6.2 to 1.7.4 (nextcloud#361)
b39f699
Bumps [axios](https://github.com/axios/axios) from 1.6.2 to 1.7.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/axios/axios/releases">axios's
releases</a>.</em></p>
<blockquote>
<h2>Release v1.7.4</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>sec:</strong> CVE-2024-39338 (<a
href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>)
(<a
href="https://redirect.github.com/axios/axios/issues/6543">#6543</a>)
(<a
href="https://github.com/axios/axios/commit/6b6b605eaf73852fb2dae033f1e786155959de3a">6b6b605</a>)</li>
<li><strong>sec:</strong> disregard protocol-relative URL to remediate
SSRF (<a
href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>)
(<a
href="https://github.com/axios/axios/commit/07a661a2a6b9092c4aa640dcc7f724ec5e65bdda">07a661a</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a href="https://github.com/levpachmanov"
title="+47/-11 ([nextcloud#6543](axios/axios#6543)
)">Lev Pachmanov</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/hainenber"
title="+49/-4 ([nextcloud#6539](axios/axios#6539) )">Đỗ
Trọng Hải</a></li>
</ul>
<h2>Release v1.7.3</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>adapter:</strong> fix progress event emitting; (<a
href="https://redirect.github.com/axios/axios/issues/6518">#6518</a>)
(<a
href="https://github.com/axios/axios/commit/e3c76fc9bdd03aa4d98afaf211df943e2031453f">e3c76fc</a>)</li>
<li><strong>fetch:</strong> fix withCredentials request config (<a
href="https://redirect.github.com/axios/axios/issues/6505">#6505</a>)
(<a
href="https://github.com/axios/axios/commit/85d4d0ea0aae91082f04e303dec46510d1b4e787">85d4d0e</a>)</li>
<li><strong>xhr:</strong> return original config on errors from XHR
adapter (<a
href="https://redirect.github.com/axios/axios/issues/6515">#6515</a>)
(<a
href="https://github.com/axios/axios/commit/8966ee7ea62ecbd6cfb39a905939bcdab5cf6388">8966ee7</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+211/-159
([nextcloud#6518](axios/axios#6518)
[nextcloud#6519](axios/axios#6519) )">Dmitriy
Mozgovoy</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/ValeraS"
title="+3/-3 ([nextcloud#6515](axios/axios#6515)
)">Valerii Sidorenko</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/prianyu"
title="+2/-2 ([nextcloud#6505](axios/axios#6505)
)">prianYu</a></li>
</ul>
<h2>Release v1.7.2</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>fetch:</strong> enhance fetch API detection; (<a
href="https://redirect.github.com/axios/axios/issues/6413">#6413</a>)
(<a
href="https://github.com/axios/axios/commit/4f79aef81b7c4644328365bfc33acf0a9ef595bc">4f79aef</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+3/-3
([nextcloud#6413](axios/axios#6413) )">Dmitriy
Mozgovoy</a></li>
</ul>
<h2>Release v1.7.1</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>fetch:</strong> fixed ReferenceError issue when TextEncoder
is not available in the environment; (<a
href="https://redirect.github.com/axios/axios/issues/6410">#6410</a>)
(<a
href="https://github.com/axios/axios/commit/733f15fe5bd2d67e1fadaee82e7913b70d45dc5e">733f15f</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+14/-9
([nextcloud#6410](axios/axios#6410) )">Dmitriy
Mozgovoy</a></li>
</ul>
<h2>Release v1.7.0</h2>
<h2>Release notes:</h2>
<h3>Features</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/axios/axios/blob/v1.x/CHANGELOG.md">axios's
changelog</a>.</em></p>
<blockquote>
<h2><a
href="https://github.com/axios/axios/compare/v1.7.3...v1.7.4">1.7.4</a>
(2024-08-13)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>sec:</strong> CVE-2024-39338 (<a
href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>)
(<a
href="https://redirect.github.com/axios/axios/issues/6543">#6543</a>)
(<a
href="https://github.com/axios/axios/commit/6b6b605eaf73852fb2dae033f1e786155959de3a">6b6b605</a>)</li>
<li><strong>sec:</strong> disregard protocol-relative URL to remediate
SSRF (<a
href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>)
(<a
href="https://github.com/axios/axios/commit/07a661a2a6b9092c4aa640dcc7f724ec5e65bdda">07a661a</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a href="https://github.com/levpachmanov"
title="+47/-11 ([nextcloud#6543](axios/axios#6543)
)">Lev Pachmanov</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/hainenber"
title="+49/-4 ([nextcloud#6539](axios/axios#6539) )">Đỗ
Trọng Hải</a></li>
</ul>
<h2><a
href="https://github.com/axios/axios/compare/v1.7.2...v1.7.3">1.7.3</a>
(2024-08-01)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>adapter:</strong> fix progress event emitting; (<a
href="https://redirect.github.com/axios/axios/issues/6518">#6518</a>)
(<a
href="https://github.com/axios/axios/commit/e3c76fc9bdd03aa4d98afaf211df943e2031453f">e3c76fc</a>)</li>
<li><strong>fetch:</strong> fix withCredentials request config (<a
href="https://redirect.github.com/axios/axios/issues/6505">#6505</a>)
(<a
href="https://github.com/axios/axios/commit/85d4d0ea0aae91082f04e303dec46510d1b4e787">85d4d0e</a>)</li>
<li><strong>xhr:</strong> return original config on errors from XHR
adapter (<a
href="https://redirect.github.com/axios/axios/issues/6515">#6515</a>)
(<a
href="https://github.com/axios/axios/commit/8966ee7ea62ecbd6cfb39a905939bcdab5cf6388">8966ee7</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+211/-159
([nextcloud#6518](axios/axios#6518)
[nextcloud#6519](axios/axios#6519) )">Dmitriy
Mozgovoy</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/ValeraS"
title="+3/-3 ([nextcloud#6515](axios/axios#6515)
)">Valerii Sidorenko</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/prianyu"
title="+2/-2 ([nextcloud#6505](axios/axios#6505)
)">prianYu</a></li>
</ul>
<h2><a
href="https://github.com/axios/axios/compare/v1.7.1...v1.7.2">1.7.2</a>
(2024-05-21)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>fetch:</strong> enhance fetch API detection; (<a
href="https://redirect.github.com/axios/axios/issues/6413">#6413</a>)
(<a
href="https://github.com/axios/axios/commit/4f79aef81b7c4644328365bfc33acf0a9ef595bc">4f79aef</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+3/-3
([nextcloud#6413](axios/axios#6413) )">Dmitriy
Mozgovoy</a></li>
</ul>
<h2><a
href="https://github.com/axios/axios/compare/v1.7.0...v1.7.1">1.7.1</a>
(2024-05-20)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>fetch:</strong> fixed ReferenceError issue when TextEncoder
is not available in the environment; (<a
href="https://redirect.github.com/axios/axios/issues/6410">#6410</a>)
(<a
href="https://github.com/axios/axios/commit/733f15fe5bd2d67e1fadaee82e7913b70d45dc5e">733f15f</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+14/-9
([nextcloud#6410](axios/axios#6410) )">Dmitriy
Mozgovoy</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/axios/axios/commit/abd24a7367726616e60dfc04cb394b4be37cf597"><code>abd24a7</code></a>
chore(release): v1.7.4 (<a
href="https://redirect.github.com/axios/axios/issues/6544">#6544</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/6b6b605eaf73852fb2dae033f1e786155959de3a"><code>6b6b605</code></a>
fix(sec): CVE-2024-39338 (<a
href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>)
(<a
href="https://redirect.github.com/axios/axios/issues/6543">#6543</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/07a661a2a6b9092c4aa640dcc7f724ec5e65bdda"><code>07a661a</code></a>
fix(sec): disregard protocol-relative URL to remediate SSRF (<a
href="https://redirect.github.com/axios/axios/issues/6539">#6539</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/c6cce43cd94489f655f4488c5a50ecaf781c94f2"><code>c6cce43</code></a>
chore(release): v1.7.3 (<a
href="https://redirect.github.com/axios/axios/issues/6521">#6521</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/e3c76fc9bdd03aa4d98afaf211df943e2031453f"><code>e3c76fc</code></a>
fix(adapter): fix progress event emitting; (<a
href="https://redirect.github.com/axios/axios/issues/6518">#6518</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/85d4d0ea0aae91082f04e303dec46510d1b4e787"><code>85d4d0e</code></a>
fix(fetch): fix withCredentials request config (<a
href="https://redirect.github.com/axios/axios/issues/6505">#6505</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/92cd8ed94362f929d3d0ed85ca84296c0ac8fd6d"><code>92cd8ed</code></a>
chore(github): update ISSUE_TEMPLATE.md (<a
href="https://redirect.github.com/axios/axios/issues/6519">#6519</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/8966ee7ea62ecbd6cfb39a905939bcdab5cf6388"><code>8966ee7</code></a>
fix(xhr): return original config on errors from XHR adapter (<a
href="https://redirect.github.com/axios/axios/issues/6515">#6515</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/0e4f9fa29077ebee4499facea6be1492b42e8a26"><code>0e4f9fa</code></a>
chore(release): v1.7.2 (<a
href="https://redirect.github.com/axios/axios/issues/6414">#6414</a>)</li>
<li><a
href="https://github.com/axios/axios/commit/4f79aef81b7c4644328365bfc33acf0a9ef595bc"><code>4f79aef</code></a>
fix(fetch): enhance fetch API detection; (<a
href="https://redirect.github.com/axios/axios/issues/6413">#6413</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/axios/axios/compare/v1.6.2...v1.7.4">compare
view</a></li>
</ul>
</details>
<br />
[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=axios&package-manager=npm_and_yarn&previous-version=1.6.2&new-version=1.7.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/cloud-py-api/app_api/network/alerts).
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@LukasReschkeLukasReschkeLukasReschke left review comments
@blizzzblizzzAwaiting requested review from blizzz

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsenhancement

Projects

None yet

Milestone

Nextcloud 13

Development

Successfully merging this pull request may close these issues.

5 participants

@nickvergessen@codecov-io@MorrisJobke@rullzer@LukasReschke