mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-64017 core: remove group conversation check for processors

Browse Source 
We now want to allow processors to process group messages.
This commit is contained in:
Mark Nelson 2019-03-25 12:39:59 +08:00
parent ca754fc8c2
commit c210455a4c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/message/manager.php
View File

@ -202,10 +202,9 @@ class manager {
}
// Fill in the array of processors to be used based on default and user preferences.
// This applies only to individual conversations. Messages to group conversations ignore processors.
// Do not process muted conversations.
$processorlist = [];
if ($conv->type == \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL && !$recipient->ismuted) {
if (!$recipient->ismuted) {
foreach ($processors as $processor) {
// Skip adding processors for internal user, if processor doesn't support sending message to internal user.
if (!$usertoisrealuser && !$processor->object->can_send_to_any_users()) {

6
lib/tests/messagelib_test.php
View File

@ -867,11 +867,11 @@ class core_messagelib_testcase extends advanced_testcase {
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user2);
set_user_preference('message_provider_moodle_instantmessage_loggedoff', 'email', $user3);
// Now, send a message and verify the email processor is NOT hit.
// Now, send a message and verify the email processor are hit.
$sink = $this->redirectEmails();
$messageid = message_send($message);
$emails = $sink->get_messages();
$this->assertCount(0, $emails);
$this->assertCount(2, $emails);
// Verify the record was created in 'messages'.
$recordexists = $DB->record_exists('messages', ['id' => $messageid]);
@ -952,7 +952,7 @@ class core_messagelib_testcase extends advanced_testcase {
$transaction->allow_commit();
$events = $eventsink->get_events();
$emails = $sink->get_messages();
$this->assertCount(0, $emails); // Email processor is disabled for messages to group conversations.
$this->assertCount(2, $emails);
$this->assertCount(1, $events);
$this->assertInstanceOf('\core\event\group_message_sent', $events[0]);
}