Send message with attributes (#17)

* Added new methods to allow attributed messages to be sent

* Updated sendMessage method. It now accepts attributes param

* Converting ReadableMap to JSONObject

* Vars accessed from within inner classes should be marked as final

* Removed unnecessary method

* Updated docs regarding the `attributes` param in `Channel#sendMessage` method

Author: svlaev

Example/android/app/build.gradle

@@ -73,6 +73,8 @@ dependencies {
     compile "com.facebook.react:react-native:+"  // From node_modules
     compile project(':ExtraDimensions')
     compile project(':RCTTwilioChat')
+    compile 'com.twilio:chat-android:0.12.1'
+    compile 'com.twilio:accessmanager-android:0.1.0'
 }
 
 // Run this once to be able to run the application with BUCK

android/src/main/java/com/bradbumbalough/RCTTwilioChat/RCTTwilioChatMessages.java

@@ -14,6 +14,7 @@
 import com.twilio.chat.CallbackListener;
 
 import java.util.List;
+import java.util.Map;
 
 import org.json.JSONObject;
 
@@ -65,7 +66,7 @@ public void onSuccess(Messages messages) {
     }
 
     @ReactMethod
-    public void sendMessage(String channelSid, final String body, final Promise promise) {
+    public void sendMessage(String channelSid, final String body, final ReadableMap attributes, final Promise promise) {
         loadMessagesFromChannelSid(channelSid, new CallbackListener<Messages>() {
             @Override
             public void onError(ErrorInfo errorInfo) {
@@ -74,19 +75,39 @@ public void onError(ErrorInfo errorInfo) {
             }
 
             @Override
-            public void onSuccess(Messages messages) {
-                messages.sendMessage(body, new StatusListener() {
-                    @Override
-                    public void onError(ErrorInfo errorInfo) {
-                        super.onError(errorInfo);
-                        promise.reject("send-message-error","Error occurred while attempting to sendMessage.");
-                    }
-
-                    @Override
-                    public void onSuccess() {
-                        promise.resolve(true);
-                    }
-                });
+            public void onSuccess(final Messages messages) {
+                final Message newMessage = messages.createMessage(body);
+
+                final StatusListener sendListener = new StatusListener() {
+                  @Override
+                  public void onError(ErrorInfo errorInfo) {
+                      super.onError(errorInfo);
+                      promise.reject("send-message-error","Error occurred while attempting to sendMessage.");
+                  }
+
+                  @Override
+                  public void onSuccess() {
+                      promise.resolve(true);
+                  }
+                };
+
+                if(attributes != null) {
+                  final JSONObject json = RCTConvert.readableMapToJson(attributes);
+                  newMessage.setAttributes(json, new StatusListener() {
+                      @Override
+                      public void onSuccess() {
+                          messages.sendMessage(newMessage, sendListener);
+                      }
+
+                      @Override
+                      public void onError(ErrorInfo errorInfo) {
+                          super.onError(errorInfo);
+                          promise.reject("send-attributed-message-error","Error occurred while attempting to set attributes in sendAttributedMessage.");
+                      }
+                  });
+                } else {
+                  messages.sendMessage(body, sendListener);
+                }
             }
         });
     }

docs/Channel.md

@@ -147,10 +147,11 @@ Leave a channel.
 |--- |--- |--- |
 |*index*|Number|The index of the message to delete
 
-#### `sendMessage(body)` : Promise
+#### `sendMessage(body, attributes)` : Promise
 |Name |Type |Description |
 |--- |--- |--- |
 |*body*|String|The message body
+|*attributes*|Object|Any properties you want associated with the message (Optional)
 
 #### `setAllMessagesConsumed()`
 Update the last consumed index for this Member and Channel to the max message currently on this device.

ios/RCTTwilioChat/RCTTwilioChatMessages.m

@@ -36,17 +36,30 @@ - (void)loadMessagesFromChannelSid:(NSString *)sid :(void (^)(TCHResult *result,
 }
 
 
-RCT_REMAP_METHOD(sendMessage, channelSid:(NSString *)channelSid body:(NSString *)body send_message_resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+RCT_REMAP_METHOD(sendMessage, channelSid:(NSString *)channelSid body:(NSString *)body attributes:(NSDictionary<NSString *, id> *)attributes send_message_resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     [self loadMessagesFromChannelSid:channelSid :^(TCHResult *result, TCHMessages *messages) {
         if (result.isSuccessful) {
-            [messages sendMessage:[messages createMessageWithBody:body] completion:^(TCHResult *result) {
-                if (result.isSuccessful) {
-                    resolve(@[@TRUE]);
-                }
-                else {
-                    reject(@"send-message-error", @"Error occured while attempting to send a message.", result.error);
+          TCHMessage* message = [messages createMessageWithBody:body];
+          void (^sendListener)(TCHResult * sendResult) = ^(TCHResult *sendResult) {
+              if (sendResult.isSuccessful) {
+                  resolve(@[@TRUE]);
+              }
+              else {
+                  reject(@"send-message-error", @"Error occured while attempting to send a message.", sendResult.error);
+              }
+          };
+          if (attributes != nil) {
+            [message setAttributes:attributes completion:^(TCHResult *setAttrResult) {
+                if(setAttrResult.isSuccessful) {
+                    [messages sendMessage:message completion:sendListener];
+                } else {
+                    reject(@"send-attributed-message-error", @"Error occured while attempting to send attributed message.", setAttrResult.error);
                 }
             }];
+          }
+          else {
+            [messages sendMessage:message completion:sendListener];
+          }
         }
         else {
             reject(@"send-message-error", @"Error occured while attempting to send a message.", result.error);

lib/Channel.js

@@ -214,8 +214,8 @@ class Channel {
     return TwilioChatMessages.getLastConsumedMessageIndex(this.sid);
   }
 
-  sendMessage(body) {
-    return TwilioChatMessages.sendMessage(this.sid, body);
+  sendMessage(body, attributes = null) {
+    return TwilioChatMessages.sendMessage(this.sid, body, attributes);
   }
 
   removeMessage(index) {