]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - classes/Notice.php
[OStatus] Wrong exception was being caught
[quix0rs-gnu-social.git] / classes / Notice.php
index 5c7d9f10262701ace66b02237ed1fffb4bbcf3c9..b70dd97dc36f7bf8b05521607e9addc899496f17 100644 (file)
@@ -88,9 +88,9 @@ class Notice extends Managed_DataObject
                 'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
                 'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
                 'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
-                'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'),
+                'conversation' => array('type' => 'int', 'description' => 'the local numerical conversation id'),
                 'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
-                'object_type' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'),
+                'object_type' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams object type', 'default' => null),
                 'verb' => array('type' => 'varchar', 'length' => 191, 'description' => 'URI representing activity streams verb', 'default' => 'http://activitystrea.ms/schema/1.0/post'),
                 'scope' => array('type' => 'int',
                                  'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = followers; null = default'),
@@ -110,6 +110,10 @@ class Notice extends Managed_DataObject
                 'notice_profile_id_idx' => array('profile_id', 'created', 'id'),
                 'notice_repeat_of_created_id_idx' => array('repeat_of', 'created', 'id'),
                 'notice_conversation_created_id_idx' => array('conversation', 'created', 'id'),
+                'notice_object_type_idx' => array('object_type'),
+                'notice_verb_idx' => array('verb'),
+                'notice_profile_id_verb_idx' => array('profile_id', 'verb'),
+                'notice_url_idx' => array('url'),   // Qvitter wants this
                 'notice_replyto_idx' => array('reply_to')
             )
         );
@@ -164,6 +168,18 @@ class Notice extends Managed_DataObject
             throw new AuthorizationException(_('You are not allowed to delete another user\'s notice.'));
         }
 
+        $result = null;
+        if (!$delete_event || Event::handle('DeleteNoticeAsProfile', array($this, $actor, &$result))) {
+            // If $delete_event is true, we run the event. If the Event then 
+            // returns false it is assumed everything was handled properly 
+            // and the notice was deleted.
+            $result = $this->delete();
+        }
+        return $result;
+    }
+
+    protected function deleteRelated()
+    {
         if (Event::handle('NoticeDeleteRelated', array($this))) {
             // Clear related records
             $this->clearReplies();
@@ -175,19 +191,12 @@ class Notice extends Managed_DataObject
             $this->clearAttentions();
             // NOTE: we don't clear queue items
         }
-
-        $result = null;
-        if (!$delete_event || Event::handle('DeleteNoticeAsProfile', array($this, $actor, &$result))) {
-            // If $delete_event is true, we run the event. If the Event then 
-            // returns false it is assumed everything was handled properly 
-            // and the notice was deleted.
-            $result = $this->delete();
-        }
-        return $result;
     }
 
     public function delete($useWhere=false)
     {
+        $this->deleteRelated();
+
         $result = parent::delete($useWhere);
 
         $this->blowOnDelete();
@@ -239,10 +248,10 @@ class Notice extends Managed_DataObject
         return common_local_url('shownotice', array('notice' => $this->id), null, null, false);
     }
 
