README.md

@@ -4,8 +4,12 @@ A [Flarum](http://flarum.org) extension for adding private messages to your foru
 
 Private messages (PM's) are also known as "direct messages" (DM's). (e.g. "Send me a PM!" or "Send me a DM!")
 
+![Flarum Private Messages screenshot](https://raw.githubusercontent.com/neoncube2/flarum-private-messages/main/resources/screenshot.jpg)
+
 ## Installation
 
+	composer remove kyrne/whisper --no-update
+	composer remove littlecxm/whisper --no-update
     composer require neoncube/flarum-private-messages:"*"
 
 ## Updating
@@ -16,7 +20,7 @@ Private messages (PM's) are also known as "direct messages" (DM's). (e.g. "Send
 
 ## Links
 
-- [Report an issue via Flarum forums](https://github.com/neoncube2/flarum-private-messages/issues)
+- [Report an issue via Flarum forums](https://discuss.flarum.org/d/35388-private-messages)
 - [Report an issue via Github](https://github.com/neoncube2/flarum-private-messages/issues)
 
 ## Credits

extend.php

@@ -9,16 +9,17 @@
 use Flarum\User\User;
 use Neoncube\FlarumPrivateMessages\Api\Controllers;
 use Neoncube\FlarumPrivateMessages\Api\Serializers\ConversationRecipientSerializer;
-use Neoncube\FlarumPrivateMessages\Notifications\PrivateMessageReceivedBlueprint;
+use Neoncube\FlarumPrivateMessages\Api\Serializers\MessageSerializer;
+use Neoncube\FlarumPrivateMessages\Notifications\NewPrivateMessageBlueprint;
 
 return [
     (new Extend\Frontend('admin'))
         ->js(__DIR__ . '/js/dist/admin.js'),
     (new Extend\Frontend('forum'))
         ->js(__DIR__ . '/js/dist/forum.js')
         ->css(__DIR__ . '/resources/less/extension.less')
-        ->route('/neoncube-private-messages/messages/{id}', 'neoncube-private-messages.messages')
-        ->route('/neoncube-private-messages/conversations', 'neoncube-private-messages.conversation'),
+        ->route('/conversations/{id}', 'neoncube-private-messages.messages')
+        ->route('/conversations', 'neoncube-private-messages.conversations'),
     new Extend\Locales(__DIR__ . '/resources/locale'),
     // (new Extend\Model(User::class))
     //     ->hasMany('conversations', ConversationUser::class, 'user_id'),
@@ -38,6 +39,10 @@
         ->attribute('canMessage', function (ForumSerializer $serializer) {
             return $serializer->getActor()->can('startConversation');
         }),
+    (new Extend\ApiSerializer(ForumSerializer::class))
+        ->attribute('neoncubePrivateMessagesAllowUsersToReceiveEmailNotifications', function (ForumSerializer $serializer) {
+            return $serializer->getActor()->can('neoncube-private-messages.allowUsersToReceiveEmailNotifications');
+        }),
 
     (new Extend\ApiSerializer(CurrentUserSerializer::class))
         ->attribute('unreadMessages', function (CurrentUserSerializer $serializer) {
@@ -60,5 +65,7 @@
     // (new Extend\ApiController(Controller\UpdateUserController::class))
     //     ->addInclude('conversations'),
     (new Extend\Notification())
-        ->type(PrivateMessageReceivedBlueprint::class, MessageSerializer::class, ['alert', 'email']),
+        ->type(NewPrivateMessageBlueprint::class, MessageSerializer::class, ['email']),
+    (new Extend\View)
+        ->namespace('flarum-private-messages', __DIR__.'/views'),
 ];