45 files changed, 1552 insertions, 67 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index eb725a59..e327bbe5 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -286,7 +286,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupConfig()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> Config setup.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> config setup.</info>');
         $em = $this->getContainer()->get('doctrine.orm.entity_manager');
 
         // cleanup before insert new stuff
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index d4170d39..23af98e5 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -10,12 +10,16 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\TaggingRule;
+use Wallabag\CoreBundle\Event\Activity\Actions\User\UserDeletedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\User\UserEditedEvent;
 use Wallabag\CoreBundle\Form\Type\ConfigType;
 use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
 use Wallabag\CoreBundle\Form\Type\RssType;
 use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
 use Wallabag\CoreBundle\Form\Type\UserInformationType;
 use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\FederationBundle\Form\Type\AccountType;
+use Wallabag\UserBundle\Entity\User;
 
 class ConfigController extends Controller
 {
@@ -82,6 +86,50 @@ class ConfigController extends Controller
         if ($userForm->isSubmitted() && $userForm->isValid()) {
             $userManager->updateUser($user, true);
 
+            $this->get('event_dispatcher')->dispatch(UserEditedEvent::NAME, new UserEditedEvent($user->getAccount()));
+
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'flashes.config.notice.user_updated'
+            );
+
+            return $this->redirect($this->generateUrl('config').'#set3');
+        }
+
+        // handle account information
+        $account = $user->getAccount();
+        $accountForm = $this->createForm(AccountType::class, $account, [
+            'action' => $this->generateUrl('config').'#set3',
+        ]);
+        $accountForm->handleRequest($request);
+
+        if ($accountForm->isSubmitted() && $accountForm->isValid()) {
+
+            $avatar = $account->getAvatar();
+            $banner = $account->getBanner();
+
+            if (null !== $avatar) {
+                $avatarFileName = md5(uniqid('', true)) . '.' . $avatar->guessExtension();
+
+                $avatar->move(
+                    $this->getParameter('media_directory') . '/avatar',
+                    $avatarFileName
+                );
+                $account->setAvatar($avatarFileName);
+            }
+
+            if (null != $banner) {
+                $bannerFileName = md5(uniqid('', true)) . '.' . $banner->guessExtension();
+
+                $banner->move(
+                    $this->get('media_directory') . '/banner',
+                    $bannerFileName
+                );
+                $account->setBanner($bannerFileName);
+            }
+
+            $this->get('event_dispatcher')->dispatch(UserEditedEvent::NAME, new UserEditedEvent($user));
+
             $this->get('session')->getFlashBag()->add(
                 'notice',
                 'flashes.config.notice.user_updated'
@@ -145,6 +193,7 @@ class ConfigController extends Controller
                 'pwd' => $pwdForm->createView(),
                 'user' => $userForm->createView(),
                 'new_tagging_rule' => $newTaggingRule->createView(),
+                'account' => $accountForm->createView(),
             ],
             'rss' => [
                 'username' => $user->getUsername(),
@@ -400,9 +449,13 @@ class ConfigController extends Controller
         $this->get('security.token_storage')->setToken(null);
         $request->getSession()->invalidate();
 
+        $account = $user->getAccount();
+
         $em = $this->get('fos_user.user_manager');
         $em->deleteUser($user);
 
+        $this->get('event_dispatcher')->dispatch(UserDeletedEvent::NAME, new UserDeletedEvent($account));
+
         return $this->redirect($this->generateUrl('fos_user_security_login'));
     }
 
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index fafa49f1..5e4462ed 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -9,12 +9,14 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryEditedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryFavouriteEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryReadEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntrySavedEvent;
 use Wallabag\CoreBundle\Form\Type\EntryFilterType;
 use Wallabag\CoreBundle\Form\Type\EditEntryType;
 use Wallabag\CoreBundle\Form\Type\NewEntryType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Event\EntryDeletedEvent;
 use Wallabag\CoreBundle\Form\Type\SearchEntryType;
 
 class EntryController extends Controller
@@ -405,6 +407,8 @@ class EntryController extends Controller
         $entry->toggleArchive();
         $this->getDoctrine()->getManager()->flush();
 
+        $this->get('event_dispatcher')->dispatch(EntryReadEvent::NAME, new EntryReadEvent($entry));
+
         $message = 'flashes.entry.notice.entry_unarchived';
         if ($entry->isArchived()) {
             $message = 'flashes.entry.notice.entry_archived';
@@ -437,6 +441,8 @@ class EntryController extends Controller
         $entry->toggleStar();
         $this->getDoctrine()->getManager()->flush();
 
+        $this->get('event_dispatcher')->dispatch(EntryFavouriteEvent::NAME, new EntryFavouriteEvent($entry));
+
         $message = 'flashes.entry.notice.entry_unstarred';
         if ($entry->isStarred()) {
             $message = 'flashes.entry.notice.entry_starred';
@@ -473,9 +479,6 @@ class EntryController extends Controller
             UrlGeneratorInterface::ABSOLUTE_PATH
         );
 
-        // entry deleted, dispatch event about it!
-        $this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));
-
         $em = $this->getDoctrine()->getManager();
         $em->remove($entry);
         $em->flush();
