Repository navigation
feat(mail): use the new email template blocks for guest invitations - #1720
Merged
Merged
Conversation
Use IMessage::useTemplate() so inline images from EMailTemplate (the cid:logo theming logo since Nextcloud 34) are attached. Signed-off-by:Klaus Salminen klaus@andqfive.com Signed-off-by: klaussalminenq5 <klaus@andqfive.com>
Signed-off-by: klaussalminenq5 <klaus@andqfive.com>
useTemplate() overwrites the message subject with the template one. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: John Molakvo忙 <14975046+skjnldsv@users.noreply.github.com>
Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: John Molakvo忙 <14975046+skjnldsv@users.noreply.github.com>
skjnldsv
added
2. developing
skjnldsv
commented
Oct 11, 2026
| <screenshot>https://raw.githubusercontent.com/nextcloud/guests/master/screenshots/dropdown.png</screenshot> | ||
| <dependencies> | ||
| <nextcloud min-version="32" max-version="36" /> | ||
| <nextcloud min-version="36" max-version="36" /> |
Member
Author
There was a problem hiding this comment.
We should branch off before merging this
skjnldsv
marked this pull request as ready for review
October 11, 2026 20:34
Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: John Molakvo忙 <14975046+skjnldsv@users.noreply.github.com>
come-nc
approved these changes
Oct 14, 2026
pringelmann
approved these changes
Oct 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Server 36 added blocks to the email template API (nextcloud/server#65193 and follow-ups). This switches both guest invitation mails to them: the inviter is shown as the sender, the share note is now included, the file name, expiry and login go in a details card, and the mail gets the recipient's language direction.
The new methods are
@since 36.0.0, so this raisesmin-versionto 36. Depends on #1719, and on cuttingstable-4.10frommainfirst so 32 to 35 keep getting fixes.The share subject now names the file ("Alice shared Budget.xlsx with you") like sharebymail does. The share note was never sent before; I have not checked whether it can already be set when
ShareCreatedListenerfires.Unit tests cover both mails, the share mail without note or expiry, and RTL. Rendered on server master, not sent through a real SMTP server.
馃懢 This pull request was assisted by Claude Code, commits carry an
Assisted-bytrailer.