-    public function getTitle()
+    public function getTitle($imply=true)
     {
         $title = null;
-        if (Event::handle('GetNoticeTitle', array($this, &$title))) {
+        if (Event::handle('GetNoticeTitle', array($this, &$title)) && $imply) {
             // TRANS: Title of a notice posted without a title value.
             // TRANS: %1$s is a user name, %2$s is the notice creation date/time.
             $title = sprintf(_('%1$s\'s status on %2$s'),
@@ -257,6 +266,36 @@ class Notice extends Managed_DataObject
         return $this->content;
     }
 
+    public function getRendered()
+    {
+        // we test $this->id because if it's not inserted yet, we can't update the field
+        if (!empty($this->id) && (is_null($this->rendered) || $this->rendered === '')) {
+            // update to include rendered content on-the-fly, so we don't have to have a fix-up script in upgrade.php
+            common_debug('Rendering notice '.$this->getID().' as it had no rendered HTML content.');
+            $orig = clone($this);
+            $this->rendered = common_render_content($this->getContent(),
+                                                    $this->getProfile(),
+                                                    $this->hasParent() ? $this->getParent() : null);
+            $this->update($orig);
+        }
+        return $this->rendered;
+    }
+
+    public function getCreated()
+    {
+        return $this->created;
+    }
+
+    public function getVerb($make_relative=false)
+    {
+        return ActivityUtils::resolveUri($this->verb, $make_relative);
+    }
+
+    public function isVerb(array $verbs)
+    {
+        return ActivityUtils::compareVerbs($this->getVerb(), $verbs);
+    }
+
     /*
      * Get the original representation URL of this notice.
      *
@@ -267,31 +306,49 @@ class Notice extends Managed_DataObject
         // The risk is we start having empty urls and non-http uris...
         // and we can't really handle any other protocol right now.
         switch (true) {
+        case $this->isLocal():
+            return common_local_url('shownotice', array('notice' => $this->getID()), null, null, false);
         case common_valid_http_url($this->url): // should we allow non-http/https URLs?
             return $this->url;
-        case !$this->isLocal() && common_valid_http_url($this->uri): // Sometimes we only have the URI for remote posts.
+        case common_valid_http_url($this->uri): // Sometimes we only have the URI for remote posts.
             return $this->uri;
-        case $this->isLocal() || $fallback:
+        case $fallback:
             // let's generate a valid link to our locally available notice on demand
-            return common_local_url('shownotice', array('notice' => $this->id), null, null, false);
+            return common_local_url('shownotice', array('notice' => $this->getID()), null, null, false);
         default:
-            common_debug('No URL available for notice: id='.$this->id);
             throw new InvalidUrlException($this->url);
         }
     }
 
+    public function getSelfLink()
+    {
+        if ($this->isLocal()) {
+            return common_local_url('ApiStatusesShow', array('id' => $this->getID(), 'format' => 'atom'));
+        }
+
+        $selfLink = $this->getPref('ostatus', 'self');
+
+        if (!common_valid_http_url($selfLink)) {
+            throw new InvalidUrlException($selfLink);
+        }
+
+        return $selfLink;
+    }
+
     public function getObjectType($canonical=false) {
+        if (is_null($this->object_type) || $this->object_type==='') {
+            throw new NoObjectTypeException($this);
+        }
         return ActivityUtils::resolveUri($this->object_type, $canonical);
     }
 
-    public static function getByUri($uri)
+    public function isObjectType(array $types)
     {
-        $notice = new Notice();
-        $notice->uri = $uri;
-        if (!$notice->find(true)) {
-            throw new NoResultException($notice);
+        try {
+            return ActivityUtils::compareTypes($this->getObjectType(), $types);
+        } catch (NoObjectTypeException $e) {
+            return false;
         }
-        return $notice;
     }
 
     /**
@@ -400,6 +457,7 @@ class Notice extends Managed_DataObject
     static function saveNew($profile_id, $content, $source, array $options=null) {
         $defaults = array('uri' => null,
                           'url' => null,
+                          'self' => null,
                           'conversation' => null,   // URI of conversation
                           'reply_to' => null,       // This will override convo URI if the parent is known
                           'repeat_of' => null,      // This will override convo URI if the repeated notice is known
@@ -462,12 +520,7 @@ class Notice extends Managed_DataObject
         $notice = new Notice();
         $notice->profile_id = $profile_id;
 
-        $autosource = common_config('public', 'autosource');
-
-        // Sandboxed are non-false, but not 1, either
-
-        if (!$profile->hasRight(Right::PUBLICNOTICE) ||
-            ($source && $autosource && in_array($source, $autosource))) {
+        if ($source && in_array($source, common_config('public', 'autosource'))) {
             $notice->is_local = Notice::LOCAL_NONPUBLIC;
         } else {
             $notice->is_local = $is_local;
@@ -481,9 +534,6 @@ class Notice extends Managed_DataObject
 
         if (!$notice->isLocal()) {
             // Only do these checks for non-local notices. Local notices will generate these values later.
-            if (!common_valid_http_url($url)) {
-                common_debug('Bad notice URL: ['.$url.'], URI: ['.$uri.']. Cannot link back to original! This is normal for shared notices etc.');
-            }
             if (empty($uri)) {
                 throw new ServerException('No URI for remote notice. Cannot accept that.');
             }
@@ -587,21 +637,30 @@ class Notice extends Managed_DataObject
                 $conv = Conversation::getKV('uri', $options['conversation']);
                 if ($conv instanceof Conversation) {
                     common_debug('Conversation stitched together from (probably) a reply to unknown remote user. Activity creation time ('.$notice->created.') should maybe be compared to conversation creation time ('.$conv->created.').');
-                    $notice->conversation = $conv->id;
                 } else {
-                    // Conversation URI was not found, so we must create it. But we can't create it
-                    // until we have a Notice ID because of the database layout...
-                    // $options['conversation'] will be used later after the $notice->insert();
-                    common_debug('Conversation URI not found, so we have to create it after inserting this Notice: '.$options['conversation']);
+                    // Conversation entry with specified URI was not found, so we must create it.
+                    common_debug('Conversation URI not found, so we will create it with the URI given in the options to Notice::saveNew: '.$options['conversation']);
+                    $convctx = new ActivityContext();
+                    $convctx->conversation = $options['conversation'];
+                    if (array_key_exists('conversation_url', $options)) {
+                        $convctx->conversation_url = $options['conversation_url'];
+                    }
+                    // The insert in Conversation::create throws exception on failure
+                    $conv = Conversation::create($convctx, $notice->created);
                 }
-            } else {
-                // If we're not using the attached conversation URI let's remove it
-                // so we don't mistake ourselves later, when creating our own Conversation.
-                // This implies that the notice knows which conversation it belongs to.
-                $options['conversation'] = null;
+                $notice->conversation = $conv->getID();
+                unset($conv);
             }
         }
 
+        // If it's not part of a conversation, it's the beginning of a new conversation.
+        if (empty($notice->conversation)) {
+            $conv = Conversation::create();
+            $notice->conversation = $conv->getID();
+            unset($conv);
+        }
+
+
         $notloc = new Notice_location();
         if (!empty($lat) && !empty($lon)) {
             $notloc->lat = $lat;
@@ -616,7 +675,9 @@ class Notice extends Managed_DataObject
         if (!empty($rendered)) {
             $notice->rendered = $rendered;
         } else {
-            $notice->rendered = common_render_content($final, $notice);
+            $notice->rendered = common_render_content($final,
+                                                      $notice->getProfile(),
+                                                      $notice->hasParent() ? $notice->getParent() : null);
         }
 
         if (empty($verb)) {
@@ -655,17 +716,6 @@ class Notice extends Managed_DataObject
                     $notloc->notice_id = $notice->getID();
                     $notloc->insert();  // store the notice location if it had any information
                 }
-
-                // If it's not part of a conversation, it's
-                // the beginning of a new conversation.
-                if (empty($notice->conversation)) {
-                    $orig = clone($notice);
-                    // $act->context->conversation will be null if it was not provided
-
-                    $conv = Conversation::create($notice, $options['conversation']);
-                    $notice->conversation = $conv->id;
-                    $notice->update($orig);
-                }
             } catch (Exception $e) {
                 // Let's test if we managed initial insert, which would imply
                 // failing on some update-part (check 'insert()'). Delete if
@@ -677,33 +727,37 @@ class Notice extends Managed_DataObject
             }
         }
 
-        // Clear the cache for subscribed users, so they'll update at next request
-        // XXX: someone clever could prepend instead of clearing the cache
-
-        // Save per-notice metadata...
-
-        if (isset($replies)) {
-            $notice->saveKnownReplies($replies);
-        } else {
-            $notice->saveReplies();
+        if ($self && common_valid_http_url($self)) {
+            $notice->setPref('ostatus', 'self', $self);
         }
 
-        if (isset($tags)) {
-            $notice->saveKnownTags($tags);
-        } else {
-            $notice->saveTags();
-        }
+        // Only save 'attention' and metadata stuff (URLs, tags...) stuff if
+        // the activityverb is a POST (since stuff like repeat, favorite etc.
+        // reasonably handle notifications themselves.
+        if (ActivityUtils::compareVerbs($notice->verb, array(ActivityVerb::POST))) {
+            if (isset($replies)) {
+                $notice->saveKnownReplies($replies);
+            } else {
+                $notice->saveReplies();
+            }
 
-        // Note: groups may save tags, so must be run after tags are saved
-        // to avoid errors on duplicates.
-        // Note: groups should always be set.
+            if (isset($tags)) {
+                $notice->saveKnownTags($tags);
+            } else {
+                $notice->saveTags();
+            }
 
-        $notice->saveKnownGroups($groups);
+            // Note: groups may save tags, so must be run after tags are saved
+            // to avoid errors on duplicates.
+            // Note: groups should always be set.
 
-        if (isset($urls)) {
-            $notice->saveKnownUrls($urls);
-        } else {
-            $notice->saveUrls();
+            $notice->saveKnownGroups($groups);
+
+            if (isset($urls)) {
+                $notice->saveKnownUrls($urls);
+            } else {
+                $notice->saveUrls();
+            }
         }
 
         if ($distribute) {
@@ -731,12 +785,16 @@ class Notice extends Managed_DataObject
         }
 
         // Get ActivityObject properties
+        $actobj = null;
         if (!empty($act->id)) {
             // implied object
             $options['uri'] = $act->id;
             $options['url'] = $act->link;
+            if ($act->selfLink) {
+                $options['self'] = $act->selfLink;
+            }
         } else {
-            $actobj = count($act->objects)==1 ? $act->objects[0] : null;
+            $actobj = count($act->objects)===1 ? $act->objects[0] : null;
             if (!is_null($actobj) && !empty($actobj->id)) {
                 $options['uri'] = $actobj->id;
                 if ($actobj->link) {
@@ -745,15 +803,19 @@ class Notice extends Managed_DataObject
                     $options['url'] = $actobj->id;
                 }
             }
+            if ($actobj->selfLink) {
+                $options['self'] = $actobj->selfLink;
+            }
         }
 
         $defaults = array(
                           'groups'   => array(),
-                          'is_local' => self::LOCAL_PUBLIC,
+                          'is_local' => $actor->isLocal() ? self::LOCAL_PUBLIC : self::REMOTE,
                           'mentions' => array(),
                           'reply_to' => null,
                           'repeat_of' => null,
                           'scope' => null,
+                          'self' => null,
                           'source' => 'unknown',
                           'tags' => array(),
                           'uri' => null,
@@ -775,31 +837,52 @@ class Notice extends Managed_DataObject
             $stored->uri = $uri;
             if ($stored->find()) {
                 common_debug('cannot create duplicate Notice URI: '.$stored->uri);
-                throw new Exception('Notice URI already exists');
+                // I _assume_ saving a Notice with a colliding URI means we're really trying to
+                // save the same notice again...
+                throw new AlreadyFulfilledException('Notice URI already exists');
+            }
+        }
+
+        // NOTE: Sandboxed users previously got all the notices _during_
+        // sandbox period set to to is_local=Notice::LOCAL_NONPUBLIC here.
+        // Since then we have started just filtering _when_ it gets shown
+        // instead of creating a mixed jumble of differently scoped notices.
+
+        if ($source && in_array($source, common_config('public', 'autosource'))) {
+            $stored->is_local = Notice::LOCAL_NONPUBLIC;
+        } else {
+            $stored->is_local = intval($is_local);
+        }
+
+        if (!$stored->isLocal()) {
+            // Only do these checks for non-local notices. Local notices will generate these values later.
+            if (!common_valid_http_url($url)) {
+                common_debug('Bad notice URL: ['.$url.'], URI: ['.$uri.']. Cannot link back to original! This is normal for shared notices etc.');
+            }
+            if (empty($uri)) {
+                throw new ServerException('No URI for remote notice. Cannot accept that.');
             }
         }
 
-        $stored->profile_id = $actor->id;
+        $stored->profile_id = $actor->getID();
         $stored->source = $source;
         $stored->uri = $uri;
         $stored->url = $url;
         $stored->verb = $act->verb;
 
-        // Use the local user's shortening preferences, if applicable.
-        $stored->rendered = $actor->isLocal()
-                                ? $actor->shortenLinks($act->content)
-                                : $act->content;
-        $stored->content = common_strip_html($stored->rendered);
-
-        $autosource = common_config('public', 'autosource');
-
-        // Sandboxed are non-false, but not 1, either
-        if (!$actor->hasRight(Right::PUBLICNOTICE) ||
-            ($source && $autosource && in_array($source, $autosource))) {
-            $stored->is_local = Notice::LOCAL_NONPUBLIC;
-        } else {
-            $stored->is_local = $is_local;
+        // we use mb_strlen because it _might_ be that the content is just the string "0"...
+        $content = mb_strlen($act->content) ? $act->content : $act->summary;
+        if (mb_strlen($content)===0 && !is_null($actobj)) {
+            $content = mb_strlen($actobj->content) ? $actobj->content : $actobj->summary;
+        }
+        // Strip out any bad HTML from $content. URI.Base is used to sort out relative URLs.
+        $stored->rendered = common_purify($content, ['URI.Base' => $stored->url ?: null]);
+        $stored->content  = common_strip_html($stored->getRendered(), true, true);
+        if (trim($stored->content) === '') {
+            // TRANS: Error message when the plain text content of a notice has zero length.
+            throw new ClientException(_('Empty notice content, will not save this.'));
         }
+        unset($content);    // garbage collect
 
         // Maybe a missing act-time should be fatal if the actor is not local?
         if (!empty($act->time)) {
@@ -808,13 +891,31 @@ class Notice extends Managed_DataObject
             $stored->created = common_sql_now();
         }
 
-        $reply = null;
+        $reply = null;  // this will store the in-reply-to Notice if found
+        $replyUris = [];    // this keeps a list of possible URIs to look up
         if ($act->context instanceof ActivityContext && !empty($act->context->replyToID)) {
-            $reply = self::getKV('uri', $act->context->replyToID);
+            $replyUris[] = $act->context->replyToID;
         }
-        if (!$reply instanceof Notice && $act->target instanceof ActivityObject) {
-            $reply = self::getKV('uri', $act->target->id);
+        if ($act->target instanceof ActivityObject && !empty($act->target->id)) {
+            $replyUris[] = $act->target->id;
         }
+        foreach (array_unique($replyUris) as $replyUri) {
+            $reply = self::getKV('uri', $replyUri);
+            // Only do remote fetching if we're not a private site
+            if (!common_config('site', 'private') && !$reply instanceof Notice) {
+                // the URI is the object we're looking for, $actor is a
+                // Profile that surely knows of it and &$reply where it
+                // will be stored when fetched
+                Event::handle('FetchRemoteNotice', array($replyUri, $actor, &$reply));
+            }
+            // we got what we're in-reply-to now, so let's move on
+            if ($reply instanceof Notice) {
+                break;
+            }
+            // otherwise reset whatever we might've gotten from the event
+            $reply = null;
+        }
+        unset($replyUris);  // garbage collect
 
         if ($reply instanceof Notice) {
             if (!$reply->inScope($actor)) {
@@ -829,7 +930,6 @@ class Notice extends Managed_DataObject
             // If the original is private to a group, and notice has no group specified,
             // make it to the same group(s)
             if (empty($groups) && ($reply->scope & Notice::GROUP_SCOPE)) {
-                $groups = array();
                 $replyGroups = $reply->getGroups();
                 foreach ($replyGroups as $group) {
                     if ($actor->isMember($group)) {
@@ -849,15 +949,24 @@ class Notice extends Managed_DataObject
                 $conv = Conversation::getKV('uri', $act->context->conversation);
                 if ($conv instanceof Conversation) {
                     common_debug('Conversation stitched together from (probably) a reply activity to unknown remote user. Activity creation time ('.$stored->created.') should maybe be compared to conversation creation time ('.$conv->created.').');
-                    $stored->conversation = $conv->getID();
                 } else {
-                    // Conversation URI was not found, so we must create it. But we can't create it
-                    // until we have a Notice ID because of the database layout...
-                    // $options['conversation'] will be used later after the $stored->insert();
-                    common_debug('Conversation URI from activity context not found, so we have to create it after inserting this Notice: '.$act->context->conversation);
+                    // Conversation entry with specified URI was not found, so we must create it.
+                    common_debug('Conversation URI not found, so we will create it with the URI given in the context of the activity: '.$act->context->conversation);
+                    // The insert in Conversation::create throws exception on failure
+                    $conv = Conversation::create($act->context, $stored->created);
                 }
+                $stored->conversation = $conv->getID();
+                unset($conv);
             }
         }
+        unset($reply);  // garbage collect
+
+        // If it's not part of a conversation, it's the beginning of a new conversation.
+        if (empty($stored->conversation)) {
+            $conv = Conversation::create();
+            $stored->conversation = $conv->getID();
+            unset($conv);
+        }
 
         $notloc = null;
         if ($act->context instanceof ActivityContext) {
@@ -868,7 +977,13 @@ class Notice extends Managed_DataObject
             $act->context = new ActivityContext();
         }
 
-        $stored->scope = self::figureOutScope($actor, $groups, $scope);
+        if (array_key_exists(ActivityContext::ATTN_PUBLIC, $act->context->attention)) {
+            $stored->scope = Notice::PUBLIC_SCOPE;
+            // TODO: maybe we should actually keep this? if the saveAttentions thing wants to use it...
+            unset($act->context->attention[ActivityContext::ATTN_PUBLIC]);
+        } else {
+            $stored->scope = self::figureOutScope($actor, $groups, $scope);
+        }
 
         foreach ($act->categories as $cat) {
             if ($cat->term) {
@@ -913,18 +1028,11 @@ class Notice extends Managed_DataObject
                 $object = null;
                 Event::handle('StoreActivityObject', array($act, $stored, $options, &$object));
                 if (empty($object)) {
-                    throw new ServerException('Unsuccessful call to StoreActivityObject '.$stored->getUri() . ': '.$act->asString());
-                }
-
-                // If it's not part of a conversation, it's the beginning
-                // of a new one (or belongs to a previously unknown URI).
-                if (empty($stored->conversation)) {
-                    // $act->context->conversation will be null if it was not provided
-                    common_debug('Creating a new conversation for stored notice ID='.$stored->getID().' with URI: '.$act->context->conversation);
-                    $conv = Conversation::create($stored, $act->context->conversation);
-                    $stored->conversation = $conv->getID();
+                    throw new NoticeSaveException('Unsuccessful call to StoreActivityObject '._ve($stored->getUri()) . ': '._ve($act->asString()));
                 }
+                unset($object);
 
+                // If something changed in the Notice during StoreActivityObject
                 $stored->update($orig);
             } catch (Exception $e) {
                 if (empty($stored->id)) {
@@ -936,40 +1044,42 @@ class Notice extends Managed_DataObject
                 throw $e;
             }
         }
+        unset($notloc); // garbage collect
+
         if (!$stored instanceof Notice) {
-            throw new ServerException('StartNoticeSave did not give back a Notice');
+            throw new ServerException('StartNoticeSave did not give back a Notice.');
+        } elseif (empty($stored->id)) {
+            throw new ServerException('Supposedly saved Notice has no ID.');
         }
 
-        // Save per-notice metadata...
-        $mentions = array();
-        $groups   = array();
-
-        // This event lets plugins filter out non-local recipients (attentions we don't care about)
-        // Used primarily for OStatus (and if we don't federate, all attentions would be local anyway)
-        Event::handle('GetLocalAttentions', array($actor, $act->context->attention, &$mentions, &$groups));
-
-        if (!empty($mentions)) {
-            $stored->saveKnownReplies($mentions);
-        } else {
-            $stored->saveReplies();
+        if ($self && common_valid_http_url($self)) {
+            $stored->setPref('ostatus', 'self', $self);
         }
 
-        if (!empty($tags)) {
-            $stored->saveKnownTags($tags);
-        } else {
-            $stored->saveTags();
+        if ($self && common_valid_http_url($self)) {
+            $stored->setPref('ostatus', 'self', $self);
         }
 
-        // Note: groups may save tags, so must be run after tags are saved
-        // to avoid errors on duplicates.
-        // Note: groups should always be set.
+        // Only save 'attention' and metadata stuff (URLs, tags...) stuff if
+        // the activityverb is a POST (since stuff like repeat, favorite etc.
+        // reasonably handle notifications themselves.
+        if (ActivityUtils::compareVerbs($stored->verb, array(ActivityVerb::POST))) {
+
+            if (!empty($tags)) {
+                $stored->saveKnownTags($tags);
+            } else {
+                $stored->saveTags();
+            }
 
-        $stored->saveKnownGroups($groups);
+            // Note: groups may save tags, so must be run after tags are saved
+            // to avoid errors on duplicates.
+            $stored->saveAttentions($act->context->attention);
 
-        if (!empty($urls)) {
-            $stored->saveKnownUrls($urls);
-        } else {
-            $stored->saveUrls();
+            if (!empty($urls)) {
+                $stored->saveKnownUrls($urls);
+            } else {
+                $stored->saveUrls();
+            }
         }
 
         if ($distribute) {
@@ -981,15 +1091,13 @@ class Notice extends Managed_DataObject
     }
 
     static public function figureOutScope(Profile $actor, array $groups, $scope=null) {
-        if (is_null($scope)) {
-            $scope = self::defaultScope();
-        }
+        $scope = is_null($scope) ? self::defaultScope() : intval($scope);
 
         // For private streams
         try {
             $user = $actor->getUser();
             // FIXME: We can't do bit comparison with == (Legacy StatusNet thing. Let's keep it for now.)
-            if ($user->private_stream && ($scope == Notice::PUBLIC_SCOPE || $scope == Notice::SITE_SCOPE)) {
+            if ($user->private_stream && ($scope === Notice::PUBLIC_SCOPE || $scope === Notice::SITE_SCOPE)) {
                 $scope |= Notice::FOLLOWER_SCOPE;
             }
         } catch (NoSuchUserException $e) {
@@ -1021,8 +1129,10 @@ class Notice extends Managed_DataObject
             $this->blowStream('networkpublic');
         }
 
-        self::blow('notice:list-ids:conversation:%s', $this->conversation);
-        self::blow('conversation:notice_count:%d', $this->conversation);
+        if ($this->conversation) {
+            self::blow('notice:list-ids:conversation:%s', $this->conversation);
+            self::blow('conversation:notice_count:%d', $this->conversation);
+        }
 
         if ($this->isRepeat()) {
             // XXX: we should probably only use one of these
@@ -1212,14 +1322,12 @@ class Notice extends Managed_DataObject
             $ids[] = $f2p->file_id;
         }
 
-               $files = File::multiGet('id', $ids);
-               $this->_attachments[$this->id] = $files->fetchAll();
-        return $this->_attachments[$this->id];
+        return $this->_setAttachments(File::multiGet('id', $ids)->fetchAll());
     }
 
-       function _setAttachments($attachments)
+       public function _setAttachments(array $attachments)
        {
-           $this->_attachments[$this->id] = $attachments;
+           return $this->_attachments[$this->id] = $attachments;
        }
 
     static function publicStream($offset=0, $limit=20, $since_id=null, $max_id=null)
@@ -1228,9 +1336,9 @@ class Notice extends Managed_DataObject
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 
-    static function conversationStream($id, $offset=0, $limit=20, $since_id=null, $max_id=null)
+    static function conversationStream($id, $offset=0, $limit=20, $since_id=null, $max_id=null, Profile $scoped=null)
     {
-        $stream = new ConversationNoticeStream($id);
+        $stream = new ConversationNoticeStream($id, $scoped);
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 
@@ -1248,8 +1356,9 @@ class Notice extends Managed_DataObject
             return false;
         }
 
-        $stream = new ConversationNoticeStream($this->conversation);
-        $notice = $stream->getNotices(/*offset*/ 1, /*limit*/ 1);
+        //FIXME: Get the Profile::current() stuff some other way
+        // to avoid confusion between queue processing and session.
+        $notice = self::conversationStream($this->conversation, 1, 1, null, null, Profile::current());
 
         // if our "offset 1, limit 1" query got a result, return true else false
         return $notice->N > 0;
@@ -1458,12 +1567,16 @@ class Notice extends Managed_DataObject
 
     function getProfileTags()
     {
-        $profile = $this->getProfile();
-        $list    = $profile->getOtherTags($profile);
         $ptags   = array();
+        try {
+            $profile = $this->getProfile();
+            $list    = $profile->getOtherTags($profile);
 
-        while($list->fetch()) {
-            $ptags[] = clone($list);
+            while($list->fetch()) {
+                $ptags[] = clone($list);
+            }
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "Error during Notice->getProfileTags() for id=={$this->getID()}: {$e->getMessage()}");
         }
 
         return $ptags;
@@ -1491,13 +1604,8 @@ class Notice extends Managed_DataObject
      *        best with generalizations on user_group to support
      *        remote groups better.
      */
-    function saveKnownGroups($group_ids)
+    function saveKnownGroups(array $group_ids)
     {
-        if (!is_array($group_ids)) {
-            // TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-            throw new ServerException(_('Bad type provided to saveKnownGroups.'));
-        }
-
         $groups = array();
         foreach (array_unique($group_ids) as $id) {
             $group = User_group::getKV('id', $id);
@@ -1510,12 +1618,12 @@ class Notice extends Managed_DataObject
 
                 if (common_config('group', 'addtag')) {
                     // we automatically add a tag for every group name, too
-
-                    $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->nickname),
-                                                     'notice_id' => $this->id));
+                    common_debug('Adding hashtag matching group nickname: '._ve($group->getNickname()));
+                    $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->getNickname()),
+                                                     'notice_id' => $this->getID()));
 
                     if (is_null($tag)) {
-                        $this->saveTag($group->nickname);
+                        $this->saveTag($group->getNickname());
                     }
                 }
 
