* @package OStatusPlugin
* @maintainer Brion Vibber <brion@status.net>
*/
-
class Ostatus_profile extends Managed_DataObject
{
public $__table = 'ostatus_profile';
public $created;
public $modified;
- public /*static*/ function staticGet($k, $v=null)
- {
- return parent::staticGet(__CLASS__, $k, $v);
- }
-
/**
* Return table definition for Schema setup and DB_DataObject usage.
*
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;
}
public function localPeopletag()
{
if ($this->peopletag_id) {
- return Profile_list::staticGet('id', $this->peopletag_id);
+ return Profile_list::getKV('id', $this->peopletag_id);
}
return null;
}
*
* 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
*/
public function garbageCollect()
{
- $feedsub = FeedSub::staticGet('uri', $this->feeduri);
+ $feedsub = FeedSub::getKV('uri', $this->feeduri);
return $feedsub->garbageCollect();
}
$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',
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.
*
* @return Notice Notice representing the new (or existing) activity
*/
-
public function processEntry($entry, $feed, $source)
{
$activity = new Activity($entry, $feed);
Event::handle('EndHandleFeedEntry', array($activity));
Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this, $notice));
}
-
+
return $notice;
}
}
if (count($activity->objects) != 1) {
- throw new ClientException(_m("Can only handle share activities with exactly one object."));
+ // 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)) {
- throw new ClientException(_m("Can only handle shared activities."));
+ // 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;
- throw new ClientException(sprintf(_m("Failed to save activity %s"),
+ // 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));
}
$sourceUri = $activity->id;
- $dupe = Notice::staticGet('uri', $sourceUri);
+ $dupe = Notice::getKV('uri', $sourceUri);
if ($dupe) {
common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
return $dupe;
} else if (!empty($activity->title)) {
$sourceContent = $activity->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));
}
$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;
// Atom enclosures -> attachment URLs
foreach ($activity->enclosures as $href) {
- // @fixme save these locally or....?
+ // @todo FIXME: Save these locally or....?
$options['urls'][] = $href;
}
* @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)
{
// 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 $dupe;
} 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));
}
$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;
// 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
// 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
*/
*
* @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.
$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 {
} 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:
// http://status.net/open-source/issues/2663
chmod(Avatar::path($filename), 0644);
- $profile = $this->localProfile();
-
- if (!empty($profile)) {
- $profile->setOriginal($filename);
- }
+ $self->setOriginal($filename);
$orig = clone($this);
$this->avatar = $url;
}
if ($url) {
$opts = array('allowed_schemes' => array('http', 'https'));
- if (Validate::uri($url, $opts)) {
+ if (common_valid_http_url($url)) {
return $url;
}
}
protected static function getActivityObjectProfile($object)
{
$uri = self::getActivityObjectProfileURI($object);
- return Ostatus_profile::staticGet('uri', $uri);
+ return Ostatus_profile::getKV('uri', $uri);
}
/**
}
/**
- * @fixme validate stuff somewhere
+ * @todo FIXME: Validate stuff somewhere.
*/
/**
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 cannot be referenced as remote.'));
throw new Exception(_m('Local group cannot be referenced as remote.'));
}
- $ptag = Profile_list::staticGet('uri', $homeuri);
+ $ptag = Profile_list::getKV('uri', $homeuri);
if ($ptag) {
- $local_user = User::staticGet('id', $ptag->tagger);
+ $local_user = User::getKV('id', $ptag->tagger);
if (!empty($local_user)) {
// TRANS: Exception.
throw new Exception(_m('Local list cannot be referenced as remote.'));
$oprofile->profile_id = $profile->insert();
if (!$oprofile->profile_id) {
- // TRANS: Server exception.
+ // TRANS: Server exception.
throw new ServerException(_m('Cannot save local profile.'));
}
} else if ($object->type == ActivityObject::GROUP) {
$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) {
// 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.
throw new Exception(_m('Not a valid webfinger address.'));
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.
}
// First, try to query it
- $oprofile = Ostatus_profile::staticGet('uri', $uri);
+ $oprofile = Ostatus_profile::getKV('uri', $uri);
// If unfound, do discovery stuff
projects / quix0rs-gnu-social.git / blobdiff