{{ $t('subscriptionBillingFYIShort') }}
diff --git a/website/client/src/pages/private-messages/index.vue b/website/client/src/pages/private-messages/index.vue
index 4e347ce870..4e051a3b00 100644
--- a/website/client/src/pages/private-messages/index.vue
+++ b/website/client/src/pages/private-messages/index.vue
@@ -679,7 +679,7 @@ import NotificationMixins from '@/mixins/notifications';
// extract to a shared path
const CONVERSATIONS_PER_PAGE = 10;
-const PM_PER_PAGE = 50;
+const PM_PER_PAGE = 10;
const UI_STATES = Object.freeze({
LOADING: 'LOADING',
diff --git a/website/client/src/store/actions/chat.js b/website/client/src/store/actions/chat.js
index 836e6d0f7c..855eba8696 100644
--- a/website/client/src/store/actions/chat.js
+++ b/website/client/src/store/actions/chat.js
@@ -3,7 +3,7 @@ import Vue from 'vue';
import * as Analytics from '@/libs/analytics';
export async function getChat (store, payload) {
- const response = await axios.get(`/api/v4/groups/${payload.groupId}/chat?limit=400`);
+ const response = await axios.get(`/api/v4/groups/${payload.groupId}/chat`);
return response.data.data;
}
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 09ddf4eb80..8a3766ba10 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -109,8 +109,8 @@ export const REPEATING_EVENTS = {
foodSeason: 'Pie',
},
giftOneGetOne: {
- start: new Date('1970-12-18T04:00-05:00'),
- end: new Date('1970-01-05T23:59-05:00'),
+ start: new Date('1970-12-16T04:00-05:00'),
+ end: new Date('1970-01-09T23:59-05:00'),
promo: 'g1g1',
},
};
diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js
index 32ac046a70..65dce42abe 100644
--- a/website/server/controllers/api-v3/chat.js
+++ b/website/server/controllers/api-v3/chat.js
@@ -64,8 +64,6 @@ function textContainsBannedSlur (message) {
*
* @apiParam (Path) {String} groupId The group _id ('party' for the user party and
* 'habitrpg' for tavern are accepted).
- * @apiParam (Query) {Number} [limit=50] The number of messages to fetch (max 400).
- * @apiParam (Query) {String} [before] Fetch messages older than this message ID.
*
* @apiSuccess {Array} data An array of
chat messages
*
@@ -80,21 +78,18 @@ api.getChat = {
const { user } = res.locals;
req.checkParams('groupId', apiError('groupIdRequired')).notEmpty();
- req.checkQuery('before').optional().isUUID();
const validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
const { groupId } = req.params;
- const limit = req.query.limit ? Math.min(parseInt(req.query.limit, 10), 400) : 50;
- const { before } = req.query;
const group = await Group.getGroup({ user, groupId, fields: 'chat privacy' });
if (!group) throw new NotFound(res.t('groupNotFound'));
if (group.privacy === 'public') {
throw new BadRequest(res.t('featureRetired'));
}
- const groupChat = await Group.toJSONCleanChat(group, user, { limit, before });
+ const groupChat = await Group.toJSONCleanChat(group, user);
res.respond(200, groupChat.chat);
},
};
diff --git a/website/server/controllers/api-v3/debug.js b/website/server/controllers/api-v3/debug.js
index d70eeeeb86..108cf2dbaa 100644
--- a/website/server/controllers/api-v3/debug.js
+++ b/website/server/controllers/api-v3/debug.js
@@ -2,7 +2,6 @@ import mongoose from 'mongoose';
import get from 'lodash/get';
import sinon from 'sinon';
import moment from 'moment';
-import { v4 as uuid } from 'uuid';
import { authWithHeaders } from '../../middlewares/auth';
import ensureDevelopmentMode from '../../middlewares/ensureDevelopmentMode';
import ensureTimeTravelMode from '../../middlewares/ensureTimeTravelMode';
@@ -12,7 +11,6 @@ import {
model as Group,
// basicFields as basicGroupFields,
} from '../../models/group';
-import { chatModel as Chat, inboxModel as Inbox } from '../../models/message';
import connectToMongoDB from '../../libs/mongoose';
const { content } = common;
@@ -313,93 +311,4 @@ api.timeTravelAdjust = {
},
};
-api.seedPartyChat = {
- method: 'POST',
- url: '/debug/seed-party-chat',
- middlewares: [ensureDevelopmentMode, authWithHeaders()],
- async handler (req, res) {
- const { user } = res.locals;
- const messageCount = Number(req.body.messageCount);
-
- if (!Number.isInteger(messageCount) || messageCount < 1) {
- throw new BadRequest('messageCount must be a positive integer.');
- }
-
- if (!user.party._id) {
- throw new BadRequest('You are not in a party.');
- }
-
- const party = await Group.findOne({ _id: user.party._id, type: 'party' }).exec();
- if (!party) {
- throw new BadRequest('Party not found.');
- }
-
- const messages = [];
- const baseTimestamp = Date.now();
-
- for (let i = 1; i <= messageCount; i += 1) {
- const id = uuid();
- messages.push({
- _id: id,
- id,
- groupId: party._id,
- text: `#${i}`,
- unformattedText: `#${i}`,
- timestamp: new Date(baseTimestamp - (messageCount - i) * 1000),
- likes: {},
- flags: {},
- flagCount: 0,
- uuid: 'system',
- user: 'System',
- client: 'debug-seed',
- });
- }
-
- await Chat.insertMany(messages);
-
- res.respond(200, { messageCount });
- },
-};
-
-// Messaging ourselves for testing
-api.seedInbox = {
- method: 'POST',
- url: '/debug/seed-inbox',
- middlewares: [ensureDevelopmentMode, authWithHeaders()],
- async handler (req, res) {
- const { user } = res.locals;
- const messageCount = Number(req.body.messageCount);
-
- if (!Number.isInteger(messageCount) || messageCount < 1) {
- throw new BadRequest('messageCount must be a positive integer.');
- }
-
- const messages = [];
- const baseTimestamp = Date.now();
-
- for (let i = 1; i <= messageCount; i += 1) {
- const id = uuid();
- messages.push({
- _id: id,
- id,
- ownerId: user._id,
- uuid: user._id,
- user: user.profile.name,
- text: `#${i}`,
- unformattedText: `#${i}`,
- timestamp: new Date(baseTimestamp - (messageCount - i) * 1000),
- likes: {},
- flags: {},
- flagCount: 0,
- sent: true,
- client: 'debug-seed',
- });
- }
-
- await Inbox.insertMany(messages);
-
- res.respond(200, { messageCount });
- },
-};
-
export default api;
diff --git a/website/server/libs/chat/group-chat.js b/website/server/libs/chat/group-chat.js
index 028f987b4a..445c72528d 100644
--- a/website/server/libs/chat/group-chat.js
+++ b/website/server/libs/chat/group-chat.js
@@ -9,9 +9,7 @@ import { // eslint-disable-line import/no-cycle
const questScrolls = shared.content.quests;
// @TODO: Don't use this method when the group can be saved.
-export async function getGroupChat (group, options = {}) {
- const { limit, before } = options;
-
+export async function getGroupChat (group) {
let maxChatCount = MAX_CHAT_COUNT;
if (group.chatLimitCount && group.chatLimitCount >= MAX_CHAT_COUNT) {
maxChatCount = group.chatLimitCount;
@@ -19,19 +17,10 @@ export async function getGroupChat (group, options = {}) {
maxChatCount = MAX_SUBBED_GROUP_CHAT_COUNT;
}
- const effectiveLimit = limit !== undefined ? Math.min(limit, maxChatCount) : maxChatCount;
-
- let query = Chat.find({ groupId: group._id })
- .sort('-timestamp');
-
- if (before) {
- const beforeMessage = await Chat.findOne({ _id: before }).exec();
- if (beforeMessage) {
- query = query.where('timestamp').lt(beforeMessage.timestamp);
- }
- }
-
- const groupChat = await query.limit(effectiveLimit).exec();
+ const groupChat = await Chat.find({ groupId: group._id })
+ .limit(maxChatCount)
+ .sort('-timestamp')
+ .exec();
// @TODO: Concat old chat to keep continuity of chat stored on group object
const currentGroupChat = group.chat || [];
diff --git a/website/server/libs/inbox/index.js b/website/server/libs/inbox/index.js
index af0d7ae07d..3cc2c2228b 100644
--- a/website/server/libs/inbox/index.js
+++ b/website/server/libs/inbox/index.js
@@ -37,9 +37,7 @@ export async function sentMessage (sender, receiver, message, translate) {
return messageSent;
}
-// Paginate per every 50
-const PM_PER_PAGE = 50;
-const MAX_PM_COUNT = 400;
+const PM_PER_PAGE = 10;
const getUserInboxDefaultOptions = {
asArray: true,
@@ -63,18 +61,12 @@ export async function getUserInbox (user, optionParams = getUserInboxDefaultOpti
.sort({ timestamp: -1 });
if (typeof options.page !== 'undefined') {
- const page = Number(options.page);
- const skip = PM_PER_PAGE * page;
- if (skip >= MAX_PM_COUNT) {
- return options.asArray ? [] : {};
- }
- const remainingAllowed = MAX_PM_COUNT - skip;
- const limit = Math.min(PM_PER_PAGE, remainingAllowed);
query = query
- .skip(skip)
- .limit(limit);
+ .skip(PM_PER_PAGE * Number(options.page))
+ .limit(PM_PER_PAGE);
} else {
- query = query.limit(MAX_PM_COUNT);
+ // Limit for legacy calls that are not paginated to prevent database issues
+ query = query.limit(200);
}
const messages = (await query.lean().exec()).map(msgObj => {
diff --git a/website/server/middlewares/index.js b/website/server/middlewares/index.js
index 6507e28a05..e14aaf9ae9 100644
--- a/website/server/middlewares/index.js
+++ b/website/server/middlewares/index.js
@@ -68,13 +68,29 @@ export default function attachMiddlewares (app, server) {
// New middlewares added by default in Helmet 4 are disabled
contentSecurityPolicy: {
directives: {
- imgSrc: null,
+ defaultSrc: [
+ '*.habitica.com',
+ '*.amazon.com',
+ '*.amazonaws.com',
+ '*.loggly.com',
+ '*.payments-amazon.com',
+ '*.stripe.com',
+ '*.stripe.network',
+ ],
+ imgSrc: [
+ '*',
+ 'data:',
+ ],
scriptSrc: [
- '\'self\'',
- 'cloudfront.loggly.com',
- 'js.stripe.com',
- 'm.stripe.network',
- 'static-na.payments-amazon.com',
+ '\'unsafe-eval\'',
+ '\'unsafe-inline\'',
+ '*.habitica.com',
+ '*.amazon.com',
+ '*.amazonaws.com',
+ '*.loggly.com',
+ '*.payments-amazon.com',
+ '*.stripe.com',
+ '*.stripe.network',
],
upgradeInsecureRequests: IS_PROD ? [] : null,
},
diff --git a/website/server/models/group.js b/website/server/models/group.js
index 36c678c2cd..7d181c818e 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -345,12 +345,12 @@ schema.statics.getGroups = async function getGroups (options = {}) {
// unless the user is an admin or said chat is posted by that user
// Not putting into toJSON because there we can't access user
// It also removes the _meta field that can be stored inside a chat message
-schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, user, options = {}) {
+schema.statics.toJSONCleanChat = async function groupToJSONCleanChat (group, user) {
// @TODO: Adding this here for support the old chat,
// but we should depreciate accessing chat like this
// Also only return chat if requested, eventually we don't want to return chat here
if (group && group.chat) {
- await getGroupChat(group, options);
+ await getGroupChat(group);
}
const groupToJson = group.toJSON();