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;
-
- if (Event::handle('StartFavorNotice', array($profile, $notice, &$fave))) {
-
- $fave = new Fave();
-
- $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);
-
- 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');
+ static function addNew(Profile $actor, Notice $target) {
+ $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;
- Event::handle('EndFavorNotice', array($profile, $notice));
- }
+ // saveActivity will in turn also call Fave::saveActivityObject which does
+ // what this function used to do before this commit.
+ $stored = Notice::saveActivity($act, $actor);
- return $fave;
+ return $stored;
}
// 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);
$act->time = strtotime($this->created);
// TRANS: Activity title when marking a notice as favorite.
$act->title = _("Favor");
- $act->content = $target->rendered ?: $target->content;
+ // 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();
return $object;
}
+ /**
+ * 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 self::fromStored($stored)->getTarget();
+ }
+
static public function getObjectType()
{
return 'activity';
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::compareTypes($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;
}
projects / quix0rs-gnu-social.git / blobdiff