X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=46e1dca35e57f87022a2aab3230c53aa7a2b10e1;hb=8564fc51c53de7a0670720eec437000a6b972688;hp=f1b012465b39cbd2c0766ffe8b211802d4d964b0;hpb=c758b2b0005cd434ff679686b6e11df60a65e1cb;p=quix0rs-gnu-social.git
diff --git a/classes/Notice.php b/classes/Notice.php
index f1b012465b..46e1dca35e 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -256,9 +256,14 @@ class Notice extends Memcached_DataObject
$is_local = Notice::LOCAL_PUBLIC;
}
- $profile = Profile::staticGet($profile_id);
-
- $final = common_shorten_links($content);
+ $profile = Profile::staticGet('id', $profile_id);
+ $user = User::staticGet('id', $profile_id);
+ if ($user) {
+ // Use the local user's shortening preferences, if applicable.
+ $final = $user->shortenLinks($content);
+ } else {
+ $final = common_shorten_links($content);
+ }
if (Notice::contentTooLong($final)) {
// TRANS: Client exception thrown if a notice contains too many characters.
@@ -476,7 +481,9 @@ class Notice extends Memcached_DataObject
* @return void
*/
function saveUrls() {
- common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
+ if (common_config('attachments', 'process_links')) {
+ common_replace_urls_callback($this->content, array($this, 'saveUrl'), $this->id);
+ }
}
/**
@@ -489,17 +496,18 @@ class Notice extends Memcached_DataObject
*/
function saveKnownUrls($urls)
{
- // @fixme validation?
- foreach (array_unique($urls) as $url) {
- File::processNew($url, $this->id);
+ if (common_config('attachments', 'process_links')) {
+ // @fixme validation?
+ foreach (array_unique($urls) as $url) {
+ File::processNew($url, $this->id);
+ }
}
}
/**
* @private callback
*/
- function saveUrl($data) {
- list($url, $notice_id) = $data;
+ function saveUrl($url, $notice_id) {
File::processNew($url, $notice_id);
}
@@ -524,10 +532,8 @@ class Notice extends Memcached_DataObject
$notice = new Notice();
$notice->profile_id = $profile_id;
$notice->content = $content;
- if (common_config('db','type') == 'pgsql')
- $notice->whereAdd('extract(epoch from now() - created) < ' . common_config('site', 'dupelimit'));
- else
- $notice->whereAdd('now() - created < ' . common_config('site', 'dupelimit'));
+ $threshold = common_sql_date(time() - common_config('site', 'dupelimit'));
+ $notice->whereAdd(sprintf("created > '%s'", $notice->escape($threshold)));
$cnt = $notice->count();
return ($cnt == 0);
@@ -745,6 +751,7 @@ class Notice extends Memcached_DataObject
1,
1
);
+
if ($conversation->N > 0) {
return true;
}
@@ -753,8 +760,15 @@ class Notice extends Memcached_DataObject
}
/**
- * @param $groups array of Group *objects*
- * @param $recipients array of profile *ids*
+ * Pull up a full list of local recipients who will be getting
+ * this notice in their inbox. Results will be cached, so don't
+ * change the input data wily-nilly!
+ *
+ * @param array $groups optional list of Group objects;
+ * if left empty, will be loaded from group_inbox records
+ * @param array $recipient optional list of reply profile ids
+ * if left empty, will be loaded from reply records
+ * @return array associating recipient user IDs with an inbox source constant
*/
function whoGets($groups=null, $recipients=null)
{
@@ -787,27 +801,27 @@ class Notice extends Memcached_DataObject
$ni[$id] = NOTICE_INBOX_SOURCE_SUB;
}
- $profile = $this->getProfile();
-
foreach ($groups as $group) {
$users = $group->getUserMembers();
foreach ($users as $id) {
if (!array_key_exists($id, $ni)) {
- $user = User::staticGet('id', $id);
- if (!$user->hasBlocked($profile)) {
- $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
- }
+ $ni[$id] = NOTICE_INBOX_SOURCE_GROUP;
}
}
}
foreach ($recipients as $recipient) {
-
if (!array_key_exists($recipient, $ni)) {
- $recipientUser = User::staticGet('id', $recipient);
- if (!empty($recipientUser)) {
- $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
- }
+ $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
+ }
+ }
+
+ // Exclude any deleted, non-local, or blocking recipients.
+ $profile = $this->getProfile();
+ foreach ($ni as $id => $source) {
+ $user = User::staticGet('id', $id);
+ if (empty($user) || $user->hasBlocked($profile)) {
+ unset($ni[$id]);
}
}
@@ -896,7 +910,7 @@ class Notice extends Memcached_DataObject
{
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"));
+ throw new ServerException(_('Bad type provided to saveKnownGroups.'));
}
$groups = array();
@@ -1109,7 +1123,7 @@ class Notice extends Memcached_DataObject
common_log_db_error($reply, 'INSERT', __FILE__);
// TRANS: Server exception thrown when a reply cannot be saved.
// TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
- throw new ServerException(sprintf(_("Could not save reply for %1$d, %2$d."), $this->id, $mentioned->id));
+ throw new ServerException(sprintf(_('Could not save reply for %1$d, %2$d.'), $this->id, $mentioned->id));
} else {
$replied[$mentioned->id] = 1;
self::blow('reply:stream:%d', $mentioned->id);
@@ -1212,351 +1226,200 @@ class Notice extends Memcached_DataObject
return $groups;
}
- // This has gotten way too long. Needs to be sliced up into functional bits
- // or ideally exported to a utility class.
+ /**
+ * Convert a notice into an activity for export.
+ *
+ * @param User $cur Current user
+ *
+ * @return Activity activity object representing this Notice.
+ */
- function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null)
+ function asActivity($cur = null, $source = false)
{
- $profile = $this->getProfile();
-
- $xs = new XMLStringer(true);
-
- if ($namespace) {
- $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
- 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
- 'xmlns:georss' => 'http://www.georss.org/georss',
- 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
- 'xmlns:media' => 'http://purl.org/syndication/atommedia',
- 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0',
- 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0',
- 'xmlns:statusnet' => 'http://status.net/schema/api/1/');
- } else {
- $attrs = array();
- }
+ $act = self::cacheGet('notice:as-activity:'.$this->id);
- if (Event::handle('StartActivityStart', array(&$this, &$xs, &$attrs))) {
- $xs->elementStart('entry', $attrs);
- Event::handle('EndActivityStart', array(&$this, &$xs, &$attrs));
+ if (!empty($act)) {
+ return $act;
}
- if (Event::handle('StartActivitySource', array(&$this, &$xs))) {
+ $act = new Activity();
+
+ if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
- if ($source) {
-
- $atom_feed = $profile->getAtomFeed();
-
- if (!empty($atom_feed)) {
+ $profile = $this->getProfile();
+
+ $act->actor = ActivityObject::fromProfile($profile);
+ $act->verb = ActivityVerb::POST;
+ $act->objects[] = ActivityObject::fromNotice($this);
- $xs->elementStart('source');
-
- // XXX: we should store the actual feed ID
-
- $xs->element('id', null, $atom_feed);
-
- // XXX: we should store the actual feed title
+ // XXX: should this be handled by default processing for object entry?
- $xs->element('title', null, $profile->getBestName());
+ $act->time = strtotime($this->created);
+ $act->link = $this->bestUrl();
+
+ $act->content = common_xml_safe_str($this->rendered);
+ $act->id = $this->uri;
+ $act->title = common_xml_safe_str($this->content);
- $xs->element('link', array('rel' => 'alternate',
- 'type' => 'text/html',
- 'href' => $profile->profileurl));
+ // Categories
- $xs->element('link', array('rel' => 'self',
- 'type' => 'application/atom+xml',
- 'href' => $atom_feed));
+ $tags = $this->getTags();
- $xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
-
- $notice = $profile->getCurrentNotice();
-
- if (!empty($notice)) {
- $xs->element('updated', null, self::utcDate($notice->created));
- }
-
- $user = User::staticGet('id', $profile->id);
-
- if (!empty($user)) {
- $xs->element('link', array('rel' => 'license',
- 'href' => common_config('license', 'url')));
- }
+ foreach ($tags as $tag) {
+ $cat = new AtomCategory();
+ $cat->term = $tag;
- $xs->elementEnd('source');
- }
+ $act->categories[] = $cat;
}
- Event::handle('EndActivitySource', array(&$this, &$xs));
- }
-
- $title = common_xml_safe_str($this->content);
-
- if (Event::handle('StartActivityTitle', array(&$this, &$xs, &$title))) {
- $xs->element('title', null, $title);
- Event::handle('EndActivityTitle', array($this, &$xs, $title));
- }
- $atomAuthor = '';
+ // Enclosures
+ // XXX: use Atom Media and/or File activity objects instead
- if ($author) {
- $atomAuthor = $profile->asAtomAuthor($cur);
- }
+ $attachments = $this->attachments();
- if (Event::handle('StartActivityAuthor', array(&$this, &$xs, &$atomAuthor))) {
- if (!empty($atomAuthor)) {
- $xs->raw($atomAuthor);
- Event::handle('EndActivityAuthor', array(&$this, &$xs, &$atomAuthor));
+ foreach ($attachments as $attachment) {
+ $enclosure = $attachment->getEnclosure();
+ if ($enclosure) {
+ $act->enclosures[] = $enclosure;
+ }
}
- }
-
- $actor = '';
-
- if ($author) {
- $actor = $profile->asActivityActor();
- }
-
- if (Event::handle('StartActivityActor', array(&$this, &$xs, &$actor))) {
- if (!empty($actor)) {
- $xs->raw($actor);
- Event::handle('EndActivityActor', array(&$this, &$xs, &$actor));
+
+ $ctx = new ActivityContext();
+
+ if (!empty($this->reply_to)) {
+ $reply = Notice::staticGet('id', $this->reply_to);
+ if (!empty($reply)) {
+ $ctx->replyToID = $reply->uri;
+ $ctx->replyToUrl = $reply->bestUrl();
+ }
}
- }
-
- $url = $this->bestUrl();
-
- if (Event::handle('StartActivityLink', array(&$this, &$xs, &$url))) {
- $xs->element('link', array('rel' => 'alternate',
- 'type' => 'text/html',
- 'href' => $url));
- Event::handle('EndActivityLink', array(&$this, &$xs, $url));
- }
-
- $id = $this->uri;
-
- if (Event::handle('StartActivityId', array(&$this, &$xs, &$id))) {
- $xs->element('id', null, $id);
- Event::handle('EndActivityId', array(&$this, &$xs, $id));
- }
-
- $published = self::utcDate($this->created);
-
- if (Event::handle('StartActivityPublished', array(&$this, &$xs, &$published))) {
- $xs->element('published', null, $published);
- Event::handle('EndActivityPublished', array(&$this, &$xs, $published));
- }
-
- $updated = $published; // XXX: notices are usually immutable
-
- if (Event::handle('StartActivityUpdated', array(&$this, &$xs, &$updated))) {
- $xs->element('updated', null, $updated);
- Event::handle('EndActivityUpdated', array(&$this, &$xs, $updated));
- }
-
- $content = common_xml_safe_str($this->rendered);
-
- if (Event::handle('StartActivityContent', array(&$this, &$xs, &$content))) {
- $xs->element('content', array('type' => 'html'), $content);
- Event::handle('EndActivityContent', array(&$this, &$xs, $content));
- }
-
- // Most of our notices represent POSTing a NOTE. This is the default verb
- // for activity streams, so we normally just leave it out.
-
- $verb = ActivityVerb::POST;
-
- if (Event::handle('StartActivityVerb', array(&$this, &$xs, &$verb))) {
- $xs->element('activity:verb', null, $verb);
- Event::handle('EndActivityVerb', array(&$this, &$xs, $verb));
- }
-
- // We use the default behavior for activity streams: if there's no activity:object,
- // then treat the entry itself as the object. Here, you can set the type of that object,
- // which is normally a NOTE.
-
- $type = ActivityObject::NOTE;
-
- if (Event::handle('StartActivityDefaultObjectType', array(&$this, &$xs, &$type))) {
- $xs->element('activity:object-type', null, $type);
- Event::handle('EndActivityDefaultObjectType', array(&$this, &$xs, $type));
- }
-
- // Since we usually use the entry itself as an object, we don't have an explicit
- // object. Some extensions may want to add them (for photo, event, music, etc.).
-
- $objects = array();
-
- if (Event::handle('StartActivityObjects', array(&$this, &$xs, &$objects))) {
- foreach ($objects as $object) {
- $xs->raw($object->asString());
+
+ $ctx->location = $this->getLocation();
+
+ $conv = null;
+
+ if (!empty($this->conversation)) {
+ $conv = Conversation::staticGet('id', $this->conversation);
+ if (!empty($conv)) {
+ $ctx->conversation = $conv->uri;
+ }
}
- Event::handle('EndActivityObjects', array(&$this, &$xs, $objects));
- }
-
- $noticeInfoAttr = array('local_id' => $this->id); // local notice ID (useful to clients for ordering)
-
- $ns = $this->getSource();
-
- if (!empty($ns)) {
- $noticeInfoAttr['source'] = $ns->code;
- if (!empty($ns->url)) {
- $noticeInfoAttr['source_link'] = $ns->url;
- if (!empty($ns->name)) {
- $noticeInfoAttr['source'] = ''
- . htmlspecialchars($ns->name)
- . '';
+
+ $reply_ids = $this->getReplies();
+
+ foreach ($reply_ids as $id) {
+ $profile = Profile::staticGet('id', $id);
+ if (!empty($profile)) {
+ $ctx->attention[] = $profile->getUri();
}
}
- }
-
- if (!empty($cur)) {
- $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false";
- $profile = $cur->getProfile();
- $noticeInfoAttr['repeated'] = ($profile->hasRepeated($this->id)) ? "true" : "false";
- }
-
- if (!empty($this->repeat_of)) {
- $noticeInfoAttr['repeat_of'] = $this->repeat_of;
- }
-
- if (Event::handle('StartActivityNoticeInfo', array(&$this, &$xs, &$noticeInfoAttr))) {
- $xs->element('statusnet:notice_info', $noticeInfoAttr, null);
- Event::handle('EndActivityNoticeInfo', array(&$this, &$xs, $noticeInfoAttr));
- }
-
- $replyNotice = null;
-
- if ($this->reply_to) {
- $replyNotice = Notice::staticGet('id', $this->reply_to);
- }
-
- if (Event::handle('StartActivityInReplyTo', array(&$this, &$xs, &$replyNotice))) {
- if (!empty($replyNotice)) {
- $xs->element('link', array('rel' => 'related',
- 'href' => $replyNotice->bestUrl()));
- $xs->element('thr:in-reply-to',
- array('ref' => $replyNotice->uri,
- 'href' => $replyNotice->bestUrl()));
- Event::handle('EndActivityInReplyTo', array(&$this, &$xs, $replyNotice));
+
+ $groups = $this->getGroups();
+
+ foreach ($groups as $group) {
+ $ctx->attention[] = $group->uri;
}
- }
- $conv = null;
+ // XXX: deprecated; use ActivityVerb::SHARE instead
- if (!empty($this->conversation)) {
- $conv = Conversation::staticGet('id', $this->conversation);
- }
+ $repeat = null;
- if (Event::handle('StartActivityConversation', array(&$this, &$xs, &$conv))) {
- if (!empty($conv)) {
- $xs->element('link', array('rel' => 'ostatus:conversation',
- 'href' => $conv->uri));
+ if (!empty($this->repeat_of)) {
+ $repeat = Notice::staticGet('id', $this->repeat_of);
+ $ctx->forwardID = $repeat->uri;
+ $ctx->forwardUrl = $repeat->bestUrl();
}
- Event::handle('EndActivityConversation', array(&$this, &$xs, $conv));
- }
-
- $replyProfiles = array();
-
- $reply_ids = $this->getReplies();
-
- foreach ($reply_ids as $id) {
- $profile = Profile::staticGet('id', $id);
- if (!empty($profile)) {
- $replyProfiles[] = $profile;
+
+ $act->context = $ctx;
+
+ $noticeInfoAttr = array('local_id' => $this->id); // local notice ID (useful to clients for ordering)
+
+ $ns = $this->getSource();
+
+ if (!empty($ns)) {
+ $noticeInfoAttr['source'] = $ns->code;
+ if (!empty($ns->url)) {
+ $noticeInfoAttr['source_link'] = $ns->url;
+ if (!empty($ns->name)) {
+ $noticeInfoAttr['source'] = ''
+ . htmlspecialchars($ns->name)
+ . '';
+ }
+ }
}
- }
- if (Event::handle('StartActivityAttentionProfiles', array(&$this, &$xs, &$replyProfiles))) {
- foreach ($replyProfiles as $profile) {
- $xs->element('link', array('rel' => 'ostatus:attention',
- 'href' => $profile->getUri()));
- $xs->element('link', array('rel' => 'mentioned',
- 'href' => $profile->getUri()));
+ if (!empty($cur)) {
+ $noticeInfoAttr['favorite'] = ($cur->hasFave($this)) ? "true" : "false";
+ $cp = $cur->getProfile();
+ $noticeInfoAttr['repeated'] = ($cp->hasRepeated($this->id)) ? "true" : "false";
}
- Event::handle('EndActivityAttentionProfiles', array(&$this, &$xs, $replyProfiles));
- }
-
- $groups = $this->getGroups();
- if (Event::handle('StartActivityAttentionGroups', array(&$this, &$xs, &$groups))) {
- foreach ($groups as $group) {
- $xs->element('link', array('rel' => 'ostatus:attention',
- 'href' => $group->permalink()));
- $xs->element('link', array('rel' => 'mentioned',
- 'href' => $group->permalink()));
+ if (!empty($this->repeat_of)) {
+ $noticeInfoAttr['repeat_of'] = $this->repeat_of;
}
- Event::handle('EndActivityAttentionGroups', array(&$this, &$xs, $groups));
- }
- $repeat = null;
+ $act->extra[] = array('statusnet:notice_info', $noticeInfoAttr, null);
- if (!empty($this->repeat_of)) {
- $repeat = Notice::staticGet('id', $this->repeat_of);
- }
+ if ($source) {
+
+ $atom_feed = $profile->getAtomFeed();
- if (Event::handle('StartActivityForward', array(&$this, &$xs, &$repeat))) {
- if (!empty($repeat)) {
- $xs->element('ostatus:forward',
- array('ref' => $repeat->uri,
- 'href' => $repeat->bestUrl()));
- }
+ if (!empty($atom_feed)) {
- Event::handle('EndActivityForward', array(&$this, &$xs, $repeat));
- }
+ $act->source = new ActivitySource();
+
+ // XXX: we should store the actual feed ID
- $tags = $this->getTags();
+ $act->source->id = $atom_feed;
- if (Event::handle('StartActivityCategories', array(&$this, &$xs, &$tags))) {
- foreach ($tags as $tag) {
- $xs->element('category', array('term' => $tag));
- }
- Event::handle('EndActivityCategories', array(&$this, &$xs, $tags));
- }
+ // XXX: we should store the actual feed title
- // Enclosures
+ $act->source->title = $profile->getBestName();
- $enclosures = array();
+ $act->source->links['alternate'] = $profile->profileurl;
+ $act->source->links['self'] = $atom_feed;
- $attachments = $this->attachments();
+ $act->source->icon = $profile->avatarUrl(AVATAR_PROFILE_SIZE);
+
+ $notice = $profile->getCurrentNotice();
- foreach ($attachments as $attachment) {
- $enclosure = $attachment->getEnclosure();
- if ($enclosure) {
- $enclosures[] = $enclosure;
- }
- }
+ if (!empty($notice)) {
+ $act->source->updated = self::utcDate($notice->created);
+ }
- if (Event::handle('StartActivityEnclosures', array(&$this, &$xs, &$enclosures))) {
- foreach ($enclosures as $enclosure) {
- $attributes = array('rel' => 'enclosure',
- 'href' => $enclosure->url,
- 'type' => $enclosure->mimetype,
- 'length' => $enclosure->size);
+ $user = User::staticGet('id', $profile->id);
- if ($enclosure->title) {
- $attributes['title'] = $enclosure->title;
+ if (!empty($user)) {
+ $act->source->links['license'] = common_config('license', 'url');
+ }
}
-
- $xs->element('link', $attributes, null);
}
- Event::handle('EndActivityEnclosures', array(&$this, &$xs, $enclosures));
- }
-
- $lat = $this->lat;
- $lon = $this->lon;
- if (Event::handle('StartActivityGeo', array(&$this, &$xs, &$lat, &$lon))) {
- if (!empty($lat) && !empty($lon)) {
- $xs->element('georss:point', null, $lat . ' ' . $lon);
+ if ($this->isLocal()) {
+ $act->selfLink = common_local_url('ApiStatusesShow', array('id' => $this->id,
+ 'format' => 'atom'));
+ $act->editLink = $act->selfLink;
}
- Event::handle('EndActivityGeo', array(&$this, &$xs, $lat, $lon));
- }
- if (Event::handle('StartActivityEnd', array(&$this, &$xs))) {
- $xs->elementEnd('entry');
- Event::handle('EndActivityEnd', array(&$this, &$xs));
+ Event::handle('EndNoticeAsActivity', array($this, &$act));
}
+
+ self::cacheSet('notice:as-activity:'.$this->id, $act);
+
+ return $act;
+ }
- return $xs->getString();
+ // This has gotten way too long. Needs to be sliced up into functional bits
+ // or ideally exported to a utility class.
+
+ function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null)
+ {
+ $act = $this->asActivity($cur, $source);
+ return $act->asString($namespace, $author);
}
+
/**
* Returns an XML string fragment with a reference to a notice as an
@@ -1567,6 +1430,7 @@ class Notice extends Memcached_DataObject
* @param string $element one of 'subject', 'object', 'target'
* @return string
*/
+
function asActivityNoun($element)
{
$noun = ActivityObject::fromNotice($this);
@@ -1834,7 +1698,6 @@ class Notice extends Memcached_DataObject
$options = array();
if (!empty($location_id) && !empty($location_ns)) {
-
$options['location_id'] = $location_id;
$options['location_ns'] = $location_ns;
@@ -1846,7 +1709,6 @@ class Notice extends Memcached_DataObject
}
} else if (!empty($lat) && !empty($lon)) {
-
$options['lat'] = $lat;
$options['lon'] = $lon;
@@ -1857,7 +1719,6 @@ class Notice extends Memcached_DataObject
$options['location_ns'] = $location->location_ns;
}
} else if (!empty($profile)) {
-
if (isset($profile->lat) && isset($profile->lon)) {
$options['lat'] = $profile->lat;
$options['lon'] = $profile->lon;
@@ -1974,6 +1835,7 @@ class Notice extends Memcached_DataObject
{
// We always insert for the author so they don't
// have to wait
+ Event::handle('StartNoticeDistribute', array($this));
$user = User::staticGet('id', $this->profile_id);
if (!empty($user)) {