From 73dbc5ca1b203758693f73d6423fea71ef6b6fb6 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Wed, 17 Feb 2016 23:44:15 +0100
Subject: [PATCH] Use ToSelector choice again.

---
 actions/newnotice.php |  3 +++
 lib/toselector.php    | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 298361d600..6ee2092061 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -190,6 +190,9 @@ class NewnoticeAction extends FormAction
             // and maybe even directly save whether they're local or not!
             $act->context->attention = common_get_attentions($content, $this->scoped, $parent);
 
+            // $options gets filled with possible scoping settings
+            ToSelector::fillActivity($this, $act, $options);
+
             $actobj = new ActivityObject();
             $actobj->type = ActivityObject::NOTE;
             $actobj->content = common_render_content($content, $this->scoped, $parent);
diff --git a/lib/toselector.php b/lib/toselector.php
index aed38e1cf6..85747b70e9 100644
--- a/lib/toselector.php
+++ b/lib/toselector.php
@@ -136,6 +136,26 @@ class ToSelector extends Widget
         $this->out->elementEnd('span');
     }
 
+    static function fillActivity(Action $action, Activity $act, array &$options)
+    {
+        if (!$act->context instanceof ActivityContext) {
+            $act->context = new ActivityContext();
+        }
+        self::fillOptions($action, $options);
+        if (isset($options['groups'])) {
+            foreach ($options['groups'] as $group_id) {
+                $group = User_group::getByID($group_id);
+                $act->context->attention[$group->getUri()] = $group->getObjectType();
+            }
+        }
+        if (isset($options['replies'])) {
+            foreach ($options['replies'] as $profile_uri) {
+                $profile = Profile::fromUri($profile_uri);
+                $act->context->attention[$profile->getUri()] = $profile->getObjectType();
+            }
+        }
+    }
+
     static function fillOptions($action, &$options)
     {
         // XXX: make arg name selectable
-- 
2.39.5