@@ -1555,6 +1663,53 @@ class Notice extends Managed_DataObject
         return true;
     }
 
+    function saveAttentions(array $uris)
+    {
+        foreach ($uris as $uri=>$type) {
+            try {
+                $target = Profile::fromUri($uri);
+            } catch (UnknownUriException $e) {
+                common_log(LOG_WARNING, "Unable to determine profile for URI '$uri'");
+                continue;
+            }
+
+            try {
+                $this->saveAttention($target);
+            } catch (AlreadyFulfilledException $e) {
+                common_debug('Attention already exists: '.var_export($e->getMessage(),true));
+            } catch (Exception $e) {
+                common_log(LOG_ERR, "Could not save notice id=={$this->getID()} attention for profile id=={$target->getID()}: {$e->getMessage()}");
+            }
+        }
+    }
+
+    /**
+     * Saves an attention for a profile (user or group) which means
+     * it shows up in their home feed and such.
+     */
+    function saveAttention(Profile $target, $reason=null)
+    {
+        if ($target->isGroup()) {
+            // FIXME: Make sure we check (for both local and remote) users are in the groups they send to!
+
+            // legacy notification method, will still be in use for quite a while I think
+            $this->addToGroupInbox($target->getGroup());
+        } else {
+            if ($target->hasBlocked($this->getProfile())) {
+                common_log(LOG_INFO, "Not saving reply to profile {$target->id} ($uri) from sender {$sender->id} because of a block.");
+                return false;
+            }
+        }
+
+        if ($target->isLocal()) {
+            // legacy notification method, will still be in use for quite a while I think
+            $this->saveReply($target->getID());
+        }
+
+        $att = Attention::saveNew($this, $target, $reason);
+        return true;
+    }
+
     /**
      * Save reply records indicating that this notice needs to be
      * delivered to the local users with the given URIs.
@@ -1573,7 +1728,7 @@ class Notice extends Managed_DataObject
             return;
         }
 
-        $sender = Profile::getKV($this->profile_id);
+        $sender = $this->getProfile();
 
         foreach (array_unique($uris) as $uri) {
             try {
@@ -1588,11 +1743,9 @@ class Notice extends Managed_DataObject
                 continue;
             }
 
-            $this->saveReply($profile->id);
-            self::blow('reply:stream:%d', $profile->id);
+            $this->saveReply($profile->getID());
+            self::blow('reply:stream:%d', $profile->getID());
         }
-
-        return;
     }
 
     /**
@@ -1607,12 +1760,6 @@ class Notice extends Managed_DataObject
 
     function saveReplies()
     {
-        // Don't save reply data for repeats
-
-        if ($this->isRepeat()) {
-            return array();
-        }
-
         $sender = $this->getProfile();
 
         $replied = array();
@@ -1621,22 +1768,21 @@ class Notice extends Managed_DataObject
         try {
             $parent = $this->getParent();
             $parentauthor = $parent->getProfile();
-            $this->saveReply($parentauthor->id);
-            $replied[$parentauthor->id] = 1;
-            self::blow('reply:stream:%d', $parentauthor->id);
+            $this->saveReply($parentauthor->getID());
+            $replied[$parentauthor->getID()] = 1;
+            self::blow('reply:stream:%d', $parentauthor->getID());
         } catch (NoParentNoticeException $e) {
             // Not a reply, since it has no parent!
+            $parent = null;
         } catch (NoResultException $e) {
             // Parent notice was probably deleted
+            $parent = null;
         }
 
         // @todo ideally this parser information would only
         // be calculated once.
 
-        $mentions = common_find_mentions($this->content, $this);
-
-        // store replied only for first @ (what user/notice what the reply directed,
-        // we assume first @ is it)
+        $mentions = common_find_mentions($this->content, $sender, $parent);
 
         foreach ($mentions as $mention) {
 
@@ -1648,9 +1794,7 @@ class Notice extends Managed_DataObject
                 }
 
                 // Don't save replies from blocked profile to local user
-
-                $mentioned_user = User::getKV('id', $mentioned->id);
-                if ($mentioned_user instanceof User && $mentioned_user->hasBlocked($sender)) {
+                if ($mentioned->hasBlocked($sender)) {
                     continue;
                 }
 
@@ -1678,6 +1822,23 @@ class Notice extends Managed_DataObject
         return $reply;
     }
 
+    protected $_attentionids = array();
+
+    /**
+     * Pull the complete list of known activity context attentions for this notice.
+     *
+     * @return array of integer profile ids (also group profiles)
+     */
+    function getAttentionProfileIDs()
+    {
+        if (!isset($this->_attentionids[$this->getID()])) {
+            $atts = Attention::multiGet('notice_id', array($this->getID()));
+            // (array)null means empty array
+            $this->_attentionids[$this->getID()] = (array)$atts->fetchAll('profile_id');
+        }
+        return $this->_attentionids[$this->getID()];
+    }
+
     protected $_replies = array();
 
     /**
@@ -1704,11 +1865,11 @@ class Notice extends Managed_DataObject
      *
      * @return array of Profiles
      */
