Changes after rebase

diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md
index 885378231b27938316126f03a711c2c530642ac3..7f85f37ef1f34586fbaf4cb3c3abe8d65b38c071 100644 (file)
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@@ -33,6 +33,7 @@ General
 --------
 * y - for you
 * f - followers
+* r - sharers of sharers
 * h - what's hot
 * i - Images
 * v - Videos

diff --git a/src/Content/Conversation/Entity/Channel.php b/src/Content/Conversation/Entity/Channel.php
index 8d1e899acf0ec70bfcc99d6afeaea333a7a89b73..b8e0e2bb299f0d4e0d08d6c22846645dfa9fbc65 100644 (file)
--- a/src/Content/Conversation/Entity/Channel.php
+++ b/src/Content/Conversation/Entity/Channel.php
@@ -29,13 +29,14 @@ namespace Friendica\Content\Conversation\Entity;
  */
 final class Channel extends \Friendica\BaseEntity
 {
-       const WHATSHOT  = 'whatshot';
-       const FORYOU    = 'foryou';
-       const FOLLOWERS = 'followers';
-       const IMAGE     = 'image';
-       const VIDEO     = 'video';
-       const AUDIO     = 'audio';
-       const LANGUAGE  = 'language';
+       const WHATSHOT         = 'whatshot';
+       const FORYOU           = 'foryou';
+       const FOLLOWERS        = 'followers';
+       const SHARERSOFSHARERS = 'sharersofsharers';
+       const IMAGE            = 'image';
+       const VIDEO            = 'video';
+       const AUDIO            = 'audio';
+       const LANGUAGE         = 'language';
 
        /** @var string */
        protected $code;

diff --git a/src/Content/Conversation/Factory/Channel.php b/src/Content/Conversation/Factory/Channel.php
index f95971d647bdb9312c5eae61849e44ad65478334..702eab67ce4adde4f24ee8baf5373dcd108bf8fd 100644 (file)
--- a/src/Content/Conversation/Factory/Channel.php
+++ b/src/Content/Conversation/Factory/Channel.php
@@ -55,6 +55,7 @@ final class Channel extends \Friendica\BaseModel
                        new ChannelEntity(ChannelEntity::WHATSHOT, $this->l10n->t('What\'s Hot'), $this->l10n->t('Posts with a lot of interactions'), 'h'),
                        new ChannelEntity(ChannelEntity::LANGUAGE, $languages[$language], $this->l10n->t('Posts in %s', $languages[$language]), 'g'),
                        new ChannelEntity(ChannelEntity::FOLLOWERS, $this->l10n->t('Followers'), $this->l10n->t('Posts from your followers that you don\'t follow'), 'f'),
+                       new ChannelEntity(ChannelEntity::SHARERSOFSHARERS, $this->l10n->t('Sharers of sharers'), $this->l10n->t('Posts from accounts that are followed by accounts that you follow'), 'r'),
                        new ChannelEntity(ChannelEntity::IMAGE, $this->l10n->t('Images'), $this->l10n->t('Posts with images'), 'i'),
                        new ChannelEntity(ChannelEntity::AUDIO, $this->l10n->t('Audio'), $this->l10n->t('Posts with audio'), 'd'),
                        new ChannelEntity(ChannelEntity::VIDEO, $this->l10n->t('Videos'), $this->l10n->t('Posts with videos'), 'v'),