From d9228a80852d77e14b3900fe9be0da6200ca7fd9 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Mon, 18 Jul 2022 04:51:54 -0700
Subject: [PATCH] cleanup collect_recips

---
 Code/Lib/ActivityStreams.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/Code/Lib/ActivityStreams.php b/Code/Lib/ActivityStreams.php
index f2b4d231b..5ed4a35c2 100644
--- a/Code/Lib/ActivityStreams.php
+++ b/Code/Lib/ActivityStreams.php
@@ -186,42 +186,39 @@ class ActivityStreams
      */
     public function collect_recips($base = '', $namespace = '')
     {
-        $x = [];
-
+        $result = [];
+        $tmp = [];
+    
         $fields = ['to', 'cc', 'bto', 'bcc', 'audience'];
         foreach ($fields as $f) {
             // don't expand these yet
             $y = $this->get_property_obj($f, $base, $namespace);
             if ($y) {
-                if (!is_array($this->raw_recips)) {
-                    $this->raw_recips = [];
-                }
                 if (!is_array($y)) {
                     $y = [$y];
                 }
-                $this->raw_recips[$f] = $y;
-                $x = array_values(array_unique(array_merge($x, $y)));
+                $tmp[$f] = $y;
+                $result = array_values(array_unique(array_merge($result, $y)));
             }
             // Merge the object recipients if they exist.
             $z = $this->objprop($f);
             if ($z) {
-                if (!is_array($this->raw_recips)) {
-                    $this->raw_recips = [];
-                }
                 if (!is_array($z)) {
                     $z = [$z];
                 }
-                $this->raw_recips[$f] = (($this->raw_recips[$f]) ? array_merge($this->raw_recips[$f], $z) : z);
-                $x = array_values(array_unique(array_merge($x, $z)));
+                $tmp[$f] = (($tmp[$f]) ? array_merge($tmp[$f], $z) : $z);
+                $result = array_values(array_unique(array_merge($result, $z)));
             }
-            if (is_array($this->raw_recips[$f])) {
-                $this->raw_recips[$f] = array_values(array_unique($this->raw_recips[$f]));
+            if (is_array($tmp[$f])) {
+                $tmp[$f] = array_values(array_unique($tmp[$f]));
             }
         }
-        
+
+       $this->raw_recips = $tmp;
+    
 // not yet ready for prime time
-//      $x = $this->expand($x,$base,$namespace);
-        return $x;
+//      $result = $this->expand($result,$base,$namespace);
+        return $result;
     }
 
     public function expand($arr, $base = '', $namespace = '')