Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Improves error messages, cleans up code

Browse Source
This commit is contained in:
Vlad
2017-11-10 15:24:37 -05:00
parent 7fea134109
commit 54dd3b621a
2 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/API/MP/v1/API.php
View File

@ -51,7 +51,10 @@ class API {
// throw exception when none of the segments exist
$found_segments = Segment::whereIn('id', $segments_ids)->findMany();
if(!$found_segments) {
throw new \Exception(__('These lists do not exist.', 'mailpoet'));
$exception = (count($segments_ids) === 1) ?
__('This list does not exist.', 'mailpoet') :
__('These lists do not exist.', 'mailpoet');
throw new \Exception($exception);
}
// throw exception when trying to subscribe to a WP Users segment
@ -66,7 +69,10 @@ class API {
// throw an exception when one or more segments do not exist
if(count($found_segments_ids) !== count($segments_ids)) {
$missing_ids = array_values(array_diff($segments_ids, $found_segments_ids));
throw new \Exception(__(sprintf('Lists with ID %s do not exist.', implode(', ', $missing_ids)), 'mailpoet'));
$exception = (count($missing_ids) === 1) ?
__('List with ID %s does not exist.', 'mailpoet') :
__('Lists with IDs %s do not exist.', 'mailpoet');
throw new \Exception(sprintf($exception, implode(', ', $missing_ids)));
}
SubscriberSegment::subscribeToSegments($subscriber, $found_segments_ids);