Fix filtering contacts by segments

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Campaign
 
+## 1.26.1 - 2024-11-29
+
+### Fixed
+
+- Fixed a bug in which contacts could not be filtered by segments in non-primary sites ([#504](https://github.com/putyourlightson/craft-campaign/issues/504)).
+
 ## 1.26.0 - 2024-04-17
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "putyourlightson/craft-campaign",
     "description": "Send and manage email campaigns, contacts and mailing lists.",
-    "version": "1.26.0",
+    "version": "1.26.1",
     "type": "craft-plugin",
     "homepage": "https://putyourlightson.com/plugins/campaign",
     "license": "proprietary",

src/elements/ContactElement.php

@@ -175,12 +175,13 @@ protected static function defineSources(string $context = null): array
         if (Campaign::$plugin->getIsPro()) {
             $sources[] = ['heading' => Craft::t('campaign', 'Segments')];
 
-            $segments = SegmentElement::findAll();
+            $segments = Campaign::$plugin->segments->getAllSegments();
 
             foreach ($segments as $segment) {
                 $sources[] = [
                     'key' => 'segment:'.$segment->id,
                     'label' => $segment->title,
+                    'sites' => [$segment->siteId],
                     'data' => [
                         'id' => $segment->id
                     ],

src/services/SegmentsService.php

@@ -64,6 +64,19 @@ public function getSegmentsByIds(array $segmentIds): array
             ->all();
     }
 
+    /**
+     * Returns all segments.
+     *
+     * @return SegmentElement[]
+     */
+    public function getAllSegments(): array
+    {
+        /** @var SegmentElement[]] */
+        return SegmentElement::find()
+            ->site('*')
+            ->all();
+    }
+
     /**
      * Returns the segment's contacts
      *