templater: add Email template type, deprecate Signature.username()
#5079
+117
−19
Conversation
This file contains 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
The `Signature.email()` method is also updated to return the new Email type. The `Signature.username()` method is deprecated for `Signature.email().local()`.
bnjmnt4n
force-pushed
the
bnjmnt4n/push-knznzkuuumll
branch
from
aa7ae95 to
eee3065
Compare
yuja
approved these changes
Dec 12, 2024
| @@ -217,6 +222,9 @@ impl<'a> IntoTemplateProperty<'a> for CoreTemplatePropertyKind<'a> { | |||
| CoreTemplatePropertyKind::StringList(property) => { | |||
| Some(Box::new(property.map(|l| !l.is_empty()))) | |||
| } | |||
| CoreTemplatePropertyKind::Email(property) => Some(Box::new( | |||
| property.map(|e| !e.local.is_empty() || e.domain.is_some()), | |||
| )), | |||
There was a problem hiding this comment.
nit: sort in definition order?
| @@ -820,14 +840,19 @@ fn builtin_signature_methods<'a, L: TemplateLanguage<'a> + ?Sized>( | |||
| "email", | |||
| |_language, _diagnostics, _build_ctx, self_property, function| { | |||
| function.expect_no_arguments()?; | |||
| let out_property = self_property.map(|signature| signature.email); | |||
| Ok(L::wrap_string(out_property)) | |||
| let out_property = self_property.map(|signature| signature.email.clone().into()); | |||
Comment on lines
+88
to
+91
| pub struct Email { | ||
| pub local: String, | ||
| pub domain: Option<String>, | ||
| } |
There was a problem hiding this comment.
nit: might be simpler to implement as a new type Email(pub String) (because the type implements implicit cast to boolean based on string)
| * `.timestamp() -> Timestamp` | ||
|
|
||
| ### Email type |
There was a problem hiding this comment.
nit: types are sorted alphabetically in doc
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.
The
Signature.email()method is also updated to return the new Email type. TheSignature.username()method is deprecated forSignature.email().local().This is an alternative to #4687.
Checklist
If applicable:
CHANGELOG.md