{
$schema = Schema::get();
- // For storing user-submitted flags on profiles
-
- $schema->ensureTable('bookmark',
- array(new ColumnDef('id',
- 'char',
- 36,
- false,
- 'PRI'),
- new ColumnDef('profile_id',
- 'integer',
- null,
- false,
- 'MUL'),
- new ColumnDef('url',
- 'varchar',
- 255,
- false,
- 'MUL'),
- new ColumnDef('title',
- 'varchar',
- 255),
- new ColumnDef('description',
- 'text'),
- new ColumnDef('uri',
- 'varchar',
- 255,
- false,
- 'UNI'),
- new ColumnDef('created',
- 'datetime',
- null,
- false,
- 'MUL')));
+ $schema->ensureTable('bookmark', Bookmark::schemaDef());
return true;
}
*/
function onEndShowStyles($action)
{
- $action->cssLink($this->path('bookmark.css'));
+ $action->cssLink($this->path('css/bookmark.css'));
return true;
}
$action->script($this->path('js/bookmark.js'));
return true;
}
- /**
- * Load related modules when needed
- *
- * @param string $cls Name of the class to be loaded
- *
- * @return boolean hook value; true means continue processing, false means stop.
- */
- function onAutoload($cls)
- {
- $dir = dirname(__FILE__);
-
- switch ($cls)
- {
- case 'ShowbookmarkAction':
- case 'NewbookmarkAction':
- case 'BookmarkpopupAction':
- case 'NoticebyurlAction':
- case 'BookmarkforurlAction':
- case 'ImportdeliciousAction':
- include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
- return false;
- case 'Bookmark':
- include_once $dir.'/'.$cls.'.php';
- return false;
- case 'BookmarkListItem':
- case 'BookmarkForm':
- case 'InitialBookmarkForm':
- case 'DeliciousBackupImporter':
- case 'DeliciousBookmarkImporter':
- include_once $dir.'/'.strtolower($cls).'.php';
- return false;
- default:
- return true;
- }
- }
/**
* Map URLs to actions
*/
function onRouterInitialized($m)
{
+ if (common_config('singleuser', 'enabled')) {
+ $nickname = User::singleUserNickname();
+ $m->connect('bookmarks',
+ array('action' => 'bookmarks', 'nickname' => $nickname));
+ $m->connect('bookmarks/rss',
+ array('action' => 'bookmarksrss', 'nickname' => $nickname));
+ } else {
+ $m->connect(':nickname/bookmarks',
+ array('action' => 'bookmarks'),
+ array('nickname' => Nickname::DISPLAY_FMT));
+ $m->connect(':nickname/bookmarks/rss',
+ array('action' => 'bookmarksrss'),
+ array('nickname' => Nickname::DISPLAY_FMT));
+ }
+
+ $m->connect('api/bookmarks/:id.:format',
+ array('action' => 'ApiTimelineBookmarks',
+ 'id' => Nickname::INPUT_FMT,
+ 'format' => '(xml|json|rss|atom|as)'));
+
$m->connect('main/bookmark/new',
array('action' => 'newbookmark'),
array('id' => '[0-9]+'));
{
$versions[] = array('name' => 'Bookmark',
'version' => self::VERSION,
- 'author' => 'Evan Prodromou',
+ 'author' => 'Evan Prodromou, Stephane Berube, Jean Baptiste Favre',
'homepage' => 'http://status.net/wiki/Plugin:Bookmark',
'description' =>
// TRANS: Plugin description.
- _m('Simple extension for supporting bookmarks.'));
+ _m('Simple extension for supporting bookmarks. ') .
+ 'BookmarkList feature has been developped by Stephane Berube. ' .
+ 'Integration has been done by Jean Baptiste Favre.');
return true;
}
}
$id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
- $class = 'hentry notice bookmark';
+ $class = 'h-entry notice bookmark';
if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
$class .= ' limited-scope';
}
}
/**
- * Save a remote bookmark (from Salmon or PuSH)
+ * Modify the default menu to link to our custom action
*
- * @param Ostatus_profile $author Author of the bookmark
- * @param Activity $activity Activity to save
+ * Using event handlers, it's possible to modify the default UI for pages
+ * almost without limit. In this method, we add a menu item to the default
+ * primary menu for the interface to link to our action.
*
- * @return Notice resulting notice.
- */
- static private function _postRemoteBookmark(Ostatus_profile $author,
- Activity $activity)
- {
- $bookmark = $activity->objects[0];
-
- $options = array('uri' => $bookmark->id,
- 'url' => $bookmark->link,
- 'is_local' => Notice::REMOTE,
- 'source' => 'ostatus');
-
- return self::_postBookmark($author->localProfile(), $activity, $options);
- }
-
- /**
- * Test if an activity represents posting a bookmark
+ * The Action class provides a rich set of events to hook, as well as output
+ * methods.
*
- * @param Activity $activity Activity to test
+ * @param Action $action The current action handler. Use this to
+ * do any output.
*
- * @return true if it's a Post of a Bookmark, else false
+ * @return boolean hook value; true means continue processing, false means stop.
+ *
+ * @see Action
*/
- static private function _isPostBookmark($activity)
+ function onEndPersonalGroupNav($action)
{
- return ($activity->verb == ActivityVerb::POST &&
- $activity->objects[0]->type == ActivityObject::BOOKMARK);
+ $this->user = common_current_user();
+
+ if (!$this->user) {
+ // TRANS: Client error displayed when trying to display bookmarks for a non-existing user.
+ $this->clientError(_('No such user.'));
+ }
+
+ $action->menuItem(common_local_url('bookmarks', array('nickname' => $this->user->nickname)),
+ // TRANS: Menu item in sample plugin.
+ _m('Bookmarks'),
+ // TRANS: Menu item title in sample plugin.
+ _m('A list of your bookmarks'), false, 'nav_timeline_bookmarks');
+ return true;
}
function types()
}
}
- $replies = $activity->context->attention;
-
$options['groups'] = array();
- $options['replies'] = array();
-
- foreach ($replies as $replyURI) {
- $other = Profile::fromURI($replyURI);
- if (!empty($other)) {
- $options['replies'][] = $replyURI;
- } else {
- $group = User_group::staticGet('uri', $replyURI);
- if (!empty($group)) {
- $options['groups'][] = $replyURI;
+ $options['replies'] = array(); // TODO: context->attention
+
+ foreach ($activity->context->attention as $attnUrl=>$type) {
+ try {
+ $other = Profile::fromUri($attnUrl);
+ if ($other->isGroup()) {
+ $options['groups'][] = $other->id;
+ } else {
+ $options['replies'][] = $attnUrl;
}
+ } catch (UnknownUriException $e) {
+ // We simply don't know this URI, despite lookup attempts.
}
}
// @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;
$object->type = ActivityObject::BOOKMARK;
$object->title = $nb->title;
$object->summary = $nb->description;
- $object->link = $notice->bestUrl();
+ $object->link = $notice->getUrl();
// Attributes of the URL
// Attributes of the thumbnail, if any
- $thumbnail = $target->getThumbnail();
-
- if (!empty($thumbnail)) {
+ try {
+ $thumbnail = $target->getThumbnail();
$tattrs = array('rel' => 'preview',
'href' => $thumbnail->url);
$tattrs['media:height'] = $thumbnail->height;
}
- $object->extra[] = array('link', $attrs, null);
+ $object->extra[] = array('link', $tattrs, null);
+ } catch (UnsupportedMediaException $e) {
+ // No image thumbnail metadata available
}
return $object;
{
assert($obj->type == ActivityObject::BOOKMARK);
- $bm = Bookmark::staticGet('uri', $obj->id);
+ $bm = Bookmark::getKV('uri', $obj->id);
if (empty($bm)) {
throw new ServerException("Unknown bookmark: " . $obj->id);
projects / quix0rs-gnu-social.git / blobdiff