#971 : Media support with BuddyPress message.

app/assets/css/rtmedia.css

@@ -185,6 +185,19 @@ body.media.buddypress {
   padding: 0;
 }
 
+#rtmedia_uploader_filelist {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+}
+
+.rtmedia_bp_msg_media_upload_render {
+  display: inline;
+  float: left;
+}
+
 .rtmedia-list-item > a {
   border: 0;
   display: inline-block;
@@ -3014,6 +3027,7 @@ h2.rtm-gallery-title {
 }
 .rtmedia-upload-media-link {
   cursor: pointer;
+  display: block;
 }
 
 a.rtmedia-upload-media-link {

app/assets/css/sass/_media-tab.scss

@@ -391,6 +391,7 @@ h2.rtm-gallery-title  {
 
 .rtmedia-upload-media-link {
 	cursor: pointer;
+	display: block;
 }
 
 a.rtmedia-upload-media-link {

app/assets/css/sass/_rtm.scss

@@ -30,6 +30,18 @@
 	}
 }
 
+// Rearranging media preview at uploading time below uploader in BuddyPress compose message
+#rtmedia_uploader_filelist{
+    display: flex;
+    flex-wrap: wrap;
+}
+
+// Preview of attached media below uploader in BuddyPress media message
+.rtmedia_bp_msg_media_upload_render{
+    display: inline;
+    float: left;
+}
+
 .rtmedia-list-item > a {
 	border: 0;
 	display: inline-block;

app/assets/js/rtMedia.backbone.js

@@ -6,7 +6,7 @@ var uploaderObj;
 var objUploadView;
 var rtmedia_load_template_flag = true;
 var rtmedia_add_media_button_post_update = false;
-
+var msg_media_files = []; // To store media id in BP Message.
 
 jQuery( document ).ready( function () {
 
@@ -598,7 +598,17 @@ jQuery( function( $ ) {
 			},
 			initialize: function( config ) {
 				this.uploader = new plupload.Uploader( config );
-				/*
+                /**
+                 * var current_url will fetch present working area's address and we will find if it contains message in url though find variable.
+                 * If message is there in URL then we need to mention that it is message.
+                 * we have appended message:true in config.
+                 */
+				var current_url = document.URL, find= 'message';
+				if ( -1 !== current_url.indexOf( find ) ){
+					config.message = true;
+				}
+
+				/**
 				* 'ext_enabled' will get value of enabled media types if nothing is enabled,
 				* then an error message will be displayed.
 				*/
@@ -668,6 +678,18 @@ jQuery( function( $ ) {
 
 			uploaderObj.uploader.bind( 'UploadComplete', function( up, files ) {
 
+				// Success message for BudyyPress Media Message
+				if ( jQuery( '.rtm-media-msg-upload-button' ).length == 1 ) {
+                    jQuery( '.rtm-media-msg-upload-button' ).html( '' );
+                    jQuery( '.rtm-media-msg-upload-button' ).removeAttr( 'id' );
+                    jQuery( '.rtm-media-msg-upload-button' ).html(
+                        jQuery( '<p>', { id: 'rtm_bpm_success' } )
+                    );
+                    jQuery( '#rtm_bpm_success' ).css( {'background': '#98ef98', 'padding': '20px' } );
+                    jQuery( '#rtm_bpm_success' ).append( 'Media has been attached with this message!' );
+					jQuery( '#send_reply_button').hide();
+					jQuery( '#send_reply_button_with_media').show();
+				}
 				activity_id = -1;
 				var hook_respo = rtMediaHook.call( 'rtmedia_js_after_files_uploaded' );
 				if ( typeof rtmedia_gallery_reload_on_upload != 'undefined' && rtmedia_gallery_reload_on_upload == '1' ) { //Reload gallery view when upload completes if enabled( by default enabled)
@@ -927,6 +949,11 @@ jQuery( function( $ ) {
 				};
 			} );
 
+			// This function will store hidden values of Media ID in Array
+        	function store_array_in_hidden_field(){
+				jQuery("#rtm_bpm_uploaded_media").attr("value", msg_media_files.toString());
+			}
+
 			uploaderObj.uploader.bind( 'BeforeUpload', function( up, file ) {
 				// We send terms conditions data on backend to validate this on server side.
 				rtMediaHook.call( 'rtmedia_js_before_upload', { uploader: up, file: file, src: 'uploader' } );
@@ -964,6 +991,30 @@ jQuery( function( $ ) {
 			} );
 
 			uploaderObj.uploader.bind( 'FileUploaded', function( up, file, res ) {
+                var uploaded_response_data = JSON.parse( res.response );
+                if( uploaded_response_data.length<=0 ){
+                    jQuery( '.rtm-media-msg-upload-button' ).html( '' );
+                    jQuery( '.rtm-media-msg-upload-button' ).removeAttr( 'id' );
+                    jQuery( '.rtm-media-msg-upload-button' ).html(
+                        jQuery( '<p>', { id: 'rtm_bpm_success' } )
+                    );
+                    jQuery( '#rtm_bpm_success' ).css(
+                        { 'background: #db001e':'#db001e', 'padding':'20px' }
+                    );
+                    jQuery( '#rtm_bpm_success' ).append(
+                        rtmedia_backbone_strings.rtm_bp_msg_media_failure
+                    );
+                } else {
+                    msg_media_files.push( uploaded_response_data['media_id'] );
+                    jQuery( '#rtm_bpm_uploaded_media' ).val(
+                        jQuery( '#rtm_bpm_uploaded_media' ).val() ?
+                            jQuery( '#rtm_bpm_uploaded_media' ).val() + ',' + uploaded_response_data[ 'media_id' ] :
+                            uploaded_response_data[ 'media_id' ]
+                    );
+                }
+
+				store_array_in_hidden_field();
+
 				if ( /MSIE (\d+\.\d+);/.test( navigator.userAgent ) ) { //Test for MSIE x.x;
 					var ieversion = new Number( RegExp.$1 ); // Capture x.x portion and store as a number
 
@@ -3010,3 +3061,4 @@ const rtMediaScrollComments = () => {
 		commentBox.scrollTo( { top: commentsToScroll, behavior: 'smooth' } );
 	}
 }
+

app/main/RTMedia.php

@@ -1398,7 +1398,9 @@ public function enqueue_scripts_styles() {
 
 		// Localizing strings for rtMedia.backbone.js.
 		$rtmedia_backbone_strings = array(
-			'rtm_edit_file_name' => esc_html__( 'Edit File Name', 'buddypress-media' ),
+			'rtm_edit_file_name'       => esc_html__( 'Edit File Name', 'buddypress-media' ),
+			'rtm_bp_msg_media_success' => esc_html__( 'Media has been attached with this message!', 'buddypress-media' ),
+			'rtm_bp_msg_media_failure' => esc_html__( 'Media attachement failed! Please try again!', 'buddypress-media' ),
 		);
 
 		// Localise fot rtmedia-backcone js.

app/main/controllers/shortcodes/RTMediaGalleryShortcode.php

@@ -99,6 +99,17 @@ public static function register_scripts() {
 		$request_uri = rtm_get_server_var( 'REQUEST_URI', 'FILTER_SANITIZE_URL' );
 		$url         = rtmedia_get_upload_url( $request_uri );
 
+		/**
+		 * @param array $url_array
+		 * @param mixed $url
+		 * Redirects to 'upload.php' when we are composing message and uplaod media with BP message
+		 */
+
+		if ( false !== strpos( $url, '/messages' ) ) {
+			$url_array = explode( '/messages', $url );
+			$url       = trailingslashit( $url_array[0] ) . 'upload/';
+		}
+
 		$upload_max_size = ( wp_max_upload_size() ) / ( 1024 * 1024 ) . 'M';
 		$params          = array(
 			'url'                 => $url,

app/main/controllers/template/rtmedia-functions.php

@@ -2680,7 +2680,7 @@ function is_rtmedia_privacy_enable() {
 	if ( isset( $rtmedia->options['privacy_enabled'] ) && 0 !== intval( $rtmedia->options['privacy_enabled'] ) ) {
 		return true;
 	}
-
+	
 	return false;
 
 }

index.php

@@ -103,6 +103,11 @@ function rtmedia_autoloader( $class_name ) {
 	}
 }
 
+/**
+ * Allow media in BuddyPress message
+ */
+require_once RTMEDIA_PATH . '/templates/media/media-with-message.php';
+
 /**
  * Register the autoloader function into spl_autoload
  */