MDL-65101 core_message: 'canmessage' should trump 'requirescontract'

message/amd/src/message_drawer_view_conversation_patcher.js

@@ -854,6 +854,11 @@ function(
      * @return {Bool}
      */
     var requiresContactRequest = function(loggedInUserId, user) {
+        // If a user can message then no contact request is required.
+        if (user.canmessage) {
+            return false;
+        }
+
         var contactRequests = user.contactrequests.filter(function(request) {
             return request.userid == loggedInUserId || request.requesteduserid;
         });
@@ -1036,7 +1041,7 @@ function(
                         type: 'add-contact',
                         user: otherUser
                     };
-                } else if (!otherUser.canmessage || (otherUser.requirescontact && !otherUser.iscontact)) {
+                } else if (!otherUser.canmessage && (otherUser.requirescontact && !otherUser.iscontact)) {
                     return {type: 'unable-to-message'};
                 }
             }