From 7295dc44b76daa59d3d97afed4b9b3653d8a6f88 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 22 Dec 2018 23:25:18 +0100
Subject: [PATCH] Improved email subject of notification mails

Closes #123
---
 ...ersationMessageUserNotificationEvent.class.php | 15 +++++++++++++++
 .../ConversationUserNotificationEvent.class.php   | 11 +++++++++++
 language/de.xml                                   |  2 ++
 language/en.xml                                   |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php b/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
index b7b682b..7eeaea7 100644
--- a/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
+++ b/files/lib/system/user/notification/event/ConversationMessageUserNotificationEvent.class.php
@@ -74,6 +74,21 @@ class ConversationMessageUserNotificationEvent extends AbstractUserNotificationE
 		];
 	}
 	
+	/**
+	 * @inheritDoc
+	 * @since	3.2
+	 */
+	public function getEmailTitle() {
+		if (count($this->getAuthors()) > 1) {
+			return parent::getEmailTitle();
+		}
+		
+		return $this->getLanguage()->getDynamicVariable('wcf.user.notification.conversation.message.mail.title', [
+			'author' => $this->author,
+			'message' => $this->userNotificationObject
+		]);
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/files/lib/system/user/notification/event/ConversationUserNotificationEvent.class.php b/files/lib/system/user/notification/event/ConversationUserNotificationEvent.class.php
index 8245a30..f4bdac3 100644
--- a/files/lib/system/user/notification/event/ConversationUserNotificationEvent.class.php
+++ b/files/lib/system/user/notification/event/ConversationUserNotificationEvent.class.php
@@ -47,6 +47,17 @@ class ConversationUserNotificationEvent extends AbstractUserNotificationEvent im
 		];
 	}
 	
+	/**
+	 * @inheritDoc
+	 * @since	3.2
+	 */
+	public function getEmailTitle() {
+		return $this->getLanguage()->getDynamicVariable('wcf.user.notification.conversation.mail.title', [
+			'author' => $this->author,
+			'conversation' => $this->userNotificationObject
+		]);
+	}
+	
 	/**
 	 * @inheritDoc
 	 */