-    function getReplyProfiles()
+    function getAttentionProfiles()
     {
-        $ids = $this->getReplies();
+        $ids = array_unique(array_merge($this->getReplies(), $this->getGroupProfileIDs(), $this->getAttentionProfileIDs()));
 
-        $profiles = Profile::multiGet('id', $ids);
+        $profiles = Profile::multiGet('id', (array)$ids);
 
         return $profiles->fetchAll();
     }
@@ -1722,7 +1883,6 @@ class Notice extends Managed_DataObject
     function sendReplyNotifications()
     {
         // Don't send reply notifications for repeats
-
         if ($this->isRepeat()) {
             return array();
         }
@@ -1732,15 +1892,34 @@ class Notice extends Managed_DataObject
             require_once INSTALLDIR.'/lib/mail.php';
 
             foreach ($recipientIds as $recipientId) {
-                $user = User::getKV('id', $recipientId);
-                if ($user instanceof User) {
-                    mail_notify_attn($user, $this);
+                try {
+                    $user = User::getByID($recipientId);
+                    mail_notify_attn($user->getProfile(), $this);
+                } catch (NoResultException $e) {
+                    // No such user
                 }
             }
             Event::handle('EndNotifyMentioned', array($this, $recipientIds));
         }
     }
 
+    /**
+     * Pull list of Profile IDs of groups this notice addresses.
+     *
+     * @return array of Group _profile_ IDs
+     */
+
+    function getGroupProfileIDs()
+    {
+        $ids = array();
+
+               foreach ($this->getGroups() as $group) {
+                   $ids[] = $group->profile_id;
+               }
+
+        return $ids;
+    }
+
     /**
      * Pull list of groups this notice needs to be delivered to,
      * as previously recorded by saveKnownGroups().
@@ -1783,9 +1962,11 @@ class Notice extends Managed_DataObject
     /**
      * Convert a notice into an activity for export.
      *
-     * @param Profile $scoped   The currently logged in/scoped profile
+     * @param Profile $scoped The currently logged in/scoped profile
      *
      * @return Activity activity object representing this Notice.
+     * @throws ClientException
+     * @throws ServerException
      */
 
     function asActivity(Profile $scoped=null)
