notification subscription

backend/src/schema/resolvers/notifications.ts

@@ -7,8 +7,8 @@ export default {
     notificationAdded: {
       subscribe: withFilter(
         () => pubsub.asyncIterator(NOTIFICATION_ADDED),
-        (payload, variables) => {
+        (payload, variables, context) => {
-          return payload.notificationAdded.to.id === variables.userId
+          return payload.notificationAdded.to.id === context.user?.id
         },
       ),
     },

backend/src/schema/types/type/NOTIFIED.gql

@@ -38,5 +38,5 @@ type Mutation {
 }
 
 type Subscription {
-  notificationAdded(userId: ID!): NOTIFIED
+  notificationAdded: NOTIFIED
 }

webapp/components/NotificationMenu/NotificationMenu.vue

@@ -137,11 +137,6 @@ export default {
       },
       subscribeToMore: {
         document: notificationAdded(),
-        variables() {
-          return {
-            userId: this.user.id,
-          }
-        },
         updateQuery: (previousResult, { subscriptionData }) => {
           const {
             data: { notificationAdded: newNotification },

webapp/graphql/User.js

@@ -245,8 +245,8 @@ export const notificationAdded = () => {
     ${postFragment}
     ${groupFragment}
 
-    subscription notifications($userId: ID!) {
+    subscription notifications {
-      notificationAdded(userId: $userId) {
+      notificationAdded {
         id
         read
         reason