diff --git a/src/Wallabag/CoreBundle/Controller/ShareController.php b/src/Wallabag/CoreBundle/Controller/ShareController.php
new file mode 100644
index 00000000..d6f83ebc
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Controller/ShareController.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Wallabag\CoreBundle\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Exception\InvalidArgumentException;
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Notification;
+use Wallabag\CoreBundle\Entity\Share;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntrySavedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareAcceptedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareCancelledEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareCreatedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareDeniedEvent;
+use Wallabag\CoreBundle\Notifications\NoAction;
+use Wallabag\CoreBundle\Notifications\YesAction;
+use Wallabag\UserBundle\Entity\User;
+
+class ShareController extends Controller
+{
+    /**
+     * @Route("/share-user/{entry}/{destination}", name="share-entry-user", requirements={"entry" = "\d+", "destination" = "\d+"})
+     * @param Entry $entry
+     * @param User $destination
+     * @throws AccessDeniedException
+     * @throws InvalidArgumentException
+     */
+    public function shareEntryAction(Entry $entry, User $destination)
+    {
+
+        if ($entry->getUser() !== $this->getUser()) {
+            throw new AccessDeniedException("You can't share this entry");
+        }
+
+        if ($destination === $this->getUser()) {
+            throw new InvalidArgumentException("You can't share entries to yourself");
+        }
+
+        $share = new Share();
+        $share->setUserOrigin($this->getUser())
+            ->setEntry($entry)
+            ->setUserDestination($destination);
+
+        $em = $this->getDoctrine()->getManager();
+        $em->persist($share);
+        $em->flush();
+
+        $this->get('event_dispatcher')->dispatch(ShareCreatedEvent::NAME, new ShareCancelledEvent($share));
+
+        $accept = new YesAction($this->generateUrl('share-entry-user-accept', ['share' => $share->getId()]));
+
+        $deny = new NoAction($this->generateUrl('share-entry-user-refuse', ['share' => $share->getId()]));
+
+        $notification = new Notification($destination);
+        $notification->setType(Notification::TYPE_SHARE)
+            ->setTitle($this->get('translator')->trans('share.notification.new.title'))
+            ->addAction($accept)
+            ->addAction($deny);
+
+        $em->persist($notification);
+        $em->flush();
+
+        $this->redirectToRoute('view', ['id' => $entry->getId()]);
+    }
+
+    /**
+     * @Route("/share-user/accept/{share}", name="share-entry-user-accept")
+     *
+     * @param Share $share
+     * @return RedirectResponse
+     * @throws AccessDeniedException
+     */
+    public function acceptShareAction(Share $share)
+    {
+        if ($share->getUserDestination() !== $this->getUser()) {
+            throw new AccessDeniedException("You can't accept this entry");
+        }
+
+        $entry = new Entry($this->getUser());
+        $entry->setUrl($share->getEntry()->getUrl());
+
+        $em = $this->getDoctrine()->getManager();
+
+        if (false === $this->checkIfEntryAlreadyExists($entry)) {
+            $this->updateEntry($entry);
+
+            $em->persist($entry);
+            $em->flush();
+
+            $this->get('event_dispatcher')->dispatch(ShareAcceptedEvent::NAME, new ShareAcceptedEvent($share));
+
+            // entry saved, dispatch event about it!
+            $this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
+        }
+
+        $em->remove($share);
+        $em->flush(); // we keep the previous flush above in case the event dispatcher would lead in using the saved entry
+
+        return $this->redirect($this->generateUrl('homepage'));
+    }
+
+    /**
+     * @Route("/share-user/refuse/{share}", name="share-entry-user-refuse")
+     *
+     * @param Share $share
+     * @return RedirectResponse
+     */
+    public function refuseShareAction(Share $share)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $em->remove($share);
+        $em->flush();
+
+        $this->get('event_dispatcher')->dispatch(ShareDeniedEvent::NAME, new ShareDeniedEvent($share));
+
+        return $this->redirect($this->generateUrl('homepage'));
+    }
+
+    /**
+     * Fetch content and update entry.
+     * In case it fails, entry will return to avod loosing the data.
+     *
+     * @param Entry  $entry
+     * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
+     *
+     * @return Entry
+     */
+    private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
+    {
+        // put default title in case of fetching content failed
+        $entry->setTitle('No title found');
+
+        $message = 'flashes.entry.notice.'.$prefixMessage;
+
+        try {
+            $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+        } catch (\Exception $e) {
+            $this->get('logger')->error('Error while saving an entry', [
+                'exception' => $e,
+                'entry' => $entry,
+            ]);
+
+            $message = 'flashes.entry.notice.'.$prefixMessage.'_failed';
+        }
+
+        $this->get('session')->getFlashBag()->add('notice', $message);
+
+        return $entry;
+    }
+
+    /**
+     * Check for existing entry, if it exists, redirect to it with a message.
+     *
+     * @param Entry $entry
+     *
+     * @return Entry|bool
+     */
+    private function checkIfEntryAlreadyExists(Entry $entry)
+    {
+        return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index a8b1eadd..6cc78458 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -9,6 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryTaggedEvent;
 use Wallabag\CoreBundle\Form\Type\NewTagType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
@@ -37,6 +38,8 @@ class TagController extends Controller
             $em->persist($entry);
             $em->flush();
 
+            $this->get('event_dispatcher')->dispatch(EntryTaggedEvent::NAME, new EntryTaggedEvent($entry, $tags));
+
             $this->get('session')->getFlashBag()->add(
                 'notice',
                 'flashes.tag.notice.tag_added'
@@ -64,6 +67,8 @@ class TagController extends Controller
         $em = $this->getDoctrine()->getManager();
         $em->flush();
 
+        $this->get('event_dispatcher')->dispatch(EntryTaggedEvent::NAME, new EntryTaggedEvent($entry, $tag), true);
+
         // remove orphan tag in case no entries are associated to it
         if (count($tag->getEntries()) === 0) {
             $em->remove($tag);
diff --git a/src/Wallabag/CoreBundle/Entity/Activity.php b/src/Wallabag/CoreBundle/Entity/Activity.php
new file mode 100644
index 00000000..08a3f1fb
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/Activity.php
@@ -0,0 +1,295 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Wallabag\FederationBundle\Entity\Account;
+
+/**
+ * Change.
+ *
+ * This entity stores a datetime for each activity.
+ *
+ * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ChangeRepository")
+ * @ORM\Table(name="`activity`")
+ */
+class Activity
+{
+    /**
+     * Object types
+     */
+    const ENTRY_OBJECT = 1;
+    const TAG_OBJECT = 2;
+    const USER_OBJECT = 3;
+    const SHARE_OBJECT = 4;
+    const GROUP_OBJECT = 5;
+    const ANNOTATION_OBJECT = 6;
+    const CONFIG_OBJECT = 7;
+    const ACCOUNT_OBJECT = 8;
+
+    /**
+     * Events
+     */
+
+    /**
+     * Entry events
+     */
+    const ENTRY_ADD = 10; // done
+    const ENTRY_EDIT = 11; // done
+    const ENTRY_READ = 12; // done
+    const ENTRY_UNREAD = 13; // done
+    const ENTRY_FAVOURITE = 14; // done
+    const ENTRY_UNFAVOURITE = 15; // done
+    const ENTRY_DELETE = 19; // done
+
+    /**
+     * Tag events
+     */
+    const TAG_CREATE = 20; // not yet implemented
+    const TAG_EDIT = 21; // not yet implemented
+    const TAG_REMOVE = 29; // not yet implemented
+
+    /**
+     * Entry - Tag events
+     */
+    const ENTRY_ADD_TAG = 30; // done
+    const ENTRY_REMOVE_TAG = 39; // done
+
+    /**
+     * Entry - Annotation events
+     */
+    const ANNOTATION_ADD = 40; // done
+    const ANNOTATION_EDIT = 41; // done
+    const ANNOTATION_REMOVE = 49; // done
+
+    /**
+     * User events
+     */
+    const USER_CREATE = 50; // done
+    const USER_EDIT = 51; // done
+    const USER_REMOVE = 59; // done
+
+    /**
+     * Federation events
+     */
+    const FOLLOW_ACCOUNT = 61;
+    const UNFOLLOW_ACCOUNT = 62;
+    const RECOMMEND_ENTRY = 63;
+
+    /**
+     * Share events
+     */
+    const USER_SHARE_CREATED = 70; // done
+    const USER_SHARE_ACCEPTED = 71; // done
+    const USER_SHARE_REFUSED = 72; // done
+    const USER_SHARE_CANCELLED = 79; // not implemented yet
+
+    /**
+     * Group events
+     */
+    const GROUP_CREATE = 80;
+    const GROUP_EDIT = 81;
+    const GROUP_ADD_MEMBER = 82;
+    const GROUP_EDIT_MEMBER = 83;
+    const GROUP_REMOVE_MEMBER = 84;
+    const GROUP_SHARE_ENTRY = 85;
+    const GROUP_DELETE = 89;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $activityType;
+
+    /**
+     * @var Account
+     */
+    private $user;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $primaryObjectType;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $primaryObjectId;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    private $secondaryObjectType;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    private $secondaryObjectId;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="created_at", type="datetime")
+     */
+    private $createdAt;
+
+    public function __construct($activityType, $primaryObjectType, $primaryObjectId)
+    {
+        $this->activityType = $activityType;
+        $this->primaryObjectType = $primaryObjectType;
+        $this->primaryObjectId = $primaryObjectId;
+        $this->createdAt = new \DateTime();
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getActivityType()
+    {
+        return $this->activityType;
+    }
+
+    /**
+     * @param int $activityType
+     * @return Activity
+     */
+    public function setActivityType($activityType)
+    {
+        $this->activityType = $activityType;
+        return $this;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @param \DateTime $createdAt
+     * @return Activity
+     */
+    public function setCreatedAt(\DateTime $createdAt)
+    {
+        $this->createdAt = $createdAt;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPrimaryObjectId()
+    {
+        return $this->primaryObjectId;
+    }
+
+    /**
+     * @param $primaryObjectId
+     * @return Activity
+     */
+    public function setPrimaryObjectId($primaryObjectId)
+    {
+        $this->primaryObjectId = $primaryObjectId;
+        return $this;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param Account $user
+     * @return Activity
+     */
+    public function setUser($user)
+    {
+        $this->user = $user;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPrimaryObjectType()
+    {
+        return $this->primaryObjectType;
+    }
+
+    /**
+     * @param int $primaryObjectType
+     * @return Activity
+     */
+    public function setPrimaryObjectType($primaryObjectType)
+    {
+        $this->primaryObjectType = $primaryObjectType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSecondaryObjectType()
+    {
+        return $this->secondaryObjectType;
+    }
+
+    /**
+     * @param int $secondaryObjectType
+     * @return Activity
+     */
+    public function setSecondaryObjectType($secondaryObjectType)
+    {
+        $this->secondaryObjectType = $secondaryObjectType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSecondaryObjectId()
+    {
+        return $this->secondaryObjectId;
+    }
+
+    /**
+     * @param int $secondaryObjectId
+     * @return Activity
+     */
+    public function setSecondaryObjectId($secondaryObjectId)
+    {
+        $this->secondaryObjectId = $secondaryObjectId;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index b902ae2c..f42a49b3 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -8,7 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 use Wallabag\UserBundle\Entity\User;
 
 /**
- * Config.
+ * config.
  *
  * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository")
  * @ORM\Table(name="`config`")
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index a0503c39..6ca17126 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -233,13 +233,21 @@ class Entry
      */
     private $tags;
 
-    /*
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="recommended", type="boolean", nullable=true)
+     */
+    private $recommended;
+
+    /**
      * @param User     $user
      */
     public function __construct(User $user)
     {
         $this->user = $user;
         $this->tags = new ArrayCollection();
+        $this->changes = new ArrayCollection();
     }
 
     /**
@@ -778,4 +786,20 @@ class Entry
 
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isRecommended()
+    {
+        return $this->recommended;
+    }
+
+    /**
+     * @param bool $recommended
+     */
+    public function setRecommended($recommended)
+    {
+        $this->recommended = $recommended;
+    }
 }
diff --git a/src/Wallabag/CoreBundle/Entity/Notification.php b/src/Wallabag/CoreBundle/Entity/Notification.php
index aa4c03c3..d4304f39 100644
--- a/src/Wallabag/CoreBundle/Entity/Notification.php
+++ b/src/Wallabag/CoreBundle/Entity/Notification.php
@@ -91,6 +91,7 @@ class Notification implements NotificationInterface
     const TYPE_ADMIN = 0;
     const TYPE_USER = 1;
     const TYPE_RELEASE = 2;
+    const TYPE_SHARE = 3;
 
     public function __construct(User $user = null)
     {
diff --git a/src/Wallabag/CoreBundle/Entity/Share.php b/src/Wallabag/CoreBundle/Entity/Share.php
new file mode 100644
index 00000000..a55b4e67
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/Share.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Wallabag\FederationBundle\Entity\Account;
+use Wallabag\UserBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Share.
+ *
+ * @ORM\Entity
+ */
+class Share
+{
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var Account
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\FederationBundle\Entity\Account")
+     */
+    private $userOrigin;
+
+    /**
+     * @var Account
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\FederationBundle\Entity\Account")
+     */
+    private $userDestination;
+
+    /**
+     * @var Entry
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Entry")
+     */
+    private $entry;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="accepted", type="boolean")
+     */
+    private $accepted;
+
+    /**
+     * Share constructor.
+     */
+    public function __construct()
+    {
+        $this->accepted = false;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getUserOrigin()
+    {
+        return $this->userOrigin;
+    }
+
+    /**
+     * @param User $userOrigin
+     * @return Share
+     */
+    public function setUserOrigin(User $userOrigin)
+    {
+        $this->userOrigin = $userOrigin;
+        return $this;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getUserDestination()
+    {
+        return $this->userDestination;
+    }
+
+    /**
+     * @param User $userDestination
+     * @return Share
+     */
+    public function setUserDestination(User $userDestination)
+    {
+        $this->userDestination = $userDestination;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAccepted()
+    {
+        return $this->accepted;
+    }
+
+    /**
+     * @param bool $accepted
+     * @return Share
+     */
+    public function setAccepted($accepted)
+    {
+        $this->accepted = $accepted;
+        return $this;
+    }
+
+    /**
+     * @return Entry
+     */
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+
+    /**
+     * @param Entry $entry
+     * @return Share
+     */
+    public function setEntry(Entry $entry)
+    {
+        $this->entry = $entry;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationCreatedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationCreatedEvent.php
new file mode 100644
index 00000000..b3667703
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationCreatedEvent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Annotation;
+
+class AnnotationCreatedEvent extends AnnotationEvent
+{
+    const NAME = 'annotation.created';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationDeletedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationDeletedEvent.php
new file mode 100644
index 00000000..60d53849
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationDeletedEvent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Annotation;
+
+class AnnotationDeletedEvent extends AnnotationEvent
+{
+    const NAME = 'annotation.deleted';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationEditedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationEditedEvent.php
new file mode 100644
index 00000000..385b8025
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationEditedEvent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Annotation;
+
+class AnnotationEditedEvent extends AnnotationEvent
+{
+    const NAME = 'annotation.edited';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationEvent.php
new file mode 100644
index 00000000..b4cb93af
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Annotation/AnnotationEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Annotation;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\AnnotationBundle\Entity\Annotation;
+
+/**
+ * This event is fired when annotation-relative stuff is made.
+ */
+abstract class AnnotationEvent extends Event
+{
+    protected $annotation;
+
+    /**
+     * AnnotationEvent constructor.
+     * @param Annotation $annotation
+     */
+    public function __construct(Annotation $annotation)
+    {
+        $this->annotation = $annotation;
+    }
+
+    /**
+     * @return Annotation
+     */
+    public function getAnnotation()
+    {
+        return $this->annotation;
+    }
+
+    /**
+     * @param Annotation $annotation
+     */
+    public function setAnnotation(Annotation $annotation)
+    {
+        $this->annotation = $annotation;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryDeletedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryDeletedEvent.php
new file mode 100644
index 00000000..1d413d41
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryDeletedEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+/**
+ * This event is fired as soon as an entry is deleted.
+ */
+class EntryDeletedEvent extends EntryEvent
+{
+    const NAME = 'entry.deleted';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryEditedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryEditedEvent.php
new file mode 100644
index 00000000..f7528bb4
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryEditedEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+/**
+ * This event is fired as soon as an entry was edited.
+ */
+class EntryEditedEvent extends EntryEvent
+{
+    const NAME = 'entry.edited';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryEvent.php
new file mode 100644
index 00000000..0e0c90d0
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * This event is fired when entry-related stuff is made.
+ */
+abstract class EntryEvent extends Event
+{
+    protected $entry;
+
+    /**
+     * EntryEvent constructor.
+     * @param Entry $entry
+     */
+    public function __construct(Entry $entry)
+    {
+        $this->entry = $entry;
+    }
+
+    /**
+     * @return Entry
+     */
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+
+    /**
+     * @param Entry $entry
+     * @return EntryEvent
+     */
+    public function setEntry(Entry $entry)
+    {
+        $this->entry = $entry;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryFavouriteEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryFavouriteEvent.php
new file mode 100644
index 00000000..98edb00d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryFavouriteEvent.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * This event is fired as soon as an entry was favourited.
+ */
+class EntryFavouriteEvent extends EntryEvent
+{
+    const NAME = 'entry.favourite';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryReadEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryReadEvent.php
new file mode 100644
index 00000000..be6e6b40
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryReadEvent.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * This event is fired as soon as an entry was favourited.
+ */
+class EntryReadEvent extends EntryEvent
+{
+    const NAME = 'entry.read';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntrySavedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntrySavedEvent.php
new file mode 100644
index 00000000..20c623c5
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntrySavedEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+/**
+ * This event is fired as soon as an entry was saved.
+ */
+class EntrySavedEvent extends EntryEvent
+{
+    const NAME = 'entry.saved';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryTaggedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryTaggedEvent.php
new file mode 100644
index 00000000..1ea8a7f1
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Entry/EntryTaggedEvent.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Entry;
+
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Tag;
+
+/**
+ * This event is fired as soon as a tag is added on an entry.
+ */
+class EntryTaggedEvent extends EntryEvent
+{
+    const NAME = 'entry.tagged';
+
+    /** @var Tag[] */
+    protected $tags;
+
+    /**
+     * @var boolean
+     */
+    protected $remove;
+
+    /**
+     * EntryTaggedEvent constructor.
+     * @param Entry $entry
+     * @param $tags
+     * @param bool $remove
+     */
+    public function __construct(Entry $entry, $tags, $remove = false)
+    {
+        parent::__construct($entry);
+
+        if (false === is_array($tags)) {
+            $tags = [$tags];
+        }
+
+        $this->tags = $tags;
+    }
+
+    /**
+     * @return Tag[]
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isRemove()
+    {
+        return $this->remove;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/FederationEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/FederationEvent.php
new file mode 100644
index 00000000..da18330e
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/FederationEvent.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Federation;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\FederationBundle\Entity\Account;
+
+abstract class FederationEvent extends Event
+{
+    protected $account;
+
+    /**
+     * FederationEvent constructor.
+     * @param Account $account
+     */
+    public function __construct(Account $account)
+    {
+        $this->account = $account;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getAccount()
+    {
+        return $this->account;
+    }
+
+    /**
+     * @param Account $account
+     * @return FederationEvent
+     */
+    public function setAccount(Account $account)
+    {
+        $this->account = $account;
+        return $this;
+    }
+
+
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/FollowEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/FollowEvent.php
new file mode 100644
index 00000000..4004932e
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/FollowEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Federation;
+
+use Wallabag\FederationBundle\Entity\Account;
+
+/**
+ * This event is fired as soon as an account was followed.
+ */
+class FollowEvent extends FederationEvent
+{
+    const NAME = 'federation.follow';
+
+    protected $follower;
+
+    public function __construct(Account $accountFollowed, Account $follower)
+    {
+        parent::__construct($accountFollowed);
+        $this->follower = $follower;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getFollower()
+    {
+        return $this->follower;
+    }
+
+    /**
+     * @param Account $follower
+     * @return FollowEvent
+     */
+    public function setFollower(Account $follower)
+    {
+        $this->follower = $follower;
+        return  $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/RecommendedEntryEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/RecommendedEntryEvent.php
new file mode 100644
index 00000000..998b56d5
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/RecommendedEntryEvent.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Federation;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * This event is fired as soon as an entry was recommended.
+ */
+class RecommendedEntryEvent extends Event
+{
+    const NAME = 'federation.recommend';
+
+    protected $entry;
+
+    /**
+     * FederationEvent constructor.
+     * @param Entry $entry
+     */
+    public function __construct(Entry $entry)
+    {
+        $this->entry = $entry;
+    }
+
+    /**
+     * @return Entry
+     */
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+
+    /**
+     * @param Entry $entry
+     * @return RecommendedEntryEvent
+     */
+    public function setEntry(Entry $entry)
+    {
+        $this->entry = $entry;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/UnfollowEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/UnfollowEvent.php
new file mode 100644
index 00000000..bf9a35f8
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Federation/UnfollowEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Federation;
+
+use Wallabag\FederationBundle\Entity\Account;
+
+/**
+ * This event is fired as soon as an account is being unfollowed
+ */
+class UnfollowEvent extends FederationEvent
+{
+    const NAME = 'federation.unfollow';
+
+    protected $follower;
+
+    public function __construct(Account $accountFollowed, Account $follower)
+    {
+        parent::__construct($accountFollowed);
+        $this->follower = $follower;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getFollower()
+    {
+        return $this->follower;
+    }
+
+    /**
+     * @param Account $follower
+     * @return UnfollowEvent
+     */
+    public function setFollower(Account $follower)
+    {
+        $this->follower = $follower;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareAcceptedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareAcceptedEvent.php
new file mode 100644
index 00000000..e171ef04
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareAcceptedEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Share;
+
+/**
+ * This event is fired as soon as an share is accepted
+ */
+class ShareAcceptedEvent extends ShareEvent
+{
+    const NAME = 'share.accepted';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareCancelledEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareCancelledEvent.php
new file mode 100644
index 00000000..26bee896
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareCancelledEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Share;
+
+/**
+ * This event is fired as soon as an share is cancelled
+ */
+class ShareCancelledEvent extends ShareEvent
+{
+    const NAME = 'share.cancelled';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareCreatedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareCreatedEvent.php
new file mode 100644
index 00000000..c2cb72d8
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareCreatedEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Share;
+
+/**
+ * This event is fired as soon as a share is created.
+ */
+class ShareCreatedEvent extends ShareEvent
+{
+    const NAME = 'share.created';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareDeniedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareDeniedEvent.php
new file mode 100644
index 00000000..fcdfd1ce
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareDeniedEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Share;
+
+/**
+ * This event is fired as soon as an share is denied
+ */
+class ShareDeniedEvent extends ShareEvent
+{
+    const NAME = 'share.denied';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareEvent.php
new file mode 100644
index 00000000..0022a39f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/Share/ShareEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\Share;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\CoreBundle\Entity\Share;
+
+/**
+ * This event is fired when share-related stuff is made.
+ */
+abstract class ShareEvent extends Event
+{
+    protected $share;
+
+    /**
+     * ShareEvent constructor.
+     * @param Share $share
+     */
+    public function __construct(Share $share)
+    {
+        $this->share = $share;
+    }
+
+    /**
+     * @return Share
+     */
+    public function getShare()
+    {
+        return $this->share;
+    }
+
+    /**
+     * @param Share $share
+     */
+    public function setShare(Share $share)
+    {
+        $this->share = $share;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserDeletedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserDeletedEvent.php
new file mode 100644
index 00000000..df06db8c
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserDeletedEvent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\User;
+
+class UserDeletedEvent extends UserEvent
+{
+    const NAME = 'user.deleted';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserEditedEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserEditedEvent.php
new file mode 100644
index 00000000..27f8f2d5
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserEditedEvent.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\User;
+
+class UserEditedEvent extends UserEvent
+{
+    const NAME = 'user.edited';
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserEvent.php b/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserEvent.php
new file mode 100644
index 00000000..e3807abf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/Actions/User/UserEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity\Actions\User;
+
+use Symfony\Component\EventDispatcher\Event;
+use Wallabag\UserBundle\Entity\User;
+
+/**
+ * This event is fired when user-related stuff is made.
+ */
+abstract class UserEvent extends Event
+{
+    protected $user;
+
+    /**
+     * UserEvent constructor.
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param User $user
+     * @return UserEvent
+     */
+    public function setUser(User $user)
+    {
+        $this->user = $user;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/Activity/ActivitySubscriber.php b/src/Wallabag/CoreBundle/Event/Activity/ActivitySubscriber.php
new file mode 100644
index 00000000..81379ff2
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Activity/ActivitySubscriber.php
@@ -0,0 +1,224 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Activity;
+
+use Doctrine\ORM\EntityManager;
+use FOS\UserBundle\Event\UserEvent;
+use FOS\UserBundle\FOSUserEvents;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Wallabag\CoreBundle\Entity\Activity;
+use Wallabag\CoreBundle\Event\Activity\Actions\Annotation\AnnotationCreatedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Annotation\AnnotationDeletedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Annotation\AnnotationEditedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Annotation\AnnotationEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryDeletedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryEditedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryFavouriteEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryReadEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntrySavedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryTaggedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Federation\FollowEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Federation\RecommendedEntryEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Federation\UnfollowEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareAcceptedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareCancelledEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareCreatedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareDeniedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Share\ShareEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\User\UserDeletedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\User\UserEditedEvent;
+use Wallabag\CoreBundle\Notifications\ActionInterface;
+
+/**
+ * This listener will create the associated configuration when a user register.
+ * This configuration will be created right after the registration (no matter if it needs an email validation).
+ */
+class ActivitySubscriber implements EventSubscriberInterface
+{
+
+    /**
+     * @var EntityManager
+     */
+    private $em;
+
+    /**
+     * @var LoggerInterface $logger
+     */
+    private $logger;
+
+    public function __construct(EntityManager $em, LoggerInterface $logger)
+    {
+        $this->em = $em;
+        $this->logger = $logger;
+    }
+
+    public static function getSubscribedEvents()
+    {
+        return [
+            EntrySavedEvent::NAME => 'entryActivity',
+            EntryDeletedEvent::NAME => 'entryActivity',
+            EntryEditedEvent::NAME => 'entryActivity',
+            EntryTaggedEvent::NAME => 'taggedEntry',
+            EntryFavouriteEvent::NAME => 'entryActivity',
+            EntryReadEvent::NAME => 'entryActivity',
+
+            AnnotationCreatedEvent::NAME => 'annotationActivity',
+            AnnotationEditedEvent::NAME => 'annotationActivity',
+            AnnotationDeletedEvent::NAME => 'annotationActivity',
+
+            FollowEvent::NAME => 'followedAccount',
+            UnfollowEvent::NAME => 'unfollowedAccount',
+            RecommendedEntryEvent::NAME => 'recommendedEntry',
+
+            ShareCreatedEvent::NAME => 'shareActivity',
+            ShareAcceptedEvent::NAME => 'shareActivity',
+            ShareDeniedEvent::NAME => 'shareActivity',
+            ShareCancelledEvent::NAME => 'shareActivity',
+
+            // when a user register using the normal form
+            FOSUserEvents::REGISTRATION_COMPLETED => 'userActivity',
+            // when we manually create a user using the command line
+            // OR when we create it from the config UI
+            FOSUserEvents::USER_CREATED => 'userActivity',
+            UserEditedEvent::NAME => 'userActivity',
+            UserDeletedEvent::NAME => 'userActivity',
+        ];
+    }
+
+    public function userActivity(Event $event)
+    {
+        $activityType = 0;
+        if ($event instanceof UserEvent) {
+            $activityType = Activity::USER_CREATE;
+        } elseif ($event instanceof UserEditedEvent) {
+            $activityType = Activity::USER_EDIT;
+        } elseif ($event instanceof UserDeletedEvent) {
+            $activityType = Activity::USER_REMOVE;
+        }
+
+        $user = $event->getUser();
+        $activity = new Activity($activityType, Activity::USER_OBJECT, $user->getId());
+        $activity->setUser($user->getAccount());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function entryActivity(EntryEvent $event)
+    {
+        $entry = $event->getEntry();
+
+        $activityType = 0;
+        if ($event instanceof EntrySavedEvent) {
+            $activityType = Activity::ENTRY_ADD;
+        } elseif ($event instanceof EntryDeletedEvent) {
+            $activityType = Activity::ENTRY_DELETE;
+        } elseif ($event instanceof EntryEditedEvent) {
+            $activityType = Activity::ENTRY_EDIT;
+        } elseif ($event instanceof EntryFavouriteEvent) {
+            if ($entry->isStarred()) {
+                $activityType = Activity::ENTRY_FAVOURITE;
+            } else {
+                $activityType = Activity::ENTRY_UNFAVOURITE;
+            }
+        } elseif ($event instanceof EntryReadEvent) {
+            if ($entry->isArchived()) {
+                $activityType = Activity::ENTRY_READ;
+            } else {
+                $activityType = Activity::ENTRY_UNREAD;
+            }
+        }
+
+        $activity = new Activity($activityType, Activity::ENTRY_OBJECT, $entry->getId());
+        $activity->setUser($entry->getUser()->getAccount());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function taggedEntry(EntryTaggedEvent $event)
+    {
+        $entry = $event->getEntry();
+        $activity = new Activity($event->isRemove() ? Activity::ENTRY_REMOVE_TAG : Activity::ENTRY_ADD_TAG, Activity::ENTRY_OBJECT, $entry->getId());
+        $activity->setUser($entry->getUser()->getAccount());
+        $activity->setSecondaryObjectType(Activity::TAG_OBJECT)
+            ->setSecondaryObjectId($event->getTags()[0]->getId());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function annotationActivity(AnnotationEvent $event)
+    {
+        $annotation = $event->getAnnotation();
+
+        $activityType = 0;
+        if ($event instanceof AnnotationCreatedEvent) {
+            $activityType = Activity::ANNOTATION_ADD;
+        } elseif ($event instanceof AnnotationEditedEvent) {
+            $activityType = Activity::ANNOTATION_EDIT;
+        } elseif ($event instanceof AnnotationDeletedEvent) {
+            $activityType = Activity::ANNOTATION_REMOVE;
+        }
+
+        $activity = new Activity($activityType, Activity::ANNOTATION_OBJECT, $annotation->getId());
+        $activity->setUser($annotation->getUser()->getAccount());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function followedAccount(FollowEvent $event)
+    {
+        $activity = new Activity(Activity::FOLLOW_ACCOUNT, Activity::ACCOUNT_OBJECT, $event->getAccount()->getId());
+        $activity->setUser($event->getAccount());
+        $activity->setSecondaryObjectType(Activity::ACCOUNT_OBJECT)
+            ->setSecondaryObjectId($event->getFollower()->getId());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function unfollowedAccount(UnfollowEvent $event)
+    {
+        $activity = new Activity(Activity::UNFOLLOW_ACCOUNT, Activity::ACCOUNT_OBJECT, $event->getAccount()->getId());
+        $activity->setUser($event->getAccount());
+        $activity->setSecondaryObjectType(Activity::ACCOUNT_OBJECT)
+            ->setSecondaryObjectId($event->getFollower()->getId());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function recommendedEntry(RecommendedEntryEvent $event)
+    {
+        $entry = $event->getEntry();
+        $account = $entry->getUser()->getAccount();
+        $activity = new Activity(Activity::RECOMMEND_ENTRY, Activity::ACCOUNT_OBJECT, $account->getId());
+        $activity->setUser($account);
+        $activity->setSecondaryObjectType(Activity::ENTRY_OBJECT)
+            ->setSecondaryObjectId($entry->getId());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+
+    public function shareActivity(ShareEvent $event)
+    {
+        $share = $event->getShare();
+
+        $activityType = 0;
+        if ($event instanceof ShareCreatedEvent) {
+            $activityType = Activity::USER_SHARE_CREATED;
+        } elseif ($event instanceof ShareAcceptedEvent) {
+            $activityType = Activity::USER_SHARE_ACCEPTED;
+        } elseif ($event instanceof ShareDeniedEvent) {
+            $activityType = Activity::USER_SHARE_REFUSED;
+        } elseif ($event instanceof ShareCancelledEvent) {
+            $activityType = Activity::USER_SHARE_CANCELLED;
+        }
+
+        $activity = new Activity($activityType, Activity::SHARE_OBJECT, $share->getId());
+        $activity->setUser($share->getUserOrigin());
+        $activity->setSecondaryObjectType(Activity::ACCOUNT_OBJECT)
+            ->setSecondaryObjectId($share->getUserDestination()->getId());
+        $this->em->persist($activity);
+        $this->em->flush();
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php b/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php
deleted file mode 100644
index e9061d04..00000000
--- a/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Event;
-
-use Symfony\Component\EventDispatcher\Event;
-use Wallabag\CoreBundle\Entity\Entry;
-
-/**
- * This event is fired as soon as an entry is deleted.
- */
-class EntryDeletedEvent extends Event
-{
-    const NAME = 'entry.deleted';
-
-    protected $entry;
-
-    public function __construct(Entry $entry)
-    {
-        $this->entry = $entry;
-    }
-
-    public function getEntry()
-    {
-        return $this->entry;
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php b/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php
deleted file mode 100644
index 5fdb5221..00000000
--- a/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Event;
-
-use Symfony\Component\EventDispatcher\Event;
-use Wallabag\CoreBundle\Entity\Entry;
-
-/**
- * This event is fired as soon as an entry was saved.
- */
-class EntrySavedEvent extends Event
-{
-    const NAME = 'entry.saved';
-
-    protected $entry;
-
-    public function __construct(Entry $entry)
-    {
-        $this->entry = $entry;
-    }
-
-    public function getEntry()
-    {
-        return $this->entry;
-    }
-}
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 4ebe837b..5c3550c2 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -4,10 +4,10 @@ namespace Wallabag\CoreBundle\Event\Subscriber;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Psr\Log\LoggerInterface;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntryDeletedEvent;
+use Wallabag\CoreBundle\Event\Activity\Actions\Entry\EntrySavedEvent;
 use Wallabag\CoreBundle\Helper\DownloadImages;
 use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Event\EntryDeletedEvent;
 use Doctrine\ORM\EntityManager;
 
 class DownloadImagesSubscriber implements EventSubscriberInterface
diff --git a/src/Wallabag/CoreBundle/Repository/ChangeRepository.php b/src/Wallabag/CoreBundle/Repository/ChangeRepository.php
new file mode 100644
index 00000000..18d015a7
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Repository/ChangeRepository.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Wallabag\CoreBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+class ChangeRepository extends EntityRepository
+{
+    /**
+     * Used only in test case to get a tag for our entry.
+     *
+     * @param int $timestamp
+     *
+     * @return Tag
+     */
+    public function findChangesSinceDate($timestamp)
+    {
+        $date = new \DateTime();
+        $date->setTimestamp($timestamp);
+
+        return $this->createQueryBuilder('c')
+            ->where('c.createdAt >= :timestamp')->setParameter('timestamp', $date)
+            ->getQuery()
+            ->getResult();
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 9bda4e15..4bbd05ff 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -4,6 +4,7 @@ namespace Wallabag\CoreBundle\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Pagerfanta;
 use Wallabag\CoreBundle\Entity\Tag;
@@ -89,7 +90,7 @@ class EntryRepository extends EntityRepository
      *
      * @param int    $userId
      * @param string $term
-     * @param strint $currentRoute
+     * @param string $currentRoute
      *
      * @return QueryBuilder
      */
@@ -414,4 +415,15 @@ class EntryRepository extends EntityRepository
             ->getQuery()
             ->getResult();
     }
+
+    /**
+     * @param $userId
+     * @return QueryBuilder
+     */
+    public function getBuilderForRecommendationsByUser($userId)
+    {
+        return $this->getBuilderByUser($userId)
+            ->andWhere('e.recommended = true')
+            ;
+    }
 }
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 183b6690..6864993c 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -222,3 +222,11 @@ services:
         arguments:
             - "%wallabag_core.site_credentials.encryption_key_path%"
             - "@logger"
+
+    wallabag_core.activity.subscriber:
+        class: Wallabag\CoreBundle\Event\Activity\ActivitySubscriber
+        arguments:
+            - "@doctrine.orm.default_entity_manager"
+            - "@logger"
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 98f1b48c..4f19556f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -20,7 +20,7 @@ menu:
         starred: 'Starred'
         archive: 'Archive'
         all_articles: 'All entries'
-        config: 'Config'
+        config: 'config'
         tags: 'Tags'
         internal_settings: 'Internal Settings'
         import: 'Import'
@@ -51,7 +51,7 @@ footer:
     stats: Since %user_creation% you read %nb_archives% articles. That is about %per_day% a day!
 
 config:
-    page_title: 'Config'
+    page_title: 'config'
     tab_menu:
         settings: 'Settings'
         rss: 'RSS'
@@ -108,6 +108,11 @@ config:
             description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
             confirm: Are you really sure? (THIS CAN'T BE UNDONE)
             button: Delete my account
+    form_account:
+        title: "Profile"
+        description_label: "Description de votre compte. Ce texte sera affiché sur votre page de profil."
+        avatar_label: "Avatar"
+        banner_label: "Bannière"
     reset:
         title: Reset area (a.k.a danger zone)
         description: By hitting buttons below you'll have ability to remove some information from your account. Be aware that these actions are IRREVERSIBLE.
@@ -562,7 +567,7 @@ error:
 flashes:
     config:
         notice:
-            config_saved: 'Config saved.'
+            config_saved: 'config saved.'
             password_updated: 'Password updated'
             password_not_updated_demo: "In demonstration mode, you can't change password for this user."
             user_updated: 'Information updated'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 277f2f63..2c53c12b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -108,6 +108,11 @@ config:
             description: "Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c’est IRRÉVERSIBLE). Vous serez ensuite déconnecté."
             confirm: "Vous êtes vraiment sûr ? (C’EST IRRÉVERSIBLE)"
             button: "Supprimer mon compte"
+    form_account:
+        title: "Profil"
+        description_label: "Description de votre compte. Ce texte sera affiché sur votre page de profil."
+        avatar_label: "Avatar"
+        banner_label: "Bannière"
     reset:
         title: "Réinitialisation (attention danger !)"
         description: "En cliquant sur les boutons ci-dessous vous avez la possibilité de supprimer certaines informations de votre compte. Attention, ces actions sont IRRÉVERSIBLES !"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 2d71cb9d..b77bfd7f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -51,7 +51,7 @@ footer:
     stats: 'Desde %user_creation% você leu %nb_archives% artigos. Isso é %per_day% por dia!'
 
 config:
-    page_title: 'Config'
+    page_title: 'config'
     tab_menu:
         settings: 'Configurações'
         rss: 'RSS'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index bd5932b0..c2beb35a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -220,6 +220,51 @@
                         </form>
 
                         <br /><hr /><br />
+                        <h5>{{ 'config.form_account.title'|trans }}</h5>
+
+                        {{ form_start(form.account) }}
+                        {{ form_errors(form.account) }}
+
+                        <div class="row">
+                            <div class="input-field col s12">
+                                {{ form_errors(form.account.description) }}
+                                {{ form_widget(form.account.description, {'attr': {'class': 'materialize-textarea'}}) }}
+                                {{ form_label(form.account.description) }}
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="file-field input-field col s12">
+                                {{ form_errors(form.account.avatar) }}
+                                <div class="btn">
+                                    <span>{{ 'config.form_account.avatar_label'|trans }}</span>
+                                    {{ form_widget(form.account.avatar) }}
+                                </div>
+                                <div class="file-path-wrapper">
+                                    <input class="file-path validate" type="text">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="file-field input-field col s12">
+                                {{ form_errors(form.account.banner) }}
+                                <div class="btn">
+                                    <span>{{ 'config.form_account.banner_label'|trans }}</span>
+                                    {{ form_widget(form.account.banner) }}
+                                </div>
+                                <div class="file-path-wrapper">
+                                    <input class="file-path validate" type="text">
+                                </div>
+                            </div>
+                        </div>
+
+                        {{ form_widget(form.account.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                        <a href="{{ path('user-profile', {'user': app.user.account.username}) }}" class="btn">{{ 'config.form_account.view_profile' | trans }}</a>
+                        {{ form_widget(form.account._token) }}
+                        </form>
+
+                        <br /><hr /><br />
 
                         <div class="row">
                             <h5>{{ 'config.reset.title'|trans }}</h5>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index ccc44931..f93b635f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -117,6 +117,11 @@
                         {% if unreadNotifs > 0 %}<span id="notifications-count" class="red-text text-accent-2">{{ unreadNotifs }}</span>{% endif %}
                     </a>
                 </li>
+                <li id="button_profile">
+                    <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.profile' | trans }}" href="{{ path('user-profile', {'user': app.user.account.username}) }}">
+                        <i class="material-icons">person</i>
+                    </a>
+                </li>
                 <li id="button_filters">
                     <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
                         <i class="material-icons">filter_list</i>