@@ -1807,7 +1988,7 @@ class Notice extends Managed_DataObject
                 // The notice is probably a share or similar, which don't
                 // have a representational URL of their own.
             }
-            $act->content = common_xml_safe_str($this->rendered);
+            $act->content = common_xml_safe_str($this->getRendered());
 
             $profile = $this->getProfile();
 
@@ -1869,22 +2050,15 @@ class Notice extends Managed_DataObject
                 $conv = Conversation::getKV('id', $this->conversation);
                 if ($conv instanceof Conversation) {
                     $ctx->conversation = $conv->uri;
+                    $ctx->conversation_url = $conv->url;
                 }
             }
 
-            $reply_ids = $this->getReplies();
-
-            foreach ($reply_ids as $id) {
-                $rprofile = Profile::getKV('id', $id);
-                if ($rprofile instanceof Profile) {
-                    $ctx->attention[$rprofile->getUri()] = ActivityObject::PERSON;
-                }
-            }
-
-            $groups = $this->getGroups();
-
-            foreach ($groups as $group) {
-                $ctx->attention[$group->getUri()] = ActivityObject::GROUP;
+            // This covers the legacy getReplies and getGroups too which get their data
+            // from entries stored via Notice::saveNew (which we want to move away from)...
+            foreach ($this->getAttentionProfiles() as $target) {
+                // User and group profiles which get the attention of this notice
+                $ctx->attention[$target->getUri()] = $target->getObjectType();
             }
 
             switch ($this->scope) {
@@ -1939,9 +2113,12 @@ class Notice extends Managed_DataObject
                 }
             }
 
