Changed RSS to Atom feed and improve paging

This commit is contained in:
Thomas Citharel
2017-06-13 18:48:10 +02:00
committed by Jeremy Benoist
parent 522e37ad27
commit 531c8d0a5c
57 changed files with 635 additions and 564 deletions

View File

@ -18,19 +18,19 @@ class CreateConfigListener implements EventSubscriberInterface
private $em;
private $theme;
private $itemsOnPage;
private $rssLimit;
private $feedLimit;
private $language;
private $readingSpeed;
private $actionMarkAsRead;
private $listMode;
private $session;
public function __construct(EntityManager $em, $theme, $itemsOnPage, $rssLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, Session $session)
public function __construct(EntityManager $em, $theme, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, Session $session)
{
$this->em = $em;
$this->theme = $theme;
$this->itemsOnPage = $itemsOnPage;
$this->rssLimit = $rssLimit;
$this->feedLimit = $feedLimit;
$this->language = $language;
$this->readingSpeed = $readingSpeed;
$this->actionMarkAsRead = $actionMarkAsRead;
@ -54,7 +54,7 @@ class CreateConfigListener implements EventSubscriberInterface
$config = new Config($event->getUser());
$config->setTheme($this->theme);
$config->setItemsPerPage($this->itemsOnPage);
$config->setRssLimit($this->rssLimit);
$config->setFeedLimit($this->feedLimit);
$config->setLanguage($this->session->get('_locale', $this->language));
$config->setReadingSpeed($this->readingSpeed);
$config->setActionMarkAsRead($this->actionMarkAsRead);

View File

@ -9,18 +9,18 @@ use Wallabag\UserBundle\Entity\User;
class UserRepository extends EntityRepository
{
/**
* Find a user by its username and rss roken.
* Find a user by its username and Feed token.
*
* @param string $username
* @param string $rssToken
* @param string $feedToken
*
* @return User|null
* @return null|User
*/
public function findOneByUsernameAndRsstoken($username, $rssToken)
public function findOneByUsernameAndFeedtoken($username, $feedToken)
{
return $this->createQueryBuilder('u')
->leftJoin('u.config', 'c')
->where('c.rssToken = :rss_token')->setParameter('rss_token', $rssToken)
->where('c.feedToken = :feed_token')->setParameter('feed_token', $feedToken)
->andWhere('u.username = :username')->setParameter('username', $username)
->getQuery()
->getOneOrNullResult();

View File

@ -28,7 +28,7 @@ services:
- "@doctrine.orm.entity_manager"
- "%wallabag_core.theme%"
- "%wallabag_core.items_on_page%"
- "%wallabag_core.rss_limit%"
- "%wallabag_core.feed_limit%"
- "%wallabag_core.language%"
- "%wallabag_core.reading_speed%"
- "%wallabag_core.action_mark_as_read%"