Loading...
diff --git a/templates/components/entry_comment.html.twig b/templates/components/entry_comment.html.twig
index 1f87f77b5..4bac7c4ac 100644
--- a/templates/components/entry_comment.html.twig
+++ b/templates/components/entry_comment.html.twig
@@ -19,7 +19,7 @@
'show-preview': SHOW_PREVIEW is same as V_TRUE and not comment.isAdult,
})}).without('id') }}
id="entry-comment-{{ comment.id }}"
- data-controller="comment subject mentions comment-collapse"
+ data-controller="comment subject mentions comment-collapse html-refresh"
data-comment-collapse-depth-value="{{ level }}"
data-subject-parent-value="{{ comment.parent ? comment.parent.id : '' }}"
data-action="{{- DYNAMIC_LISTS is same as V_TRUE ? 'notifications:Notification@window->subject#notification' : '' -}}">
diff --git a/templates/components/magazine_box.html.twig b/templates/components/magazine_box.html.twig
index d84849a53..19bc5fff9 100644
--- a/templates/components/magazine_box.html.twig
+++ b/templates/components/magazine_box.html.twig
@@ -43,6 +43,13 @@
{{ component('magazine_sub', {magazine: magazine}) }}
+
+ {% if app.user is defined and app.user is not same as null %}
+
+ {{ component('notification_switch', {target: magazine}) }}
+
+ {% endif %}
+
{% if computed.magazine.description and showDescription %}
{{ computed.magazine.description|markdown|raw }}
{% endif %}
diff --git a/templates/components/notification_switch.html.twig b/templates/components/notification_switch.html.twig
new file mode 100644
index 000000000..8d0109898
--- /dev/null
+++ b/templates/components/notification_switch.html.twig
@@ -0,0 +1,32 @@
+
diff --git a/templates/components/post.html.twig b/templates/components/post.html.twig
index 80a31cf13..6f9fe32ec 100644
--- a/templates/components/post.html.twig
+++ b/templates/components/post.html.twig
@@ -16,7 +16,7 @@
'isSingle': isSingle is same as true
})}).without('id') }}
id="post-{{ post.id }}"
- data-controller="post subject mentions"
+ data-controller="post subject mentions html-refresh"
data-action="notifications:Notification@window->subject#notification">
{% if post.isAdult %}18+{% endif %}
@@ -115,6 +115,9 @@
{{ component('bookmark_standard', { subject: post }) }}
{% endif %}
{% include 'post/_menu.html.twig' %}
+ {% if app.user is defined and app.user is not same as null and isSingle is defined and isSingle %}
+ {{ component('notification_switch', {target: post}) }}
+ {% endif %}
Loading...
diff --git a/templates/components/post_comment.html.twig b/templates/components/post_comment.html.twig
index 7755aceac..487c0f8a3 100644
--- a/templates/components/post_comment.html.twig
+++ b/templates/components/post_comment.html.twig
@@ -21,7 +21,7 @@
'show-preview': SHOW_PREVIEW is same as V_TRUE and not comment.isAdult,
})}).without('id') }}
id="post-comment-{{ comment.id }}"
- data-controller="comment subject mentions comment-collapse"
+ data-controller="comment subject mentions comment-collapse html-refresh"
data-comment-collapse-depth-value="{{ level }}"
data-subject-parent-value="{{ comment.parent ? comment.parent.id : '' }}"
data-action="notifications:Notification@window->subject#notification">
diff --git a/templates/components/user_box.html.twig b/templates/components/user_box.html.twig
index c74c2b07b..177e47dc3 100644
--- a/templates/components/user_box.html.twig
+++ b/templates/components/user_box.html.twig
@@ -76,6 +76,11 @@
{{ component('user_actions', {user: user}) }}
+ {% if app.user is defined and app.user is not same as null and app.user is not same as user %}
+
+ {{ component('notification_switch', {target: user}) }}
+
+ {% endif %}
{% if user.about|length %}
diff --git a/templates/entry/_info.html.twig b/templates/entry/_info.html.twig
index c4af6389e..2da5abebc 100644
--- a/templates/entry/_info.html.twig
+++ b/templates/entry/_info.html.twig
@@ -25,6 +25,11 @@
{{ component('user_actions', {user: entry.user}) }}
+ {% if app.user is defined and app.user is not same as null and app.user is not same as entry.user %}
+
+ {{ component('notification_switch', {target: entry.user}) }}
+
+ {% endif %}
- {{ 'added'|trans }}: {{ component('date', {date: entry.createdAt}) }}
{% if entry.editedAt %}
diff --git a/templates/post/_info.html.twig b/templates/post/_info.html.twig
index f2565e554..2fc2e9d4c 100644
--- a/templates/post/_info.html.twig
+++ b/templates/post/_info.html.twig
@@ -25,6 +25,11 @@
{{ component('user_actions', {user: post.user}) }}
+ {% if app.user is defined and app.user is not same as null and app.user is not same as post.user %}
+
+ {{ component('notification_switch', {target: post.user}) }}
+
+ {% endif %}
- {{ 'added'|trans }}: {{ component('date', {date: post.createdAt}) }}
- {{ 'up_votes'|trans }}:
diff --git a/templates/user/_user_popover.html.twig b/templates/user/_user_popover.html.twig
index c7900044b..21a53f126 100644
--- a/templates/user/_user_popover.html.twig
+++ b/templates/user/_user_popover.html.twig
@@ -44,6 +44,9 @@
{{ component('user_actions', {user: user}) }}
+ {% if app.user is defined and app.user is not same as null and app.user is not same as user %}
+ {{ component('notification_switch', {target: user}) }}
+ {% endif %}
diff --git a/tests/WebTestCase.php b/tests/WebTestCase.php
index 3456c4da1..b740577d2 100644
--- a/tests/WebTestCase.php
+++ b/tests/WebTestCase.php
@@ -69,15 +69,15 @@ abstract class WebTestCase extends BaseWebTestCase
protected const PAGINATION_KEYS = ['count', 'currentPage', 'maxPage', 'perPage'];
protected const IMAGE_KEYS = ['filePath', 'sourceUrl', 'storageUrl', 'altText', 'width', 'height', 'blurHash'];
protected const MESSAGE_RESPONSE_KEYS = ['messageId', 'threadId', 'sender', 'body', 'status', 'createdAt'];
- protected const USER_RESPONSE_KEYS = ['userId', 'username', 'about', 'avatar', 'cover', 'createdAt', 'followersCount', 'apId', 'apProfileId', 'isBot', 'isFollowedByUser', 'isFollowerOfUser', 'isBlockedByUser', 'isAdmin', 'isGlobalModerator', 'serverSoftware', 'serverSoftwareVersion'];
+ protected const USER_RESPONSE_KEYS = ['userId', 'username', 'about', 'avatar', 'cover', 'createdAt', 'followersCount', 'apId', 'apProfileId', 'isBot', 'isFollowedByUser', 'isFollowerOfUser', 'isBlockedByUser', 'isAdmin', 'isGlobalModerator', 'serverSoftware', 'serverSoftwareVersion', 'notificationStatus'];
protected const USER_SMALL_RESPONSE_KEYS = ['userId', 'username', 'isBot', 'isFollowedByUser', 'isFollowerOfUser', 'isBlockedByUser', 'avatar', 'apId', 'apProfileId', 'createdAt', 'isAdmin', 'isGlobalModerator'];
- protected const ENTRY_RESPONSE_KEYS = ['entryId', 'magazine', 'user', 'domain', 'title', 'url', 'image', 'body', 'lang', 'tags', 'badges', 'numComments', 'uv', 'dv', 'favourites', 'isFavourited', 'userVote', 'isOc', 'isAdult', 'isPinned', 'createdAt', 'editedAt', 'lastActive', 'visibility', 'type', 'slug', 'apId', 'canAuthUserModerate'];
+ protected const ENTRY_RESPONSE_KEYS = ['entryId', 'magazine', 'user', 'domain', 'title', 'url', 'image', 'body', 'lang', 'tags', 'badges', 'numComments', 'uv', 'dv', 'favourites', 'isFavourited', 'userVote', 'isOc', 'isAdult', 'isPinned', 'createdAt', 'editedAt', 'lastActive', 'visibility', 'type', 'slug', 'apId', 'canAuthUserModerate', 'notificationStatus'];
protected const ENTRY_COMMENT_RESPONSE_KEYS = ['commentId', 'magazine', 'user', 'entryId', 'parentId', 'rootId', 'image', 'body', 'lang', 'isAdult', 'uv', 'dv', 'favourites', 'isFavourited', 'userVote', 'visibility', 'apId', 'mentions', 'tags', 'createdAt', 'editedAt', 'lastActive', 'childCount', 'children', 'canAuthUserModerate'];
- protected const POST_RESPONSE_KEYS = ['postId', 'user', 'magazine', 'image', 'body', 'lang', 'isAdult', 'isPinned', 'comments', 'uv', 'dv', 'favourites', 'isFavourited', 'userVote', 'visibility', 'apId', 'tags', 'mentions', 'createdAt', 'editedAt', 'lastActive', 'slug', 'canAuthUserModerate'];
+ protected const POST_RESPONSE_KEYS = ['postId', 'user', 'magazine', 'image', 'body', 'lang', 'isAdult', 'isPinned', 'comments', 'uv', 'dv', 'favourites', 'isFavourited', 'userVote', 'visibility', 'apId', 'tags', 'mentions', 'createdAt', 'editedAt', 'lastActive', 'slug', 'canAuthUserModerate', 'notificationStatus'];
protected const POST_COMMENT_RESPONSE_KEYS = ['commentId', 'user', 'magazine', 'postId', 'parentId', 'rootId', 'image', 'body', 'lang', 'isAdult', 'uv', 'dv', 'favourites', 'isFavourited', 'userVote', 'visibility', 'apId', 'mentions', 'tags', 'createdAt', 'editedAt', 'lastActive', 'childCount', 'children', 'canAuthUserModerate'];
protected const BAN_RESPONSE_KEYS = ['banId', 'reason', 'expired', 'expiredAt', 'bannedUser', 'bannedBy', 'magazine'];
protected const LOG_ENTRY_KEYS = ['type', 'createdAt', 'magazine', 'moderator', 'subject'];
- protected const MAGAZINE_RESPONSE_KEYS = ['magazineId', 'owner', 'icon', 'name', 'title', 'description', 'rules', 'subscriptionsCount', 'entryCount', 'entryCommentCount', 'postCount', 'postCommentCount', 'isAdult', 'isUserSubscribed', 'isBlockedByUser', 'tags', 'badges', 'moderators', 'apId', 'apProfileId', 'serverSoftware', 'serverSoftwareVersion', 'isPostingRestrictedToMods', 'localSubscribers'];
+ protected const MAGAZINE_RESPONSE_KEYS = ['magazineId', 'owner', 'icon', 'name', 'title', 'description', 'rules', 'subscriptionsCount', 'entryCount', 'entryCommentCount', 'postCount', 'postCommentCount', 'isAdult', 'isUserSubscribed', 'isBlockedByUser', 'tags', 'badges', 'moderators', 'apId', 'apProfileId', 'serverSoftware', 'serverSoftwareVersion', 'isPostingRestrictedToMods', 'localSubscribers', 'notificationStatus'];
protected const MAGAZINE_SMALL_RESPONSE_KEYS = ['magazineId', 'name', 'icon', 'isUserSubscribed', 'isBlockedByUser', 'apId', 'apProfileId'];
protected const DOMAIN_RESPONSE_KEYS = ['domainId', 'name', 'entryCount', 'subscriptionsCount', 'isUserSubscribed', 'isBlockedByUser'];