fixed notifications dispatch

api/notification/internal/server/notificationimp/notification.go

@@ -80,13 +80,8 @@ func CreateAPI(a api.API) (*NotificationAPI, error) {
 		return nil, err
 	}
 
-	if err := a.Register().Consumer(snotifications.NewDemoRequestProcessor(p.logger, p.onDemoRequest)); err != nil {
-		p.logger.Error("Failed to register demo request handler", zap.Error(err))
-		return nil, err
-	}
-
-	if err := a.Register().Consumer(snotifications.NewContactRequestProcessor(p.logger, p.onContactRequest)); err != nil {
-		p.logger.Error("Failed to register contact request handler", zap.Error(err))
+	if err := a.Register().Consumer(snotifications.NewSiteRequestProcessor(p.logger, p.onDemoRequest, p.onContactRequest)); err != nil {
+		p.logger.Error("Failed to register site request handler", zap.Error(err))
 		return nil, err
 	}
 

api/notification/internal/server/notificationimp/telegram/client.go

@@ -33,7 +33,7 @@ type client struct {
 	botToken   string
 	chatID     string
 	threadID   *int64
-	parseMode  string
+	parseMode  parseMode
 }
 
 type sendMessagePayload struct {
@@ -80,9 +80,9 @@ func NewClient(logger mlogger.Logger, cfg *notconfig.TelegramConfig) (Client, er
 	if apiURL == "" {
 		apiURL = defaultAPIURL
 	}
-	parseMode := strings.TrimSpace(cfg.ParseMode)
-	if parseMode == "" {
-		parseMode = "Markdown"
+	mode := normalizeParseMode(cfg.ParseMode)
+	if mode == parseModeUnset {
+		mode = parseModeMarkdown
 	}
 
 	return &client{
@@ -94,7 +94,7 @@ func NewClient(logger mlogger.Logger, cfg *notconfig.TelegramConfig) (Client, er
 		botToken:  token,
 		chatID:    chatID,
 		threadID:  threadID,
-		parseMode: parseMode,
+		parseMode: mode,
 	}, nil
 }
 
@@ -166,7 +166,7 @@ func (c *client) sendForm(ctx context.Context, template messageTemplate) error {
 	payload := sendMessagePayload{
 		ChatID:         c.chatID,
 		Text:           message,
-		ParseMode:      c.parseMode,
+		ParseMode:      c.parseMode.String(),
 		ThreadID:       c.threadID,
 		DisablePreview: true,
 	}

api/notification/internal/server/notificationimp/telegram/contact.go

@@ -4,7 +4,8 @@ import "github.com/tech/sendico/pkg/model"
 
 func newContactRequestTemplate(request *model.ContactRequest) messageTemplate {
 	return messageTemplate{
-		title: "New contact request received",
+		title:     "New site request received",
+		emphasize: []string{"site request"},
 		fields: []messageField{
 			{label: "Name", value: request.Name},
 			{label: "Email", value: request.Email},

api/notification/internal/server/notificationimp/telegram/demo.go

@@ -18,7 +18,8 @@ func newDemoRequestTemplate(request *model.DemoRequest) messageTemplate {
 		fields = append(fields, messageField{label: "Comment", value: request.Comment})
 	}
 	return messageTemplate{
-		title:  "New demo request received",
-		fields: fields,
+		title:     "New demo request received",
+		fields:    fields,
+		emphasize: []string{"demo request"},
 	}
 }

api/notification/internal/server/notificationimp/telegram/message.go

@@ -6,23 +6,50 @@ import (
 	"strings"
 )
 
+type parseMode string
+
+const (
+	parseModeUnset      parseMode = ""
+	parseModeMarkdown   parseMode = "markdown"
+	parseModeMarkdownV2 parseMode = "markdownV2"
+	parseModeHTML       parseMode = "HTML"
+)
+
+func normalizeParseMode(value string) parseMode {
+	switch strings.ToLower(strings.TrimSpace(value)) {
+	case "markdown":
+		return parseModeMarkdown
+	case "markdownv2":
+		return parseModeMarkdownV2
+	case "html":
+		return parseModeHTML
+	default:
+		return parseModeUnset
+	}
+}
+
+func (pm parseMode) String() string {
+	return string(pm)
+}
+
 type messageField struct {
 	label string
 	value string
 }
 
 type messageTemplate struct {
-	title  string
-	fields []messageField
+	title     string
+	fields    []messageField
+	emphasize []string
 }
 
-func (mt messageTemplate) Format(parseMode string) string {
+func (mt messageTemplate) Format(mode parseMode) string {
 	var builder strings.Builder
-	builder.WriteString(mt.title)
+	builder.WriteString(formatTitle(mode, mt.title, mt.emphasize))
 	builder.WriteString("\n")
 	builder.WriteString("-----------------------------\n")
 
-	formatter := selectValueFormatter(parseMode)
+	formatter := selectValueFormatter(mode)
 	for _, field := range mt.fields {
 		appendMessageField(&builder, field.label, field.value, formatter)
 	}
@@ -31,6 +58,53 @@ func (mt messageTemplate) Format(parseMode string) string {
 
 type valueFormatter func(string) string
 
+func formatTitle(mode parseMode, title string, emphasize []string) string {
+	switch mode {
+	case parseModeMarkdown:
+		return highlightMarkdown(title, emphasize, escapeMarkdown)
+	case parseModeMarkdownV2:
+		return highlightMarkdown(title, emphasize, escapeMarkdownV2)
+	case parseModeHTML:
+		return highlightHTML(title, emphasize)
+	default:
+		return title
+	}
+}
+
+func highlightMarkdown(title string, emphasize []string, esc func(string) string) string {
+	if len(emphasize) == 0 {
+		return title
+	}
+	result := title
+	for _, word := range emphasize {
+		word = strings.TrimSpace(word)
+		if word == "" {
+			continue
+		}
+		escaped := esc(word)
+		replacement := fmt.Sprintf("*%s*", escaped)
+		result = strings.ReplaceAll(result, word, replacement)
+	}
+	return result
+}
+
+func highlightHTML(title string, emphasize []string) string {
+	if len(emphasize) == 0 {
+		return html.EscapeString(title)
+	}
+	result := html.EscapeString(title)
+	for _, word := range emphasize {
+		word = strings.TrimSpace(word)
+		if word == "" {
+			continue
+		}
+		escaped := html.EscapeString(word)
+		replacement := fmt.Sprintf("<b>%s</b>", escaped)
+		result = strings.ReplaceAll(result, escaped, replacement)
+	}
+	return result
+}
+
 func appendMessageField(builder *strings.Builder, label, value string, formatter valueFormatter) {
 	value = strings.TrimSpace(value)
 	if value == "" {
@@ -41,17 +115,17 @@ func appendMessageField(builder *strings.Builder, label, value string, formatter
 	fmt.Fprintf(builder, "• %s: %s\n", label, value)
 }
 
-func selectValueFormatter(parseMode string) valueFormatter {
-	switch strings.ToLower(parseMode) {
-	case "markdown":
+func selectValueFormatter(mode parseMode) valueFormatter {
+	switch mode {
+	case parseModeMarkdown:
 		return func(value string) string {
 			return fmt.Sprintf("*%s*", escapeMarkdown(value))
 		}
-	case "markdownv2":
+	case parseModeMarkdownV2:
 		return func(value string) string {
 			return fmt.Sprintf("*%s*", escapeMarkdownV2(value))
 		}
-	case "html":
+	case parseModeHTML:
 		return func(value string) string {
 			return fmt.Sprintf("<b>%s</b>", html.EscapeString(value))
 		}