New version 1.0.5 - add send-message and send-multicast-message funct…

…ions

README.md

@@ -4,7 +4,7 @@ Clojure wrap for Firebase Cloud Messaging that allows You to send push notificat
 ### Installation
 Leiningen coordinates:
 ```clj
-[clj-push-notifications "1.0.4"]
+[clj-push-notifications "1.0.5"]
 ```
 ### Example of usage:
 First get Your credentials (google-services.json file) from Firebase console, and add them to Your project path (or some config file):

project.clj

@@ -1,4 +1,4 @@
-(defproject clj-push-notifications "1.0.4"
+(defproject clj-push-notifications "1.0.5"
   :description "Firebase cloud messaging client."
   :url "https://github.com/spinneyio/clj-push-notifications"
   :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"

src/clj_push_notifications/core.clj

@@ -69,14 +69,16 @@
                   (.setApnsConfig apns-config))]
     message))
 
+(defn- get-message [builder data]
+  (reduce (fn [builder [k v]] (.putData builder k v)) builder data))
 
 (defn send-notification [{:keys [token title message badges custom-field custom-data type]}]
   (let [custom-field (or custom-field "")
         custom-data (or custom-data "")
         message (get-notification (Message/builder) title message badges custom-field custom-data type)
         message-with-token (.setToken message token)
-        builded (.build message-with-token)]
-    (future (.send (FirebaseMessaging/getInstance) builded))))
+        built (.build message-with-token)]
+    (future (.send (FirebaseMessaging/getInstance) built))))
 
 (defn send-multicast-notifications [{:keys [tokens title message badges custom-field custom-data type]}]
   (let [custom-field (or custom-field "")
@@ -85,3 +87,15 @@
         message-with-token (.addAllTokens message tokens)
         built (.build message-with-token)]
     (future (.sendMulticast (FirebaseMessaging/getInstance) built))))
+
+(defn send-message [{:keys [token data]}]
+  (let [message (get-message (Message/builder) data)
+        message-with-token (.setToken message token)
+        built (.build message-with-token)]
+    (future (.send (FirebaseMessaging/getInstance) built))))
+
+(defn send-multicast-messages [{:keys [tokens data]}]
+  (let [message (get-message (MulticastMessage/builder) data)
+        message-with-tokens (.addAllTokens message tokens)
+        built (.build message-with-tokens)]
+    (future (.send (FirebaseMessaging/getInstance) built))))