krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix push notifications imports

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-02-19 20:59:12 +01:00
parent fb343f8feb
commit fbc944a5cc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/src/controllers/api-v3/challenges.js
View File

@@ -17,7 +17,7 @@ import {
import shared from '../../../../common'; import shared from '../../../../common';
import * as Tasks from '../../models/task'; import * as Tasks from '../../models/task';
import { sendTxn as txnEmail } from '../../libs/api-v3/email'; import { sendTxn as txnEmail } from '../../libs/api-v3/email';
import { sendNotification as sendPushNotification } from '../../libs/api-v3/pushNotifications'; import sendPushNotification from '../../libs/api-v3/pushNotifications';
import Q from 'q'; import Q from 'q';
import csvStringify from '../../libs/api-v3/csvStringify'; import csvStringify from '../../libs/api-v3/csvStringify';

2
website/src/controllers/api-v3/groups.js
View File

@@ -22,7 +22,7 @@ import * as firebase from '../../libs/api-v3/firebase';
import { sendTxn as sendTxnEmail } from '../../libs/api-v3/email'; import { sendTxn as sendTxnEmail } from '../../libs/api-v3/email';
import { encrypt } from '../../libs/api-v3/encryption'; import { encrypt } from '../../libs/api-v3/encryption';
import common from '../../../../common'; import common from '../../../../common';
import { sendNotification as sendPushNotification } from '../../libs/api-v3/pushNotifications'; import sendPushNotification from '../../libs/api-v3/pushNotifications';
let api = {}; let api = {};
// TODO shall we accept party as groupId in all routes? // TODO shall we accept party as groupId in all routes?

2
website/src/controllers/api-v3/quests.js
View File

@@ -18,7 +18,7 @@ import {
} from '../../libs/api-v3/email'; } from '../../libs/api-v3/email';
import { quests as questScrolls } from '../../../../common/script/content'; import { quests as questScrolls } from '../../../../common/script/content';
import common from '../../../../common'; import common from '../../../../common';
import { sendNotification as sendPushNotification } from '../../libs/api-v3/pushNotifications'; import sendPushNotification from '../../libs/api-v3/pushNotifications';
function canStartQuestAutomatically (group) { function canStartQuestAutomatically (group) {
// If all members are either true (accepted) or false (rejected) return true // If all members are either true (accepted) or false (rejected) return true

4
website/src/models/group.js
View File

@@ -15,7 +15,7 @@ import { sendTxn as sendTxnEmail } from '../libs/api-v3/email';
import { quests as questScrolls } from '../../../common/script/content'; import { quests as questScrolls } from '../../../common/script/content';
import Q from 'q'; import Q from 'q';
import nconf from 'nconf'; import nconf from 'nconf';
import { sendNotification as sendPushNotification } from '../libs/api-v3/pushNotifications'; import sendPushNotification from '../libs/api-v3/pushNotifications';
let Schema = mongoose.Schema; let Schema = mongoose.Schema;
@@ -311,7 +311,7 @@ schema.methods.startQuest = async function startQuest (user) {
).exec().then(membersToNotify => { ).exec().then(membersToNotify => {
let membersToEmail = _.filter(membersToNotify, (member) => { let membersToEmail = _.filter(membersToNotify, (member) => {
// send push notifications and filter users that disabled emails // send push notifications and filter users that disabled emails
sendPushNotification(user, 'HabitRPG', `${shared.i18n.t('questStarted')}: ${quest.text()}`); sendPushNotification(member, 'HabitRPG', `${shared.i18n.t('questStarted')}: ${quest.text()}`);
return member.preferences.emailNotifications.questStarted !== false && return member.preferences.emailNotifications.questStarted !== false &&
member._id !== user._id; member._id !== user._id;