Skip to content

Commit 6a336be

Browse files
authored
Merge pull request #115 from qa-guru/change_telegtam_template
change telegram template
2 parents 9e2fa7e + d42c407 commit 6a336be

File tree

3 files changed

+39
-7
lines changed

3 files changed

+39
-7
lines changed

src/main/java/guru/qa/allure/notifications/clients/telegram/TelegramClient.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
import guru.qa.allure.notifications.config.enums.Headers;
77
import guru.qa.allure.notifications.config.telegram.Telegram;
88
import guru.qa.allure.notifications.exceptions.MessagingException;
9-
import guru.qa.allure.notifications.template.MarkdownTemplate;
9+
import guru.qa.allure.notifications.template.TelegramTemplate;
1010
import kong.unirest.Unirest;
1111

1212
import java.io.File;
1313

1414
public class TelegramClient implements Notifier {
1515
private final Base base;
1616
private final Telegram telegram;
17-
private final MarkdownTemplate markdownTemplate;
17+
private final TelegramTemplate telegramTemplate;
1818

1919
public TelegramClient(Base base, Telegram telegram) {
2020
this.base = base;
2121
this.telegram = telegram;
22-
this.markdownTemplate = new MarkdownTemplate(base);
22+
this.telegramTemplate = new TelegramTemplate(base);
2323
}
2424

2525
@Override
@@ -29,8 +29,8 @@ public void sendText() throws MessagingException {
2929
.header("Content-Type", Headers.URL_ENCODED.header())
3030
.field("chat_id", telegram.chat())
3131
.field("reply_to_message_id", telegram.replyTo() + "")
32-
.field("text", markdownTemplate.create())
33-
.field("parse_mode", "Markdown")
32+
.field("text", telegramTemplate.create())
33+
.field("parse_mode", "HTML")
3434
.asString()
3535
.getBody();
3636
}
@@ -45,8 +45,8 @@ public void sendPhoto() throws MessagingException {
4545
new File("chart.png"))
4646
.field("chat_id", telegram.chat())
4747
.field("reply_to_message_id", telegram.replyTo())
48-
.field("caption", markdownTemplate.create())
49-
.field("parse_mode", "Markdown")
48+
.field("caption", telegramTemplate.create())
49+
.field("parse_mode", "HTML")
5050
.asString()
5151
.getBody();
5252
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package guru.qa.allure.notifications.template;
2+
3+
import guru.qa.allure.notifications.config.base.Base;
4+
import guru.qa.allure.notifications.exceptions.MessageBuildException;
5+
6+
/**
7+
* Utility class for telegram html template creation.
8+
*/
9+
public class TelegramTemplate {
10+
private final Base base;
11+
12+
public TelegramTemplate(Base base) {
13+
this.base = base;
14+
}
15+
16+
public String create() throws MessageBuildException {
17+
return new MessageTemplate(base).of("telegram.ftl");
18+
}
19+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<#compress>
2+
<b>${results}:</b>
3+
<b>${environment}: </b>${env}
4+
<b>${comment}: </b>${comm}
5+
<b>${duration}: </b>${time}
6+
<b>${totalScenarios}: </b>${total}
7+
<#if passed != 0 ><b>${totalPassed}: </b>${passed} (${passedPercentage} %)</#if>
8+
<#if failed != 0 ><b>${totalFailed}: </b>${failed} (${failedPercentage} %)</#if>
9+
<#if broken != 0 ><b>${totalBroken}: </b>${broken}</#if>
10+
<#if unknown != 0 ><b>${totalUnknown}: </b>${unknown}</#if>
11+
<#if skipped != 0 ><b>${totalSkipped}: </b>${skipped}</#if>
12+
<#if reportLink??><b>${reportAvailableAtLink}:</b> <a href="${reportLink}">${reportLink}</a></#if>
13+
</#compress>

0 commit comments

Comments
 (0)