mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-16 22:27:26 +01:00
Notifications v2 and Bailey API (#9716)
* Added initial bailey api
* wip
* implement new panel header
* Fixed lint
* add ability to mark notification as seen
* add notification count, remove top badge from user and add ability to mark multiple notifications as seen
* add support dismissall and mark all as read
* do not dismiss actionable notif
* mark as seen when menu is opened instead of closed
* implement ordering, list of actionable notifications
* add groups messages and fix badges count
* add notifications for received cards
* send card received notification to target not sender
* rename notificaion field
* fix integration tests
* mark cards notifications as read and update tests
* add mystery items notifications
* add unallocated stats points notifications
* fix linting
* simplify code
* refactoring and fixes
* fix dropdown opening
* start splitting notifications into their own component
* add notifications for inbox messages
* fix unit tests
* fix default buttons styles
* add initial bailey support
* add title and tests to new stuff notification
* add notification if a group task needs more work
* add tests and fixes for marking a task as needing more work
* make sure user._v is updated
* remove console.log
* notification: hover status and margins
* start styling notifications, add separate files and basic functionalities
* fix tests
* start adding mystery items notification
* wip card notification
* fix cards text
* initial implementation inbox messages
* initial implementation group messages
* disable inbox notifications until mobile is ready
* wip group chat messages
* finish mystery and card notifications
* add bailey notification and fix a lot of stuff
* start adding guilds and parties invitations
* misc invitation fixes
* fix lint issues
* remove old code and add key to notifications
* fix tests
* remove unused code
* add link for public guilds invite
* starts to implement needs work notification design and feature
* fixes to needs work, add group task approved notification
* finish needs work feature
* lots of fixes
* implement quest notification
* bailey fixes and static page
* routing fixes
* fixes # this.$store.dispatch(guilds:join, {groupId: group.id, type: party});
* read notifications on click
* chat notifications
* fix tests for chat notifications
* fix chat notification test
* fix tests
* fix tests (again)
* try awaiting
* remove only
* more sleep
* add bailey tests
* fix icons alignment
* fix issue with multiple points notifications
* remove merge code
* fix rejecting guild invitation
* make remove area bigger
* fix error with notifications and add migration
* fix migration
* fix typos
* add cleanup migration too
* notifications empty state, new counter color, fix marking messages as seen in guilds
* fixes
* add image and install correct packages
* fix mongoose version
* update bailey
* typo
* make sure chat is marked as read after other requests
This commit is contained in:
@@ -31,6 +31,7 @@ import {
|
||||
} from './subscriptionPlan';
|
||||
import amazonPayments from '../libs/amazonPayments';
|
||||
import stripePayments from '../libs/stripePayments';
|
||||
import { model as UserNotification } from './userNotification';
|
||||
|
||||
const questScrolls = shared.content.quests;
|
||||
const Schema = mongoose.Schema;
|
||||
@@ -493,10 +494,8 @@ schema.methods.sendChat = function sendChat (message, user, metaData) {
|
||||
}
|
||||
|
||||
// Kick off chat notifications in the background.
|
||||
let lastSeenUpdate = {$set: {
|
||||
[`newMessages.${this._id}`]: {name: this.name, value: true},
|
||||
}};
|
||||
let query = {};
|
||||
|
||||
const query = {};
|
||||
|
||||
if (this.type === 'party') {
|
||||
query['party._id'] = this._id;
|
||||
@@ -506,7 +505,29 @@ schema.methods.sendChat = function sendChat (message, user, metaData) {
|
||||
|
||||
query._id = { $ne: user ? user._id : ''};
|
||||
|
||||
User.update(query, lastSeenUpdate, {multi: true}).exec();
|
||||
// First remove the old notification (if it exists)
|
||||
const lastSeenUpdateRemoveOld = {
|
||||
$pull: {
|
||||
notifications: { type: 'NEW_CHAT_MESSAGE', 'data.group.id': this._id },
|
||||
},
|
||||
};
|
||||
|
||||
// Then add the new notification
|
||||
const lastSeenUpdateAddNew = {
|
||||
$set: { // old notification, supported until mobile is updated and we release api v4
|
||||
[`newMessages.${this._id}`]: {name: this.name, value: true},
|
||||
},
|
||||
$push: {
|
||||
notifications: new UserNotification({
|
||||
type: 'NEW_CHAT_MESSAGE',
|
||||
data: { group: { id: this._id, name: this.name } },
|
||||
}).toObject(),
|
||||
},
|
||||
};
|
||||
|
||||
User.update(query, lastSeenUpdateRemoveOld, {multi: true}).exec().then(() => {
|
||||
User.update(query, lastSeenUpdateAddNew, {multi: true}).exec();
|
||||
});
|
||||
|
||||
// If the message being sent is a system message (not gone through the api.postChat controller)
|
||||
// then notify Pusher about it (only parties for now)
|
||||
|
||||
Reference in New Issue
Block a user