From 20215fbd095586ac7828e87bd558ed989df332f7 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Fri, 13 Dec 2024 14:17:32 +0100 Subject: [PATCH] fix(shares): Remove noisy text from emails Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> --- apps/sharebymail/lib/ShareByMailProvider.php | 4 ---- .../tests/ShareByMailProviderTest.php | 24 ------------------- lib/private/Share20/DefaultShareProvider.php | 4 ---- 3 files changed, 32 deletions(-) diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index a9e6add23593e..0f3f5a75dddc0 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -352,10 +352,6 @@ protected function sendEmail(IShare $share, array $emails): void { ); } - $emailTemplate->addBodyText( - $this->l->t('Click the button below to open it.') - ); - $emailTemplate->addBodyButton( $this->l->t('Open %s', [$filename]), $link diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index f7325fc248a2f..05435b835e095 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -1289,10 +1289,6 @@ public function testSendMailNotificationWithSameUserAndUserEmail(): void { ->expects($this->once()) ->method('addHeading') ->with('Mrs. Owner User shared file.txt with you'); - $template - ->expects($this->once()) - ->method('addBodyText') - ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') @@ -1399,10 +1395,6 @@ public function testSendMailNotificationWithSameUserAndUserEmailAndNote(): void ->expects($this->once()) ->method('addHeading') ->with('Mrs. Owner User shared file.txt with you'); - $template - ->expects($this->once()) - ->method('addBodyText') - ->with('Click the button below to open it.'); $this->urlGenerator->expects($this->once())->method('imagePath') ->with('core', 'caldav/description.png') @@ -1525,10 +1517,6 @@ public function testSendMailNotificationWithSameUserAndUserEmailAndExpiration(): ->expects($this->once()) ->method('addHeading') ->with('Mrs. Owner User shared file.txt with you'); - $template - ->expects($this->once()) - ->method('addBodyText') - ->with('Click the button below to open it.'); $expiration = new DateTime('2001-01-01'); $this->l->expects($this->once()) @@ -1657,10 +1645,6 @@ public function testSendMailNotificationWithDifferentUserAndNoUserEmail(): void ->expects($this->once()) ->method('addHeading') ->with('Mr. Initiator User shared file.txt with you'); - $template - ->expects($this->once()) - ->method('addBodyText') - ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') @@ -1758,10 +1742,6 @@ public function testSendMailNotificationWithSameUserAndUserEmailAndReplyToDesact ->expects($this->once()) ->method('addHeading') ->with('Mrs. Owner User shared file.txt with you'); - $template - ->expects($this->once()) - ->method('addBodyText') - ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') @@ -1863,10 +1843,6 @@ public function testSendMailNotificationWithDifferentUserAndNoUserEmailAndReplyT ->expects($this->once()) ->method('addHeading') ->with('Mr. Initiator User shared file.txt with you'); - $template - ->expects($this->once()) - ->method('addBodyText') - ->with('Click the button below to open it.'); $template ->expects($this->once()) ->method('addBodyButton') diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index b39e5a7178217..ca3c33d6dbb63 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1520,10 +1520,6 @@ protected function sendUserShareMail( $emailTemplate->addBodyText(htmlspecialchars($note), $note); } - $emailTemplate->addBodyText( - $l->t('Click the button below to open it.') - ); - $emailTemplate->addBodyButton( $l->t('Open %s', [$filename]), $link