Add html link helper #240
Merged
Add html link helper #240
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
ayrat555
reviewed
Aug 22, 2022
src/deliver/render_message.rs
Outdated
| @@ -177,6 +199,13 @@ fn truncate(s: &str, max_chars: usize) -> String { | |||
| result.trim().to_string() | |||
| } | |||
|
|
|||
| fn create_links(urls: &str)-> String { | |||
There was a problem hiding this comment.
this function is not needed. let's format the string directly in the create_link helper on the line 37
src/deliver/render_message.rs
Outdated
| @@ -132,6 +152,8 @@ impl MessageRenderer { | |||
| } | |||
| } | |||
|
|
|||
|
|
|||
|
|
|||
There was a problem hiding this comment.
let's remove the new lines that you added here, line 110, lines 65-66. 41-42 and all other
src/deliver/render_message.rs
Outdated
| @@ -21,15 +21,27 @@ const BOT_ITEM_LINK: &str = "bot_item_link"; | |||
| const BOT_ITEM_DESCRIPTION: &str = "bot_item_description"; | |||
|
|
|||
| const SUBSTRING_HELPER: &str = "substring"; | |||
| const CREATE_LINK_HELPER: &str = "create_link"; | |||
| const BOLD_HELPER: &str = "bold"; | |||
There was a problem hiding this comment.
maybe let's italic helper also?
Closed
|
@athulkrishnaaei can you please resolve conflicts? |
ayrat555
reviewed
Aug 22, 2022
Cargo.toml
Outdated
| @@ -30,5 +30,6 @@ tokio = { version = "1", features = ["full"] } | |||
| typed-builder = "0.10" | |||
| url = "2" | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
you don't need changes in this file
.env
Outdated
| @@ -1,4 +1,4 @@ | |||
| TELEGRAM_BOT_TOKEN= # insert @BotFather token here | |||
| TELEGRAM_BOT_TOKEN=# insert @BotFather token here | |||
There was a problem hiding this comment.
you don't need changes in this file
| @@ -414,7 +414,9 @@ mod tests { | |||
|
|
|||
| assert_eq!( | |||
| result[0].0, | |||
| // "FeedTitle\r\n\r\nTitle\r\n\r\nDescription\r\n\r\n2020-05-13 19:59:02 +00:05\r\n\r\ndsd".to_string() | |||
src/deliver/render_message.rs
Outdated
| @@ -50,6 +58,7 @@ pub struct MessageRenderer { | |||
| } | |||
|
|
|||
| impl MessageRenderer { | |||
|
|
|||
There was a problem hiding this comment.
please remove news lines that you added in this file
ayrat555
reviewed
Aug 23, 2022
src/deliver/render_message.rs
Outdated
| const DEFAULT_TEMPLATE: &str = "{{bot_feed_name}}\n\n{{bot_item_name}}\n\n{{bot_item_description}}\n\n{{bot_date}}\n\n{{bot_item_link}}\n\n"; | ||
| const MAX_CHARS: usize = 4000; | ||
|
|
||
| const RENDER_ERROR: &str = "Failed to render template"; | ||
| const EMPTY_MESSAGE_ERROR: &str = "According to your template the message is empty. Telegram doesn't support empty messages. That's why we're sending this placeholder message."; | ||
|
|
||
| handlebars_helper!(create_link: |string: String,link: String| format!("<a href={}>{}</a>",create_hyper_link(&link),&string)); |
There was a problem hiding this comment.
Suggested change
| handlebars_helper!(create_link: |string: String,link: String| format!("<a href={}>{}</a>",create_hyper_link(&link),&string)); | |
| handlebars_helper!(create_link: |string: String, link: String| format!("<a href=\"{}\">{}</a>", link, string)); |
src/deliver/render_message.rs
Outdated
| handlebars_helper!(substring: |string: String, length: usize| truncate(&string, length)); | ||
|
|
||
| #[derive(Builder)] | ||
|
|
src/deliver/render_message.rs
Outdated
| @@ -161,7 +173,10 @@ fn truncate_and_check(s: &str) -> String { | |||
| message_without_empty_chars | |||
| } | |||
| } | |||
|
|
|||
| fn create_hyper_link(url: &str) -> String { | |||
Cargo.toml
Outdated
| @@ -30,5 +30,6 @@ tokio = { version = "1", features = ["full"] } | |||
| typed-builder = "0.10" | |||
| url = "2" | |||
|
|
|||
|
|
|||
.env
Outdated
| @@ -1,4 +1,4 @@ | |||
| TELEGRAM_BOT_TOKEN= # insert @BotFather token here | |||
| TELEGRAM_BOT_TOKEN=# insert @BotFather token here | |||
ayrat555
reviewed
Aug 23, 2022
.gitignore
Outdated
| @@ -1 +1,2 @@ | |||
| /target | |||
| .env | |||
There was a problem hiding this comment.
let's not added .env to .gitignore yet
tests are failing because it's missing
athulkrishnaaei
force-pushed
the
develop_2
branch
from
2b57612 to
ce8e403
Compare
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.
added create_link helper function