diff options
-rw-r--r-- | classes/Notice.php | 1 | ||||
-rw-r--r-- | lib/distribqueuehandler.php | 8 | ||||
-rw-r--r-- | plugins/ForceGroup/ForceGroupPlugin.php | 82 | ||||
-rw-r--r-- | plugins/GroupFavorited/GroupFavoritedPlugin.php | 79 | ||||
-rw-r--r-- | plugins/GroupFavorited/groupfavoritedaction.php | 111 | ||||
-rw-r--r-- | plugins/OpenID/OpenIDPlugin.php | 11 | ||||
-rw-r--r-- | plugins/SlicedFavorites/SlicedFavoritesPlugin.php | 109 | ||||
-rw-r--r-- | plugins/SlicedFavorites/favoritedsliceaction.php | 155 |
8 files changed, 552 insertions, 4 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 79626f889..e268544b5 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -2034,6 +2034,7 @@ class Notice extends Memcached_DataObject { // We always insert for the author so they don't // have to wait + Event::handle('StartNoticeDistribute', array($this)); $user = User::staticGet('id', $this->profile_id); if (!empty($user)) { diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php index 8f4b72d5c..a7519c1d5 100644 --- a/lib/distribqueuehandler.php +++ b/lib/distribqueuehandler.php @@ -78,13 +78,19 @@ class DistribQueueHandler } try { + Event::handle('EndNoticeDistribute', array($notice)); + } catch (Exception $e) { + $this->logit($notice, $e); + } + + try { Event::handle('EndNoticeSave', array($notice)); - // Enqueue for other handlers } catch (Exception $e) { $this->logit($notice, $e); } try { + // Enqueue for other handlers common_enqueue_notice($notice); } catch (Exception $e) { $this->logit($notice, $e); diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php new file mode 100644 index 000000000..e0a04fcca --- /dev/null +++ b/plugins/ForceGroup/ForceGroupPlugin.php @@ -0,0 +1,82 @@ +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2010, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** + * @package ForceGroupPlugin + * @maintainer Brion Vibber <brion@status.net> + */ + +if (!defined('STATUSNET')) { exit(1); } + +class ForceGroupPlugin extends Plugin +{ + /** + * Members of these groups will have all their posts mirrored into + * the group even if they don't explicitly mention it. + * + * List by local nickname. + */ + public $post = array(); + + /** + * New user registrations will automatically join these groups on + * registration. They're not prevented from leaving, however. + * + * List by local nickname. + */ + public $join = array(); + + /** + * If poster is in one of the forced groups, make sure their notice + * gets saved into that group even if not explicitly mentioned. + * + * @param Notice $notice + * @return boolean event hook return + */ + function onStartNoticeDistribute($notice) + { + $profile = $notice->getProfile(); + foreach ($this->post as $nickname) { + $group = User_group::getForNickname($nickname); + if ($group && $profile->isMember($group)) { + $notice->addToGroupInbox($group); + } + } + return true; + } + + function onEndUserRegister($profile, $user) + { + $profile = $user->getProfile(); + foreach ($this->join as $nickname) { + $group = User_group::getForNickname($nickname); + if ($group && !$profile->isMember($group)) { + try { + if (Event::handle('StartJoinGroup', array($group, $user))) { + Group_member::join($group->id, $user->id); + Event::handle('EndJoinGroup', array($group, $user)); + } + } catch (Exception $e) { + throw new ServerException(sprintf(_('Could not join user %1$s to group %2$s.'), + $user->nickname, $group->nickname)); + } + } + } + } +} diff --git a/plugins/GroupFavorited/GroupFavoritedPlugin.php b/plugins/GroupFavorited/GroupFavoritedPlugin.php new file mode 100644 index 000000000..68815530a --- /dev/null +++ b/plugins/GroupFavorited/GroupFavoritedPlugin.php @@ -0,0 +1,79 @@ +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2010, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** + * @package GroupFavoritedPlugin + * @maintainer Brion Vibber <brion@status.net> + */ + +if (!defined('STATUSNET')) { exit(1); } + +class GroupFavoritedPlugin extends Plugin +{ + /** + * Hook for RouterInitialized event. + * + * @param Net_URL_Mapper $m path-to-action mapper + * @return boolean hook return + */ + function onRouterInitialized($m) + { + $m->connect('group/:nickname/favorited', + array('action' => 'groupfavorited'), + array('nickname' => '[a-zA-Z0-9]+')); + + return true; + } + + /** + * Automatically load the actions and libraries used by the plugin + * + * @param Class $cls the class + * + * @return boolean hook return + * + */ + function onAutoload($cls) + { + $base = dirname(__FILE__); + $lower = strtolower($cls); + switch ($lower) { + case 'groupfavoritedaction': + require_once "$base/$lower.php"; + return false; + default: + return true; + } + } + + function onEndGroupGroupNav(GroupNav $nav) + { + $action_name = $nav->action->trimmed('action'); + $nickname = $nav->group->nickname; + $nav->out->menuItem(common_local_url('groupfavorited', array('nickname' => + $nickname)), + // TRANS: Menu item in the group navigation page. + _m('MENU', 'Popular'), + // TRANS: Tooltip for menu item in the group navigation page. + // TRANS: %s is the nickname of the group. + sprintf(_m('TOOLTIP','Popular notices in %s group'), $nickname), + $action_name == 'groupfavorited', + 'nav_group_group'); + } +} diff --git a/plugins/GroupFavorited/groupfavoritedaction.php b/plugins/GroupFavorited/groupfavoritedaction.php new file mode 100644 index 000000000..6803bea8d --- /dev/null +++ b/plugins/GroupFavorited/groupfavoritedaction.php @@ -0,0 +1,111 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * List of popular notices + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Public + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @author Evan Prodromou <evan@status.net> + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + + +class GroupFavoritedAction extends ShowgroupAction +{ + + /** + * Title of the page + * + * @return string page title, with page number + */ + + function title() + { + if (!empty($this->group->fullname)) { + $base = $this->group->fullname . ' (' . $this->group->nickname . ')'; + } else { + $base = $this->group->nickname; + } + + if ($this->page == 1) { + return sprintf(_m('Popular posts in %s group'), $base); + } else { + return sprintf(_m('Popular posts in %1$s group, page %2$d'), + $base, + $this->page); + } + } + + /** + * Content area + * + * Shows the list of popular notices + * + * @return void + */ + + function showContent() + { + $groupId = intval($this->group->id); + $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff')); + $cutoff = sprintf("fave.modified > '%s'", + common_sql_date(time() - common_config('popular', 'cutoff'))); + + $qry = 'SELECT notice.*, '. + $weightexpr . ' as weight ' . + 'FROM notice ' . + "JOIN group_inbox ON notice.id = group_inbox.notice_id " . + 'JOIN fave ON notice.id = fave.notice_id ' . + "WHERE $cutoff AND group_id = $groupId " . + 'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source,notice.conversation ' . + 'ORDER BY weight DESC'; + + $offset = ($this->page - 1) * NOTICES_PER_PAGE; + $limit = NOTICES_PER_PAGE + 1; + + if (common_config('db', 'type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } + + $notice = Memcached_DataObject::cachedQuery('Notice', + $qry, + 600); + + $nl = new NoticeList($notice, $this); + + $cnt = $nl->show(); + + if ($cnt == 0) { + //$this->showEmptyList(); + } + + $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'groupfavorited', + array('nickname' => $this->group->nickname)); + } +} diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 7d6a5dc00..a033a5010 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -102,9 +102,14 @@ class OpenIDPlugin extends Plugin function onStartConnectPath(&$path, &$defaults, &$rules, &$result) { if (common_config('site', 'openidonly')) { - static $block = array('main/login', - 'main/register', - 'main/recoverpassword', + // Note that we should not remove the login and register + // actions. Lots of auth-related things link to them, + // such as when visiting a private site without a session + // or revalidating a remembered login for admin work. + // + // We take those two over with redirects to ourselves + // over in onArgsInitialize(). + static $block = array('main/recoverpassword', 'settings/password'); if (in_array($path, $block)) { diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php new file mode 100644 index 000000000..ed7f5ebb9 --- /dev/null +++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php @@ -0,0 +1,109 @@ +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2010, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/** + * @package SlicedFavoritesPlugin + * @maintainer Brion Vibber <brion@status.net> + */ + +if (!defined('STATUSNET')) { exit(1); } + +class SlicedFavoritesPlugin extends Plugin +{ + /** + * Example: + * + * addPlugin('SlicedFavorites', array( + * 'slices' => array( + * // show only pop's notices on /favorited + * 'default' => array('include' => array('pop')), + * + * // show only son's notices on /favorited/blog + * 'blog' => array('include' => array('son')), + * + * // show all favorited notices except pop's and son's on /favorited/submitted + * 'submitted' => array('exclude' => array('pop', 'son')), + * + * // show all favorited notices on /favorited/everybody + * 'everybody' => array(), + * ) + * )); + * + * @var array + */ + public $slices = array(); + + /** + * Hook for RouterInitialized event. + * + * @param Net_URL_Mapper $m path-to-action mapper + * @return boolean hook return + */ + function onRouterInitialized($m) + { + $m->connect('favorited/:slice', + array('action' => 'favoritedslice'), + array('slice' => '[a-zA-Z0-9]+')); + + return true; + } + + // Take over the default... :D + function onArgsInitialize($args) + { + if (array_key_exists('action', $args)) { + $action = trim($args['action']); + if ($action == 'favorited') { + common_redirect(common_local_url('favoritedslice', array('slice' => 'default'))); + exit(0); + } + } + return true; + } + + /** + * Automatically load the actions and libraries used by the plugin + * + * @param Class $cls the class + * + * @return boolean hook return + * + */ + function onAutoload($cls) + { + $base = dirname(__FILE__); + $lower = strtolower($cls); + switch ($lower) { + case 'favoritedsliceaction': + require_once "$base/$lower.php"; + return false; + default: + return true; + } + } + + function onSlicedFavoritesGetSettings($slice, &$data) + { + if (isset($this->slices[$slice])) { + $data = $this->slices[$slice]; + return false; + } + return true; + } +} diff --git a/plugins/SlicedFavorites/favoritedsliceaction.php b/plugins/SlicedFavorites/favoritedsliceaction.php new file mode 100644 index 000000000..020688cfa --- /dev/null +++ b/plugins/SlicedFavorites/favoritedsliceaction.php @@ -0,0 +1,155 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * List of popular notices + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Public + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @author Evan Prodromou <evan@status.net> + * @copyright 2008-2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + + +class FavoritedSliceAction extends FavoritedAction +{ + private $includeUsers = array(), $excludeUsers = array(); + + /** + * Take arguments for running + * + * @param array $args $_REQUEST args + * + * @return boolean success flag + * + * @todo move queries from showContent() to here + */ + + function prepare($args) + { + parent::prepare($args); + + $this->slice = $this->arg('slice', 'default'); + $data = array(); + if (Event::handle('SlicedFavoritesGetSettings', array($this->slice, &$data))) { + throw new ClientException(_m('Unknown favorites slice.')); + } + if (isset($data['include'])) { + $this->includeUsers = $data['include']; + } + if (isset($data['exclude'])) { + $this->excludeUsers = $data['exclude']; + } + + return true; + } + + /** + * Content area + * + * Shows the list of popular notices + * + * @return void + */ + + function showContent() + { + $slice = $this->sliceWhereClause(); + if (!$slice) { + return parent::showContent(); + } + + $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff')); + $cutoff = sprintf("fave.modified > '%s'", + common_sql_date(time() - common_config('popular', 'cutoff'))); + + $qry = 'SELECT notice.*, '. + $weightexpr . ' as weight ' . + 'FROM notice JOIN fave ON notice.id = fave.notice_id ' . + "WHERE $cutoff AND $slice " . + 'GROUP BY id,profile_id,uri,content,rendered,url,created,notice.modified,reply_to,is_local,source,notice.conversation ' . + 'ORDER BY weight DESC'; + + $offset = ($this->page - 1) * NOTICES_PER_PAGE; + $limit = NOTICES_PER_PAGE + 1; + + if (common_config('db', 'type') == 'pgsql') { + $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset; + } else { + $qry .= ' LIMIT ' . $offset . ', ' . $limit; + } + + $notice = Memcached_DataObject::cachedQuery('Notice', + $qry, + 600); + + $nl = new NoticeList($notice, $this); + + $cnt = $nl->show(); + + if ($cnt == 0) { + $this->showEmptyList(); + } + + $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'favorited'); + } + + private function sliceWhereClause() + { + $include = $this->nicknamesToIds($this->includeUsers); + $exclude = $this->nicknamesToIds($this->excludeUsers); + + if (count($include) == 1) { + return "profile_id = " . intval($include[0]); + } else if (count($include) > 1) { + return "profile_id IN (" . implode(',', $include) . ")"; + } else if (count($exclude) == 1) { + return "profile_id != " . intval($exclude[0]); + } else if (count($exclude) > 1) { + return "profile_id NOT IN (" . implode(',', $exclude) . ")"; + } else { + return false; + } + } + + /** + * + * @param array $nicks array of user nicknames + * @return array of profile/user IDs + */ + private function nicknamesToIds($nicks) + { + $ids = array(); + foreach ($nicks as $nick) { + // not the most efficient way for a big list! + $user = User::staticGet('nickname', $nick); + if ($user) { + $ids[] = intval($user->id); + } + } + return $ids; + } +} |