From 11186c14b8d6678533853e4a4295bd09a5d535a8 Mon Sep 17 00:00:00 2001 From: Hannes Mannerheim Date: Fri, 26 Feb 2016 23:18:02 +0100 Subject: [PATCH] silenced & sandboxed flags and streams, only show notifications from people you follow, ghost notification fix, mentions no longer default stream, block stream link in menu, etc --- QvitterPlugin.php | 23 ++++ actions/apiqvitterchecklogin.php | 17 ++- actions/apiqvitternotifications.php | 7 +- actions/apiqvittersandboxed.php | 196 ++++++++++++++++++++++++++++ actions/apiqvittersilencecreate.php | 93 +++++++++++++ actions/apiqvittersilenced.php | 196 ++++++++++++++++++++++++++++ actions/qvitter.php | 5 +- classes/NotificationStream.php | 9 +- css/qvitter.css | 54 ++++++++ js/ajax-functions.js | 5 +- js/dom-functions.js | 100 ++++++++++++-- js/misc-functions.js | 10 ++ js/qvitter.js | 7 + js/stream-router.js | 64 ++++++++- locale/ar.json | 11 +- locale/ast.json | 11 +- locale/ca.json | 11 +- locale/de.json | 11 +- locale/en.json | 13 +- locale/eo.json | 11 +- locale/es.json | 11 +- locale/es_ahorita.json | 11 +- locale/eu.json | 11 +- locale/fa.json | 11 +- locale/fi.json | 11 +- locale/fr.json | 11 +- locale/gl.json | 11 +- locale/he.json | 11 +- locale/io.json | 11 +- locale/it.json | 11 +- locale/ja.json | 11 +- locale/nb.json | 11 +- locale/nl.json | 11 +- locale/pt.json | 11 +- locale/pt_br.json | 11 +- locale/ru.json | 11 +- locale/sq.json | 11 +- locale/sv.json | 13 +- locale/tr.json | 13 +- locale/zh_cn.json | 11 +- locale/zh_tw.json | 11 +- 41 files changed, 1040 insertions(+), 49 deletions(-) create mode 100644 actions/apiqvittersandboxed.php create mode 100644 actions/apiqvittersilencecreate.php create mode 100644 actions/apiqvittersilenced.php diff --git a/QvitterPlugin.php b/QvitterPlugin.php index c3c9bf8..8d767ef 100644 --- a/QvitterPlugin.php +++ b/QvitterPlugin.php @@ -153,6 +153,14 @@ class QvitterPlugin extends Plugin { // route/reroute urls 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', array('action' => 'apiqvitteroembednotice', 'format' => '(xml|json)')); @@ -263,6 +271,8 @@ class QvitterPlugin extends Plugin { $m->connect('', array('action' => 'qvitter')); $m->connect('main/all', 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')); // if the user wants the twitter style home stream with hidden replies to non-friends @@ -808,6 +818,12 @@ class QvitterPlugin extends Plugin { $twitter_user['is_local'] = $profile->isLocal(); + // silenced? + $twitter_user['is_silenced'] = $profile->isSilenced(); + + // sandboxed? + $twitter_user['is_sandboxed'] = $profile->isSandboxed(); + // ostatus uri if($twitter_user['is_local']) { $user = $profile->getUser(); @@ -1248,6 +1264,7 @@ class QvitterPlugin extends Plugin { } $user_id = $user->id; + $profile = $user->getProfile(); $notification = new QvitterNotification(); $notification->selectAdd(); @@ -1255,6 +1272,12 @@ class QvitterPlugin extends Plugin { $notification->selectAdd('count(id) as count'); $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 $current_profile = $user->getProfile(); $disable_notify_replies_and_mentions = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_replies_and_mentions'); diff --git a/actions/apiqvitterchecklogin.php b/actions/apiqvitterchecklogin.php index db24770..5e58c9f 100644 --- a/actions/apiqvitterchecklogin.php +++ b/actions/apiqvitterchecklogin.php @@ -71,12 +71,23 @@ class ApiQvitterCheckLoginAction extends ApiAction $user = common_check_user($this->arg('username'), $this->arg('password')); - if($user) { - $user = true; + if(!$user instanceof User) { + $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->showJsonObjects($user); + $this->showJsonObjects($this->twitterUserArray($profile)); $this->endDocument('json'); } diff --git a/actions/apiqvitternotifications.php b/actions/apiqvitternotifications.php index c992fb2..b0f56b8 100644 --- a/actions/apiqvitternotifications.php +++ b/actions/apiqvitternotifications.php @@ -55,7 +55,7 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction { parent::prepare($args); - $this->format = 'json'; + $this->format = 'json'; $this->notifications = $this->getNotifications(); @@ -99,6 +99,8 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction if($notice_object instanceof Notice) { $notice = self::twitterSimpleStatusArray($notice_object); } else { + // if the referenced notice is missing, delete this corrupt notification! + $notification->delete(); continue; } @@ -117,6 +119,9 @@ class ApiQvitterNotificationsAction extends ApiPrivateAuthAction 'created_at'=>self::dateTwitter($notification->created), 'is_seen'=>$notification->is_seen ); + } else { + // if the referenced from_profile is missing, delete this corrupt notification! + $notification->delete(); } // mark as seen diff --git a/actions/apiqvittersandboxed.php b/actions/apiqvittersandboxed.php new file mode 100644 index 0000000..f0d3bd1 --- /dev/null +++ b/actions/apiqvittersandboxed.php @@ -0,0 +1,196 @@ +. + * + * @category API + * @package GNUsocial + * @author Craig Andrews + * @author Evan Prodromou + * @author Jeffery To + * @author Zach Copley + * @author Hannes Mannerheim + * @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 + * @author Evan Prodromou + * @author Jeffery To + * @author Zach Copley + * @author Hannes Mannerheim + * @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; + } +} diff --git a/actions/apiqvittersilencecreate.php b/actions/apiqvittersilencecreate.php new file mode 100644 index 0000000..1383067 --- /dev/null +++ b/actions/apiqvittersilencecreate.php @@ -0,0 +1,93 @@ + \\\\_\ · + · \\) \____) · + · · + · · + · · + · 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 . · + · · + · 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'); + } +} diff --git a/actions/apiqvittersilenced.php b/actions/apiqvittersilenced.php new file mode 100644 index 0000000..1f97ab3 --- /dev/null +++ b/actions/apiqvittersilenced.php @@ -0,0 +1,196 @@ +. + * + * @category API + * @package GNUsocial + * @author Craig Andrews + * @author Evan Prodromou + * @author Jeffery To + * @author Zach Copley + * @author Hannes Mannerheim + * @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 + * @author Evan Prodromou + * @author Jeffery To + * @author Zach Copley + * @author Hannes Mannerheim + * @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; + } +} diff --git a/actions/qvitter.php b/actions/qvitter.php index 672a655..fcc1c75 100644 --- a/actions/qvitter.php +++ b/actions/qvitter.php @@ -472,7 +472,8 @@ class QvitterAction extends ApiAction
    • -
    • +
    • +
    • @@ -622,7 +623,6 @@ class QvitterAction extends ApiAction if($logged_in_user) { ?> - @@ -644,6 +644,7 @@ class QvitterAction extends ApiAction

    +
    diff --git a/classes/NotificationStream.php b/classes/NotificationStream.php index eb17c9d..bf0a65f 100644 --- a/classes/NotificationStream.php +++ b/classes/NotificationStream.php @@ -34,14 +34,21 @@ class NotificationStream function getNotificationIds($offset, $limit, $since_id, $max_id) { + $current_profile = Profile::current(); + $notification = new QvitterNotification(); $notification->selectAdd(); $notification->selectAdd('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))); + // 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 - $current_profile = Profile::current(); $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_repeats = Profile_prefs::getConfigData($current_profile, 'qvitter', 'disable_notify_repeats'); diff --git a/css/qvitter.css b/css/qvitter.css index f05eca6..e138c08 100644 --- a/css/qvitter.css +++ b/css/qvitter.css @@ -1643,6 +1643,19 @@ body.rtl #history-container.menu-container a .chev-right { 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 { display: inline-block; font-size: 20px; @@ -1872,6 +1885,47 @@ background-repeat: no-repeat; 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 { bottom: 3px; color: #777; diff --git a/js/ajax-functions.js b/js/ajax-functions.js index 2cb4d3b..aec28db 100644 --- a/js/ajax-functions.js +++ b/js/ajax-functions.js @@ -112,8 +112,11 @@ function checkLogin(username,password,actionOnSuccess) { password: password }, dataType: 'json', - error: function() { + error: function(data) { shakeLoginBox(); + if(data.status === 403) { + showErrorMessage(window.sL.silenced); + } }, success: function(data) { if(typeof data.error == 'undefined' && data !== false) { diff --git a/js/dom-functions.js b/js/dom-functions.js index d0edece..6e30a0f 100644 --- a/js/dom-functions.js +++ b/js/dom-functions.js @@ -171,7 +171,7 @@ function alignMenuToParent(menu, parent, offsetLeft) { function showErrorMessage(message, after) { if(typeof after == 'undefined') { - var after = $('#user-container'); + var after = $('#user-container,#login-register-container'); } after.after('
    ' + message + '
    '); } @@ -358,6 +358,16 @@ function buildProfileCard(data) { var follows_you = '' + window.sL.followsYou + ''; } + // 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 = ''; @@ -385,13 +395,15 @@ function buildProfileCard(data) { // full card html data.profileCardHtml = '\
    \ -
    \ +
    \
    \ \ \ \
    \ -

    ' + data.name + '

    \ +

    ' + data.name + '

    \ + ' + window.sL.silenced + '\ + ' + window.sL.sandboxed + '\

    \ @' + data.screen_name + '\ ' + follows_you + '\ @@ -446,6 +458,21 @@ function buildExternalProfileCard(data) { 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 data = cleanUpUserObject(data.external); @@ -480,12 +507,14 @@ function buildExternalProfileCard(data) { data.profileCardHtml = '\
    \ -
    \ +
    \
    \ \
    \ \ -

    ' + data.name + '

    \ +

    ' + data.name + '

    \ + ' + window.sL.silenced + '\ + ' + window.sL.sandboxed + '\

    \ ' + data.screenNameWithServer + '\ ' + window.sL.goToTheUsersRemoteProfile + '\ @@ -694,13 +723,19 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess // remember the most recent stream object window.currentStreamObject = streamObject; - // set the new streams header + // set the new streams header and description if(streamObject.streamSubHeader) { $('#feed-header-inner h2').html(streamObject.streamSubHeader); } else { $('#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 if(streamObject.menu && window.loggedIn) { @@ -892,14 +927,21 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess else { showErrorMessage(window.sL.ERRORcouldNotFindPage + '

    url: ' + url); } + emptyRememberAndHideFeed(); } else if(error.status == 410 && streamObject.name == 'notice') { showErrorMessage(window.sL.ERRORnoticeRemoved); + emptyRememberAndHideFeed(); } else if(error.status == 0 || (error.status == 200 && error.responseText == 'An error occurred.') ) { 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 { showErrorMessage(window.sL.ERRORsomethingWentWrong + '

    \ @@ -908,6 +950,9 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess streamObject:
    ' + replaceHtmlSpecialChars(JSON.stringify(streamObject, null, ' ')) + '
    \ '); } + + // make sure page-container is visible + $('#page-container').css('opacity','1'); } // 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'; } + // silenced? + var silencedClass = ''; + if(obj.is_silenced === true) { + silencedClass = ' silenced'; + } + // sandboxed? + var sandboxedClass = ''; + if(obj.is_sandboxed === true) { + sandboxedClass = ' sandboxed'; + } + var followButton = ''; if(typeof window.loggedIn.screen_name != 'undefined' // if logged in && window.loggedIn.id != obj.id) { // not if this is me @@ -1923,14 +1993,16 @@ function buildUserStreamItemHtml(obj) { } } - return '
    \ + return '
    \
    \ ' + followButton + '\
    \
    \ \ ' + 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? if(typeof window.knownDeletedNotices[obj.uri] != 'undefined') { extraClasses += ' deleted always-hidden'; @@ -2146,7 +2226,9 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
    \ ' + '' + reply_to_html + in_groups_html + '' + diff --git a/js/misc-functions.js b/js/misc-functions.js index 64b11fa..388a4b9 100644 --- a/js/misc-functions.js +++ b/js/misc-functions.js @@ -899,6 +899,16 @@ function updateUserDataInStream() { && typeof userArray.modified != 'undefined' && (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) $.each($('img.avatar.profile-size[data-user-id="' + userArray.local.id + '"]'),function(){ if($(this).attr('src') != userArray.local.profile_image_url_profile_size) { diff --git a/js/qvitter.js b/js/qvitter.js index 5d49d81..187e44e 100644 --- a/js/qvitter.js +++ b/js/qvitter.js @@ -935,6 +935,7 @@ function proceedToSetLanguageAndLogin(data){ $('.stream-selection.public-timeline').prepend(window.sL.publicTimeline); $('.stream-selection.public-and-external-timeline').prepend(window.sL.publicAndExtTimeline) $('#search-query').attr('placeholder',window.sL.searchVerb); + $('#blocking-link').html(window.sL.userBlocks); $('#faq-link').html(window.sL.FAQ); $('#tou-link').html(window.sL.showTerms); $('#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 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); } diff --git a/js/stream-router.js b/js/stream-router.js index f7ed994..6cabd3d 100644 --- a/js/stream-router.js +++ b/js/stream-router.js @@ -126,6 +126,7 @@ function pathToStreamRouter(path) { name: false, // human readable name streamHeader: false, // short header, e.g. links and buttons – no html! 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" stream: false, // the API path 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, label: window.sL.hideQuotesInTimeline, 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 = [ @@ -188,6 +202,19 @@ function pathToStreamRouter(path) { topic: 'hide_quotes_in_timeline:' + streamObject.path, label: window.sL.hideQuotesInTimeline, 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 = [ @@ -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} if(/^[a-zA-Z0-9]+$/.test(path)) { streamObject.name = 'profile'; @@ -443,8 +494,7 @@ function pathToStreamRouter(path) { streamObject.nickname = pathSplit[0]; if(window.loggedIn.screen_name == streamObject.nickname) { streamObject.stream = 'statuses/mentions.json'; - streamObject.streamHeader = '@' + replaceHtmlSpecialChars(streamObject.nickname); - streamObject.streamSubHeader = window.sL.mentions; + streamObject.streamHeader = window.sL.mentions; } else { streamObject.parentPath = streamObject.nickname; @@ -512,6 +562,16 @@ function pathToStreamRouter(path) { { 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', namespace: 'qvitter', diff --git a/locale/ar.json b/locale/ar.json index 4d17ca9..1781224 100644 --- a/locale/ar.json +++ b/locale/ar.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/ast.json b/locale/ast.json index 453b49f..09d8c69 100644 --- a/locale/ast.json +++ b/locale/ast.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/ca.json b/locale/ca.json index f778b37..fdef729 100644 --- a/locale/ca.json +++ b/locale/ca.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/de.json b/locale/de.json index daaf1fd..6c4b087 100644 --- a/locale/de.json +++ b/locale/de.json @@ -170,5 +170,14 @@ "failedBlockingUser": "Blockieren des Benutzers fehlgeschlagen.", "failedUnblockingUser": "Entblockieren des Benutzers fehlgeschlagen.", "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" } diff --git a/locale/en.json b/locale/en.json index d11c471..6f35c76 100644 --- a/locale/en.json +++ b/locale/en.json @@ -98,7 +98,7 @@ "signUpEmail": "Email", "signUpButtonText": "Sign up to {site-title}", "welcomeHeading": "Welcome to {site-title}.", - "welcomeText": "We are a
    \"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 Ostatus protocol! You don't even have to join a service – try installing the lovely GNU social software on your own server! :)
    federation     of microbloggers who care about ethics and solidarity and want to quit the centralised capitalist services.", + "welcomeText": "We are a
    \"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 Ostatus protocol! You don't even have to join a service – try installing the lovely GNU social software on your own server! :)
    federation     of microbloggers who care about social justice and solidarity and want to quit the centralised capitalist services.", "registerNickname": "Nickname", "registerHomepage": "Homepage", "registerBio": "Bio", @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/eo.json b/locale/eo.json index 7eb8c5b..497d017 100644 --- a/locale/eo.json +++ b/locale/eo.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/es.json b/locale/es.json index a7edf80..9e35e21 100644 --- a/locale/es.json +++ b/locale/es.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Falló el bloqueo al usuario.", "failedUnblockingUser":"Falló el desbloqueo del usuario .", "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" } diff --git a/locale/es_ahorita.json b/locale/es_ahorita.json index c83203a..edb2d8e 100644 --- a/locale/es_ahorita.json +++ b/locale/es_ahorita.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/eu.json b/locale/eu.json index e269780..00cd0a0 100644 --- a/locale/eu.json +++ b/locale/eu.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/fa.json b/locale/fa.json index bbfcff3..b3ed018 100644 --- a/locale/fa.json +++ b/locale/fa.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/fi.json b/locale/fi.json index 9d41e01..9325e30 100644 --- a/locale/fi.json +++ b/locale/fi.json @@ -171,5 +171,14 @@ "failedBlockingUser":"Käyttäjän esto epäoinnistui.", "failedUnblockingUser":"Eston poisto epäoinnistui.", "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" } diff --git a/locale/fr.json b/locale/fr.json index f564a4e..7a40010 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/gl.json b/locale/gl.json index d092e18..5a966f0 100644 --- a/locale/gl.json +++ b/locale/gl.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/he.json b/locale/he.json index cffad42..a905a65 100644 --- a/locale/he.json +++ b/locale/he.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/io.json b/locale/io.json index 157989a..025c2be 100644 --- a/locale/io.json +++ b/locale/io.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/it.json b/locale/it.json index 39a0793..840c0fe 100644 --- a/locale/it.json +++ b/locale/it.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/ja.json b/locale/ja.json index 27c3e72..bc56840 100644 --- a/locale/ja.json +++ b/locale/ja.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/nb.json b/locale/nb.json index 4a472d7..dc8e3a8 100644 --- a/locale/nb.json +++ b/locale/nb.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Kunne ikke blokkere brukeren.", "failedUnblockingUser":"Kunne ikke oppheve blokkeringen av bruker.", "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" } diff --git a/locale/nl.json b/locale/nl.json index 3001145..48d8320 100644 --- a/locale/nl.json +++ b/locale/nl.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Gefaald om de gebruiker te blokkeren.", "failedUnblockingUser":"Gefaald om de gebruiker te deblokkeren.", "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" } diff --git a/locale/pt.json b/locale/pt.json index b801895..b1bdc67 100644 --- a/locale/pt.json +++ b/locale/pt.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/pt_br.json b/locale/pt_br.json index 787a5a8..873b759 100644 --- a/locale/pt_br.json +++ b/locale/pt_br.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Falha ao bloquear usuário.", "failedUnblockingUser":"Falha ao desbloquear usuário.", "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" } diff --git a/locale/ru.json b/locale/ru.json index 703c866..fb0e07f 100644 --- a/locale/ru.json +++ b/locale/ru.json @@ -168,5 +168,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/sq.json b/locale/sq.json index a8ccbe1..a90184b 100644 --- a/locale/sq.json +++ b/locale/sq.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/sv.json b/locale/sv.json index 7496751..5b591c8 100644 --- a/locale/sv.json +++ b/locale/sv.json @@ -98,7 +98,7 @@ "signUpEmail": "E-post", "signUpButtonText": "Registrera dig på {site-title}", "welcomeHeading": "Välkommen till {site-title}.", - "welcomeText": "Vi är en
    \"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 Ostatus, eller mikroblogga på en helt egen server, förslagsvis med den fria programvaran GNU social (som {site-title} bygger på).
    federerad     allmänning, där du som har hoppat av de centraliserade kapitalistiska tjänsterna kan mikroblogga etiskt och solidariskt.", + "welcomeText": "Vi är en
    \"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 Ostatus, eller mikroblogga på en helt egen server, förslagsvis med den fria programvaran GNU social (som {site-title} bygger på).
    federerad     allmänning, där du som har hoppat av de centraliserade kapitalistiska tjänsterna kan mikroblogga rättvist och solidariskt.", "registerNickname": "Användarnamn", "registerHomepage": "Webbplats", "registerBio": "Biografi", @@ -170,5 +170,14 @@ "failedBlockingUser":"Misslyckades med att blockera användaren.", "failedUnblockingUser":"Misslyckades med att avblockera användaren.", "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 "Hela sajtens flöde" eller "Hela det kända nätverket". 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" } diff --git a/locale/tr.json b/locale/tr.json index d5e2fa6..cf98047 100644 --- a/locale/tr.json +++ b/locale/tr.json @@ -170,5 +170,14 @@ "failedBlockingUser":"Kullanıcı engellenemedi.", "failedUnblockingUser":"Kullanıcının engeli kaldırılamadı.", "unblockUser": "{username} engelini kaldır", - "tooltipBlocksYou":"You are blocked from following {username}." -} \ No newline at end of file + "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" +} diff --git a/locale/zh_cn.json b/locale/zh_cn.json index 3cc8d2a..8b754fe 100644 --- a/locale/zh_cn.json +++ b/locale/zh_cn.json @@ -169,5 +169,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" } diff --git a/locale/zh_tw.json b/locale/zh_tw.json index ee9cde6..c5f430f 100644 --- a/locale/zh_tw.json +++ b/locale/zh_tw.json @@ -169,5 +169,14 @@ "failedBlockingUser":"Failed to block the user.", "failedUnblockingUser":"Failed to unblock the user.", "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" }