From bef4cd74aef6636f7bb8c5528d14bdfcc229bc6e Mon Sep 17 00:00:00 2001
From: Waterticket <matthew218@naver.com>
Date: Wed, 29 Dec 2021 04:27:03 +0000
Subject: [PATCH] =?UTF-8?q?FCM=20notification=20=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/framework/drivers/push/fcm.php |  24 +++++
 common/framework/push.php             | 138 ++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/common/framework/drivers/push/fcm.php b/common/framework/drivers/push/fcm.php
index 54b69c030..6e20a6598 100644
--- a/common/framework/drivers/push/fcm.php
+++ b/common/framework/drivers/push/fcm.php
@@ -66,6 +66,30 @@ class FCM extends Base implements \Rhymix\Framework\Drivers\PushInterface
 		{
 			$notification['click_action'] = $message->getClickAction();
 		}
+		if($message->getSound())
+		{
+			$notification['sound'] = $message->getSound();
+		}
+		if($message->getBadge())
+		{
+			$notification['badge'] = $message->getBadge();
+		}
+		if($message->getIcon())
+		{
+			$notification['icon'] = $message->getIcon();
+		}
+		if($message->getTag())
+		{
+			$notification['tag'] = $message->getTag();
+		}
+		if($message->getColor())
+		{
+			$notification['color'] = $message->getColor();
+		}
+		if($message->getAndroidChannelId())
+		{
+			$notification['android_channel_id'] = $message->getAndroidChannelId();
+		}
 
 		$chunked_token = array_chunk($tokens, 1000);
 		foreach($chunked_token as $token_unit)
diff --git a/common/framework/push.php b/common/framework/push.php
index 031536d4c..48b407263 100644
--- a/common/framework/push.php
+++ b/common/framework/push.php
@@ -15,6 +15,12 @@ class Push
 	protected $subject = '';
 	protected $content = '';
 	protected $click_action = '';
+	protected $sound = '';
+	protected $badge = '';
+	protected $icon = '';
+	protected $tag = '';
+	protected $color = '';
+	protected $android_channel_id = '';
 	protected $data = [];
 	protected $errors = array();
 	protected $success_tokens = array();
@@ -218,6 +224,138 @@ class Push
 	{
 		return $this->click_action;
 	}
+	
+	/**
+	 * Set a sound to associate with this push notification.
+	 *
+	 * @param string $sound
+	 * @return bool
+	 */
+	public function setSound(string $sound): bool
+	{
+		$this->sound = utf8_trim(utf8_clean($sound));
+		return true;
+	}
+	
+	/**
+	 * Get the sound associated with this push notification.
+	 * 
+	 * @return string
+	 */
+	public function getSound(): string
+	{
+		return $this->sound;
+	}
+
+	/**
+	 * Set a badge to associate with this push notification.
+	 *
+	 * @param string $badge
+	 * @return bool
+	 */
+	public function setBadge(string $badge): bool
+	{
+		$this->badge = utf8_trim(utf8_clean($badge));
+		return true;
+	}
+	
+	/**
+	 * Get the badge associated with this push notification.
+	 * 
+	 * @return string
+	 */
+	public function getBadge(): string
+	{
+		return $this->badge;
+	}
+
+	/**
+	 * Set an icon to associate with this push notification.
+	 *
+	 * @param string $icon
+	 * @return bool
+	 */
+	public function setIcon(string $icon): bool
+	{
+		$this->icon = utf8_trim(utf8_clean($icon));
+		return true;
+	}
+	
+	/**
+	 * Get the icon associated with this push notification.
+	 * 
+	 * @return string
+	 */
+	public function getIcon(): string
+	{
+		return $this->icon;
+	}
+
+	/**
+	 * Set a tag to associate with this push notification.
+	 *
+	 * @param string $tag
+	 * @return bool
+	 */
+	public function setTag(string $tag): bool
+	{
+		$this->tag = utf8_trim(utf8_clean($tag));
+		return true;
+	}
+	
+	/**
+	 * Get the tag associated with this push notification.
+	 * 
+	 * @return string
+	 */
+	public function getTag(): string
+	{
+		return $this->tag;
+	}
+
+	/**
+	 * Set a color to associate with this push notification.
+	 *
+	 * @param string $color
+	 * @return bool
+	 */
+	public function setColor(string $color): bool
+	{
+		$this->color = utf8_trim(utf8_clean($color));
+		return true;
+	}
+	
+	/**
+	 * Get the color associated with this push notification.
+	 * 
+	 * @return string
+	 */
+	public function getColor(): string
+	{
+		return $this->color;
+	}
+
+	/**
+	 * Set an android-channel-id to associate with this push notification.
+	 *
+	 * @param string $android_channel_id
+	 * @return bool
+	 */
+	public function setAndroidChannelId(string $android_channel_id): bool
+	{
+		$this->android_channel_id = utf8_trim(utf8_clean($android_channel_id));
+		return true;
+	}
+	
+	/**
+	 * Get the android-channel-id associated with this push notification.
+	 * 
+	 * @return string
+	 */
+	public function getAndroidChannelId(): string
+	{
+		return $this->android_channel_id;
+	}
 
 	/**
 	 * Set a data to associate with this push notification.