+            try {
+                $act->selfLink = $this->getSelfLink();
+            } catch (InvalidUrlException $e) {
+                $act->selfLink = null;
+            }
             if ($this->isLocal()) {
-                $act->selfLink = common_local_url('ApiStatusesShow', array('id' => $this->id,
-                                                                           'format' => 'atom'));
                 $act->editLink = $act->selfLink;
             }
 
@@ -1992,11 +2169,7 @@ class Notice extends Managed_DataObject
             if (!empty($ns->url)) {
                 $noticeInfoAttr['source_link'] = $ns->url;
                 if (!empty($ns->name)) {
-                    $noticeInfoAttr['source'] =  '<a href="'
-                        . htmlspecialchars($ns->url)
-                        . '" rel="nofollow">'
-                        . htmlspecialchars($ns->name)
-                        . '</a>';
+                    $noticeInfoAttr['source'] = $ns->name;
                 }
             }
         }
@@ -2039,15 +2212,26 @@ class Notice extends Managed_DataObject
         if (Event::handle('StartActivityObjectFromNotice', array($this, &$object))) {
             $object->type    = $this->object_type ?: ActivityObject::NOTE;
             $object->id      = $this->getUri();
+            //FIXME: = $object->title ?: sprintf(... because we might get a title from StartActivityObjectFromNotice
             $object->title   = sprintf('New %1$s by %2$s', ActivityObject::canonicalType($object->type), $this->getProfile()->getNickname());
-            $object->content = $this->rendered;
+            $object->content = $this->getRendered();
             $object->link    = $this->getUrl();
+            try {
+                $object->selfLink = $this->getSelfLink();
+            } catch (InvalidUrlException $e) {
+                $object->selfLink = null;
+            }
 
-            $object->extra[] = array('status_net', array('notice_id' => $this->id));
+            $object->extra[] = array('statusnet:notice_id', null, $this->id);
 
             Event::handle('EndActivityObjectFromNotice', array($this, &$object));
         }
 
+        if (!$object instanceof ActivityObject) {
+            common_log(LOG_ERR, 'Notice asActivityObject created something else for uri=='._ve($this->getUri()).': '._ve($object));
+            throw new ServerException('Notice asActivityObject created something else.');
+        }
+
         return $object;
     }
 