diff --git a/language/de.xml b/language/de.xml
index 476f0a6..548179f 100644
--- a/language/de.xml
+++ b/language/de.xml
@@ -189,10 +189,12 @@
 		<item name="wcf.user.notification.conversation.message.title.stacked"><![CDATA[{#$count} Teilnehmer haben auf eine Konversation geantwortet]]></item>
 		<item name="wcf.user.notification.conversation.message.mail.plaintext"><![CDATA[{@$authorList} {if $count == 1 && !$guestTimesTriggered}hat{else}haben{/if} auf die Konversation „{$event->getUserNotificationObject()->getConversation()->subject}“ [URL:{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}] geantwortet{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>
 		<item name="wcf.user.notification.conversation.message.mail.html"><![CDATA[<p>{@$authorList} {if $count == 1 && !$guestTimesTriggered}hat{else}haben{/if} auf die Konversation <a href="{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}">{$event->getUserNotificationObject()->getConversation()->subject}</a> geantwortet:</p>]]></item>
+		<item name="wcf.user.notification.conversation.message.mail.title"><![CDATA["{@$author->username}" hat auf die Konversation "{$message->getConversation()->subject}" geantwortet]]></item>
 		<item name="wcf.user.notification.conversation.message"><![CDATA[{@$author->getAnchorTag()} hat die Konversation <a href="{link controller='Conversation' object=$conversation}{/link}">{$conversation->subject}</a> gestartet.]]></item>
 		<item name="wcf.user.notification.conversation.title"><![CDATA[Neue Konversation]]></item>
 		<item name="wcf.user.notification.conversation.mail.plaintext"><![CDATA[{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}] hat die Konversation „{@$event->getUserNotificationObject()->subject}“ [URL:{link controller='Conversation' object=$event->getUserNotificationObject() isEmail=true}{/link}] gestartet:]]></item>
 		<item name="wcf.user.notification.conversation.mail.html"><![CDATA[<p><a href="{link controller='User' object=$event->getAuthor() isEmail=true}{/link}">{$event->getAuthor()->username}</a> hat die Konversation <a href="{link controller='Conversation' object=$event->getUserNotificationObject() isEmail=true}{/link}">{$event->getUserNotificationObject()->subject}</a> gestartet:</p>]]></item>
+		<item name="wcf.user.notification.conversation.mail.title"><![CDATA[Neue Konversation von "{@$author->username}"]]></item>
 		<item name="wcf.user.notification.com.woltlab.wcf.conversation"><![CDATA[Konversationen]]></item>
 		<item name="wcf.user.notification.com.woltlab.wcf.conversation.notification.conversation"><![CDATA[Neue Konversation]]></item>
 		<item name="wcf.user.notification.com.woltlab.wcf.conversation.message.notification.conversationMessage"><![CDATA[Antwort auf bestehende Konversation]]></item>
diff --git a/language/en.xml b/language/en.xml
index b3d7404..af2c2c9 100644
--- a/language/en.xml
+++ b/language/en.xml
@@ -190,10 +190,12 @@
 		<item name="wcf.user.notification.conversation.message.title.stacked"><![CDATA[{#$count} participants replied to a conversation]]></item>
 		<item name="wcf.user.notification.conversation.message.mail.plaintext"><![CDATA[{@$authorList} replied to the conversation “{$event->getUserNotificationObject()->getConversation()->subject}” [URL:{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}]{if $count == 1 && !$guestTimesTriggered}:{else}.{/if}]]></item>
 		<item name="wcf.user.notification.conversation.message.mail.html"><![CDATA[<p>{@$authorList} replied to the conversation <a href="{link controller='Conversation' object=$event->getUserNotificationObject()->getConversation() isEmail=true}{/link}">{$event->getUserNotificationObject()->getConversation()->subject}</a>:</p>]]></item>
+		<item name="wcf.user.notification.conversation.message.mail.title"><![CDATA["{@$author->username}" replied to the conversation "{$message->getConversation()->subject}"]]></item>
 		<item name="wcf.user.notification.conversation.message"><![CDATA[{@$author->getAnchorTag()} started the conversation <a href="{link controller='Conversation' object=$conversation}{/link}">{$conversation->subject}</a>.]]></item>
 		<item name="wcf.user.notification.conversation.title"><![CDATA[New Conversation]]></item>
 		<item name="wcf.user.notification.conversation.mail.plaintext"><![CDATA[{@$event->getAuthor()->username} [URL:{link controller='User' object=$event->getAuthor() isEmail=true}{/link}] started the conversation “{@$event->getUserNotificationObject()->subject}” [URL:{link controller='Conversation' object=$event->getUserNotificationObject() isEmail=true}{/link}]:]]></item>
 		<item name="wcf.user.notification.conversation.mail.html"><![CDATA[<p><a href="{link controller='User' object=$event->getAuthor() isEmail=true}{/link}">{$event->getAuthor()->username}</a> started the conversation <a href="{link controller='Conversation' object=$event->getUserNotificationObject() isEmail=true}{/link}">{$event->getUserNotificationObject()->subject}</a>:</p>]]></item>
+		<item name="wcf.user.notification.conversation.mail.title"><![CDATA[New Conversation from "{@$author->username}"]]></item>
 		<item name="wcf.user.notification.com.woltlab.wcf.conversation"><![CDATA[Conversations]]></item>
 		<item name="wcf.user.notification.com.woltlab.wcf.conversation.notification.conversation"><![CDATA[Notify me of new conversations]]></item>
 		<item name="wcf.user.notification.com.woltlab.wcf.conversation.message.notification.conversationMessage"><![CDATA[Notify me of new replies in conversations]]></item>
-- 
2.20.1