* @package OStatusPlugin
* @maintainer Brion Vibber <brion@status.net>
*/
-class Ostatus_profile extends Memcached_DataObject
+class Ostatus_profile extends Managed_DataObject
{
public $__table = 'ostatus_profile';
public $profile_id;
public $group_id;
+ public $peopletag_id;
public $feeduri;
public $salmonuri;
public $created;
public $modified;
- public /*static*/ function staticGet($k, $v=null)
- {
- return parent::staticGet(__CLASS__, $k, $v);
- }
-
/**
- * return table definition for DB_DataObject
- *
- * DB_DataObject needs to know something about the table to manipulate
- * instances. This method provides all the DB_DataObject needs to know.
+ * Return table definition for Schema setup and DB_DataObject usage.
*
* @return array array of column definitions
*/
- function table()
- {
- return array('uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
- 'profile_id' => DB_DATAOBJECT_INT,
- 'group_id' => DB_DATAOBJECT_INT,
- 'feeduri' => DB_DATAOBJECT_STR,
- 'salmonuri' => DB_DATAOBJECT_STR,
- 'avatar' => DB_DATAOBJECT_STR,
- 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
- 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
- }
-
static function schemaDef()
{
- return array(new ColumnDef('uri', 'varchar',
- 255, false, 'PRI'),
- new ColumnDef('profile_id', 'integer',
- null, true, 'UNI'),
- new ColumnDef('group_id', 'integer',
- null, true, 'UNI'),
- new ColumnDef('feeduri', 'varchar',
- 255, true, 'UNI'),
- new ColumnDef('salmonuri', 'text',
- null, true),
- new ColumnDef('avatar', 'text',
- null, true),
- new ColumnDef('created', 'datetime',
- null, false),
- new ColumnDef('modified', 'datetime',
- null, false));
- }
-
- /**
- * return key definitions for DB_DataObject
- *
- * DB_DataObject needs to know about keys that the table has; this function
- * defines them.
- *
- * @return array key definitions
- */
- function keys()
- {
- return array_keys($this->keyTypes());
- }
-
- /**
- * return key definitions for Memcached_DataObject
- *
- * Our caching system uses the same key definitions, but uses a different
- * method to get them.
- *
- * @return array key definitions
- */
- function keyTypes()
- {
- return array('uri' => 'K', 'profile_id' => 'U', 'group_id' => 'U', 'feeduri' => 'U');
- }
-
- function sequenceKey()
- {
- return array(false, false, false);
+ return array(
+ 'fields' => array(
+ 'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true),
+ 'profile_id' => array('type' => 'integer'),
+ 'group_id' => array('type' => 'integer'),
+ 'peopletag_id' => array('type' => 'integer'),
+ 'feeduri' => array('type' => 'varchar', 'length' => 255),
+ 'salmonuri' => array('type' => 'varchar', 'length' => 255),
+ 'avatar' => array('type' => 'text'),
+ 'created' => array('type' => 'datetime', 'not null' => true),
+ 'modified' => array('type' => 'datetime', 'not null' => true),
+ ),
+ 'primary key' => array('uri'),
+ 'unique keys' => array(
+ 'ostatus_profile_profile_id_idx' => array('profile_id'),
+ 'ostatus_profile_group_id_idx' => array('group_id'),
+ 'ostatus_profile_peopletag_id_idx' => array('peopletag_id'),
+ 'ostatus_profile_feeduri_idx' => array('feeduri'),
+ ),
+ 'foreign keys' => array(
+ 'ostatus_profile_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+ 'ostatus_profile_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+ 'ostatus_profile_peopletag_id_fkey' => array('profile_list', array('peopletag_id' => 'id')),
+ ),
+ );
}
/**
public function localProfile()
{
if ($this->profile_id) {
- return Profile::staticGet('id', $this->profile_id);
+ return Profile::getKV('id', $this->profile_id);
}
return null;
}
public function localGroup()
{
if ($this->group_id) {
- return User_group::staticGet('id', $this->group_id);
+ return User_group::getKV('id', $this->group_id);
+ }
+ return null;
+ }
+
+ /**
+ * Fetch the StatusNet-side peopletag for this feed
+ * @return Profile
+ */
+ public function localPeopletag()
+ {
+ if ($this->peopletag_id) {
+ return Profile_list::getKV('id', $this->peopletag_id);
}
return null;
}
{
if ($this->isGroup()) {
return ActivityObject::fromGroup($this->localGroup());
+ } else if ($this->isPeopletag()) {
+ return ActivityObject::fromPeopletag($this->localPeopletag());
} else {
return ActivityObject::fromProfile($this->localProfile());
}
*
* Assumes that 'activity' namespace has been previously defined.
*
- * @fixme replace with wrappers on asActivityObject when it's got everything.
+ * @todo FIXME: Replace with wrappers on asActivityObject when it's got everything.
*
* @param string $element one of 'actor', 'subject', 'object', 'target'
* @return string
if ($this->isGroup()) {
$noun = ActivityObject::fromGroup($this->localGroup());
return $noun->asString('activity:' . $element);
+ } else if ($this->isPeopletag()) {
+ $noun = ActivityObject::fromPeopletag($this->localPeopletag());
+ return $noun->asString('activity:' . $element);
} else {
$noun = ActivityObject::fromProfile($this->localProfile());
return $noun->asString('activity:' . $element);
*/
function isGroup()
{
- if ($this->profile_id && !$this->group_id) {
+ if ($this->profile_id || $this->peopletag_id && !$this->group_id) {
return false;
- } else if ($this->group_id && !$this->profile_id) {
+ } else if ($this->group_id && !$this->profile_id && !$this->peopletag_id) {
return true;
- } else if ($this->group_id && $this->profile_id) {
- // TRANS: Server exception. %s is a URI.
- throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs set for %s.'),$this->uri));
+ } else if ($this->group_id && ($this->profile_id || $this->peopletag_id)) {
+ // TRANS: Server exception. %s is a URI
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->uri));
} else {
- // TRANS: Server exception. %s is a URI.
- throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs empty for %s.'),$this->uri));
+ // TRANS: Server exception. %s is a URI
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->uri));
+ }
+ }
+
+ /**
+ * @return boolean true if this is a remote peopletag
+ */
+ function isPeopletag()
+ {
+ if ($this->profile_id || $this->group_id && !$this->peopletag_id) {
+ return false;
+ } else if ($this->peopletag_id && !$this->profile_id && !$this->group_id) {
+ return true;
+ } else if ($this->peopletag_id && ($this->profile_id || $this->group_id)) {
+ // TRANS: Server exception. %s is a URI
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: Two or more IDs set for %s.'), $this->uri));
+ } else {
+ // TRANS: Server exception. %s is a URI
+ throw new ServerException(sprintf(_m('Invalid ostatus_profile state: All IDs empty for %s.'), $this->uri));
}
}
*/
public function garbageCollect()
{
- $feedsub = FeedSub::staticGet('uri', $this->feeduri);
+ $feedsub = FeedSub::getKV('uri', $this->feeduri);
return $feedsub->garbageCollect();
}
if ($this->isGroup()) {
$members = $this->localGroup()->getMembers(0, 1);
$count = $members->N;
+ } else if ($this->isPeopletag()) {
+ $subscribers = $this->localPeopletag()->getSubscribers(0, 1);
+ $count = $subscribers->N;
} else {
- $count = $this->localProfile()->subscriberCount();
+ $profile = $this->localProfile();
+ $count = $profile->subscriberCount();
+ if ($profile->hasLocalTags()) {
+ $count = 1;
+ }
}
common_log(LOG_INFO, __METHOD__ . " SUB COUNT BEFORE: $count");
* @param string $verb Activity::SUBSCRIBE or Activity::JOIN
* @param Object $object object of the action; must define asActivityNoun($tag)
*/
- public function notify($actor, $verb, $object=null)
+ public function notify($actor, $verb, $object=null, $target=null)
{
if (!($actor instanceof Profile)) {
$type = gettype($actor);
$object = $this;
}
if ($this->salmonuri) {
-
$text = 'update';
$id = TagURI::mint('%s:%s:%s',
$verb,
$actor->getURI(),
common_date_iso8601(time()));
- // @fixme consolidate all these NS settings somewhere
+ // @todo FIXME: Consolidate all these NS settings somewhere.
$attributes = array('xmlns' => Activity::ATOM,
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
$entry->raw($actor->asAtomAuthor());
$entry->raw($actor->asActivityActor());
$entry->raw($object->asActivityNoun('object'));
+ if ($target != null) {
+ $entry->raw($target->asActivityNoun('target'));
+ }
$entry->elementEnd('entry');
$xml = $entry->getString();
{
if ($this->isGroup()) {
return $this->localGroup()->getBestName();
+ } else if ($this->isPeopletag()) {
+ return $this->localPeopletag()->getBestName();
} else {
return $this->localProfile()->getBestName();
}
if ($feed->localName == 'feed' && $feed->namespaceURI == Activity::ATOM) {
$this->processAtomFeed($feed, $source);
- } else if ($feed->localName == 'rss') { // @fixme check namespace
+ } else if ($feed->localName == 'rss') { // @todo FIXME: Check namespace.
$this->processRssFeed($feed, $source);
} else {
// TRANS: Exception.
* @param DOMElement $entry
* @param DOMElement $feed for context
* @param string $source identifier ("push" or "salmon")
+ *
+ * @return Notice Notice representing the new (or existing) activity
*/
-
public function processEntry($entry, $feed, $source)
{
$activity = new Activity($entry, $feed);
+ return $this->processActivity($activity, $source);
+ }
- if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this)) &&
+ public function processActivity($activity, $source)
+ {
+ $notice = null;
+
+ // The "WithProfile" events were added later.
+
+ if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) &&
Event::handle('StartHandleFeedEntry', array($activity))) {
- // @todo process all activity objects
- switch ($activity->objects[0]->type) {
- case ActivityObject::ARTICLE:
- case ActivityObject::BLOGENTRY:
- case ActivityObject::NOTE:
- case ActivityObject::STATUS:
- case ActivityObject::COMMENT:
- case null:
- if ($activity->verb == ActivityVerb::POST) {
- $this->processPost($activity, $source);
- } else {
- common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
+ switch ($activity->verb) {
+ case ActivityVerb::POST:
+ // @todo process all activity objects
+ switch ($activity->objects[0]->type) {
+ case ActivityObject::ARTICLE:
+ case ActivityObject::BLOGENTRY:
+ case ActivityObject::NOTE:
+ case ActivityObject::STATUS:
+ case ActivityObject::COMMENT:
+ case null:
+ $notice = $this->processPost($activity, $source);
+ break;
+ default:
+ // TRANS: Client exception.
+ throw new ClientException(_m('Cannot handle that kind of post.'));
}
break;
+ case ActivityVerb::SHARE:
+ $notice = $this->processShare($activity, $source);
+ break;
default:
- // TRANS: Client exception.
- throw new ClientException(_m('Can\'t handle that kind of post.'));
+ common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
}
Event::handle('EndHandleFeedEntry', array($activity));
- Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this));
+ Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this, $notice));
+ }
+
+ return $notice;
+ }
+
+ public function processShare($activity, $method)
+ {
+ $notice = null;
+
+ $oprofile = $this->checkAuthorship($activity);
+
+ if (empty($oprofile)) {
+ common_log(LOG_INFO, "No author matched share activity");
+ return null;
+ }
+
+ if (count($activity->objects) != 1) {
+ // TRANS: Client exception thrown when trying to share multiple activities at once.
+ throw new ClientException(_m('Can only handle share activities with exactly one object.'));
+ }
+
+ $shared = $activity->objects[0];
+
+ if (!($shared instanceof Activity)) {
+ // TRANS: Client exception thrown when trying to share a non-activity object.
+ throw new ClientException(_m('Can only handle shared activities.'));
+ }
+
+ $other = Ostatus_profile::ensureActivityObjectProfile($shared->actor);
+
+ // Save the item (or check for a dupe)
+
+ $sharedNotice = $other->processActivity($shared, $method);
+
+ if (empty($sharedNotice)) {
+ $sharedId = ($shared->id) ? $shared->id : $shared->objects[0]->id;
+ // TRANS: Client exception thrown when saving an activity share fails.
+ // TRANS: %s is a share ID.
+ throw new ClientException(sprintf(_m('Failed to save activity %s.'),
+ $sharedId));
+ }
+
+ // The id URI will be used as a unique identifier for for the notice,
+ // protecting against duplicate saves. It isn't required to be a URL;
+ // tag: URIs for instance are found in Google Buzz feeds.
+
+ $sourceUri = $activity->id;
+
+ $dupe = Notice::getKV('uri', $sourceUri);
+ if ($dupe) {
+ common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
+ return $dupe;
+ }
+
+ // We'll also want to save a web link to the original notice, if provided.
+
+ $sourceUrl = null;
+ if ($activity->link) {
+ $sourceUrl = $activity->link;
+ } else if ($activity->link) {
+ $sourceUrl = $activity->link;
+ } else if (preg_match('!^https?://!', $activity->id)) {
+ $sourceUrl = $activity->id;
+ }
+
+ // Use summary as fallback for content
+
+ if (!empty($activity->content)) {
+ $sourceContent = $activity->content;
+ } else if (!empty($activity->summary)) {
+ $sourceContent = $activity->summary;
+ } else if (!empty($activity->title)) {
+ $sourceContent = $activity->title;
+ } else {
+ // @todo FIXME: Fetch from $sourceUrl?
+ // TRANS: Client exception. %s is a source URI.
+ throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
+ }
+
+ // Get (safe!) HTML and text versions of the content
+
+ $rendered = $this->purify($sourceContent);
+ $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+
+ $shortened = common_shorten_links($content);
+
+ // If it's too long, try using the summary, and make the
+ // HTML an attachment.
+
+ $attachment = null;
+
+ if (Notice::contentTooLong($shortened)) {
+ $attachment = $this->saveHTMLFile($activity->title, $rendered);
+ $summary = html_entity_decode(strip_tags($activity->summary), ENT_QUOTES, 'UTF-8');
+ if (empty($summary)) {
+ $summary = $content;
+ }
+ $shortSummary = common_shorten_links($summary);
+ if (Notice::contentTooLong($shortSummary)) {
+ $url = common_shorten_url($sourceUrl);
+ $shortSummary = substr($shortSummary,
+ 0,
+ Notice::maxContent() - (mb_strlen($url) + 2));
+ $content = $shortSummary . ' ' . $url;
+
+ // We mark up the attachment link specially for the HTML output
+ // so we can fold-out the full version inline.
+
+ // @todo FIXME i18n: This tooltip will be saved with the site's default language
+ // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+ // TRANS: this will usually be replaced with localised text from StatusNet core messages.
+ $showMoreText = _m('Show more');
+ $attachUrl = common_local_url('attachment',
+ array('attachment' => $attachment->id));
+ $rendered = common_render_text($shortSummary) .
+ '<a href="' . htmlspecialchars($attachUrl) .'"'.
+ ' class="attachment more"' .
+ ' title="'. htmlspecialchars($showMoreText) . '">' .
+ '…' .
+ '</a>';
+ }
+ }
+
+ $options = array('is_local' => Notice::REMOTE,
+ 'url' => $sourceUrl,
+ 'uri' => $sourceUri,
+ 'rendered' => $rendered,
+ 'replies' => array(),
+ 'groups' => array(),
+ 'peopletags' => array(),
+ 'tags' => array(),
+ 'urls' => array(),
+ 'repeat_of' => $sharedNotice->id,
+ 'scope' => $sharedNotice->scope);
+
+ // Check for optional attributes...
+
+ if (!empty($activity->time)) {
+ $options['created'] = common_sql_date($activity->time);
+ }
+
+ if ($activity->context) {
+ // Any individual or group attn: targets?
+ $replies = $activity->context->attention;
+ $options['groups'] = $this->filterReplies($oprofile, $replies);
+ $options['replies'] = $replies;
+
+ // Maintain direct reply associations
+ // @todo FIXME: What about conversation ID?
+ if (!empty($activity->context->replyToID)) {
+ $orig = Notice::getKV('uri',
+ $activity->context->replyToID);
+ if (!empty($orig)) {
+ $options['reply_to'] = $orig->id;
+ }
+ }
+
+ $location = $activity->context->location;
+ if ($location) {
+ $options['lat'] = $location->lat;
+ $options['lon'] = $location->lon;
+ if ($location->location_id) {
+ $options['location_ns'] = $location->location_ns;
+ $options['location_id'] = $location->location_id;
+ }
+ }
+ }
+
+ if ($this->isPeopletag()) {
+ $options['peopletags'][] = $this->localPeopletag();
+ }
+
+ // Atom categories <-> hashtags
+ foreach ($activity->categories as $cat) {
+ if ($cat->term) {
+ $term = common_canonical_tag($cat->term);
+ if ($term) {
+ $options['tags'][] = $term;
+ }
+ }
}
+
+ // Atom enclosures -> attachment URLs
+ foreach ($activity->enclosures as $href) {
+ // @todo FIXME: Save these locally or....?
+ $options['urls'][] = $href;
+ }
+
+ $notice = Notice::saveNew($oprofile->profile_id,
+ $content,
+ 'ostatus',
+ $options);
+
+ return $notice;
}
/**
* @param Activity $activity
* @param string $method 'push' or 'salmon'
* @return mixed saved Notice or false
- * @fixme break up this function, it's getting nasty long
+ * @todo FIXME: Break up this function, it's getting nasty long
*/
public function processPost($activity, $method)
{
+ $notice = null;
+
$oprofile = $this->checkAuthorship($activity);
if (empty($oprofile)) {
- return false;
+ return null;
}
// It's not always an ActivityObject::NOTE, but... let's just say it is.
// protecting against duplicate saves. It isn't required to be a URL;
// tag: URIs for instance are found in Google Buzz feeds.
$sourceUri = $note->id;
- $dupe = Notice::staticGet('uri', $sourceUri);
+ $dupe = Notice::getKV('uri', $sourceUri);
if ($dupe) {
common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
- return false;
+ return $dupe;
}
// We'll also want to save a web link to the original notice, if provided.
} else if (!empty($note->title)) {
$sourceContent = $note->title;
} else {
- // @fixme fetch from $sourceUrl?
+ // @todo FIXME: Fetch from $sourceUrl?
// TRANS: Client exception. %s is a source URI.
throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
}
// We mark up the attachment link specially for the HTML output
// so we can fold-out the full version inline.
- // @fixme I18N this tooltip will be saved with the site's default language
+ // @todo FIXME i18n: This tooltip will be saved with the site's default language
// TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
// TRANS: this will usually be replaced with localised text from StatusNet core messages.
$showMoreText = _m('Show more');
}
}
- $options = array('is_local' => Notice::REMOTE_OMB,
+ $options = array('is_local' => Notice::REMOTE,
'url' => $sourceUrl,
'uri' => $sourceUri,
'rendered' => $rendered,
'replies' => array(),
'groups' => array(),
+ 'peopletags' => array(),
'tags' => array(),
'urls' => array());
$options['replies'] = $replies;
// Maintain direct reply associations
- // @fixme what about conversation ID?
+ // @todo FIXME: What about conversation ID?
if (!empty($activity->context->replyToID)) {
- $orig = Notice::staticGet('uri',
+ $orig = Notice::getKV('uri',
$activity->context->replyToID);
if (!empty($orig)) {
$options['reply_to'] = $orig->id;
}
}
+ if ($this->isPeopletag()) {
+ $options['peopletags'][] = $this->localPeopletag();
+ }
+
// Atom categories <-> hashtags
foreach ($activity->categories as $cat) {
if ($cat->term) {
// Atom enclosures -> attachment URLs
foreach ($activity->enclosures as $href) {
- // @fixme save these locally or....?
+ // @todo FIXME: Save these locally or....?
$options['urls'][] = $href;
}
$replies = array();
foreach (array_unique($attention_uris) as $recipient) {
// Is the recipient a local user?
- $user = User::staticGet('uri', $recipient);
+ $user = User::getKV('uri', $recipient);
if ($user) {
- // @fixme sender verification, spam etc?
+ // @todo FIXME: Sender verification, spam etc?
$replies[] = $recipient;
continue;
}
// Is the recipient a local group?
- // $group = User_group::staticGet('uri', $recipient);
+ // $group = User_group::getKV('uri', $recipient);
$id = OStatusPlugin::localGroupFromUrl($recipient);
if ($id) {
- $group = User_group::staticGet('id', $id);
+ $group = User_group::getKV('id', $id);
if ($group) {
// Deliver to all members of this local group if allowed.
$profile = $sender->localProfile();
$oprofile = Ostatus_profile::ensureProfileURI($recipient);
if ($oprofile->isGroup()) {
// Deliver to local members of this remote group.
- // @fixme sender verification?
+ // @todo FIXME: Sender verification?
$groups[] = $oprofile->group_id;
} else {
// may be canonicalized or something
* @throws Exception on various error conditions
* @throws OStatusShadowException if this reference would obscure a local user/group
*/
-
public static function ensureProfileURL($profile_url, $hints=array())
{
$oprofile = self::getFromProfileURL($profile_url);
// Check if they've got an LRDD header
- $lrdd = LinkHeader::getLink($response, 'lrdd', 'application/xrd+xml');
-
- if (!empty($lrdd)) {
-
- $xrd = Discovery::fetchXrd($lrdd);
+ $lrdd = LinkHeader::getLink($response, 'lrdd');
+ try {
+ $xrd = new XML_XRD();
+ $xrd->loadFile($lrdd);
$xrdHints = DiscoveryHints::fromXRD($xrd);
-
$hints = array_merge($hints, $xrdHints);
+ } catch (Exception $e) {
+ // No hints available from XRD
}
// If discovery found a feedurl (probably from LRDD), use it.
*/
static function getFromProfileURL($profile_url)
{
- $profile = Profile::staticGet('profileurl', $profile_url);
+ $profile = Profile::getKV('profileurl', $profile_url);
if (empty($profile)) {
return null;
// Is it a known Ostatus profile?
- $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
+ $oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
if (!empty($oprofile)) {
return $oprofile;
// Is it a local user?
- $user = User::staticGet('id', $profile->id);
+ $user = User::getKV('id', $profile->id);
if (!empty($user)) {
// @todo i18n FIXME: use sprintf and add i18n (?)
*
* @param DOMElement $feedEl root element of a loaded Atom feed
* @param array $hints additional discovery information passed from higher levels
- * @fixme should this be marked public?
+ * @todo FIXME: Should this be marked public?
* @return Ostatus_profile
* @throws Exception
*/
-
public static function ensureAtomFeed($feedEl, $hints)
{
$author = ActivityUtils::getFeedAuthor($feedEl);
if (empty($author)) {
// XXX: make some educated guesses here
// TRANS: Feed sub exception.
- throw new FeedSubException(_m('Can\'t find enough profile '.
+ throw new FeedSubException(_m('Cannot find enough profile '.
'information to make a feed.'));
}
*
* @param DOMElement $feedEl root element of a loaded RSS feed
* @param array $hints additional discovery information passed from higher levels
- * @fixme should this be marked public?
+ * @todo FIXME: Should this be marked public?
* @return Ostatus_profile
* @throws Exception
*/
}
}
- // @fixme we should check whether this feed has elements
+ // @todo FIXME: We should check whether this feed has elements
// with different <author> or <dc:creator> elements, and... I dunno.
// Do something about that.
}
if (!common_valid_http_url($url)) {
// TRANS: Server exception. %s is a URL.
- throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url));
+ throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
}
if ($this->isGroup()) {
if (!$self) {
throw new ServerException(sprintf(
// TRANS: Server exception. %s is a URI.
- _m("Tried to update avatar for unsaved remote profile %s."),
+ _m('Tried to update avatar for unsaved remote profile %s.'),
$this->uri));
}
- // @fixme this should be better encapsulated
+ // @todo FIXME: This should be better encapsulated
// ripped from oauthstore.php (for old OMB client)
$temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
try {
if (!copy($url, $temp_filename)) {
// TRANS: Server exception. %s is a URL.
- throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url));
+ throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url));
}
if ($this->isGroup()) {
} else {
$id = $this->profile_id;
}
- // @fixme should we be using different ids?
+ // @todo FIXME: Should we be using different ids?
$imagefile = new ImageFile($id, $temp_filename);
$filename = Avatar::filename($id,
image_type_to_extension($imagefile->type),
unlink($temp_filename);
throw $e;
}
- // @fixme hardcoded chmod is lame, but seems to be necessary to
+ // @todo FIXME: Hardcoded chmod is lame, but seems to be necessary to
// keep from accidentally saving images from command-line (queues)
// that can't be read from web server, which causes hard-to-notice
// problems later on:
* @param array $hints
* @return mixed URL string or false
*/
-
public static function getActivityObjectAvatar($object, $hints=array())
{
if ($object->avatarLinks) {
* @param DOMElement $feed
* @return string
*/
-
protected static function getAvatar($actor, $feed)
{
$url = '';
}
if ($url) {
$opts = array('allowed_schemes' => array('http', 'https'));
- if (Validate::uri($url, $opts)) {
+ if (common_valid_http_url($url)) {
return $url;
}
}
* @return Ostatus_profile
* @throws Exception
*/
-
public static function ensureActorProfile($activity, $hints=array())
{
return self::ensureActivityObjectProfile($activity->actor, $hints);
* @return Ostatus_profile
* @throws Exception
*/
-
public static function ensureActivityObjectProfile($object, $hints=array())
{
$profile = self::getActivityObjectProfile($object);
protected static function getActivityObjectProfile($object)
{
$uri = self::getActivityObjectProfileURI($object);
- return Ostatus_profile::staticGet('uri', $uri);
+ return Ostatus_profile::getKV('uri', $uri);
}
/**
if ($object->link && common_valid_http_url($object->link)) {
return $object->link;
}
- throw new ServerException("No author ID URI found.");
+ // TRANS: Server exception.
+ throw new ServerException(_m('No author ID URI found.'));
}
/**
- * @fixme validate stuff somewhere
+ * @todo FIXME: Validate stuff somewhere.
*/
/**
if (!$homeuri) {
common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true));
- throw new Exception("No profile URI");
+ // TRANS: Exception.
+ throw new Exception(_m('No profile URI.'));
}
- $user = User::staticGet('uri', $homeuri);
+ $user = User::getKV('uri', $homeuri);
if ($user) {
// TRANS: Exception.
- throw new Exception(_m('Local user can\'t be referenced as remote.'));
+ throw new Exception(_m('Local user cannot be referenced as remote.'));
}
if (OStatusPlugin::localGroupFromUrl($homeuri)) {
// TRANS: Exception.
- throw new Exception(_m('Local group can\'t be referenced as remote.'));
+ throw new Exception(_m('Local group cannot be referenced as remote.'));
+ }
+
+ $ptag = Profile_list::getKV('uri', $homeuri);
+ if ($ptag) {
+ $local_user = User::getKV('id', $ptag->tagger);
+ if (!empty($local_user)) {
+ // TRANS: Exception.
+ throw new Exception(_m('Local list cannot be referenced as remote.'));
+ }
}
if (array_key_exists('feedurl', $hints)) {
$oprofile->profile_id = $profile->insert();
if (!$oprofile->profile_id) {
- // TRANS: Server exception.
- throw new ServerException(_m('Can\'t save local profile.'));
+ // TRANS: Server exception.
+ throw new ServerException(_m('Cannot save local profile.'));
}
- } else {
+ } else if ($object->type == ActivityObject::GROUP) {
$group = new User_group();
$group->uri = $homeuri;
$group->created = common_sql_now();
$oprofile->group_id = $group->insert();
if (!$oprofile->group_id) {
// TRANS: Server exception.
- throw new ServerException(_m('Can\'t save local profile.'));
+ throw new ServerException(_m('Cannot save local profile.'));
+ }
+ } else if ($object->type == ActivityObject::_LIST) {
+ $ptag = new Profile_list();
+ $ptag->uri = $homeuri;
+ $ptag->created = common_sql_now();
+ self::updatePeopletag($ptag, $object, $hints);
+
+ $oprofile->peopletag_id = $ptag->insert();
+ if (!$oprofile->peopletag_id) {
+ // TRANS: Server exception.
+ throw new ServerException(_m('Cannot save local list.'));
}
}
if (!$ok) {
// TRANS: Server exception.
- throw new ServerException(_m('Can\'t save OStatus profile.'));
+ throw new ServerException(_m('Cannot save OStatus profile.'));
}
$avatar = self::getActivityObjectAvatar($object, $hints);
if ($this->isGroup()) {
$group = $this->localGroup();
self::updateGroup($group, $object, $hints);
+ } else if ($this->isPeopletag()) {
+ $ptag = $this->localPeopletag();
+ self::updatePeopletag($ptag, $object, $hints);
} else {
$profile = $this->localProfile();
self::updateProfile($profile, $object, $hints);
}
+
$avatar = self::getActivityObjectAvatar($object, $hints);
- if ($avatar) {
+ if ($avatar && !isset($ptag)) {
try {
$this->updateAvatar($avatar);
} catch (Exception $ex) {
$profile->profileurl = $object->link;
} else if (array_key_exists('profileurl', $hints)) {
$profile->profileurl = $hints['profileurl'];
- } else if (Validate::uri($object->id, array('allowed_schemes' => array('http', 'https')))) {
+ } else if (common_valid_http_url($object->id)) {
$profile->profileurl = $object->id;
}
}
}
- // @fixme tags/categories
+ // @todo FIXME: tags/categories
// @todo tags from categories
if ($profile->id) {
}
}
+ protected static function updatePeopletag($tag, $object, $hints=array()) {
+ $orig = clone($tag);
+
+ $tag->tag = $object->title;
+
+ if (!empty($object->link)) {
+ $tag->mainpage = $object->link;
+ } else if (array_key_exists('profileurl', $hints)) {
+ $tag->mainpage = $hints['profileurl'];
+ }
+
+ $tag->description = $object->summary;
+ $tagger = self::ensureActivityObjectProfile($object->owner);
+ $tag->tagger = $tagger->profile_id;
+
+ if ($tag->id) {
+ common_log(LOG_DEBUG, "Updating OStatus peopletag $tag->id from remote info $object->id: " . var_export($object, true) . var_export($hints, true));
+ $tag->update($orig);
+ }
+ }
+
protected static function getActivityObjectHomepage($object, $hints=array())
{
$homepage = null;
// TRANS: Exception.
throw new Exception(_m('Not a valid webfinger address.'));
}
- $oprofile = Ostatus_profile::staticGet('uri', $uri);
+ $oprofile = Ostatus_profile::getKV('uri', $uri);
if (!empty($oprofile)) {
return $oprofile;
}
}
// Try looking it up
-
- $oprofile = Ostatus_profile::staticGet('uri', 'acct:'.$addr);
+ $oprofile = Ostatus_profile::getKV('uri', 'acct:'.$addr);
if (!empty($oprofile)) {
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
$xrd = $disco->lookup($addr);
} catch (Exception $e) {
// Save negative cache entry so we don't waste time looking it up again.
- // @fixme distinguish temporary failures?
+ // @todo FIXME: Distinguish temporary failures?
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
- // TRANS: Exception.
+ // TRANS: Exception.
throw new Exception(_m('Not a valid webfinger address.'));
}
$hints = array_merge($hints, $dhints);
// If there's an Hcard, let's grab its info
-
if (array_key_exists('hcard', $hints)) {
if (!array_key_exists('profileurl', $hints) ||
$hints['hcard'] != $hints['profileurl']) {
}
// If we got a feed URL, try that
-
if (array_key_exists('feedurl', $hints)) {
try {
common_log(LOG_INFO, "Discovery on acct:$addr with feed URL " . $hints['feedurl']);
}
// If we got a profile page, try that!
-
if (array_key_exists('profileurl', $hints)) {
try {
common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
return $oprofile;
} catch (OStatusShadowException $e) {
// We've ended up with a remote reference to a local user or group.
- // @fixme ideally we should be able to say who it was so we can
+ // @todo FIXME: Ideally we should be able to say who it was so we can
// go back and refer to it the regular way
throw $e;
} catch (Exception $e) {
common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage());
// keep looking
//
- // @fixme this means an error discovering from profile page
+ // @todo FIXME: This means an error discovering from profile page
// may give us a corrupt entry using the webfinger URI, which
// will obscure the correct page-keyed profile later on.
}
// XXX: try FOAF
if (array_key_exists('salmon', $hints)) {
-
$salmonEndpoint = $hints['salmon'];
// An account URL, a salmon endpoint, and a dream? Not much to go
if (!$profile_id) {
common_log_db_error($profile, 'INSERT', __FILE__);
// TRANS: Exception. %s is a webfinger address.
- throw new Exception(sprintf(_m('Couldn\'t save profile for "%s".'),$addr));
+ throw new Exception(sprintf(_m('Could not save profile for "%s".'),$addr));
}
$oprofile = new Ostatus_profile();
if (!$result) {
common_log_db_error($oprofile, 'INSERT', __FILE__);
// TRANS: Exception. %s is a webfinger address.
- throw new Exception(sprintf(_m('Couldn\'t save ostatus_profile for "%s".'),$addr));
+ throw new Exception(sprintf(_m('Could not save OStatus profile for "%s".'),$addr));
}
self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
}
// TRANS: Exception. %s is a webfinger address.
- throw new Exception(sprintf(_m('Couldn\'t find a valid profile for "%s".'),$addr));
+ throw new Exception(sprintf(_m('Could not find a valid profile for "%s".'),$addr));
}
/**
// First, try to query it
- $oprofile = Ostatus_profile::staticGet('uri', $uri);
+ $oprofile = Ostatus_profile::getKV('uri', $uri);
// If unfound, do discovery stuff
$oprofile = Ostatus_profile::ensureWebfinger($rest);
break;
default:
- throw new ServerException("Unrecognized URI protocol for profile: $protocol ($uri)");
+ // TRANS: Server exception.
+ // TRANS: %1$s is a protocol, %2$s is a URI.
+ throw new ServerException(sprintf(_m('Unrecognized URI protocol for profile: %1$s (%2$s).'),
+ $protocol,
+ $uri));
break;
}
} else {
- throw new ServerException("No URI protocol for profile: ($uri)");
+ // TRANS: Server exception. %s is a URI.
+ throw new ServerException(sprintf(_m('No URI protocol for profile: %s.'),$uri));
}
}
function checkAuthorship($activity)
{
- if ($this->isGroup()) {
- // A group feed will contain posts from multiple authors.
- // @fixme validate these profiles in some way!
+ if ($this->isGroup() || $this->isPeopletag()) {
+ // A group or propletag feed will contain posts from multiple authors.
$oprofile = self::ensureActorProfile($activity);
- if ($oprofile->isGroup()) {
+ if ($oprofile->isGroup() || $oprofile->isPeopletag()) {
// Groups can't post notices in StatusNet.
- common_log(LOG_WARNING,
- "OStatus: skipping post with group listed as author: ".
- "$oprofile->uri in feed from $this->uri");
+ common_log(LOG_WARNING,
+ "OStatus: skipping post with group listed ".
+ "as author: $oprofile->uri in feed from $this->uri");
return false;
}
} else {
projects / quix0rs-gnu-social.git / blobdiff