@@ -2361,8 +2545,11 @@ class Notice extends Managed_DataObject
         // If there's a failure, we want to _force_
         // distribution at this point.
         try {
+            $json = json_encode((object)array('id' => $this->getID(),
+                                              'type' => 'Notice',
+                                              ));
             $qm = QueueManager::get();
-            $qm->enqueue($this, 'distrib');
+            $qm->enqueue($json, 'distrib');
         } catch (Exception $e) {
             // If the exception isn't transient, this
             // may throw more exceptions as DQH does
@@ -2473,8 +2660,13 @@ class Notice extends Managed_DataObject
 
     public function isLocal()
     {
-        return ($this->is_local == Notice::LOCAL_PUBLIC ||
-                $this->is_local == Notice::LOCAL_NONPUBLIC);
+        $is_local = intval($this->is_local);
+        return ($is_local === self::LOCAL_PUBLIC || $is_local === self::LOCAL_NONPUBLIC);
+    }
+
+    public function getScope()
+    {
+        return intval($this->scope);
     }
 
     public function isRepeat()
@@ -2482,6 +2674,13 @@ class Notice extends Managed_DataObject
         return !empty($this->repeat_of);
     }
 
+    public function isRepeated()
+    {
+        $n = new Notice();
+        $n->repeat_of = $this->getID();
+        return $n->find() && $n->N > 0;
+    }
+
     /**
      * Get the list of hash tags saved with this notice.
      *
@@ -2527,21 +2726,21 @@ class Notice extends Managed_DataObject
      */
     public static function getAsTimestamp($id)
     {
-        if (!$id) {
-            return false;
+        if (empty($id)) {
+            throw new EmptyPkeyValueException('Notice', 'id');
         }
 
-        $notice = Notice::getKV('id', $id);
-        if ($notice) {
-            return $notice->created;
+        $timestamp = null;
+        if (Event::handle('GetNoticeSqlTimestamp', array($id, &$timestamp))) {
+            // getByID throws exception if $id isn't found
+            $notice = Notice::getByID($id);
+            $timestamp = $notice->created;
         }
 
-        $deleted = Deleted_notice::getKV('id', $id);
-        if ($deleted) {
-            return $deleted->created;
+        if (empty($timestamp)) {
+            throw new ServerException('No timestamp found for Notice with id=='._ve($id));
         }
-
-        return false;
+        return $timestamp;
     }
 
     /**
@@ -2557,11 +2756,12 @@ class Notice extends Managed_DataObject
      */
     public static function whereSinceId($id, $idField='id', $createdField='created')
     {
-        $since = Notice::getAsTimestamp($id);
-        if ($since) {
-            return sprintf("($createdField = '%s' and $idField > %d) or ($createdField > '%s')", $since, $id, $since);
+        try {
+            $since = Notice::getAsTimestamp($id);
+        } catch (Exception $e) {
+            return false;
         }
-        return false;
+        return sprintf("($createdField = '%s' and $idField > %d) or ($createdField > '%s')", $since, $id, $since);
     }
 
     /**
@@ -2596,11 +2796,12 @@ class Notice extends Managed_DataObject
      */
     public static function whereMaxId($id, $idField='id', $createdField='created')
     {
-        $max = Notice::getAsTimestamp($id);
-        if ($max) {
-            return sprintf("($createdField < '%s') or ($createdField = '%s' and $idField <= %d)", $max, $max, $id);
+        try {
+            $max = Notice::getAsTimestamp($id);
+        } catch (Exception $e) {
+            return false;
         }
-        return false;
+        return sprintf("($createdField < '%s') or ($createdField = '%s' and $idField <= %d)", $max, $max, $id);
     }
 
     /**
@@ -2622,10 +2823,10 @@ class Notice extends Managed_DataObject
         }
     }
 
-    function isPublic()
+    public function isPublic()
     {
-        return (($this->is_local != Notice::LOCAL_NONPUBLIC) &&
-                ($this->is_local != Notice::GATEWAY));
+        $is_local = intval($this->is_local);
+        return !($is_local === Notice::LOCAL_NONPUBLIC || $is_local === Notice::GATEWAY);
     }
 
     /**
@@ -2667,13 +2868,9 @@ class Notice extends Managed_DataObject
 
     protected function _inScope($profile)
     {
-        if (!is_null($this->scope)) {
-            $scope = $this->scope;
-        } else {
-            $scope = self::defaultScope();
-        }
+        $scope = is_null($this->scope) ? self::defaultScope() : $this->getScope();
 
-        if ($scope == 0 && !$this->getProfile()->isPrivateStream()) { // Not scoping, so it is public.
+        if ($scope === 0 && !$this->getProfile()->isPrivateStream()) { // Not scoping, so it is public.
             return !$this->isHiddenSpam($profile);
         }
 
@@ -2758,12 +2955,35 @@ class Notice extends Managed_DataObject
         return false;
     }
 
+    public function hasParent()
+    {
+        try {
+            $this->getParent();
+        } catch (NoParentNoticeException $e) {
+            return false;
+        }
+        return true;
+    }
+
     public function getParent()
     {
+        $reply_to_id = null;
+
         if (empty($this->reply_to)) {
             throw new NoParentNoticeException($this);
         }
-        return self::getByID($this->reply_to);
+
+        // The reply_to ID in the table Notice could exist with a number
+        // however, the replied to notice might not exist in the database.
+        // Thus we need to catch the exception and throw the NoParentNoticeException else
+        // the timeline will not display correctly.
+        try {
+            $reply_to_id = self::getByID($this->reply_to);
+        } catch(Exception $e){
+            throw new NoParentNoticeException($this);
+        }
+
+        return $reply_to_id;
     }
 
     /**
@@ -2876,6 +3096,19 @@ class Notice extends Managed_DataObject
                        $files = array();
                        $f2ps = $f2pMap[$notice->id];
                        foreach ($f2ps as $f2p) {
+                if (!isset($fileMap[$f2p->file_id])) {
+                    // We have probably deleted value from fileMap since
+                    // it as a NULL entry (see the following elseif).
+                    continue;
+                } elseif (is_null($fileMap[$f2p->file_id])) {
+                    // If the file id lookup returned a NULL value, it doesn't
+                    // exist in our file table! So this is a remnant file_to_post
+                    // entry that is no longer valid and should be removed.
+                    common_debug('ATTACHMENT deleting f2p for post_id='.$f2p->post_id.' file_id='.$f2p->file_id);
+                    $f2p->delete();
+                    unset($fileMap[$f2p->file_id]);
+                    continue;
+                }
                            $files[] = $fileMap[$f2p->file_id];
                        }
                    $notice->_setAttachments($files);
@@ -2904,42 +3137,136 @@ class Notice extends Managed_DataObject
 
         // 2015-09-04 We move Notice location data to Notice_location
         // First we see if we have to do this at all
-        if (!isset($schemadef['fields']['lat'])
-                && !isset($schemadef['fields']['lon'])
-                && !isset($schemadef['fields']['location_id'])
-                && !isset($schemadef['fields']['location_ns'])) {
-            // We have already removed the location fields, so no need to migrate.
-            return;
+        if (isset($schemadef['fields']['lat'])
+                && isset($schemadef['fields']['lon'])
+                && isset($schemadef['fields']['location_id'])
+                && isset($schemadef['fields']['location_ns'])) {
+            // Then we make sure the Notice_location table is created!
+            $schema->ensureTable('notice_location', Notice_location::schemaDef());
+
+            // Then we continue on our road to migration!
+            echo "\nFound old $table table, moving location data to 'notice_location' table... (this will probably take a LONG time, but can be aborted and continued)";
+
+            $notice = new Notice();
+            $notice->query(sprintf('SELECT id, lat, lon, location_id, location_ns FROM %1$s ' .
+                                 'WHERE lat IS NOT NULL ' .
+                                    'OR lon IS NOT NULL ' .
+                                    'OR location_id IS NOT NULL ' .
+                                    'OR location_ns IS NOT NULL',
+                                 $schema->quoteIdentifier($table)));
+            print "\nFound {$notice->N} notices with location data, inserting";
+            while ($notice->fetch()) {
+                $notloc = Notice_location::getKV('notice_id', $notice->id);
+                if ($notloc instanceof Notice_location) {
+                    print "-";
+                    continue;
+                }
+                $notloc = new Notice_location();
+                $notloc->notice_id = $notice->id;
+                $notloc->lat= $notice->lat;
+                $notloc->lon= $notice->lon;
+                $notloc->location_id= $notice->location_id;
+                $notloc->location_ns= $notice->location_ns;
+                $notloc->insert();
+                print ".";
+            }
+            print "\n";
+        }
+
+        /**
+         *  Make sure constraints are met before upgrading, if foreign keys
+         *  are not already in use.
+         *  2016-03-31
+         */
+        if (!isset($schemadef['foreign keys'])) {
+            $newschemadef = self::schemaDef();
+            printfnq("\nConstraint checking Notice table...\n");
+            /**
+             *  Improve typing and make sure no NULL values in any id-related columns are 0
+             *  2016-03-31
+             */
+            foreach (['reply_to', 'repeat_of'] as $field) {
+                $notice = new Notice(); // reset the object
+                $notice->query(sprintf('UPDATE %1$s SET %2$s=NULL WHERE %2$s=0', $notice->escapedTableName(), $field));
+                // Now we're sure that no Notice entries have repeat_of=0, only an id > 0 or NULL
+                unset($notice);
+            }
+
+            /**
+             *  This Will find foreign keys which do not fulfill the constraints and fix
+             *  where appropriate, such as delete when "repeat_of" ID not found in notice.id
+             *  or set to NULL for "reply_to" in the same case.
+             *  2016-03-31
+             *
+             *  XXX: How does this work if we would use multicolumn foreign keys?
+             */
+            foreach (['reply_to' => 'reset', 'repeat_of' => 'delete', 'profile_id' => 'delete'] as $field=>$action) {
+                $notice = new Notice();
+
+                $fkeyname = $notice->tableName().'_'.$field.'_fkey';
+                assert(isset($newschemadef['foreign keys'][$fkeyname]));
+                assert($newschemadef['foreign keys'][$fkeyname]);
+
+                $foreign_key = $newschemadef['foreign keys'][$fkeyname];
+                $fkeytable = $foreign_key[0];
+                assert(isset($foreign_key[1][$field]));
+                $fkeycol   = $foreign_key[1][$field];
+
+                printfnq("* {$fkeyname} ({$field} => {$fkeytable}.{$fkeycol})\n");
+
+                // NOTE: Above we set all repeat_of to NULL if they were 0, so this really gets them all.
+                $notice->whereAdd(sprintf('%1$s NOT IN (SELECT %2$s FROM %3$s)', $field, $fkeycol, $fkeytable));
+                if ($notice->find()) {
+                    printfnq("\tFound {$notice->N} notices with {$field} NOT IN notice.id, {$action}ing...");
+                    switch ($action) {
+                    case 'delete':  // since it's a directly dependant notice for an unknown ID we don't want it in our DB
+                        while ($notice->fetch()) {
+                            $notice->delete();
+                        }
+                        break;
+                    case 'reset':   // just set it to NULL to be compatible with our constraints, if it was related to an unknown ID
+                        $ids = [];
+                        foreach ($notice->fetchAll('id') as $id) {
+                            settype($id, 'int');
+                            $ids[] = $id;
+                        }
+                        unset($notice);
+                        $notice = new Notice();
+                        $notice->query(sprintf('UPDATE %1$s SET %2$s=NULL WHERE id IN (%3$s)',
+                                            $notice->escapedTableName(),
+                                            $field,
+                                            implode(',', $ids)));
+                        break;
+                    default:
+                        throw new ServerException('The programmer sucks, invalid action name when fixing table.');
+                    }
+                    printfnq("DONE.\n");
+                }
+                unset($notice);
+            }
         }
-        // Then we make sure the Notice_location table is created!
-        $schema->ensureTable('notice_location', Notice_location::schemaDef());
+    }
 
-        // Then we continue on our road to migration!
-        echo "\nFound old $table table, moving location data to 'notice_location' table... (this will probably take a LONG time, but can be aborted and continued)";
+    public function delPref($namespace, $topic) {
+        return Notice_prefs::setData($this, $namespace, $topic, null);
+    }
 
-        $notice = new Notice();
-        $notice->query(sprintf('SELECT id, lat, lon, location_id, location_ns FROM %1$s ' .
-                             'WHERE lat IS NOT NULL ' .
-                                'OR lon IS NOT NULL ' .
-                                'OR location_id IS NOT NULL ' .
-                                'OR location_ns IS NOT NULL',
-                             $schema->quoteIdentifier($table)));
-        print "\nFound {$notice->N} notices with location data, inserting";
-        while ($notice->fetch()) {
-            $notloc = Notice_location::getKV('notice_id', $notice->id);
-            if ($notloc instanceof Notice_location) {
-                print "-";
-                continue;
-            }
-            $notloc = new Notice_location();
-            $notloc->notice_id = $notice->id;
-            $notloc->lat= $notice->lat;
-            $notloc->lon= $notice->lon;
-            $notloc->location_id= $notice->location_id;
-            $notloc->location_ns= $notice->location_ns;
-            $notloc->insert();
-            print ".";
+    public function getPref($namespace, $topic, $default=null) {
+        // If you want an exception to be thrown, call Notice_prefs::getData directly
+        try {
+            return Notice_prefs::getData($this, $namespace, $topic, $default);
+        } catch (NoResultException $e) {
+            return null;
         }
-        print "\n";
+    }
+
+    // The same as getPref but will fall back to common_config value for the same namespace/topic
+    public function getConfigPref($namespace, $topic)
+    {
+        return Notice_prefs::getConfigData($this, $namespace, $topic);
+    }
+
+    public function setPref($namespace, $topic, $data) {
+        return Notice_prefs::setData($this, $namespace, $topic, $data);
     }
 }