ProPeace/de.propeace.mailinglistsync
6
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

♻️ code clean-up

Browse source
This commit is contained in:
Marc Koch 2025-04-01 18:15:37 +02:00
parent 5a424771fd
commit a94a9baf4c
Signed by: marc.koch
GPG key ID: 12406554CFB028B9
4 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Civi/Mailinglistsync/EventMailingList.php
View file

@ -25,7 +25,7 @@ class EventMailingList extends BaseMailingList {
* @return array * @return array
*/ */
protected function getEntity(): array { protected function getEntity(): array {
return $this->event ?? NULL; return $this->event;
} }
/** /**
@ -39,6 +39,12 @@ class EventMailingList extends BaseMailingList {
$this->event = $value; $this->event = $value;
} }
/**
* Get a list of recipients indexed by email address.
*
* @return array List of recipients (MailListRecipient)
* @throws \Civi\Mailinglistsync\Exceptions\MailinglistException
*/
public function getRecipients(): array { public function getRecipients(): array {
try { try {
$recipientData = Contact::get() $recipientData = Contact::get()
@ -72,7 +78,7 @@ class EventMailingList extends BaseMailingList {
); );
} catch (\Exception $e) { } catch (\Exception $e) {
throw new MailinglistException( throw new MailinglistException(
"Could not create recipient object for contact with id '{$recipient['id']}'\n$e", "Could not create recipient object for contact with id '{$recipient['id']}': $e",
MailinglistException::ERROR_CODE_GET_RECIPIENTS_FAILED MailinglistException::ERROR_CODE_GET_RECIPIENTS_FAILED
); );
} }

2
Civi/Mailinglistsync/GroupMailingList.php
View file

@ -110,7 +110,7 @@ class GroupMailingList extends BaseMailingList {
} }
catch (\Exception $e) { catch (\Exception $e) {
throw new MailinglistException( throw new MailinglistException(
"Could not get recipients for group with id '{$this->group['id']}'\n$e", "Could not get recipients for group with id '{$this->group['id']}': {$e->getMessage()}",
MailinglistException::ERROR_CODE_GET_RECIPIENTS_FAILED MailinglistException::ERROR_CODE_GET_RECIPIENTS_FAILED
); );
} }

1
api/v3/Mailinglistsync/Mlmmjsync.php
View file

@ -122,6 +122,7 @@ function civicrm_api3_mailinglistsync_Mlmmjsync($params) {
} }
foreach ($mailingListsToSync as $mailingList) { foreach ($mailingListsToSync as $mailingList) {
/* @var \Civi\Mailinglistsync\BaseMailingList $mailingList */
$results['mailing_lists'][$mailingList->getEmailAddress()] = $mailingList->sync(); // TODO: re-add failed task to queue $results['mailing_lists'][$mailingList->getEmailAddress()] = $mailingList->sync(); // TODO: re-add failed task to queue
} }

20
mailinglistsync.php
View file

@ -174,26 +174,6 @@ function mailinglistsync_civicrm_validateForm($formName, &$fields, &$files, &$fo
} }
} }
function mailinglistsync_civicrm_pre($op, $objectName, $objectId, &$params) {
if ($op === 'delete' || $op === 'edit') {
if ($objectName === 'Group' || $objectName === 'Event') {
$mailingList = $objectName === 'Group'
? new GroupMailingList($objectId)
: new EventMailingList($objectId);
if ($mailingList->isEnabled()) {
// If email has changed, delete the mailing list and create a new one
if ($mailingList->getEmailAddress() !== $params['email']) {
//
}
}
}
}
}
/** /**
* Implements hook_civicrm_post() to check on permissions to alter mailing list * Implements hook_civicrm_post() to check on permissions to alter mailing list
* groups and sync group with mlmmj. * groups and sync group with mlmmj.