Merge branch 'master' of git.gnu.io:h2p/Qvitter

This commit is contained in:
abjectio 2016-02-26 23:49:28 +01:00
commit 154614322a
42 changed files with 1086 additions and 72 deletions

View File

@ -153,6 +153,14 @@ class QvitterPlugin extends Plugin {
// route/reroute urls // route/reroute urls
public function onRouterInitialized($m) public function onRouterInitialized($m)
{ {
$m->connect('api/qvitter/sandboxed.:format',
array('action' => 'ApiQvitterSandboxed',
'format' => '(xml|json)'));
$m->connect('api/qvitter/silenced.:format',
array('action' => 'ApiQvitterSilenced',
'format' => '(xml|json)'));
$m->connect('api/qvitter/silence/create.json',
array('action' => 'ApiQvitterSilenceCreate'));
$m->connect('services/oembed.:format', $m->connect('services/oembed.:format',
array('action' => 'apiqvitteroembednotice', array('action' => 'apiqvitteroembednotice',
'format' => '(xml|json)')); 'format' => '(xml|json)'));
@ -263,6 +271,8 @@ class QvitterPlugin extends Plugin {
$m->connect('', array('action' => 'qvitter')); $m->connect('', array('action' => 'qvitter'));
$m->connect('main/all', array('action' => 'qvitter')); $m->connect('main/all', array('action' => 'qvitter'));
$m->connect('main/public', array('action' => 'qvitter')); $m->connect('main/public', array('action' => 'qvitter'));
$m->connect('main/silenced', array('action' => 'qvitter'));
$m->connect('main/sandboxed', array('action' => 'qvitter'));
$m->connect('search/notice', array('action' => 'qvitter')); $m->connect('search/notice', array('action' => 'qvitter'));
// if the user wants the twitter style home stream with hidden replies to non-friends // if the user wants the twitter style home stream with hidden replies to non-friends
@ -528,16 +538,16 @@ class QvitterPlugin extends Plugin {
$oembed = File_oembed::getKV('file_id',$attachment->id); $oembed = File_oembed::getKV('file_id',$attachment->id);
if($oembed instanceof File_oembed) { if($oembed instanceof File_oembed) {
$oembed_html = str_replace('<!--//-->','',$oembed->html); // trash left of wordpress' javascript after htmLawed removed the tags $oembed_html = str_replace('<!--//-->','',$oembed->html); // trash left of wordpress' javascript after htmLawed removed the tags
if($oembed->provider == 'Twitter' && strstr($oembed_html, '>— '.$oembed->author_name)) { if($oembed->provider == 'Twitter' && strstr($oembed_html, '> '.$oembed->author_name)) {
$oembed_html = substr($oembed_html,0,strpos($oembed_html, '>— '.$oembed->author_name)+1); // remove user data from twitter oembed html (we have it in ) $oembed_html = substr($oembed_html,0,strpos($oembed_html, '> '.$oembed->author_name)+1); // remove user data from twitter oembed html (we have it in )
$twitter_username = substr($oembed->html,strpos($oembed->html, '>— '.$oembed->author_name)+strlen('>— '.$oembed->author_name)); $twitter_username = substr($oembed->html,strpos($oembed->html, '> '.$oembed->author_name)+strlen('> '.$oembed->author_name));
$twitter_username = substr($twitter_username, strpos($twitter_username,'(@')+1); $twitter_username = substr($twitter_username, strpos($twitter_username,'(@')+1);
$twitter_username = substr($twitter_username, 0,strpos($twitter_username,')')); $twitter_username = substr($twitter_username, 0,strpos($twitter_username,')'));
$oembed->title = $twitter_username; $oembed->title = $twitter_username;
} }
$oembed_html = str_replace('…','...',$oembed_html); // ellipsis is sometimes stored as html in db, for some reason $oembed_html = str_replace('…','...',$oembed_html); // ellipsis is sometimes stored as html in db, for some reason
$oembed_html = mb_substr(trim(strip_tags(html_entity_decode($oembed_html,ENT_QUOTES))),0,250); // sometimes we have html charachters that we want to decode and then strip $oembed_html = mb_substr(trim(strip_tags($oembed_html)),0,250);
$oembed_title = trim(strip_tags(html_entity_decode($oembed->title,ENT_QUOTES))); $oembed_title = trim(strip_tags(html_entity_decode($oembed->title,ENT_QUOTES))); // sometimes we have html charachters that we want to decode and then strip
$oembed_provider = trim(strip_tags(html_entity_decode($oembed->provider,ENT_QUOTES))); $oembed_provider = trim(strip_tags(html_entity_decode($oembed->provider,ENT_QUOTES)));
$oembed_author_name = trim(strip_tags(html_entity_decode($oembed->author_name,ENT_QUOTES))); $oembed_author_name = trim(strip_tags(html_entity_decode($oembed->author_name,ENT_QUOTES)));
$attachment_url_to_id[$enclosure_o->url]['oembed'] = array( $attachment_url_to_id[$enclosure_o->url]['oembed'] = array(
@ -808,6 +818,12 @@ class QvitterPlugin extends Plugin {
$twitter_user['is_local'] = $profile->isLocal(); $twitter_user['is_local'] = $profile->isLocal();
// silenced?
$twitter_user['is_silenced'] = $profile->isSilenced();
// sandboxed?
$twitter_user['is_sandboxed'] = $profile->isSandboxed();
// ostatus uri // ostatus uri
if($twitter_user['is_local']) { if($twitter_user['is_local']) {
$user = $profile->getUser(); $user = $profile->getUser();
@ -1248,6 +1264,7 @@ class QvitterPlugin extends Plugin {
} }
$user_id = $user->id; $user_id = $user->id;
$profile = $user->getProfile();
$notification = new QvitterNotification(); $notification = new QvitterNotification();
$notification->selectAdd(); $notification->selectAdd();
@ -1255,6 +1272,12 @@ class QvitterPlugin extends Plugin {
$notification->selectAdd('count(id) as count'); $notification->selectAdd('count(id) as count');
$notification->whereAdd("(to_profile_id = '".$user_id."')"); $notification->whereAdd("(to_profile_id = '".$user_id."')");
// if the user only want notifications from users they follow
$only_show_notifications_from_users_i_follow = Profile_prefs::getConfigData($profile, 'qvitter', 'only_show_notifications_from_users_i_follow');
if($only_show_notifications_from_users_i_follow == '1') {
$notification->whereAdd(sprintf('qvitternotification.from_profile_id IN (SELECT subscribed FROM subscription WHERE subscriber = %u)', $user_id));
}
// the user might have opted out from certain notification types // the user might have opted out from certain notification types
$current_profile = $user->getProfile(); $current_profile = $user->getProfile();
$disable_notify_replies_and_mentions = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_replies_and_mentions'); $disable_notify_replies_and_mentions = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_replies_and_mentions');

View File

@ -71,12 +71,23 @@ class ApiQvitterCheckLoginAction extends ApiAction
$user = common_check_user($this->arg('username'), $user = common_check_user($this->arg('username'),
$this->arg('password')); $this->arg('password'));
if($user) { if(!$user instanceof User) {
$user = true; $this->clientError(_('Incorrect credentials.'), 401);
}
// silenced?
if($user->isSilenced()) {
$this->clientError(_('User '.json_encode($user->isSilenced()).' is silenced.'), 403);
}
try {
$profile = $user->getProfile();
} catch (UserNoProfileException $e) {
$this->clientError(_('User got no profile.'), 400);
} }
$this->initDocument('json'); $this->initDocument('json');
$this->showJsonObjects($user); $this->showJsonObjects($this->twitterUserArray($profile));
$this->endDocument('json'); $this->endDocument('json');
} }

View File

@ -99,6 +99,8 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction
if($notice_object instanceof Notice) { if($notice_object instanceof Notice) {
$notice = self::twitterSimpleStatusArray($notice_object); $notice = self::twitterSimpleStatusArray($notice_object);
} else { } else {
// if the referenced notice is missing, delete this corrupt notification!
$notification->delete();
continue; continue;
} }
@ -117,6 +119,9 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction
'created_at'=>self::dateTwitter($notification->created), 'created_at'=>self::dateTwitter($notification->created),
'is_seen'=>$notification->is_seen 'is_seen'=>$notification->is_seen
); );
} else {
// if the referenced from_profile is missing, delete this corrupt notification!
$notification->delete();
} }
// mark as seen // mark as seen

View File

@ -0,0 +1,196 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* List all sandboxed users on the instance
*
* 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 API
* @package GNUsocial
* @author Craig Andrews <candrews@integralblue.com>
* @author Evan Prodromou <evan@status.net>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @author Hannes Mannerheim <h@nnesmannerhe.im>
* @copyright 2009 StatusNet, Inc.
* @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://www.gnu.org/software/social/
*/
if (!defined('GNUSOCIAL')) {
exit(1);
}
/**
*
* @category API
* @package GNUsocial
* @author Craig Andrews <candrews@integralblue.com>
* @author Evan Prodromou <evan@status.net>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @author Hannes Mannerheim <h@nnesmannerhe.im>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://www.gnu.org/software/social/
*/
class ApiQvitterSandboxedAction extends ApiPrivateAuthAction
{
var $profiles = null;
/**
* Take arguments for running
*
* @param array $args $_REQUEST args
*
* @return boolean success flag
*/
protected function prepare(array $args=array())
{
parent::prepare($args);
$this->profiles = $this->getProfiles();
return true;
}
/**
* Handle the request
*
* @param array $args $_REQUEST data (unused)
*
* @return void
*/
protected function handle()
{
parent::handle();
// XXX: RSS and Atom
switch($this->format) {
case 'xml':
$this->showTwitterXmlUsers($this->profiles);
break;
case 'json':
$this->showJsonUsers($this->profiles);
break;
default:
$this->clientError(
// TRANS: Client error displayed when coming across a non-supported API method.
_('API method not found.'),
404,
$this->format
);
break;
}
}
/**
* Fetch the sandboxed profiles
*
* @return array $profiles list of profiles
*/
function getProfiles()
{
$profiles = array();
$profile = $this->getSandboxed(
($this->page - 1) * $this->count,
$this->count,
$this->since_id,
$this->max_id
);
while ($profile->fetch()) {
$profiles[] = clone($profile);
}
return $profiles;
}
/**
* Fetch the sandboxed profiles from DB
*
* @return array $profiles list of profiles
*/
function getSandboxed($offset=null, $limit=null) // offset is null because DataObject wants it, 0 would mean no results
{
$profiles = new Profile();
$profiles->joinAdd(array('id', 'profile_role:profile_id'));
$profiles->whereAdd(sprintf('profile_role.role = \'%s\'', Profile_role::SANDBOXED));
$profiles->orderBy('profile_role.created DESC');
$profiles->limit($offset, $limit);
$profiles->find();
return $profiles;
}
/**
* Is this action read only?
*
* @param array $args other arguments
*
* @return boolean true
*/
function isReadOnly($args)
{
return true;
}
/**
* When was this list of profiles last modified?
*
* @return string datestamp of the lastest profile
*/
function lastModified()
{
if (!empty($this->profiles) && (count($this->profiles) > 0)) {
return strtotime($this->profiles[0]->created);
}
return null;
}
/**
* An entity tag for this list
*
* Returns an Etag based on the action name, language
* and timestamps of the first and last profile
*
* @return string etag
*/
function etag()
{
if (!empty($this->profiles) && (count($this->profiles) > 0)) {
$last = count($this->profiles) - 1;
return '"' . implode(
':',
array($this->arg('action'),
common_user_cache_hash($this->auth_user),
common_language(),
strtotime($this->profiles[0]->created),
strtotime($this->profiles[$last]->created))
)
. '"';
}
return null;
}
}

View File

@ -0,0 +1,93 @@
<?php
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
· ·
· Silence a user ·
· ·
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
· ·
· ·
· Q V I T T E R ·
· ·
· https://git.gnu.io/h2p/Qvitter ·
· ·
· ·
· <o) ·
· /_//// ·
· (____/ ·
· (o< ·
· o> \\\\_\ ·
· \\) \____) ·
· ·
· ·
· ·
· Qvitter 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 three of the License or (at ·
· your option) any later version. ·
· ·
· Qvitter is distributed in hope that it will be useful but WITHOUT ANY ·
· WARRANTY; without even the implied warranty of MERCHANTABILTY 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 Qvitter. If not, see <http://www.gnu.org/licenses/>. ·
· ·
· Contact h@nnesmannerhe.im if you have any questions. ·
· ·
· · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · · */
if (!defined('GNUSOCIAL')) { exit(1); }
class ApiQvitterSilenceCreateAction extends ApiAuthAction
{
/**
* Take arguments for running
*
* @param array $args $_REQUEST args
*
* @return boolean success flag
*/
protected function prepare(array $args=array())
{
parent::prepare($args);
$this->other = $this->getTargetProfile($this->arg('id'));
return true;
}
/**
* Handle the request
*
* @param array $args $_REQUEST data (unused)
*
* @return void
*/
protected function handle()
{
parent::handle();
if (!$this->other instanceof Profile) {
$this->clientError(_('No such user.'), 404);
}
if ($this->scoped->id == $this->other->id) {
$this->clientError(_("You cannot silence yourself!"), 403);
}
try {
$this->other->silenceAs($this->scoped);
} catch (Exception $e) {
$this->clientError($e->getMessage(), $e->getCode());
}
$this->initDocument('json');
$this->showJsonObjects($this->twitterUserArray($this->other));
$this->endDocument('json');
}
}

View File

@ -0,0 +1,196 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* List all silenced users on the instance
*
* 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 API
* @package GNUsocial
* @author Craig Andrews <candrews@integralblue.com>
* @author Evan Prodromou <evan@status.net>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @author Hannes Mannerheim <h@nnesmannerhe.im>
* @copyright 2009 StatusNet, Inc.
* @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://www.gnu.org/software/social/
*/
if (!defined('GNUSOCIAL')) {
exit(1);
}
/**
*
* @category API
* @package GNUsocial
* @author Craig Andrews <candrews@integralblue.com>
* @author Evan Prodromou <evan@status.net>
* @author Jeffery To <jeffery.to@gmail.com>
* @author Zach Copley <zach@status.net>
* @author Hannes Mannerheim <h@nnesmannerhe.im>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://www.gnu.org/software/social/
*/
class ApiQvitterSilencedAction extends ApiPrivateAuthAction
{
var $profiles = null;
/**
* Take arguments for running
*
* @param array $args $_REQUEST args
*
* @return boolean success flag
*/
protected function prepare(array $args=array())
{
parent::prepare($args);
$this->profiles = $this->getProfiles();
return true;
}
/**
* Handle the request
*
* @param array $args $_REQUEST data (unused)
*
* @return void
*/
protected function handle()
{
parent::handle();
// XXX: RSS and Atom
switch($this->format) {
case 'xml':
$this->showTwitterXmlUsers($this->profiles);
break;
case 'json':
$this->showJsonUsers($this->profiles);
break;
default:
$this->clientError(
// TRANS: Client error displayed when coming across a non-supported API method.
_('API method not found.'),
404,
$this->format
);
break;
}
}
/**
* Fetch the silenced profiles
*
* @return array $profiles list of profiles
*/
function getProfiles()
{
$profiles = array();
$profile = $this->getSilenced(
($this->page - 1) * $this->count,
$this->count,
$this->since_id,
$this->max_id
);
while ($profile->fetch()) {
$profiles[] = clone($profile);
}
return $profiles;
}
/**
* Fetch the silenced profiles from DB
*
* @return array $profiles list of profiles
*/
function getSilenced($offset=null, $limit=null) // offset is null because DataObject wants it, 0 would mean no results
{
$profiles = new Profile();
$profiles->joinAdd(array('id', 'profile_role:profile_id'));
$profiles->whereAdd(sprintf('profile_role.role = \'%s\'', Profile_role::SILENCED));
$profiles->orderBy('profile_role.created DESC');
$profiles->limit($offset, $limit);
$profiles->find();
return $profiles;
}
/**
* Is this action read only?
*
* @param array $args other arguments
*
* @return boolean true
*/
function isReadOnly($args)
{
return true;
}
/**
* When was this list of profiles last modified?
*
* @return string datestamp of the lastest profile
*/
function lastModified()
{
if (!empty($this->profiles) && (count($this->profiles) > 0)) {
return strtotime($this->profiles[0]->created);
}
return null;
}
/**
* An entity tag for this list
*
* Returns an Etag based on the action name, language
* and timestamps of the first and last profile
*
* @return string etag
*/
function etag()
{
if (!empty($this->profiles) && (count($this->profiles) > 0)) {
$last = count($this->profiles) - 1;
return '"' . implode(
':',
array($this->arg('action'),
common_user_cache_hash($this->auth_user),
common_language(),
strtotime($this->profiles[0]->created),
strtotime($this->profiles[$last]->created))
)
. '"';
}
return null;
}
}

View File

@ -158,6 +158,17 @@ class QvitterAction extends ApiAction
print ' <link title="FOAF for '.$nickname.'" type="application/rdf+xml" href="'.$instanceurl.$nickname.'/foaf" rel="meta">'."\n"; print ' <link title="FOAF for '.$nickname.'" type="application/rdf+xml" href="'.$instanceurl.$nickname.'/foaf" rel="meta">'."\n";
print ' <link href="'.$instanceurl.$nickname.'/microsummary" rel="microsummary">'."\n"; print ' <link href="'.$instanceurl.$nickname.'/microsummary" rel="microsummary">'."\n";
// rel="me" for the IndieWeb audience
$relMes = array(
['href' => $user->getProfile()->getHomepage(),
'text' => _('Homepage'),
'image' => null],
);
Event::handle('OtherAccountProfiles', array($user->getProfile(), &$relMes));
foreach ($relMes as $relMe) {
print ' <link href="'.htmlspecialchars($relMe['href']).'" title="'.$relMe['text'].'" rel="me" />'."\n";
}
// maybe openid // maybe openid
if (array_key_exists('OpenID', StatusNet::getActivePlugins())) { if (array_key_exists('OpenID', StatusNet::getActivePlugins())) {
print ' <link rel="openid2.provider" href="'.common_local_url('openidserver').'"/>'."\n"; print ' <link rel="openid2.provider" href="'.common_local_url('openidserver').'"/>'."\n";
@ -461,6 +472,7 @@ class QvitterAction extends ApiAction
<li class="fullwidth dropdown-divider"></li> <li class="fullwidth dropdown-divider"></li>
<li class="fullwidth"><a id="edit-profile-header-link"></a></li> <li class="fullwidth"><a id="edit-profile-header-link"></a></li>
<li class="fullwidth"><a id="settings" href="<?php print $instanceurl; ?>settings/profile" donthijack></a></li> <li class="fullwidth"><a id="settings" href="<?php print $instanceurl; ?>settings/profile" donthijack></a></li>
<li class="fullwidth"><a id="blocking-link" href="<?php print $instanceurl.$logged_in_user_obj['screen_name'].'/blocks'; ?>"></a></li>
<li class="fullwidth"><a id="faq-link"></a></li> <li class="fullwidth"><a id="faq-link"></a></li>
<li class="fullwidth"><a id="tou-link"></a></li> <li class="fullwidth"><a id="tou-link"></a></li>
<li class="fullwidth"><a id="shortcuts-link"></a></li> <li class="fullwidth"><a id="shortcuts-link"></a></li>
@ -611,7 +623,6 @@ class QvitterAction extends ApiAction
if($logged_in_user) { if($logged_in_user) {
?><a href="<?php print $instanceurl.$logged_in_user->nickname ?>/all" class="stream-selection friends-timeline"><i class="chev-right"></i></a> ?><a href="<?php print $instanceurl.$logged_in_user->nickname ?>/all" class="stream-selection friends-timeline"><i class="chev-right"></i></a>
<a href="<?php print $instanceurl.$logged_in_user->nickname ?>/notifications" class="stream-selection notifications"><span id="unseen-notifications"></span><i class="chev-right"></i></a> <a href="<?php print $instanceurl.$logged_in_user->nickname ?>/notifications" class="stream-selection notifications"><span id="unseen-notifications"></span><i class="chev-right"></i></a>
<a href="<?php print $instanceurl.$logged_in_user->nickname ?>/replies" class="stream-selection mentions"><i class="chev-right"></i></a>
<a href="<?php print $instanceurl.$logged_in_user->nickname ?>" class="stream-selection my-timeline"><i class="chev-right"></i></a> <a href="<?php print $instanceurl.$logged_in_user->nickname ?>" class="stream-selection my-timeline"><i class="chev-right"></i></a>
<a href="<?php print $instanceurl.$logged_in_user->nickname ?>/favorites" class="stream-selection favorites"><i class="chev-right"></i></a> <a href="<?php print $instanceurl.$logged_in_user->nickname ?>/favorites" class="stream-selection favorites"><i class="chev-right"></i></a>
<a href="<?php print $instanceurl ?>main/public" class="stream-selection public-timeline"><i class="chev-right"></i></a> <a href="<?php print $instanceurl ?>main/public" class="stream-selection public-timeline"><i class="chev-right"></i></a>
@ -633,6 +644,7 @@ class QvitterAction extends ApiAction
<h2></h2> <h2></h2>
<div class="reload-stream"></div> <div class="reload-stream"></div>
</div> </div>
<div id="feed-header-description"></div>
</div> </div>
<div id="new-queets-bar-container" class="hidden"><div id="new-queets-bar"></div></div> <div id="new-queets-bar-container" class="hidden"><div id="new-queets-bar"></div></div>
<div id="feed-body"></div> <div id="feed-body"></div>

View File

@ -34,14 +34,21 @@ class NotificationStream
function getNotificationIds($offset, $limit, $since_id, $max_id) function getNotificationIds($offset, $limit, $since_id, $max_id)
{ {
$current_profile = Profile::current();
$notification = new QvitterNotification(); $notification = new QvitterNotification();
$notification->selectAdd(); $notification->selectAdd();
$notification->selectAdd('id'); $notification->selectAdd('id');
$notification->whereAdd(sprintf('qvitternotification.to_profile_id = "%s"', $notification->escape($this->target->id))); $notification->whereAdd(sprintf('qvitternotification.to_profile_id = "%s"', $notification->escape($this->target->id)));
$notification->whereAdd(sprintf('qvitternotification.created >= "%s"', $notification->escape($this->target->created))); $notification->whereAdd(sprintf('qvitternotification.created >= "%s"', $notification->escape($this->target->created)));
// if the user only want notifications from users they follow
$only_show_notifications_from_users_i_follow = Profile_prefs::getConfigData($current_profile, 'qvitter', 'only_show_notifications_from_users_i_follow');
if($only_show_notifications_from_users_i_follow == '1') {
$notification->whereAdd(sprintf('qvitternotification.from_profile_id IN (SELECT subscribed FROM subscription WHERE subscriber = %u)', $current_profile->id));
}
// the user might have opted out from certain notification types // the user might have opted out from certain notification types
$current_profile = Profile::current();
$disable_notify_replies_and_mentions = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_replies_and_mentions'); $disable_notify_replies_and_mentions = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_replies_and_mentions');
$disable_notify_favs = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_favs'); $disable_notify_favs = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_favs');
$disable_notify_repeats = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_repeats'); $disable_notify_repeats = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_repeats');

View File

@ -71,6 +71,18 @@ class RawPublicAndExternalNoticeStream extends NoticeStream
$notice->whereAdd('is_local !='. Notice::GATEWAY); $notice->whereAdd('is_local !='. Notice::GATEWAY);
$notice->whereAdd('repeat_of IS NULL'); $notice->whereAdd('repeat_of IS NULL');
// don't show sandboxed users in public timelines, unless you are a mod
$hide_sandboxed = true;
$cur_profile = Profile::current();
if($cur_profile instanceof Profile) {
if($cur_profile->hasRight(Right::REVIEWSPAM)) {
$hide_sandboxed = false;
}
}
if($hide_sandboxed) {
$notice->whereAdd('profile_id NOT IN (SELECT profile_id FROM profile_role WHERE role =\''.Profile_role::SANDBOXED.'\')');
}
if(!empty($max_id) && is_numeric($max_id)) { if(!empty($max_id) && is_numeric($max_id)) {
$notice->whereAdd('id < '.$max_id); $notice->whereAdd('id < '.$max_id);
} }

View File

@ -1643,6 +1643,19 @@ body.rtl #history-container.menu-container a .chev-right {
line-height: 22px; line-height: 22px;
} }
#feed-header-description {
background-color: #fff;
border-bottom: 1px solid #e8e8e8;
color: #66757f;
font-size: 12px;
margin-top: -1px;
padding: 0 10px 10px;
position: relative;
}
#feed-header-description:empty {
display:none;
}
#stream-menu-cog { #stream-menu-cog {
display: inline-block; display: inline-block;
font-size: 20px; font-size: 20px;
@ -1872,6 +1885,47 @@ background-repeat: no-repeat;
border-radius: 9px; border-radius: 9px;
} }
.stream-item .account-group span.silenced-flag,
.stream-item .account-group span.sandboxed-flag {
background-color: pink;
border-radius: 3px;
font-size: 11px;
line-height: 18px;
padding: 0 5px;
display:none;
}
.stream-item .account-group span.sandboxed-flag {
background-color: #00ccff;
}
.stream-item.silenced .account-group span.silenced-flag,
.stream-item.sandboxed .account-group span.sandboxed-flag {
display:inline-block;;
}
.profile-card .profile-header-inner span.silenced-flag,
.profile-card .profile-header-inner span.sandboxed-flag {
background-color: pink;
border-radius: 3px;
color: black;
display: none;
font-size: 11px;
line-height: 24px;
margin: 0 0 0 5px;
padding: 0 5px;
text-shadow: none;
vertical-align: top;
}
.profile-card .profile-header-inner span.sandboxed-flag {
background-color: #00ccff;
}
.hover-card .profile-card .profile-header-inner span.silenced-flag,
.hover-card .profile-card .profile-header-inner span.sandboxed-flag {
line-height: 15px;
}
.profile-card .profile-header-inner.silenced span.silenced-flag,
.profile-card .profile-header-inner.sandboxed span.sandboxed-flag {
display: inline-block;
}
.show-full-conversation { .show-full-conversation {
bottom: 3px; bottom: 3px;
color: #777; color: #777;

View File

@ -112,8 +112,11 @@ function checkLogin(username,password,actionOnSuccess) {
password: password password: password
}, },
dataType: 'json', dataType: 'json',
error: function() { error: function(data) {
shakeLoginBox(); shakeLoginBox();
if(data.status === 403) {
showErrorMessage(window.sL.silenced);
}
}, },
success: function(data) { success: function(data) {
if(typeof data.error == 'undefined' && data !== false) { if(typeof data.error == 'undefined' && data !== false) {

View File

@ -171,7 +171,7 @@ function alignMenuToParent(menu, parent, offsetLeft) {
function showErrorMessage(message, after) { function showErrorMessage(message, after) {
if(typeof after == 'undefined') { if(typeof after == 'undefined') {
var after = $('#user-container'); var after = $('#user-container,#login-register-container');
} }
after.after('<div class="error-message">' + message + '<span class="discard-error-message"></span></div>'); after.after('<div class="error-message">' + message + '<span class="discard-error-message"></span></div>');
} }
@ -358,6 +358,16 @@ function buildProfileCard(data) {
var follows_you = '<span class="follows-you">' + window.sL.followsYou + '</span>'; var follows_you = '<span class="follows-you">' + window.sL.followsYou + '</span>';
} }
// silenced?
var is_silenced = '';
if(data.is_silenced === true) {
is_silenced = ' silenced';
}
// sandboxed?
var is_sandboxed = '';
if(data.is_sandboxed === true) {
is_sandboxed = ' sandboxed';
}
var followButton = ''; var followButton = '';
@ -385,13 +395,15 @@ function buildProfileCard(data) {
// full card html // full card html
data.profileCardHtml = '\ data.profileCardHtml = '\
<div class="profile-card">\ <div class="profile-card">\
<div class="profile-header-inner" style="' + coverPhotoHtml + '" data-user-id="' + data.id + '">\ <div class="profile-header-inner' + is_silenced + is_sandboxed + '" style="' + coverPhotoHtml + '" data-user-id="' + data.id + '">\
<div class="profile-header-inner-overlay"></div>\ <div class="profile-header-inner-overlay"></div>\
<a class="profile-picture" href="' + data.profile_image_url_original + '">\ <a class="profile-picture" href="' + data.profile_image_url_original + '">\
<img class="avatar profile-size" src="' + data.profile_image_url_profile_size + '" data-user-id="' + data.id + '" />\ <img class="avatar profile-size" src="' + data.profile_image_url_profile_size + '" data-user-id="' + data.id + '" />\
</a>\ </a>\
<div class="profile-card-inner">\ <div class="profile-card-inner">\
<h1 class="fullname" data-user-id="' + data.id + '">' + data.name + '<span></span></h1>\ <h1 class="fullname" data-user-id="' + data.id + '">' + data.name + '</h1>\
<span class="silenced-flag" data-tooltip="' + window.sL.silencedStreamDescription + '">' + window.sL.silenced + '</span>\
<span class="sandboxed-flag" data-tooltip="' + window.sL.sandboxedStreamDescription + '">' + window.sL.sandboxed + '</span>\
<h2 class="username">\ <h2 class="username">\
<span class="screen-name" data-user-id="' + data.id + '">@' + data.screen_name + '</span>\ <span class="screen-name" data-user-id="' + data.id + '">@' + data.screen_name + '</span>\
' + follows_you + '\ ' + follows_you + '\
@ -446,6 +458,21 @@ function buildExternalProfileCard(data) {
var followButton = buildFollowBlockbutton(data.local); var followButton = buildFollowBlockbutton(data.local);
} }
// silenced?
var is_silenced = '';
if(data.local.is_silenced === true) {
is_silenced = ' silenced';
}
// sandboxed?
var is_sandboxed = '';
if(data.local.is_sandboxed === true) {
is_sandboxed = ' sandboxed';
}
// local id
var localUserId = data.local.id;
// empty strings and zeros instead of null // empty strings and zeros instead of null
data = cleanUpUserObject(data.external); data = cleanUpUserObject(data.external);
@ -480,12 +507,14 @@ function buildExternalProfileCard(data) {
data.profileCardHtml = '\ data.profileCardHtml = '\
<div class="profile-card">\ <div class="profile-card">\
<div class="profile-header-inner" style="background-image:url(\'' + cover_photo + '\')">\ <div class="profile-header-inner' + is_silenced + '" style="background-image:url(\'' + cover_photo + '\')" data-user-id="' + localUserId + '">\
<div class="profile-header-inner-overlay"></div>\ <div class="profile-header-inner-overlay"></div>\
<a class="profile-picture"><img src="' + data.profile_image_url_profile_size + '" /></a>\ <a class="profile-picture"><img src="' + data.profile_image_url_profile_size + '" /></a>\
<div class="profile-card-inner">\ <div class="profile-card-inner">\
<a target="_blank" href="' + data.statusnet_profile_url + '">\ <a target="_blank" href="' + data.statusnet_profile_url + '">\
<h1 class="fullname">' + data.name + '<span></span></h1>\ <h1 class="fullname">' + data.name + '</h1>\
<span class="silenced-flag" data-tooltip="' + window.sL.silencedStreamDescription + '">' + window.sL.silenced + '</span>\
<span class="sandboxed-flag" data-tooltip="' + window.sL.sandboxedStreamDescription + '">' + window.sL.sandboxed + '</span>\
<h2 class="username">\ <h2 class="username">\
<span class="screen-name">' + data.screenNameWithServer + '</span>\ <span class="screen-name">' + data.screenNameWithServer + '</span>\
<span class="ostatus-link" data-tooltip="' + window.sL.goToTheUsersRemoteProfile + '">' + window.sL.goToTheUsersRemoteProfile + '</span>\ <span class="ostatus-link" data-tooltip="' + window.sL.goToTheUsersRemoteProfile + '">' + window.sL.goToTheUsersRemoteProfile + '</span>\
@ -694,13 +723,19 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
// remember the most recent stream object // remember the most recent stream object
window.currentStreamObject = streamObject; window.currentStreamObject = streamObject;
// set the new streams header // set the new streams header and description
if(streamObject.streamSubHeader) { if(streamObject.streamSubHeader) {
$('#feed-header-inner h2').html(streamObject.streamSubHeader); $('#feed-header-inner h2').html(streamObject.streamSubHeader);
} }
else { else {
$('#feed-header-inner h2').html(streamObject.streamHeader); $('#feed-header-inner h2').html(streamObject.streamHeader);
} }
if(streamObject.streamDescription !== false) {
$('#feed-header-description').html(streamObject.streamDescription);
}
else {
$('#feed-header-description').empty();
}
// add menu cog if this stream has a menu // add menu cog if this stream has a menu
if(streamObject.menu && window.loggedIn) { if(streamObject.menu && window.loggedIn) {
@ -892,14 +927,21 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
else { else {
showErrorMessage(window.sL.ERRORcouldNotFindPage + '<br><br>url: ' + url); showErrorMessage(window.sL.ERRORcouldNotFindPage + '<br><br>url: ' + url);
} }
emptyRememberAndHideFeed();
} }
else if(error.status == 410 && streamObject.name == 'notice') { else if(error.status == 410 && streamObject.name == 'notice') {
showErrorMessage(window.sL.ERRORnoticeRemoved); showErrorMessage(window.sL.ERRORnoticeRemoved);
emptyRememberAndHideFeed();
} }
else if(error.status == 0 else if(error.status == 0
|| (error.status == 200 && error.responseText == 'An error occurred.') || (error.status == 200 && error.responseText == 'An error occurred.')
) { ) {
showErrorMessage(window.sL.ERRORnoContactWithServer + ' (' + replaceHtmlSpecialChars(error.statusText) + ')'); showErrorMessage(window.sL.ERRORnoContactWithServer + ' (' + replaceHtmlSpecialChars(error.statusText) + ')');
// don't hide feed for these errors
}
else if (typeof error.responseJSON.error != 'undefined' && error.responseJSON.error.length > 0) {
showErrorMessage(error.responseJSON.error);
emptyRememberAndHideFeed();
} }
else { else {
showErrorMessage(window.sL.ERRORsomethingWentWrong + '<br><br>\ showErrorMessage(window.sL.ERRORsomethingWentWrong + '<br><br>\
@ -908,6 +950,9 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
streamObject:<pre><code>' + replaceHtmlSpecialChars(JSON.stringify(streamObject, null, ' ')) + '</code></pre>\ streamObject:<pre><code>' + replaceHtmlSpecialChars(JSON.stringify(streamObject, null, ' ')) + '</code></pre>\
'); ');
} }
// make sure page-container is visible
$('#page-container').css('opacity','1');
} }
// everything seems fine, show the new stream // everything seems fine, show the new stream
@ -1006,6 +1051,20 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
}); });
} }
/* ·
·
· Empties the feed body, remembers the new empty state in localstorage and hide the feed and any profile card
· and mark this stream as current
·
· · · · · · · · · */
function emptyRememberAndHideFeed() {
$('#feed').css('opacity','0');
$('#feed-body').empty();
$('.profile-card').remove();
rememberStreamStateInLocalStorage();
}
/* · /* ·
· ·
@ -1915,6 +1974,17 @@ function buildUserStreamItemHtml(obj) {
blockingClass = ' blocking'; blockingClass = ' blocking';
} }
// silenced?
var silencedClass = '';
if(obj.is_silenced === true) {
silencedClass = ' silenced';
}
// sandboxed?
var sandboxedClass = '';
if(obj.is_sandboxed === true) {
sandboxedClass = ' sandboxed';
}
var followButton = ''; var followButton = '';
if(typeof window.loggedIn.screen_name != 'undefined' // if logged in if(typeof window.loggedIn.screen_name != 'undefined' // if logged in
&& window.loggedIn.id != obj.id) { // not if this is me && window.loggedIn.id != obj.id) { // not if this is me
@ -1923,14 +1993,16 @@ function buildUserStreamItemHtml(obj) {
} }
} }
return '<div id="stream-item-' + obj.id + '" class="stream-item user" data-user-id="' + obj.id + '">\ return '<div id="stream-item-' + obj.id + '" class="stream-item user' + silencedClass + sandboxedClass + '" data-user-id="' + obj.id + '">\
<div class="queet ' + rtlOrNot + '">\ <div class="queet ' + rtlOrNot + '">\
' + followButton + '\ ' + followButton + '\
<div class="queet-content">\ <div class="queet-content">\
<div class="stream-item-header">\ <div class="stream-item-header">\
<a class="account-group" href="' + obj.statusnet_profile_url + '" data-user-id="' + obj.id + '">\ <a class="account-group" href="' + obj.statusnet_profile_url + '" data-user-id="' + obj.id + '">\
<img class="avatar profile-size" src="' + obj.profile_image_url_profile_size + '" data-user-id="' + obj.id + '" />\ <img class="avatar profile-size" src="' + obj.profile_image_url_profile_size + '" data-user-id="' + obj.id + '" />\
<strong class="name" data-user-id="' + obj.id + '">' + obj.name + '</strong> \ <strong class="name" data-user-id="' + obj.id + '">' + obj.name + '</strong>\
<span class="silenced-flag" data-tooltip="' + window.sL.silencedStreamDescription + '">' + window.sL.silenced + '</span> \
<span class="sandboxed-flag" data-tooltip="' + window.sL.sandboxedStreamDescription + '">' + window.sL.sandboxed + '</span> \
<span class="screen-name" data-user-id="' + obj.id + '">@' + obj.screen_name + '</span>\ <span class="screen-name" data-user-id="' + obj.id + '">@' + obj.screen_name + '</span>\
</a>\ </a>\
' + ostatusHtml + '\ ' + ostatusHtml + '\
@ -1965,6 +2037,14 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
}); });
} }
// silenced?
if(obj.user.is_silenced === true) {
extraClasses += ' silenced';
}
// sandboxed?
if(obj.user.is_sandboxed === true) {
extraClasses += ' sandboxed';
}
// deleted? // deleted?
if(typeof window.knownDeletedNotices[obj.uri] != 'undefined') { if(typeof window.knownDeletedNotices[obj.uri] != 'undefined') {
extraClasses += ' deleted always-hidden'; extraClasses += ' deleted always-hidden';
@ -2146,7 +2226,9 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
<div class="stream-item-header">\ <div class="stream-item-header">\
<a class="account-group" href="' + obj.user.statusnet_profile_url + '" data-user-id="' + obj.user.id + '">\ <a class="account-group" href="' + obj.user.statusnet_profile_url + '" data-user-id="' + obj.user.id + '">\
<img class="avatar profile-size" src="' + obj.user.profile_image_url_profile_size + '" data-user-id="' + obj.user.id + '" />\ <img class="avatar profile-size" src="' + obj.user.profile_image_url_profile_size + '" data-user-id="' + obj.user.id + '" />\
<strong class="name" data-user-id="' + obj.user.id + '">' + obj.user.name + '</strong> \ <strong class="name" data-user-id="' + obj.user.id + '">' + obj.user.name + '</strong>\
<span class="silenced-flag" data-tooltip="' + window.sL.silencedStreamDescription + '">' + window.sL.silenced + '</span> \
<span class="sandboxed-flag" data-tooltip="' + window.sL.sandboxedStreamDescription + '">' + window.sL.sandboxed + '</span> \
<span class="screen-name" data-user-id="' + obj.user.id + '">@' + obj.user.screen_name + '</span>' + <span class="screen-name" data-user-id="' + obj.user.id + '">@' + obj.user.screen_name + '</span>' +
'</a>' + '</a>' +
'<i class="addressees">' + reply_to_html + in_groups_html + '</i>' + '<i class="addressees">' + reply_to_html + in_groups_html + '</i>' +

View File

@ -899,6 +899,16 @@ function updateUserDataInStream() {
&& typeof userArray.modified != 'undefined' && typeof userArray.modified != 'undefined'
&& (timeNow-userArray.modified)<1000) { && (timeNow-userArray.modified)<1000) {
// add/remove silenced class to stream items and profile cards
if(userArray.local.is_silenced === true) {
$('.stream-item[data-user-id=' + userArray.local.id + ']').addClass('silenced');
$('.profile-card .profile-header-inner[data-user-id=' + userArray.local.id + ']').addClass('silenced');
}
else {
$('.stream-item[data-user-id=' + userArray.local.id + ']').removeClass('silenced')
$('.profile-card .profile-header-inner[data-user-id=' + userArray.local.id + ']').removeClass('silenced');
}
// profile size avatars (notices, users) // profile size avatars (notices, users)
$.each($('img.avatar.profile-size[data-user-id="' + userArray.local.id + '"]'),function(){ $.each($('img.avatar.profile-size[data-user-id="' + userArray.local.id + '"]'),function(){
if($(this).attr('src') != userArray.local.profile_image_url_profile_size) { if($(this).attr('src') != userArray.local.profile_image_url_profile_size) {

View File

@ -935,6 +935,7 @@ function proceedToSetLanguageAndLogin(data){
$('.stream-selection.public-timeline').prepend(window.sL.publicTimeline); $('.stream-selection.public-timeline').prepend(window.sL.publicTimeline);
$('.stream-selection.public-and-external-timeline').prepend(window.sL.publicAndExtTimeline) $('.stream-selection.public-and-external-timeline').prepend(window.sL.publicAndExtTimeline)
$('#search-query').attr('placeholder',window.sL.searchVerb); $('#search-query').attr('placeholder',window.sL.searchVerb);
$('#blocking-link').html(window.sL.userBlocks);
$('#faq-link').html(window.sL.FAQ); $('#faq-link').html(window.sL.FAQ);
$('#tou-link').html(window.sL.showTerms); $('#tou-link').html(window.sL.showTerms);
$('#add-edit-language-link').html(window.sL.addEditLanguageLink); $('#add-edit-language-link').html(window.sL.addEditLanguageLink);
@ -2793,6 +2794,12 @@ $('body').on('click','.reload-stream',function () {
}); });
// can be used a callback too, e.g. from profile pref toggles // can be used a callback too, e.g. from profile pref toggles
function reloadCurrentStream() { function reloadCurrentStream() {
// always clear cache for this stream when reloading using this function
$('#feed-body').empty();
rememberStreamStateInLocalStorage();
// reload
setNewCurrentStream(URLtoStreamRouter(window.location.href),false,false,false); setNewCurrentStream(URLtoStreamRouter(window.location.href),false,false,false);
} }

View File

@ -126,6 +126,7 @@ function pathToStreamRouter(path) {
name: false, // human readable name name: false, // human readable name
streamHeader: false, // short header, e.g. links and buttons no html! streamHeader: false, // short header, e.g. links and buttons no html!
streamSubHeader: false, // a longer header, that can include html and links streamSubHeader: false, // a longer header, that can include html and links
streamDescription: false, // description of the stream
parentPath: false, // a parent path can e.g. be "group/qvitter" for "group/qvitter/members" parentPath: false, // a parent path can e.g. be "group/qvitter" for "group/qvitter/members"
stream: false, // the API path stream: false, // the API path
nickname: false, // if we can read a nickname/screen_name from the path, add it to this property nickname: false, // if we can read a nickname/screen_name from the path, add it to this property
@ -157,6 +158,19 @@ function pathToStreamRouter(path) {
topic: 'hide_quotes_in_timeline:' + streamObject.path, topic: 'hide_quotes_in_timeline:' + streamObject.path,
label: window.sL.hideQuotesInTimeline, label: window.sL.hideQuotesInTimeline,
callback: 'showOrHideQuotesInTimelineFromProfilePref' callback: 'showOrHideQuotesInTimelineFromProfilePref'
},
{
type: 'divider'
},
{
type: 'link',
label: window.sL.silencedPlural,
href: window.siteInstanceURL + 'main/silenced'
},
{
type: 'link',
label: window.sL.sandboxedPlural,
href: window.siteInstanceURL + 'main/sandboxed'
} }
]; ];
streamObject.callbacks = [ streamObject.callbacks = [
@ -188,6 +202,19 @@ function pathToStreamRouter(path) {
topic: 'hide_quotes_in_timeline:' + streamObject.path, topic: 'hide_quotes_in_timeline:' + streamObject.path,
label: window.sL.hideQuotesInTimeline, label: window.sL.hideQuotesInTimeline,
callback: 'showOrHideQuotesInTimelineFromProfilePref' callback: 'showOrHideQuotesInTimelineFromProfilePref'
},
{
type: 'divider'
},
{
type: 'link',
label: window.sL.silencedPlural,
href: window.siteInstanceURL + 'main/silenced'
},
{
type: 'link',
label: window.sL.sandboxedPlural,
href: window.siteInstanceURL + 'main/sandboxed'
} }
]; ];
streamObject.callbacks = [ streamObject.callbacks = [
@ -239,6 +266,30 @@ function pathToStreamRouter(path) {
} }
} }
// main/silenced
if(path == 'main/silenced') {
streamObject.name = 'silenced profiles';
streamObject.streamHeader = window.sL.silencedPlural;
streamObject.streamSubHeader = window.sL.silencedUsersOnThisInstance;
streamObject.streamDescription = window.sL.silencedStreamDescription;
streamObject.stream = 'qvitter/silenced.json?count=20';
streamObject.maxIdOrPage = 'page';
streamObject.type = 'users';
return streamObject;
}
// main/sandboxed
if(path == 'main/sandboxed') {
streamObject.name = 'sandboxed profiles';
streamObject.streamHeader = window.sL.sandboxedPlural;
streamObject.streamSubHeader = window.sL.sandboxedUsersOnThisInstance;
streamObject.streamDescription = window.sL.sandboxedStreamDescription;
streamObject.stream = 'qvitter/sandboxed.json?count=20';
streamObject.maxIdOrPage = 'page';
streamObject.type = 'users';
return streamObject;
}
// {screen_name} // {screen_name}
if(/^[a-zA-Z0-9]+$/.test(path)) { if(/^[a-zA-Z0-9]+$/.test(path)) {
streamObject.name = 'profile'; streamObject.name = 'profile';
@ -443,8 +494,7 @@ function pathToStreamRouter(path) {
streamObject.nickname = pathSplit[0]; streamObject.nickname = pathSplit[0];
if(window.loggedIn.screen_name == streamObject.nickname) { if(window.loggedIn.screen_name == streamObject.nickname) {
streamObject.stream = 'statuses/mentions.json'; streamObject.stream = 'statuses/mentions.json';
streamObject.streamHeader = '@' + replaceHtmlSpecialChars(streamObject.nickname); streamObject.streamHeader = window.sL.mentions;
streamObject.streamSubHeader = window.sL.mentions;
} }
else { else {
streamObject.parentPath = streamObject.nickname; streamObject.parentPath = streamObject.nickname;
@ -512,6 +562,16 @@ function pathToStreamRouter(path) {
{ {
type: 'divider' type: 'divider'
}, },
{
type: 'profile-prefs-toggle',
namespace: 'qvitter',
topic: 'only_show_notifications_from_users_i_follow',
label: window.sL.onlyShowNotificationsFromUsersIFollow,
callback: 'reloadCurrentStream'
},
{
type: 'divider'
},
{ {
type: 'profile-prefs-toggle', type: 'profile-prefs-toggle',
namespace: 'qvitter', namespace: 'qvitter',

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser": "Blockieren des Benutzers fehlgeschlagen.", "failedBlockingUser": "Blockieren des Benutzers fehlgeschlagen.",
"failedUnblockingUser": "Entblockieren des Benutzers fehlgeschlagen.", "failedUnblockingUser": "Entblockieren des Benutzers fehlgeschlagen.",
"unblockUser": "Entblockiere {username}", "unblockUser": "Entblockiere {username}",
"tooltipBlocksYou": "{username} blockiert dich, sodass du ihm nicht folgen kannst." "tooltipBlocksYou": "{username} blockiert dich, sodass du ihm nicht folgen kannst.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -6,13 +6,13 @@
"loginSignIn": "Sign in", "loginSignIn": "Sign in",
"loginRememberMe": "Remember me", "loginRememberMe": "Remember me",
"loginForgotPassword": "Forgot password?", "loginForgotPassword": "Forgot password?",
"notices": "Notices", "notices": "Quips",
"followers": "Followers", "followers": "Followers",
"following": "Following", "following": "Following",
"groups": "Groups", "groups": "Groups",
"compose": "Compose a new notice...", "compose": "What's quipping?",
"queetVerb": "Send", "queetVerb": "Send",
"queetsNounPlural": "Notices", "queetsNounPlural": "Quips",
"logout": "Sign out", "logout": "Sign out",
"languageSelected": "Language:", "languageSelected": "Language:",
"viewMyProfilePage": "View my profile page", "viewMyProfilePage": "View my profile page",
@ -21,18 +21,18 @@
"details": "Details", "details": "Details",
"expandFullConversation": "Expand full conversation", "expandFullConversation": "Expand full conversation",
"replyVerb": "Reply", "replyVerb": "Reply",
"requeetVerb": "Repeat", "requeetVerb": "Requip",
"favoriteVerb": "Favorite", "favoriteVerb": "Favorite",
"requeetedVerb": "Repeated", "requeetedVerb": "Requipped",
"favoritedVerb": "Favorited", "favoritedVerb": "Favorited",
"replyTo": "Reply to", "replyTo": "Reply to",
"requeetedBy": "Repeated by {requeeted-by}", "requeetedBy": "Requipped by {requeeted-by}",
"favoriteNoun": "Favorite", "favoriteNoun": "Favorite",
"favoritesNoun": "Favorites", "favoritesNoun": "Favorites",
"requeetNoun": "Repeat", "requeetNoun": "Requip",
"requeetsNoun": "Repeats", "requeetsNoun": "Requips",
"newQueet": "{new-notice-count} new notice", "newQueet": "{new-notice-count} new quip",
"newQueets": "{new-notice-count} new notices", "newQueets": "{new-notice-count} new quips",
"longmonthsJanuary": "January", "longmonthsJanuary": "January",
"longmonthsFebruary": "February", "longmonthsFebruary": "February",
"longmonthsMars": "March", "longmonthsMars": "March",
@ -76,7 +76,7 @@
"searchVerb": "Search", "searchVerb": "Search",
"deleteVerb": "Delete", "deleteVerb": "Delete",
"cancelVerb": "Cancel", "cancelVerb": "Cancel",
"deleteConfirmation": "Are you sure you want to delete this notice?", "deleteConfirmation": "Are you sure you want to delete this quip?",
"userExternalFollow": "Remote follow", "userExternalFollow": "Remote follow",
"userExternalFollowHelp": "Your account ID (e.g. user@rainbowdash.net).", "userExternalFollowHelp": "Your account ID (e.g. user@rainbowdash.net).",
"userFollow": "Follow", "userFollow": "Follow",
@ -98,7 +98,7 @@
"signUpEmail": "Email", "signUpEmail": "Email",
"signUpButtonText": "Sign up to {site-title}", "signUpButtonText": "Sign up to {site-title}",
"welcomeHeading": "Welcome to {site-title}.", "welcomeHeading": "Welcome to {site-title}.",
"welcomeText": "We are a <span id=\"federated-tooltip\"><div id=\"what-is-federation\">\"Federation\" means that you don't need a {site-title} account to be able to follow, be followed by or interact with {site-title} users. You can register on any StatusNet or GNU social server or any service based on the the <a href=\"http://www.w3.org/community/ostatus/wiki/Main_Page\">Ostatus</a> protocol! You don't even have to join a service try installing the lovely <a href=\"http://www.gnu.org/software/social/\">GNU social</a> software on your own server! :)</div>federation</span> of microbloggers who care about ethics and solidarity and want to quit the centralised capitalist services.", "welcomeText": "We are a <span id=\"federated-tooltip\"><div id=\"what-is-federation\">\"Federation\" means that you don't need a {site-title} account to be able to follow, be followed by or interact with {site-title} users. You can register on any StatusNet or GNU social server or any service based on the the <a href=\"http://www.w3.org/community/ostatus/wiki/Main_Page\">Ostatus</a> protocol! You don't even have to join a service try installing the lovely <a href=\"http://www.gnu.org/software/social/\">GNU social</a> software on your own server! :)</div>federation</span> of microbloggers who care about social justice and solidarity and want to quit the centralised capitalist services.",
"registerNickname": "Nickname", "registerNickname": "Nickname",
"registerHomepage": "Homepage", "registerHomepage": "Homepage",
"registerBio": "Bio", "registerBio": "Bio",
@ -108,8 +108,8 @@
"otherServers": "Alternatively you can create an account on another server of the GNU social network. <a href=\"http://federation.skilledtests.com/select_your_server.html\">Comparison</a>", "otherServers": "Alternatively you can create an account on another server of the GNU social network. <a href=\"http://federation.skilledtests.com/select_your_server.html\">Comparison</a>",
"editMyProfile": "Edit profile", "editMyProfile": "Edit profile",
"notifications": "Notifications", "notifications": "Notifications",
"xFavedYourQueet": "favorited your Queet", "xFavedYourQueet": "favorited your quip",
"xRepeatedYourQueet": "requeeted you", "xRepeatedYourQueet": "requipped you",
"xStartedFollowingYou": "followed you", "xStartedFollowingYou": "followed you",
"followsYou": "follows you", "followsYou": "follows you",
"FAQ": "FAQ", "FAQ": "FAQ",
@ -119,7 +119,7 @@
"showTerms": "Read our Terms of Use", "showTerms": "Read our Terms of Use",
"ellipsisMore": "More", "ellipsisMore": "More",
"blockUser": "Block {username}", "blockUser": "Block {username}",
"goToOriginalNotice": "Go to original notice", "goToOriginalNotice": "Go to the original quip",
"goToTheUsersRemoteProfile": "Go to the user's remote profile", "goToTheUsersRemoteProfile": "Go to the user's remote profile",
"clickToDrag":"Click to drag", "clickToDrag":"Click to drag",
"keyboardShortcuts":"Keyboard shortcuts", "keyboardShortcuts":"Keyboard shortcuts",
@ -128,7 +128,7 @@
"tooltipBookmarkStream":"Add this stream to your bookmarks", "tooltipBookmarkStream":"Add this stream to your bookmarks",
"tooltipTopMenu":"Menu and settings", "tooltipTopMenu":"Menu and settings",
"tooltipAttachImage":"Attach an image", "tooltipAttachImage":"Attach an image",
"tooltipShortenUrls":"Shorten all URLs in the Queet", "tooltipShortenUrls":"Shorten all URLs in the quip",
"tooltipReloadStream":"Refresh this stream", "tooltipReloadStream":"Refresh this stream",
"tooltipRemoveBookmark":"Remove this bookmark", "tooltipRemoveBookmark":"Remove this bookmark",
"clearHistory":"Clear browsing history", "clearHistory":"Clear browsing history",
@ -137,21 +137,21 @@
"ERRORcouldNotFindUserWithNickname":"Could not find a user with nickname \"{nickname}\" on this server", "ERRORcouldNotFindUserWithNickname":"Could not find a user with nickname \"{nickname}\" on this server",
"ERRORcouldNotFindGroupWithNickname":"Could not find a group with nickname \"{nickname}\" on this server", "ERRORcouldNotFindGroupWithNickname":"Could not find a group with nickname \"{nickname}\" on this server",
"ERRORcouldNotFindPage":"Could not find that page.", "ERRORcouldNotFindPage":"Could not find that page.",
"ERRORnoticeRemoved": "This notice has been removed.", "ERRORnoticeRemoved": "This quip has been removed.",
"ERRORnoContactWithServer": "Can not establish a connection to the server. The server could be overloaded, or there might be a problem with your internet connection. Please try again later!", "ERRORnoContactWithServer": "Can not establish a connection to the server. The server could be overloaded, or there might be a problem with your internet connection. Please try again later!",
"ERRORattachmentUploadFailed": "The upload failed. The format might be unsupported or the size too large.", "ERRORattachmentUploadFailed": "The upload failed. The format might be unsupported or the size too large.",
"hideRepliesToPeopleIDoNotFollow":"Hide replies to people I don't follow", "hideRepliesToPeopleIDoNotFollow":"Hide replies to people I don't follow",
"markAllNotificationsAsSeen":"Mark all notifications as seen", "markAllNotificationsAsSeen":"Mark all notifications as seen",
"notifyRepliesAndMentions":"Mentions and replies", "notifyRepliesAndMentions":"Mentions and replies",
"notifyFavs":"Favorites", "notifyFavs":"Favorites",
"notifyRepeats":"Requeets", "notifyRepeats":"Requips",
"notifyFollows":"New followers", "notifyFollows":"New followers",
"timelineOptions":"Timeline options", "timelineOptions":"Timeline options",
"ERRORfailedSavingYourSetting":"Failed saving your setting", "ERRORfailedSavingYourSetting":"Failed saving your setting",
"ERRORfailedMarkingAllNotificationsAsRead":"Failed marking all notifications as seen.", "ERRORfailedMarkingAllNotificationsAsRead":"Failed marking all notifications as seen.",
"newNotification": "{new-notice-count} new notification", "newNotification": "{new-notice-count} new notification",
"newNotifications": "{new-notice-count} new notifications", "newNotifications": "{new-notice-count} new notifications",
"thisIsANoticeFromABlockedUser":"Warning: This is a notice from a user you have blocked. Click to show it.", "thisIsANoticeFromABlockedUser":"Warning: This is a quip from a user you have blocked. Click to show it.",
"nicknamesListWithListName":"{nickname}s list: {list-name}", "nicknamesListWithListName":"{nickname}s list: {list-name}",
"myListWithListName":"My list: {list-name}", "myListWithListName":"My list: {list-name}",
"listMembers":"Members", "listMembers":"Members",
@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Falló el bloqueo al usuario.", "failedBlockingUser":"Falló el bloqueo al usuario.",
"failedUnblockingUser":"Falló el desbloqueo del usuario .", "failedUnblockingUser":"Falló el desbloqueo del usuario .",
"unblockUser": "Desbloquear a {username}", "unblockUser": "Desbloquear a {username}",
"tooltipBlocksYou":"Has sido bloqueado por {username}." "tooltipBlocksYou":"Has sido bloqueado por {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -171,5 +171,14 @@
"failedBlockingUser":"Käyttäjän esto epäoinnistui.", "failedBlockingUser":"Käyttäjän esto epäoinnistui.",
"failedUnblockingUser":"Eston poisto epäoinnistui.", "failedUnblockingUser":"Eston poisto epäoinnistui.",
"unblockUser": "Poista esto käyttäjältä {username}", "unblockUser": "Poista esto käyttäjältä {username}",
"tooltipBlocksYou":"{username} on estänyt sinut." "tooltipBlocksYou":"{username} on estänyt sinut.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Kunne ikke blokkere brukeren.", "failedBlockingUser":"Kunne ikke blokkere brukeren.",
"failedUnblockingUser":"Kunne ikke oppheve blokkeringen av bruker.", "failedUnblockingUser":"Kunne ikke oppheve blokkeringen av bruker.",
"unblockUser": "Opphev blokkering {username}", "unblockUser": "Opphev blokkering {username}",
"tooltipBlocksYou":"Du er blokkert fra å følge profilen {username}." "tooltipBlocksYou":"Du er blokkert fra å følge profilen {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Gefaald om de gebruiker te blokkeren.", "failedBlockingUser":"Gefaald om de gebruiker te blokkeren.",
"failedUnblockingUser":"Gefaald om de gebruiker te deblokkeren.", "failedUnblockingUser":"Gefaald om de gebruiker te deblokkeren.",
"unblockUser": "Deblokkeer {username}", "unblockUser": "Deblokkeer {username}",
"tooltipBlocksYou":"Je wordt geblokkeerd van het volgen van {username}." "tooltipBlocksYou":"Je wordt geblokkeerd van het volgen van {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Falha ao bloquear usuário.", "failedBlockingUser":"Falha ao bloquear usuário.",
"failedUnblockingUser":"Falha ao desbloquear usuário.", "failedUnblockingUser":"Falha ao desbloquear usuário.",
"unblockUser": "Desbloquear {username}", "unblockUser": "Desbloquear {username}",
"tooltipBlocksYou":"Você está impedido de seguir {username}." "tooltipBlocksYou":"Você está impedido de seguir {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -168,5 +168,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -98,7 +98,7 @@
"signUpEmail": "E-post", "signUpEmail": "E-post",
"signUpButtonText": "Registrera dig på {site-title}", "signUpButtonText": "Registrera dig på {site-title}",
"welcomeHeading": "Välkommen till {site-title}.", "welcomeHeading": "Välkommen till {site-title}.",
"welcomeText": "Vi är en <span id=\"federated-tooltip\"><div id=\"what-is-federation\">\"Federering\" betyder att du inte behöver ha ett {site-title}-konto för att följa, följas av eller prata med quittrare. Du kan registrera dig på vilken sajt som helst som stödjer protokollet <a href=\"http://www.w3.org/community/ostatus/wiki/Main_Page\">Ostatus</a>, eller mikroblogga på en helt egen server, förslagsvis med den fria programvaran <a href=\"http://www.gnu.org/software/social/\">GNU social</a> (som {site-title} bygger på).</div>federerad</span> allmänning, där du som har hoppat av de centraliserade kapitalistiska tjänsterna kan mikroblogga etiskt och solidariskt.", "welcomeText": "Vi är en <span id=\"federated-tooltip\"><div id=\"what-is-federation\">\"Federering\" betyder att du inte behöver ha ett {site-title}-konto för att följa, följas av eller prata med quittrare. Du kan registrera dig på vilken sajt som helst som stödjer protokollet <a href=\"http://www.w3.org/community/ostatus/wiki/Main_Page\">Ostatus</a>, eller mikroblogga på en helt egen server, förslagsvis med den fria programvaran <a href=\"http://www.gnu.org/software/social/\">GNU social</a> (som {site-title} bygger på).</div>federerad</span> allmänning, där du som har hoppat av de centraliserade kapitalistiska tjänsterna kan mikroblogga rättvist och solidariskt.",
"registerNickname": "Användarnamn", "registerNickname": "Användarnamn",
"registerHomepage": "Webbplats", "registerHomepage": "Webbplats",
"registerBio": "Biografi", "registerBio": "Biografi",
@ -170,5 +170,14 @@
"failedBlockingUser":"Misslyckades med att blockera användaren.", "failedBlockingUser":"Misslyckades med att blockera användaren.",
"failedUnblockingUser":"Misslyckades med att avblockera användaren.", "failedUnblockingUser":"Misslyckades med att avblockera användaren.",
"unblockUser": "Avblockera {username}", "unblockUser": "Avblockera {username}",
"tooltipBlocksYou":"Du är blockerad från att följa {username}." "tooltipBlocksYou":"Du är blockerad från att följa {username}.",
"silenced":"Nedtystad",
"silencedPlural":"Nedtystade användare",
"silencedUsersOnThisInstance":"Nedtystade användare på {site-title}",
"sandboxed":"I sandlådan",
"sandboxedPlural":"Användare i sandlådan",
"sandboxedUsersOnThisInstance":"Användare i sandlådan på {site-title}",
"silencedStreamDescription":"Nedtystade användare kan inte logga in eller skriva qvittringar. Qvittringar som de redan skrivit är dolda. För lokala användare är det som en borttagning som kan ångras, och för externa användare är det som att blockera användaren från instansen.",
"sandboxedStreamDescription":"Qvittringar från användare som är i sandlådan visas inte i &quot;Hela sajtens flöde&quot; eller &quot;Hela det kända nätverket&quot;. Qvittringar som användaren skriver under tiden den är i sandlådan kommer inte visas i de offentliga flödena om hen tas ur sandlådan senare.",
"onlyShowNotificationsFromUsersIFollow":"Visa bara notiser från användare som jag följer"
} }

View File

@ -170,5 +170,14 @@
"failedBlockingUser":"Kullanıcı engellenemedi.", "failedBlockingUser":"Kullanıcı engellenemedi.",
"failedUnblockingUser":"Kullanıcının engeli kaldırılamadı.", "failedUnblockingUser":"Kullanıcının engeli kaldırılamadı.",
"unblockUser": "{username} engelini kaldır", "unblockUser": "{username} engelini kaldır",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -169,5 +169,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }

View File

@ -169,5 +169,14 @@
"failedBlockingUser":"Failed to block the user.", "failedBlockingUser":"Failed to block the user.",
"failedUnblockingUser":"Failed to unblock the user.", "failedUnblockingUser":"Failed to unblock the user.",
"unblockUser": "Unblock {username}", "unblockUser": "Unblock {username}",
"tooltipBlocksYou":"You are blocked from following {username}." "tooltipBlocksYou":"You are blocked from following {username}.",
"silenced":"Silenced",
"silencedPlural":"Silenced profiles",
"silencedUsersOnThisInstance":"Silenced profiles on {site-title}",
"sandboxed":"Sandboxed",
"sandboxedPlural":"Sandboxed profiles",
"sandboxedUsersOnThisInstance":"Sandboxed profiles on {site-title}",
"silencedStreamDescription":"Silenced users can't login or post quips and the quips they've already posted are hidden. For local users it's like a delete that can be reversed, for remote users it's like a site wide block.",
"sandboxedStreamDescription":"Quips from sandboxed users are excluded from the Public Timeline and The Whole Known Network. Quips posted while being in the sandbox will not be included in the public timelines if the user is unsandboxed.",
"onlyShowNotificationsFromUsersIFollow":"Only show notifications from users I follow"
} }