public $__table = 'fave'; // table name
public $notice_id; // int(4) primary_key not_null
public $user_id; // int(4) primary_key not_null
- public $uri; // varchar(255)
+ public $uri; // varchar(191) not 255 because utf8mb4 takes more space not 255 because utf8mb4 takes more space
public $created; // datetime multiple_key not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
'fields' => array(
'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the favorite'),
'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who likes this notice'),
- 'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+ 'uri' => array('type' => 'varchar', 'length' => 191, 'description' => 'universally unique identifier, usually a tag URI'),
'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
),
* Save a favorite record.
* @fixme post-author notification should be moved here
*
- * @param Profile $profile the local or remote user who likes
- * @param Notice $notice the notice that is liked
- * @return mixed false on failure, or Fave record on success
+ * @param Profile $actor the local or remote Profile who favorites
+ * @param Notice $target the notice that is favorited
+ * @return Fave record on success
+ * @throws Exception on failure
*/
- static function addNew(Profile $profile, Notice $notice) {
-
- $fave = null;
+ static function addNew(Profile $actor, Notice $target) {
+ if (self::existsForProfile($target, $actor)) {
+ // TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
+ throw new AlreadyFulfilledException(_('You have already favorited this!'));
+ }
- if (Event::handle('StartFavorNotice', array($profile, $notice, &$fave))) {
+ $act = new Activity();
+ $act->type = ActivityObject::ACTIVITY;
+ $act->verb = ActivityVerb::FAVORITE;
+ $act->time = time();
+ $act->id = self::newUri($actor, $target, common_sql_date($act->time));
+ $act->title = _("Favor");
+ // TRANS: Message that is the "content" of a favorite (%1$s is the actor's nickname, %2$ is the favorited
+ // notice's nickname and %3$s is the content of the favorited notice.)
+ $act->content = sprintf(_('%1$s favorited something by %2$s: %3$s'),
+ $actor->getNickname(), $target->getProfile()->getNickname(),
+ $target->rendered ?: $target->content);
+ $act->actor = $actor->asActivityObject();
+ $act->target = $target->asActivityObject();
+ $act->objects = array(clone($act->target));
+
+ $url = common_local_url('AtomPubShowFavorite', array('profile'=>$actor->id, 'notice'=>$target->id));
+ $act->selfLink = $url;
+ $act->editLink = $url;
- $fave = new Fave();
+ // saveActivity will in turn also call Fave::saveActivityObject which does
+ // what this function used to do before this commit.
+ $stored = Notice::saveActivity($act, $actor);
- $fave->user_id = $profile->id;
- $fave->notice_id = $notice->id;
- $fave->created = common_sql_now();
- $fave->modified = common_sql_now();
- $fave->uri = self::newURI($profile,
- $notice,
- $fave->created);
+ return $stored;
+ }
- try {
- $fave->insert();
- } catch (ServerException $e) {
- common_log_db_error($fave, 'INSERT', __FILE__);
- return false;
- }
- self::blowCacheForProfileId($fave->user_id);
- self::blowCacheForNoticeId($fave->notice_id);
- self::blow('popular');
+ public function removeEntry(Profile $actor, Notice $target)
+ {
+ $fave = new Fave();
+ $fave->user_id = $actor->getID();
+ $fave->notice_id = $target->getID();
+ if (!$fave->find(true)) {
+ // TRANS: Client error displayed when trying to remove a 'favor' when there is none in the first place.
+ throw new AlreadyFulfilledException(_('This is already not favorited.'));
+ }
- Event::handle('EndFavorNotice', array($profile, $notice));
+ $result = $fave->delete();
+ if ($result === false) {
+ common_log_db_error($fave, 'DELETE', __FILE__);
+ // TRANS: Server error displayed when removing a favorite from the database fails.
+ throw new ServerException(_('Could not delete favorite.'));
}
- return $fave;
+ Fave::blowCacheForProfileId($actor->getID());
+ Fave::blowCacheForNoticeId($target->getID());
}
// exception throwing takeover!
public function insert()
{
- if (!parent::insert()) {
+ if (parent::insert()===false) {
+ common_log_db_error($this, 'INSERT', __FILE__);
throw new ServerException(sprintf(_m('Could not store new object of type %s'), get_called_class()));
}
self::blowCacheForProfileId($this->user_id);
public function delete($useWhere=false)
{
- $profile = Profile::getKV('id', $this->user_id);
- $notice = Notice::getKV('id', $this->notice_id);
-
$result = null;
- if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) {
+ try {
+ $profile = $this->getActor();
+ $notice = $this->getTarget();
- $result = parent::delete($useWhere);
+ if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) {
- self::blowCacheForProfileId($this->user_id);
- self::blowCacheForNoticeId($this->notice_id);
- self::blow('popular');
+ $result = parent::delete($useWhere);
- if ($result) {
- Event::handle('EndDisfavorNotice', array($profile, $notice));
+ if ($result !== false) {
+ Event::handle('EndDisfavorNotice', array($profile, $notice));
+ }
}
+
+ } catch (NoResultException $e) {
+ // In case there's some inconsistency where the profile or notice was deleted without losing the fave db entry
+ common_log(LOG_INFO, '"'.get_class($e->obj).'" with id=='.var_export($e->obj->id, true).' object not found when deleting favorite, ignoring...');
+ } catch (EmptyIdException $e) {
+ // Some buggy instances of GNU social have had favroites with notice id==0 stored in the database
+ common_log(LOG_INFO, '"'.get_class($e->obj).'"object had empty id deleting favorite, ignoring...');
+ }
+
+ // If we catch an exception above, then $result===null because parent::delete only returns an int>=0 or boolean false
+ if (is_null($result)) {
+ // Delete it without the event, as something is wrong and we don't want it anyway.
+ $result = parent::delete($useWhere);
}
+ // Err, apparently we can reference $this->user_id after parent::delete,
+ // I guess it's safe because this is the order it was before!
+ self::blowCacheForProfileId($this->user_id);
+ self::blowCacheForNoticeId($this->notice_id);
+ self::blow('popular');
+
return $result;
}
- function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0)
+ static function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0)
{
$stream = new FaveNoticeStream($user_id, $own);
function asActivity()
{
- $notice = Notice::getKV('id', $this->notice_id);
-
- if (!$notice) {
- throw new Exception("Fave for non-existent notice: " . $this->notice_id);
- }
-
- $profile = Profile::getKV('id', $this->user_id);
-
- if (!$profile) {
- throw new Exception("Fave by non-existent profile: " . $this->user_id);
- }
+ $target = $this->getTarget();
+ $actor = $this->getActor();
$act = new Activity();
// FIXME: rationalize this with URL below
- $act->id = $this->getURI();
+ $act->id = $this->getUri();
- $act->time = strtotime($this->modified);
+ $act->time = strtotime($this->created);
// TRANS: Activity title when marking a notice as favorite.
$act->title = _("Favor");
- // TRANS: Ntofication given when a user marks a notice as favorite.
- // TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
- $act->content = sprintf(_('%1$s marked notice %2$s as a favorite.'),
- $profile->getBestName(),
- $notice->getUrl());
+ // TRANS: Message that is the "content" of a favorite (%1$s is the actor's nickname, %2$ is the favorited
+ // notice's nickname and %3$s is the content of the favorited notice.)
+ $act->content = sprintf(_('%1$s favorited something by %2$s: %3$s'),
+ $actor->getNickname(), $target->getProfile()->getNickname(),
+ $target->rendered ?: $target->content);
- $act->actor = $profile->asActivityObject();
- $act->objects[] = ActivityObject::fromNotice($notice);
+ $act->actor = $actor->asActivityObject();
+ $act->target = $target->asActivityObject();
+ $act->objects = array(clone($act->target));
$url = common_local_url('AtomPubShowFavorite',
- array('profile' => $this->user_id,
- 'notice' => $this->notice_id));
+ array('profile' => $actor->id,
+ 'notice' => $target->id));
$act->selfLink = $url;
$act->editLink = $url;
return $object;
}
- static public function verbToTitle($verb)
+ /**
+ * Retrieves the _targeted_ notice of a verb (such as the notice that was
+ * _favorited_, but not the favorite activity itself).
+ *
+ * @param Notice $stored The activity notice.
+ *
+ * @throws NoResultException when it can't find what it's looking for.
+ */
+ static public function getTargetFromStored(Notice $stored)
{
- return ucfirst($verb);
+ return self::fromStored($stored)->getTarget();
}
static public function getObjectType()
{
$actobj = new ActivityObject();
$actobj->id = $this->getUri();
- $actobj->type = ActivityUtils::resolveUri(ActivityObject::ACTIVITY);
+ $actobj->type = ActivityUtils::resolveUri(self::getObjectType());
$actobj->actor = $this->getActorObject();
+ $actobj->target = $this->getTargetObject();
$actobj->objects = array(clone($actobj->target));
- $actobj->title = Stored_ActivityVerb::verbToTitle($this->verb);
- //$actobj->verb = $this->verb;
- //$actobj->target = $this->getTargetObject();
+ $actobj->verb = ActivityVerb::FAVORITE;
+ $actobj->title = ActivityUtils::verbToTitle($actobj->verb);
+ $actobj->content = $this->getTarget()->rendered ?: $this->getTarget()->content;
return $actobj;
}
+ /**
+ * @param ActivityObject $actobj The _favored_ notice (which we're "in-reply-to")
+ * @param Notice $stored The _activity_ notice, i.e. the favor itself.
+ */
static public function parseActivityObject(ActivityObject $actobj, Notice $stored)
{
- // The ActivityObject we get here is the _favored_ notice (kind of what we're "in-reply-to")
- // The Notice we get is the _activity_ stored in our Notice table
-
- $type = isset($actobj->type) ? ActivityUtils::resolveUri($actobj->type, true) : ActivityObject::NOTE;
- $local = ActivityUtils::findLocalObject($actobj->getIdentifiers(), $type);
+ // throws exception if nothing was found, but it could also be a non-Notice...
+ // FIXME: This should only test _one_ URI (and not the links etc.) though a function like this could be useful in other cases
+ $local = ActivityUtils::findLocalObject($actobj->getIdentifiers());
if (!$local instanceof Notice) {
// $local always returns something, but this was not what we expected. Something is wrong.
throw new Exception('Something other than a Notice was returned from findLocalObject');
return $object;
}
+ static public function extendActivity(Notice $stored, Activity $act, Profile $scoped=null)
+ {
+ $target = self::getTargetFromStored($stored);
+
+ // The following logic was copied from StatusNet's Activity plugin
+ if (ActivityUtils::compareVerbs($target->verb, array(ActivityVerb::POST))) {
+ // "I like the thing you posted"
+ $act->objects = $target->asActivity()->objects;
+ } else {
+ // "I like that you did whatever you did"
+ $act->target = $target->asActivityObject();
+ $act->objects = array(clone($act->target));
+ }
+ $act->context->replyToID = $target->getUri();
+ $act->context->replyToUrl = $target->getUrl();
+ $act->title = ActivityUtils::verbToTitle($act->verb);
+ }
+
static function saveActivityObject(ActivityObject $actobj, Notice $stored)
{
$object = self::parseActivityObject($actobj, $stored);
- $object->insert(); // exception throwing!
+ $object->insert(); // exception throwing in Fave's case!
+
+ self::blowCacheForProfileId($object->user_id);
+ self::blowCacheForNoticeId($object->notice_id);
+ self::blow('popular');
+
+ Event::handle('EndFavorNotice', array($stored->getProfile(), $object->getTarget()));
return $object;
}
+ public function getAttentionArray() {
+ // not all objects can/should carry attentions, so we don't require extending this
+ // the format should be an array with URIs to mentioned profiles
+ return array();
+ }
public function getTarget()
{
- // throws exception on failure
- return ActivityUtils::findLocalObject(array($this->uri), $this->type);
+ return Notice::getByID($this->notice_id);
}
public function getTargetObject()
public function getActor()
{
- $profile = new Profile();
- $profile->id = $this->user_id;
- if (!$profile->find(true)) {
- throw new NoResultException($profile);
- }
- return $profile;
+ return Profile::getByID($this->user_id);
}
public function getActorObject()
return $this->getActor()->asActivityObject();
}
- public function getURI()
+ public function getUri()
{
if (!empty($this->uri)) {
return $this->uri;
}
// We (should've in this case) created it ourselves, so we tag it ourselves
- return self::newURI($this->getActor(), $this->getTarget(), $this->created);
- }
-
- static function newURI(Profile $actor, Managed_DataObject $target, $created=null)
- {
- if (is_null($created)) {
- $created = common_sql_now();
- }
- return TagURI::mint(strtolower(get_called_class()).':%d:%s:%d:%s',
- $actor->id,
- ActivityUtils::resolveUri(self::getObjectType(), true),
- $target->id,
- common_date_iso8601($created));
+ return self::newUri($this->getActor(), $this->getTarget(), $this->created);
}
}
projects / quix0rs-gnu-social.git / blobdiff