$salmon = common_local_url($salmonAction, array('id' => $id));
$feed->addLink($salmon, array('rel' => Salmon::REL_SALMON));
- // XXX: these are deprecated
+ // XXX: these are deprecated, but StatusNet only looks for NS_REPLIES
$feed->addLink($salmon, array('rel' => Salmon::NS_REPLIES));
$feed->addLink($salmon, array('rel' => Salmon::NS_MENTIONS));
}
// redirect to the new profile.
common_redirect(common_local_url('tagprofile', array('id' => $oprofile->profile_id)), 303);
- return false;
} catch (Exception $e) {
// TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
* Find any explicit remote mentions. Accepted forms:
* Webfinger: @user@example.com
* Profile link: @example.com/mublog/user
- * @param Profile $sender (os user?)
+ * @param Profile $sender
* @param string $text input markup text
* @param array &$mention in/out param: set of found mentions
* @return boolean hook return value
*/
- function onEndFindMentions($sender, $text, &$mentions)
+ function onEndFindMentions(Profile $sender, $text, &$mentions)
{
$matches = array();
$this->log(LOG_INFO, "Checking webfinger '$target'");
try {
$oprofile = Ostatus_profile::ensureWebfinger($target);
- if ($oprofile && !$oprofile->isGroup()) {
+ if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
$profile = $oprofile->localProfile();
$matches[$pos] = array('mentioned' => array($profile),
+ 'type' => 'mention',
'text' => $target,
'position' => $pos,
'url' => $profile->profileurl);
$this->log(LOG_INFO, "Checking profile address '$url'");
try {
$oprofile = Ostatus_profile::ensureProfileURL($url);
- if ($oprofile && !$oprofile->isGroup()) {
+ if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
$profile = $oprofile->localProfile();
$matches[$pos] = array('mentioned' => array($profile),
+ 'type' => 'mention',
'text' => $target,
'position' => $pos,
'url' => $profile->profileurl);
function onStartCommandGetProfile($command, $arg, &$profile)
{
$oprofile = $this->pullRemoteProfile($arg);
- if ($oprofile && !$oprofile->isGroup()) {
- $profile = $oprofile->localProfile();
+ if ($oprofile instanceof Ostatus_profile && !$oprofile->isGroup()) {
+ try {
+ $profile = $oprofile->localProfile();
+ } catch (NoProfileException $e) {
+ // No locally stored profile found for remote profile
+ return true;
+ }
return false;
} else {
return true;
function onStartCommandGetGroup($command, $arg, &$group)
{
$oprofile = $this->pullRemoteProfile($arg);
- if ($oprofile && $oprofile->isGroup()) {
+ if ($oprofile instanceof Ostatus_profile && $oprofile->isGroup()) {
$group = $oprofile->localGroup();
return false;
} else {
*/
function onStartNoticeSourceLink($notice, &$name, &$url, &$title)
{
- if ($notice->source == 'ostatus') {
- if ($notice->url) {
- $bits = parse_url($notice->url);
- $domain = $bits['host'];
- if (substr($domain, 0, 4) == 'www.') {
- $name = substr($domain, 4);
- } else {
- $name = $domain;
- }
+ // If we don't handle this, keep the event handler going
+ if ($notice->source != 'ostatus') {
+ return true;
+ }
- $url = $notice->url;
- // TRANS: Title. %s is a domain name.
- $title = sprintf(_m('Sent from %s via OStatus'), $domain);
- return false;
+ try {
+ $url = $notice->getUrl();
+ // If getUrl() throws exception, $url is never set
+
+ $bits = parse_url($url);
+ $domain = $bits['host'];
+ if (substr($domain, 0, 4) == 'www.') {
+ $name = substr($domain, 4);
+ } else {
+ $name = $domain;
}
+
+ // TRANS: Title. %s is a domain name.
+ $title = sprintf(_m('Sent from %s via OStatus'), $domain);
+
+ // Abort event handler, we have a name and URL!
+ return false;
+ } catch (InvalidUrlException $e) {
+ // This just means we don't have the notice source data
+ return true;
}
- return true;
}
/**
function onStartFeedSubReceive($feedsub, $feed)
{
$oprofile = Ostatus_profile::getKV('feeduri', $feedsub->uri);
- if ($oprofile) {
+ if ($oprofile instanceof Ostatus_profile) {
$oprofile->processFeed($feed, 'push');
} else {
common_log(LOG_DEBUG, "No ostatus profile for incoming feed $feedsub->uri");
function onFeedSubSubscriberCount($feedsub, &$count)
{
$oprofile = Ostatus_profile::getKV('feeduri', $feedsub->uri);
- if ($oprofile) {
+ if ($oprofile instanceof Ostatus_profile) {
$count += $oprofile->subscriberCount();
}
return true;
}
$oprofile = Ostatus_profile::getKV('profile_id', $other->id);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
- if (!$oprofile->subscribe()) {
- // TRANS: Exception thrown when setup of remote subscription fails.
- throw new Exception(_m('Could not set up remote subscription.'));
- }
+ $oprofile->subscribe();
}
/**
}
$oprofile = Ostatus_profile::getKV('profile_id', $other->id);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
}
$oprofile = Ostatus_profile::getKV('profile_id', $other->id);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
$profile->getBestName(),
$other->getBestName());
- $act->actor = ActivityObject::fromProfile($profile);
- $act->object = ActivityObject::fromProfile($other);
+ $act->actor = $profile->asActivityObject();
+ $act->object = $other->asActivityObject();
$oprofile->notifyActivity($act, $profile);
* @param Profile $profile
*
* @return mixed hook return value
+ * @throws Exception of various kinds, some from $oprofile->subscribe();
*/
function onStartJoinGroup($group, $profile)
{
$oprofile = Ostatus_profile::getKV('group_id', $group->id);
- if ($oprofile) {
- if (!$oprofile->subscribe()) {
- // TRANS: Exception thrown when setup of remote group membership fails.
- throw new Exception(_m('Could not set up remote group membership.'));
- }
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- // NOTE: we don't use Group_member::asActivity() since that record
- // has not yet been created.
-
- $act = new Activity();
- $act->id = TagURI::mint('join:%d:%d:%s',
- $profile->id,
- $group->id,
- common_date_iso8601(time()));
-
- $act->actor = ActivityObject::fromProfile($profile);
- $act->verb = ActivityVerb::JOIN;
- $act->object = $oprofile->asActivityObject();
-
- $act->time = time();
- // TRANS: Title for joining a remote groep.
- $act->title = _m('TITLE','Join');
- // TRANS: Success message for subscribe to group attempt through OStatus.
- // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
- $act->content = sprintf(_m('%1$s has joined group %2$s.'),
- $profile->getBestName(),
- $oprofile->getBestName());
-
- if ($oprofile->notifyActivity($act, $profile)) {
- return true;
- } else {
- $oprofile->garbageCollect();
- // TRANS: Exception thrown when joining a remote group fails.
- throw new Exception(_m('Failed joining remote group.'));
- }
+ $oprofile->subscribe();
+
+ // NOTE: we don't use Group_member::asActivity() since that record
+ // has not yet been created.
+
+ $act = new Activity();
+ $act->id = TagURI::mint('join:%d:%d:%s',
+ $profile->id,
+ $group->id,
+ common_date_iso8601(time()));
+
+ $act->actor = $profile->asActivityObject();
+ $act->verb = ActivityVerb::JOIN;
+ $act->object = $oprofile->asActivityObject();
+
+ $act->time = time();
+ // TRANS: Title for joining a remote groep.
+ $act->title = _m('TITLE','Join');
+ // TRANS: Success message for subscribe to group attempt through OStatus.
+ // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+ $act->content = sprintf(_m('%1$s has joined group %2$s.'),
+ $profile->getBestName(),
+ $oprofile->getBestName());
+
+ if ($oprofile->notifyActivity($act, $profile)) {
+ return true;
+ } else {
+ $oprofile->garbageCollect();
+ // TRANS: Exception thrown when joining a remote group fails.
+ throw new Exception(_m('Failed joining remote group.'));
}
}
function onEndLeaveGroup($group, $profile)
{
$oprofile = Ostatus_profile::getKV('group_id', $group->id);
- if ($oprofile) {
- // Drop the PuSH subscription if there are no other subscribers.
- $oprofile->garbageCollect();
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- $member = $profile;
+ // Drop the PuSH subscription if there are no other subscribers.
+ $oprofile->garbageCollect();
- $act = new Activity();
- $act->id = TagURI::mint('leave:%d:%d:%s',
- $member->id,
- $group->id,
- common_date_iso8601(time()));
+ $member = $profile;
- $act->actor = ActivityObject::fromProfile($member);
- $act->verb = ActivityVerb::LEAVE;
- $act->object = $oprofile->asActivityObject();
+ $act = new Activity();
+ $act->id = TagURI::mint('leave:%d:%d:%s',
+ $member->id,
+ $group->id,
+ common_date_iso8601(time()));
- $act->time = time();
- // TRANS: Title for leaving a remote group.
- $act->title = _m('TITLE','Leave');
- // TRANS: Success message for unsubscribe from group attempt through OStatus.
- // TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
- $act->content = sprintf(_m('%1$s has left group %2$s.'),
- $member->getBestName(),
- $oprofile->getBestName());
+ $act->actor = $member->asActivityObject();
+ $act->verb = ActivityVerb::LEAVE;
+ $act->object = $oprofile->asActivityObject();
- $oprofile->notifyActivity($act, $member);
- }
+ $act->time = time();
+ // TRANS: Title for leaving a remote group.
+ $act->title = _m('TITLE','Leave');
+ // TRANS: Success message for unsubscribe from group attempt through OStatus.
+ // TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+ $act->content = sprintf(_m('%1$s has left group %2$s.'),
+ $member->getBestName(),
+ $oprofile->getBestName());
+
+ $oprofile->notifyActivity($act, $member);
}
/**
* @param User $user
*
* @return mixed hook return value
+ * @throws Exception of various kinds, some from $oprofile->subscribe();
*/
function onStartSubscribePeopletag($peopletag, $user)
{
$oprofile = Ostatus_profile::getKV('peopletag_id', $peopletag->id);
- if ($oprofile) {
- if (!$oprofile->subscribe()) {
- // TRANS: Exception thrown when setup of remote list subscription fails.
- throw new Exception(_m('Could not set up remote list subscription.'));
- }
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
+ }
- $sub = $user->getProfile();
- $tagger = Profile::getKV($peopletag->tagger);
-
- $act = new Activity();
- $act->id = TagURI::mint('subscribe_peopletag:%d:%d:%s',
- $sub->id,
- $peopletag->id,
- common_date_iso8601(time()));
-
- $act->actor = ActivityObject::fromProfile($sub);
- $act->verb = ActivityVerb::FOLLOW;
- $act->object = $oprofile->asActivityObject();
-
- $act->time = time();
- // TRANS: Title for following a remote list.
- $act->title = _m('TITLE','Follow list');
- // TRANS: Success message for remote list follow through OStatus.
- // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
- $act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
- $sub->getBestName(),
- $oprofile->getBestName(),
- $tagger->getBestName());
-
- if ($oprofile->notifyActivity($act, $sub)) {
- return true;
- } else {
- $oprofile->garbageCollect();
- // TRANS: Exception thrown when subscription to remote list fails.
- throw new Exception(_m('Failed subscribing to remote list.'));
- }
+ $oprofile->subscribe();
+
+ $sub = $user->getProfile();
+ $tagger = Profile::getKV($peopletag->tagger);
+
+ $act = new Activity();
+ $act->id = TagURI::mint('subscribe_peopletag:%d:%d:%s',
+ $sub->id,
+ $peopletag->id,
+ common_date_iso8601(time()));
+
+ $act->actor = $sub->asActivityObject();
+ $act->verb = ActivityVerb::FOLLOW;
+ $act->object = $oprofile->asActivityObject();
+
+ $act->time = time();
+ // TRANS: Title for following a remote list.
+ $act->title = _m('TITLE','Follow list');
+ // TRANS: Success message for remote list follow through OStatus.
+ // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+ $act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
+ $sub->getBestName(),
+ $oprofile->getBestName(),
+ $tagger->getBestName());
+
+ if ($oprofile->notifyActivity($act, $sub)) {
+ return true;
+ } else {
+ $oprofile->garbageCollect();
+ // TRANS: Exception thrown when subscription to remote list fails.
+ throw new Exception(_m('Failed subscribing to remote list.'));
}
}
function onEndUnsubscribePeopletag($peopletag, $user)
{
$oprofile = Ostatus_profile::getKV('peopletag_id', $peopletag->id);
- if ($oprofile) {
- // Drop the PuSH subscription if there are no other subscribers.
- $oprofile->garbageCollect();
-
- $sub = Profile::getKV($user->id);
- $tagger = Profile::getKV($peopletag->tagger);
-
- $act = new Activity();
- $act->id = TagURI::mint('unsubscribe_peopletag:%d:%d:%s',
- $sub->id,
- $peopletag->id,
- common_date_iso8601(time()));
-
- $act->actor = ActivityObject::fromProfile($member);
- $act->verb = ActivityVerb::UNFOLLOW;
- $act->object = $oprofile->asActivityObject();
-
- $act->time = time();
- // TRANS: Title for unfollowing a remote list.
- $act->title = _m('Unfollow list');
- // TRANS: Success message for remote list unfollow through OStatus.
- // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
- $act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
- $sub->getBestName(),
- $oprofile->getBestName(),
- $tagger->getBestName());
-
- $oprofile->notifyActivity($act, $user);
+ if (!$oprofile instanceof Ostatus_profile) {
+ return true;
}
+
+ // Drop the PuSH subscription if there are no other subscribers.
+ $oprofile->garbageCollect();
+
+ $sub = Profile::getKV($user->id);
+ $tagger = Profile::getKV($peopletag->tagger);
+
+ $act = new Activity();
+ $act->id = TagURI::mint('unsubscribe_peopletag:%d:%d:%s',
+ $sub->id,
+ $peopletag->id,
+ common_date_iso8601(time()));
+
+ $act->actor = $member->asActivityObject();
+ $act->verb = ActivityVerb::UNFOLLOW;
+ $act->object = $oprofile->asActivityObject();
+
+ $act->time = time();
+ // TRANS: Title for unfollowing a remote list.
+ $act->title = _m('Unfollow list');
+ // TRANS: Success message for remote list unfollow through OStatus.
+ // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+ $act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
+ $sub->getBestName(),
+ $oprofile->getBestName(),
+ $tagger->getBestName());
+
+ $oprofile->notifyActivity($act, $user);
}
/**
*/
function onEndFavorNotice(Profile $profile, Notice $notice)
{
- $user = User::getKV('id', $profile->id);
-
- if (empty($user)) {
+ // Only distribute local users' favor actions, remote users
+ // will have already distributed theirs.
+ if (!$profile->isLocal()) {
return true;
}
$oprofile = Ostatus_profile::getKV('profile_id', $notice->profile_id);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
- $fav = Fave::pkeyGet(array('user_id' => $user->id,
+ $fav = Fave::pkeyGet(array('user_id' => $profile->id,
'notice_id' => $notice->id));
- if (empty($fav)) {
+ if (!$fav instanceof Fave) {
// That's weird.
+ // TODO: Make pkeyGet throw exception, since this is a critical failure.
return true;
}
*
* @param Profile_tag $ptag the people tag that was created
* @return hook return value
+ * @throws Exception of various kinds, some from $oprofile->subscribe();
*/
function onEndTagProfile($ptag)
{
$oprofile = Ostatus_profile::getKV('profile_id', $ptag->tagged);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
$tagged->getBestName(),
$plist->getBestName());
- $act->actor = ActivityObject::fromProfile($tagger);
- $act->objects = array(ActivityObject::fromProfile($tagged));
+ $act->actor = $tagger->asActivityObject();
+ $act->objects = array($tagged->asActivityObject());
$act->target = ActivityObject::fromPeopletag($plist);
$oprofile->notifyDeferred($act, $tagger);
// initiate a PuSH subscription for the person being tagged
- if (!$oprofile->subscribe()) {
- // TRANS: Exception thrown when subscribing to a remote list fails.
- throw new Exception(sprintf(_m('Could not complete subscription to remote '.
- 'profile\'s feed. List %s could not be saved.'), $ptag->tag));
- return false;
- }
+ $oprofile->subscribe();
return true;
}
function onEndUntagProfile($ptag)
{
$oprofile = Ostatus_profile::getKV('profile_id', $ptag->tagged);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
$tagged->getBestName(),
$plist->getBestName());
- $act->actor = ActivityObject::fromProfile($tagger);
- $act->objects = array(ActivityObject::fromProfile($tagged));
+ $act->actor = $tagger->asActivityObject();
+ $act->objects = array($tagged->asActivityObject());
$act->target = ActivityObject::fromPeopletag($plist);
$oprofile->notifyDeferred($act, $tagger);
*/
function onEndDisfavorNotice(Profile $profile, Notice $notice)
{
- $user = User::getKV('id', $profile->id);
-
- if (empty($user)) {
+ // Only distribute local users' disfavor actions, remote users
+ // will have already distributed theirs.
+ if (!$profile->isLocal()) {
return true;
}
$oprofile = Ostatus_profile::getKV('profile_id', $notice->profile_id);
-
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
// TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
$act->content = sprintf(_m('%1$s no longer likes %2$s.'),
$profile->getBestName(),
- $notice->uri);
+ $notice->getUrl());
- $act->actor = ActivityObject::fromProfile($profile);
+ $act->actor = $profile->asActivityObject();
$act->object = ActivityObject::fromNotice($notice);
$oprofile->notifyActivity($act, $profile);
function onStartGetProfileUri($profile, &$uri)
{
$oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
- if (!empty($oprofile)) {
+ if ($oprofile instanceof Ostatus_profile) {
$uri = $oprofile->uri;
return false;
}
function onStartUserGroupPermalink($group, &$url)
{
$oprofile = Ostatus_profile::getKV('group_id', $group->id);
- if ($oprofile) {
+ if ($oprofile instanceof Ostatus_profile) {
// @fixme this should probably be in the user_group table
// @fixme this uri not guaranteed to be a profile page
$url = $oprofile->uri;
$act->content = sprintf(_m('%s has updated their profile page.'),
$profile->getBestName());
- $act->actor = ActivityObject::fromProfile($profile);
+ $act->actor = $profile->asActivityObject();
$act->object = $act->actor;
while ($oprofile->fetch()) {
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'OStatus',
- 'version' => STATUSNET_VERSION,
+ 'version' => GNUSOCIAL_VERSION,
'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:OStatus',
// TRANS: Plugin description.
public static function localGroupFromUrl($url)
{
$group = User_group::getKV('uri', $url);
- if ($group) {
- $local = Local_group::getKV('group_id', $group->id);
- if ($local) {
+ if ($group instanceof User_group) {
+ if ($group->isLocal()) {
return $group->id;
}
} else {
{
$oprofile = Ostatus_profile::getKV('profile_id', $profile->id);
- if (empty($oprofile)) {
+ if (!$oprofile instanceof Ostatus_profile) {
return true;
}
// Now, check remotely
- $oprofile = Ostatus_profile::ensureProfileURI($uri);
-
- if (!empty($oprofile)) {
+ try {
+ $oprofile = Ostatus_profile::ensureProfileURI($uri);
$profile = $oprofile->localProfile();
- return false;
+ return !($profile instanceof Profile); // localProfile won't throw exception but can return null
+ } catch (Exception $e) {
+ return true; // It's not an OStatus profile as far as we know, continue event handling
}
+ }
- // Still not a hit, so give up.
-
+ function onEndWebFingerNoticeLinks(XML_XRD $xrd, Notice $target)
+ {
+ $author = $target->getProfile();
+ $salmon_url = common_local_url('usersalmon', array('id' => $author->id));
+ $xrd->links[] = new XML_XRD_Element_Link(Salmon::REL_SALMON, $salmon_url);
return true;
}
array('id' => $target->id));
$xrd->links[] = new XML_XRD_Element_Link(Salmon::REL_SALMON, $salmon_url);
- // XXX : Deprecated - to be removed.
+
+ // XXX: these are deprecated, but StatusNet only looks for NS_REPLIES
$xrd->links[] = new XML_XRD_Element_Link(Salmon::NS_REPLIES, $salmon_url);
$xrd->links[] = new XML_XRD_Element_Link(Salmon::NS_MENTIONS, $salmon_url);
- // Get this user's keypair
- $magickey = Magicsig::getKV('user_id', $target->id);
- if (!($magickey instanceof Magicsig)) {
- // No keypair yet, let's generate one.
- $magickey = new Magicsig();
- $magickey->generate($target->id);
+ // Get this profile's keypair
+ $magicsig = Magicsig::getKV('user_id', $target->id);
+ if (!$magicsig instanceof Magicsig && $target->isLocal()) {
+ $magicsig = Magicsig::generate($target->getUser());
}
- $xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL,
- 'data:application/magic-public-key,'. $magickey->toString(false));
+ if ($magicsig instanceof Magicsig) {
+ $xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL,
+ 'data:application/magic-public-key,'. $magicsig->toString());
+ }
// TODO - finalize where the redirect should go on the publisher
$xrd->links[] = new XML_XRD_Element_Link('http://ostatus.org/schema/1.0/subscribe',
return true;
}
+
+ public function onGetLocalAttentions(Profile $actor, array $attention_uris, array &$mentions, array &$groups)
+ {
+ list($mentions, $groups) = Ostatus_profile::filterAttention($actor, $attention_uris);
+ }
+
+ // FIXME: Maybe this shouldn't be so authoritative that it breaks other remote profile lookups?
+ static public function onCheckActivityAuthorship(Activity $activity, Profile &$profile)
+ {
+ try {
+ $oprofile = Ostatus_profile::getFromProfile($profile);
+ $oprofile = $oprofile->checkAuthorship($activity);
+ $profile = $oprofile->localProfile();
+ } catch (Exception $e) {
+ common_log(LOG_ERR, 'Could not get a profile or check authorship ('.get_class($e).': "'.$e->getMessage().'")');
+ $profile = null;
+ return false;
+ }
+ return true;
+ }
}
projects / quix0rs-gnu-social.git / blobdiff