Allow upsert messages with _id and use upsert in file upload

lib/fileUpload.coffee

@@ -14,6 +14,7 @@ if FS?
 					"""
 					file:
 						_id: fileObj._id
+				, {upsert: true}
 
 	@Files = new FS.Collection 'Files',
 		stores: [fileStore],

packages/rocketchat-lib/server/sendMessage.coffee

@@ -1,4 +1,4 @@
-RocketChat.sendMessage = (user, message, room) ->
+RocketChat.sendMessage = (user, message, room, options) ->
 
 	if not user or not message or not room._id
 		return false
@@ -15,7 +15,10 @@ RocketChat.sendMessage = (user, message, room) ->
 
 	message = RocketChat.callbacks.run 'beforeSaveMessage', message
 
-	message._id = ChatMessage.insert message
+	if message._id? and options?.upsert is true
+		ChatMessage.upsert {_id: message._id}, message
+	else
+		message._id = ChatMessage.insert message
 
 	###
 	Defer other updates as their return is not interesting to the user

server/methods/sendMessage.coffee

@@ -1,5 +1,5 @@
 Meteor.methods
-	sendMessage: (message) ->
+	sendMessage: (message, options) ->
 		if message.msg?.length > RocketChat.settings.get('Message_MaxAllowedSize')
 			throw new Meteor.Error 400, '[methods] sendMessage -> Message size exceed Message_MaxAllowedSize'
 
@@ -15,4 +15,4 @@ Meteor.methods
 		if not room
 			return false
 
-		RocketChat.sendMessage user, message, room
+		RocketChat.sendMessage user, message, room, options