From f65a521883cf4ed9582fd4406f746dd1778d3986 Mon Sep 17 00:00:00 2001
From: Mazarin <djaiss@users.noreply.github.com>
Date: Thu, 12 Jan 2023 20:58:37 -0500
Subject: [PATCH] fix: fix telegram formatting message (monicahq/chandler#406)

---
 .../Jobs/ProcessScheduledContactReminders.php              | 7 +++----
 app/Notifications/ReminderTriggered.php                    | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php b/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
index 9da65252428..1884848f3a5 100644
--- a/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
+++ b/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
@@ -40,18 +40,17 @@ public function handle()
             $userNotificationChannel = UserNotificationChannel::findOrFail($scheduledReminder->user_notification_channel_id);
 
             $contactReminder = ContactReminder::find($scheduledReminder->contact_reminder_id);
+            $contact = $contactReminder->contact;
+            $contactName = NameHelper::formatContactName($userNotificationChannel->user, $contact);
 
             if ($userNotificationChannel->type === UserNotificationChannel::TYPE_EMAIL) {
-                $contact = $contactReminder->contact;
-                $contactName = NameHelper::formatContactName($userNotificationChannel->user, $contact);
-
                 Notification::route('mail', $userNotificationChannel->content)
                     ->notify(new ReminderTriggered($userNotificationChannel, $contactReminder->label, $contactName));
             }
 
             if ($userNotificationChannel->type === UserNotificationChannel::TYPE_TELEGRAM) {
                 Notification::route('telegram', $userNotificationChannel->content)
-                    ->notify(new ReminderTriggered($userNotificationChannel, $contactReminder->label, ''));
+                    ->notify(new ReminderTriggered($userNotificationChannel, $contactReminder->label, $contactName));
             }
 
             $this->updateScheduledContactReminderTriggeredAt($scheduledReminder);
diff --git a/app/Notifications/ReminderTriggered.php b/app/Notifications/ReminderTriggered.php
index ed2b6827e4e..8e511828208 100644
--- a/app/Notifications/ReminderTriggered.php
+++ b/app/Notifications/ReminderTriggered.php
@@ -77,9 +77,9 @@ public function toTelegram($notifiable)
         ]);
 
         // content contains the label of the ContactReminder object
-        $content = '🔔 Reminder:'.'\n'.
-            $this->content.'\n'.
-            trans('email.reminder_triggered_for').'\n'.
+        $content = '🔔 Reminder: '.
+            $this->content.' '.
+            trans('email.reminder_triggered_for').' '.
             $this->contactName;
 
         return TelegramMessage::create()