-
+
- {{ member.profile.name }}
-
+
+
{{ member.profile.name }}
+ v-if="isBuffed"
+ v-b-tooltip.hover.bottom="$t('buffed')"
+ class="is-buffed ml-2 mt-n1"
+ >
+
+
@@ -98,9 +105,12 @@
}
}
+ .standard-page .member-details {
+ padding-left: 24px;
+ }
+
.member-stats {
padding-left: 12px;
- padding-right: 24px;
opacity: 1;
transition: width 0.15s ease-out;
}
@@ -114,10 +124,6 @@
color: $header-color;
}
- .profile-name-character {
- margin-left: 12px;
- }
-
.character-name {
margin-bottom: 1px;
color: $white;
@@ -133,7 +139,6 @@
height: 20px;
background: $header-dark-background;
display: inline-block;
- margin-left: 16px;
vertical-align: middle;
padding-top: 4px;
diff --git a/website/client/src/components/members/reportMemberModal.vue b/website/client/src/components/members/reportMemberModal.vue
new file mode 100644
index 00000000000..b029966cdbe
--- /dev/null
+++ b/website/client/src/components/members/reportMemberModal.vue
@@ -0,0 +1,199 @@
+
+
+
+
{{ $t('reportPlayer') }}
+
+
+
+
+ {{ displayName }}
+ {{ username }}
+
+
+ {{ $t('whyReportingPlayer') }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/website/client/src/components/payments/buyGemsModal.vue b/website/client/src/components/payments/buyGemsModal.vue
index 3c4c0ff5685..92d3898e3c5 100644
--- a/website/client/src/components/payments/buyGemsModal.vue
+++ b/website/client/src/components/payments/buyGemsModal.vue
@@ -171,7 +171,12 @@
{{ $t('limitations') }}
- {{ $t('gemSaleLimitations', { eventStartMonth, eventStartOrdinal, eventEndOrdinal }) }}
+ {{ $t('gemSaleLimitations', {
+ eventStartMonth,
+ eventStartOrdinal,
+ eventEndMonth,
+ eventEndOrdinal,
+ }) }}
@@ -441,6 +446,9 @@ export default {
eventStartOrdinal () {
return moment(this.currentEvent.start).format('Do');
},
+ eventEndMonth () {
+ return moment(this.currentEvent.end).format('MMMM');
+ },
eventEndOrdinal () {
return moment(this.currentEvent.end).format('Do');
},
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 7120dbabdd8..74f6f848fb4 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -152,7 +152,7 @@
diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js
index ea8cceb6e94..13744b538e7 100644
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -8,7 +8,6 @@ import { PAGES } from '@/libs/consts';
import { STATIC_ROUTES } from './static-routes';
import { USER_ROUTES } from './user-routes';
import { DEPRECATED_ROUTES } from '@/router/deprecated-routes';
-import { ProfilePage } from './shared-route-imports';
// NOTE: when adding a page make sure to implement the `common:setTitle` action
@@ -94,11 +93,7 @@ const router = new VueRouter({
{
name: 'userProfile',
path: '/profile/:userId',
- component: ProfilePage,
props: true,
- children: [
- { name: 'userProfilePage', path: ':startingPage', component: ProfilePage },
- ],
},
{
path: '/inventory',
@@ -319,34 +314,40 @@ router.beforeEach(async (to, from, next) => {
});
}
- if ((to.name === 'userProfile' || to.name === 'userProfilePage') && from.name !== null) {
+ if ((to.name === 'userProfile')) {
let startingPage = 'profile';
if (to.params.startingPage !== undefined) {
startingPage = to.params.startingPage;
}
+ if (from.name === null) {
+ store.state.postLoadModal = `profile/${to.params.userId}`;
+ return next({ name: 'tasks' });
+ }
router.app.$emit('habitica:show-profile', {
userId: to.params.userId,
startingPage,
- path: to.path,
+ fromPath: from.path,
+ toPath: to.path,
});
return null;
}
if (to.name === 'tasks' && to.query.openGemsModal === 'true') {
- setTimeout(() => router.app.$emit('bv::show::modal', 'buy-gems'), 500);
+ store.state.postLoadModal = 'buy-gems';
return next({ name: 'tasks' });
}
if ((to.name === 'stats' || to.name === 'achievements' || to.name === 'profile') && from.name !== null) {
router.app.$emit('habitica:show-profile', {
startingPage: to.name,
- path: to.path,
+ fromPath: from.path,
+ toPath: to.path,
});
return null;
}
- if (from.name === 'userProfile' || from.name === 'userProfilePage' || from.name === 'stats' || from.name === 'achievements' || from.name === 'profile') {
+ if (from.name === 'userProfile' || from.name === 'stats' || from.name === 'achievements' || from.name === 'profile') {
router.app.$root.$emit('bv::hide::modal', 'profile');
}
diff --git a/website/client/src/router/shared-route-imports.js b/website/client/src/router/shared-route-imports.js
index e336f99cc69..e3b5d24d13a 100644
--- a/website/client/src/router/shared-route-imports.js
+++ b/website/client/src/router/shared-route-imports.js
@@ -1,3 +1 @@
export const NotFoundPage = () => import(/* webpackChunkName: "not-found" */'@/components/404');
-
-export const ProfilePage = () => import(/* webpackChunkName: "user" */'@/components/userMenu/profilePage');
diff --git a/website/client/src/router/user-routes.js b/website/client/src/router/user-routes.js
index bece6045f8d..0c7d0527a92 100644
--- a/website/client/src/router/user-routes.js
+++ b/website/client/src/router/user-routes.js
@@ -1,6 +1,4 @@
import ParentPage from '@/components/parentPage.vue';
-import { ProfilePage } from './shared-route-imports';
-
// Settings
const Settings = () => import(/* webpackChunkName: "settings" */'@/components/settings/index');
@@ -12,14 +10,10 @@ const Site = () => import(/* webpackChunkName: "settings" */'@/components/settin
const Subscription = () => import(/* webpackChunkName: "settings" */'@/components/settings/subscription');
const Transactions = () => import(/* webpackChunkName: "settings" */'@/components/settings/purchaseHistory');
-
export const USER_ROUTES = {
path: '/user',
component: ParentPage,
children: [
- { name: 'stats', path: 'stats', component: ProfilePage },
- { name: 'achievements', path: 'achievements', component: ProfilePage },
- { name: 'profile', path: 'profile', component: ProfilePage },
{
name: 'settings',
path: 'settings',
diff --git a/website/client/src/store/actions/members.js b/website/client/src/store/actions/members.js
index 85e44251a21..d9377cd800b 100644
--- a/website/client/src/store/actions/members.js
+++ b/website/client/src/store/actions/members.js
@@ -114,3 +114,19 @@ export async function getPurchaseHistory (store, payload) {
const response = await axios.get(`${apiv4Prefix}/members/${payload.memberId}/purchase-history`);
return response.data.data;
}
+
+export async function reportMember (store, payload) {
+ const url = `${apiv4Prefix}/members/${payload.memberId}/flag`;
+ const data = {
+ comment: payload.comment,
+ source: payload.source,
+ };
+ const response = await axios.post(url, data);
+ return response;
+}
+
+export async function clearMemberFlags (store, payload) {
+ const url = `${apiv4Prefix}/members/${payload.memberId}/clear-flags`;
+ const response = await axios.post(url);
+ return response;
+}
diff --git a/website/client/src/store/index.js b/website/client/src/store/index.js
index 20d23324063..56eaac19d71 100644
--- a/website/client/src/store/index.js
+++ b/website/client/src/store/index.js
@@ -151,6 +151,7 @@ export default function () {
bugReportOptions: {
question: false,
},
+ postLoadModal: '',
},
});
diff --git a/website/common/locales/en/character.json b/website/common/locales/en/character.json
index 0b6620cd1c3..4b6bdd7ecd9 100644
--- a/website/common/locales/en/character.json
+++ b/website/common/locales/en/character.json
@@ -175,8 +175,9 @@
"photo": "Photo",
"info": "Info",
"joined": "Joined",
- "totalLogins": "Total Check Ins",
- "latestCheckin": "Latest Check In",
+ "totalLogins": "Total Log Ins",
+ "latestCheckin": "Latest Log In",
+ "nextReward": "Next Log In Reward",
"editProfile": "Edit Profile",
"challengesWon": "Challenges Won",
"questsCompleted": "Quests Completed",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index d47f001b8b9..dcfaf9d5e5d 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -486,6 +486,15 @@
"weaponSpecialSummer2023HealerText": "Swaying Kelp",
"weaponSpecialSummer2023HealerNotes": "They may look frondly, but they get quite grumpy if you call them 'plants'. Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.",
+ "weaponSpecialFall2023RogueText": "Soupernatural Spoon",
+ "weaponSpecialFall2023RogueNotes": "It takes an exceptionally strong stirrer to cook up bubbles and toiling troubles. Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.",
+ "weaponSpecialFall2023WarriorText": "Tasty Popcorn",
+ "weaponSpecialFall2023WarriorNotes": "The most terrifying thing of all is the thought of a scary movie night with no snacks! Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.",
+ "weaponSpecialFall2023MageText": "Shining Staff",
+ "weaponSpecialFall2023MageNotes": "With a crystal at its core, this shining staff makes magic emerge from the mundane. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.",
+ "weaponSpecialFall2023HealerText": "Log Great Hammer",
+ "weaponSpecialFall2023HealerNotes": "With slow, heavy attacks, this gnarled hammer deals out healing blows instead of damage. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.",
+
"weaponMystery201411Text": "Pitchfork of Feasting",
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -1177,6 +1186,15 @@
"armorSpecialSummer2023HealerText": "Kelp Kirtle",
"armorSpecialSummer2023HealerNotes": "Hold fast to your goals and convictions in this elegant green gown. Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+ "armorSpecialFall2023RogueText": "Cursed Cauldron",
+ "armorSpecialFall2023RogueNotes": "You were lured with the promise of a nice hot soak... Joke's on you! Increases Perception by <%= per %>. Limited Edition 2023 Fall Gear.",
+ "armorSpecialFall2023WarriorText": "Video Player Armor",
+ "armorSpecialFall2023WarriorNotes": "Does it play DVDs? VHS?? What kind of cables does this need to plug into the TV?! Turns out this is the scariest part of the whole thing! Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+ "armorSpecialFall2023MageText": "Scarlet Warlock Robe",
+ "armorSpecialFall2023MageNotes": "With scarlet threads and gold accents, this outfit is a wonder for the senses. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.",
+ "armorSpecialFall2023HealerText": "Bog Creature Body",
+ "armorSpecialFall2023HealerNotes": "With moss, rock, wood, and bog water merged into one, this outfit is sometimes tough and sometimes spongey (but always intimidating). Increases Constitution by <%= con %>. Limited Edition 2023 Fall Gear.",
+
"armorMystery201402Text": "Messenger Robes",
"armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
"armorMystery201403Text": "Forest Walker Armor",
@@ -1297,6 +1315,8 @@
"armorMystery202306Notes": "No one’s going to rain on your parade! And if they try, you’ll stay colorful and dry! Confers no benefit. June 2023 Subscriber Item.",
"armorMystery202307Text": "Kraken's Tentacles",
"armorMystery202307Notes": "Suction cups have the best traction on the sea floor and on the sides of wayward ships. Confers no benefit. July 2023 Subscriber Item.",
+ "armorMystery202310Text": "Wraith's Robe",
+ "armorMystery202310Notes": "A ghostly garment that will curl and drift gracefully as you float amidst the haunted bogs and wastes. Confers no benefit. October 2023 Subscriber Item.",
"armorMystery301404Text": "Steampunk Suit",
"armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
@@ -1954,6 +1974,15 @@
"headSpecialSummer2023HealerText": "Kelp Crown",
"headSpecialSummer2023HealerNotes": "They're not snakes! You can open your eyes, it's safe! Increases Intelligence by <%= int %>. Limited Edition 2023 Summer Gear.",
+ "headSpecialFall2023RogueText": "Enchanted Visage",
+ "headSpecialFall2023RogueNotes": "This jinxed stew has given you the fuzzy face and long ears of a donkey! How very Shakespearean. Increases Perception by <%= per %>. Limited Edition 2023 Fall Gear.",
+ "headSpecialFall2023WarriorText": "Haunted Screen",
+ "headSpecialFall2023WarriorNotes": "What horror lurks in this realm of distortion and static? You'll have to stay tuned to find out! Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.",
+ "headSpecialFall2023MageText": "Scarlet Warlock Mask",
+ "headSpecialFall2023MageNotes": "With piercing eyes and pointed flair, it makes any illusion a sudden possibility. Increases Perception by <%= per %>. Limited Edition 2023 Fall Gear.",
+ "headSpecialFall2023HealerText": "Bog Creature Mask",
+ "headSpecialFall2023HealerNotes": "With eyes as dark as the bog it emerged from, it fixes its gaze upon enemies. Increases Intelligence by <%= int %>. Limited Edition 2023 Fall Gear.",
+
"headSpecialGaymerxText": "Rainbow Warrior Helm",
"headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.",
@@ -2105,6 +2134,8 @@
"headMystery202304Notes": "Wear this helm for your own safe-tea. Confers no benefit. April 2023 Subscriber Item.",
"headMystery202308Text": "Purple Protagonist Hair",
"headMystery202308Notes": "Does the unruly cowlick sticking up from the middle of your head represent your persistence or your penchant for mischief? Confers no benefit. August 2023 Subscriber Item.",
+ "headMystery202310Text": "Wraith's Hood",
+ "headMystery202310Notes": "It hides your face, and yet lends your eyes an unsettling and spectral glow. Confers no benefit. October 2023 Subscriber Item.",
"headMystery301404Text": "Fancy Top Hat",
"headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
@@ -2546,6 +2577,13 @@
"shieldSpecialSummer2023HealerText": "Sea Urchin",
"shieldSpecialSummer2023HealerNotes": "You conceal and shelter it. It dissuades nosy monsters from coming too close. Perfect symbiosis! Increases Constitution by <%= con %>. Limited Edition 2023 Summer Gear.",
+ "shieldSpecialFall2023RogueText": "Bewitched Bottle",
+ "shieldSpecialFall2023RogueNotes": "Enchanted with the strongest spells to hold powerful potions. Increases Strength by <%= str %>. Limited Edition 2023 Fall Gear.",
+ "shieldSpecialFall2023WarriorText": "Comfy Pillow",
+ "shieldSpecialFall2023WarriorNotes": "Perfect for making yourself comfortable while enjoying a scary movie... But we won't tell anyone if you need to hug it during the really spooky scenes! Increases Constitution by <%= con %>. Limited Edition 2023 Fall Gear.",
+ "shieldSpecialFall2023HealerText": "Mossy Rock",
+ "shieldSpecialFall2023HealerNotes": "With a firm base and a soft top, this is perfect to hurl at enemies or to sit upon when you need a rest from your adventures. Increases Constitution by <%= con %>. Limited Edition 2023 Fall Gear.",
+
"shieldMystery201601Text": "Resolution Slayer",
"shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.",
"shieldMystery201701Text": "Time-Freezer Shield",
@@ -3026,6 +3064,8 @@
"headAccessoryMystery202307Notes": "This mighty circlet summons cyclones and stormy weather! Confers no benefit. July 2023 Subscriber Item.",
"headAccessoryMystery202309Text": "Colossal Comet Moth Antennae",
"headAccessoryMystery202309Notes": "These antennae are fashionable and feathery, but also help you navigate! Confers no benefit. September 2023 Subscriber Item.",
+ "headAccessoryMystery202310Text": "Crown of Ghostly Lights",
+ "headAccessoryMystery202310Notes": "Like a will-o'-the-wisp, these unearthly lights may lure curious souls to their doom. Confers no benefit. October 2023 Subscriber Item.",
"headAccessoryMystery301405Text": "Headwear Goggles",
"headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json
index bb07735c43f..d7f253e739e 100644
--- a/website/common/locales/en/generic.json
+++ b/website/common/locales/en/generic.json
@@ -213,6 +213,16 @@
"loadEarlierMessages": "Load Earlier Messages",
"askQuestion": "Ask a Question",
"emptyReportBugMessage": "Report Bug Message missing",
+ "reportPlayer": "Report Player",
+ "blockPlayer": "Block Player",
+ "unblockPlayer": "Unblock Player",
+ "adminTools": "Admin Tools",
+ "viewAdminPanel": "View Admin Panel",
+ "shadowMute": "Shadow Mute",
+ "mutePlayer": "Mute",
+ "banPlayer": "Ban Player",
+ "unbanPlayer": "Unban Player",
+ "bannedPlayer": "This player is banned.",
"refreshList": "Refresh List",
"leaveHabitica": "You are about to leave Habitica.com",
"leaveHabiticaText": "Habitica is not responsible for the content of any linked website that is not owned or operated by HabitRPG.
Please note that these websites' practices may differ from Habitica’s community guidelines.",
@@ -222,5 +232,9 @@
"question": "Question",
"questionDescriptionText": "It's okay to ask your questions in your primary language if you aren't comfortable speaking in English.",
"questionPlaceholder": "Ask your question here",
- "submitQuestion": "Submit Question"
+ "submitQuestion": "Submit Question",
+ "reportPlayer": "Report Player",
+ "whyReportingPlayer": "Why are you reporting this player?",
+ "whyReportingPlayerPlaceholder": "Reason for report",
+ "playerReportModalBody": "You should only report a player who violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Submitting a false report is a violation of Habitica’s Community Guidelines."
}
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index acf0ab5e104..01dc58016dd 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -87,10 +87,12 @@
"PMCanNotReply": "You can not reply to this conversation",
"PMUserDoesNotReceiveMessages": "This user is no longer receiving private messages",
"PMUnblockUserToSendMessages": "Unblock this user to continue sending and receiving messages.",
- "block": "Block",
- "unblock": "Un-block",
+ "block": "Block Player",
+ "blockedUser": "You blocked this player. They cannot send you Private Messages but you will still see their posts.",
+ "bannedUser": "This player has been banned.",
+ "unblock": "Unblock Player",
"blockYourself": "You cannot block yourself",
- "blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
+ "blockWarning": "This will have no effect if the player is an admin.",
"inbox": "Inbox",
"messageRequired": "A message is required.",
"toUserIDRequired": "A User ID is required",
diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json
index cdd9f893fad..cf9671beec5 100644
--- a/website/common/locales/en/limited.json
+++ b/website/common/locales/en/limited.json
@@ -203,6 +203,10 @@
"summer2023GuppyRogueSet": "Guppy (Rogue)",
"summer2023KelpHealerSet": "Kelp (Healer)",
"summer2023CoralMageSet": "Coral (Mage)",
+ "fall2023ScaryMovieWarriorSet": "Scary Movie (Warrior)",
+ "fall2023ScarletWarlockMageSet": "Scarlet Warlock (Mage)",
+ "fall2023WitchsBrewRogueSet": "Witch's Brew (Rogue)",
+ "fall2023BogCreatureHealerSet": "Bog Creature (Healer)",
"eventAvailability": "Available for purchase until <%= date(locale) %>.",
"eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
"dateEndJanuary": "January 31",
@@ -245,7 +249,7 @@
"g1g1Limitations": "This is a limited time event that starts on December 15th at 8:00 AM ET (13:00 UTC) and will end January 8th at 11:59 PM ET (January 9th 04:59 UTC). This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is canceled or expires.",
"noLongerAvailable": "This item is no longer available.",
"gemSaleHow": "Between <%= eventStartMonth %> <%= eventStartOrdinal %> and <%= eventEndOrdinal %>, simply purchase any Gem bundle like usual and your account will be credited with the promotional amount of Gems. More Gems to spend, share, or save for any future releases!",
- "gemSaleLimitations": "This promotion only applies during the limited time event. This event starts on <%= eventStartMonth %> <%= eventStartOrdinal %> at 8:00 AM EDT (12:00 UTC) and will end <%= eventStartMonth %> <%= eventEndOrdinal %> at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself.",
+ "gemSaleLimitations": "This promotion only applies during the limited time event. This event starts on <%= eventStartMonth %> <%= eventStartOrdinal %> at 8:00 AM EDT (12:00 UTC) and will end <%= eventEndMonth %> <%= eventEndOrdinal %> at 8:00 PM EDT (00:00 UTC). The promo offer is only available when buying Gems for yourself.",
"anniversaryLimitations": "This is a limited time event that starts on January 30th at 8:00 AM ET (13:00 UTC) and will end February 8th at 11:59 PM ET (04:59 UTC). The Limited Edition Jubilant Gryphatrice and ten Magic Hatching Potions will be available to buy during this time. The other Gifts listed in the Four for Free section will be automatically delivered to all accounts that were active in the 30 days prior to day the gift is sent. Accounts created after the gifts are sent will not be able to claim them.",
"anniversaryLimitedDates": "January 30th to February 8th",
"limitedEvent": "Limited Event",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index fa43c663a67..7b2f8197741 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -154,6 +154,7 @@
"mysterySet202307": "Perilous Kraken Set",
"mysterySet202308": "Purple Protagonist Set",
"mysterySet202309": "Colossal Comet Moth Set",
+ "mysterySet202310": "Ghostlight Wraith Set",
"mysterySet301404": "Steampunk Standard Set",
"mysterySet301405": "Steampunk Accessories Set",
"mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js
index 5a95f5f4d90..60254bc8ae2 100644
--- a/website/common/script/content/appearance/sets.js
+++ b/website/common/script/content/appearance/sets.js
@@ -15,7 +15,7 @@ export default prefill({
setPrice: 5, availableFrom: '2023-04-11T08:00-05:00', availableUntil: EVENTS.spring2023.end, text: t('shimmerColors'),
},
hauntedHairColors: {
- setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'),
+ setPrice: 5, availableFrom: '2023-10-03T08:00-04:00', availableUntil: EVENTS.fall2023.end, text: t('hauntedColors'),
},
winteryHairColors: {
setPrice: 5, availableFrom: '2023-01-17T08:00-05:00', availableUntil: EVENTS.winter2023.end, text: t('winteryColors'),
@@ -27,7 +27,7 @@ export default prefill({
},
spookySkins: { setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins') },
supernaturalSkins: {
- setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('supernaturalSkins'),
+ setPrice: 5, availableFrom: '2023-10-03T08:00-04:00', availableUntil: EVENTS.fall2023.end, text: t('supernaturalSkins'),
},
splashySkins: {
setPrice: 5, availableFrom: '2023-07-11T08:00-05:00', availableUntil: EVENTS.summer2023.end, text: t('splashySkins'),
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 2d0d90935ac..efb229a4534 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -18,9 +18,9 @@ const bundles = {
'harpy',
'owl',
],
- event: EVENTS.potions202105,
+ event: EVENTS.bundle202309,
canBuy () {
- return moment().isBefore(EVENTS.potions202105.end);
+ return moment().isBetween(EVENTS.bundle202309.start, EVENTS.bundle202309.end);
},
type: 'quests',
class: 'quest_bundle_featheredFriends',
@@ -251,14 +251,15 @@ const bundles = {
sandySidekicks: {
key: 'sandySidekicks',
text: t('sandySidekicksText'),
- notes: t('sandySidekicksNotes', { date: moment('2020-10-31').format('LL') }),
+ notes: t('sandySidekicksNotes', { date: moment('2023-10-31').format('LL') }),
bundleKeys: [
'armadillo',
'snake',
'spider',
],
+ event: EVENTS.bundle202310,
canBuy () {
- return moment().isBetween('2020-10-13', '2020-11-02');
+ return moment().isBetween(EVENTS.bundle202310.start, EVENTS.bundle202310.end);
},
type: 'quests',
value: 7,
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 41dafd0ad21..737c44bece7 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -10,11 +10,35 @@ const gemsPromo = {
export const EVENTS = {
noEvent: {
- start: '2023-08-01T23:59-04:00',
- end: '2023-08-10T08:00-04:00',
+ start: '2023-11-01T00:00-04:00',
+ end: '2023-12-21T08:00-04:00',
season: 'normal',
npcImageSuffix: '',
},
+ spooky_extra_gems: {
+ start: '2022-10-24T08:00-04:00',
+ end: '2022-10-31T23:59-04:00',
+ gemsPromo,
+ },
+ bundle202310: {
+ start: '2023-10-17T08:00-04:00',
+ end: '2023-10-31T23:59-04:00',
+ },
+ potions202310: {
+ start: '2023-09-21T08:00-04:00',
+ end: '2023-10-31T23:59-04:00',
+ },
+ fall2023: {
+ start: '2023-09-21T08:00-04:00',
+ end: '2023-10-31T23:59-04:00',
+ npcImageSuffix: '_fall',
+ season: 'fall',
+ gear: true,
+ },
+ bundle202309: {
+ start: '2023-09-12T08:00-04:00',
+ end: '2023-09-30T23:59-04:00',
+ },
bundle202308: {
start: '2023-08-15T08:00-04:00',
end: '2023-08-31T23:59-04:00',
@@ -113,11 +137,6 @@ export const EVENTS = {
season: 'fall',
gear: true,
},
- spooky_extra_gems: {
- start: '2022-10-27T08:00-04:00',
- end: '2022-10-31T20:00-04:00',
- gemsPromo,
- },
fall_extra_gems: {
start: '2022-10-06T08:00-04:00',
end: '2022-10-13T20:00-04:00',
diff --git a/website/common/script/content/constants/seasonalSets.js b/website/common/script/content/constants/seasonalSets.js
index e30ffc82b7e..31d1b630920 100644
--- a/website/common/script/content/constants/seasonalSets.js
+++ b/website/common/script/content/constants/seasonalSets.js
@@ -209,6 +209,11 @@ const SEASONAL_SETS = {
'fall2022OrcWarriorSet',
'fall2022HarpyMageSet',
'fall2022WatcherHealerSet',
+
+ 'fall2023WitchsBrewRogueSet',
+ 'fall2023BogCreatureHealerSet',
+ 'fall2023ScaryMovieWarriorSet',
+ 'fall2023ScarletWarlockMageSet',
],
};
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index e791bb03987..6ceadc952aa 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -63,6 +63,7 @@ const armor = {
202304: { },
202306: { },
202307: { },
+ 202310: { },
301404: { },
301703: { },
301704: { },
@@ -211,6 +212,7 @@ const head = {
202303: { },
202304: { },
202308: { },
+ 202310: { },
301404: { },
301405: { },
301703: { },
@@ -242,6 +244,7 @@ const headAccessory = {
202302: { },
202305: { },
202309: { },
+ 202310: { },
301405: { },
};
diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js
index 813652340e0..28faa567f11 100644
--- a/website/common/script/content/gear/sets/special/index.js
+++ b/website/common/script/content/gear/sets/special/index.js
@@ -828,15 +828,31 @@ const armor = {
},
summer2023Rogue: {
set: 'summer2023GuppyRogueSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2023Warrior: {
set: 'summer2023GoldfishWarriorSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2023Mage: {
set: 'summer2023CoralMageSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2023Healer: {
set: 'summer2023KelpHealerSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
+ },
+ fall2023Warrior: {
+ set: 'fall2023ScaryMovieWarriorSet',
+ },
+ fall2023Healer: {
+ set: 'fall2023BogCreatureHealerSet',
+ },
+ fall2023Mage: {
+ set: 'fall2023ScarletWarlockMageSet',
+ },
+ fall2023Rogue: {
+ set: 'fall2023WitchsBrewRogueSet',
},
};
@@ -2019,15 +2035,31 @@ const head = {
},
summer2023Rogue: {
set: 'summer2023GuppyRogueSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2023Warrior: {
set: 'summer2023GoldfishWarriorSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2023Mage: {
set: 'summer2023CoralMageSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
},
summer2023Healer: {
set: 'summer2023KelpHealerSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
+ },
+ fall2023Healer: {
+ set: 'fall2023BogCreatureHealerSet',
+ },
+ fall2023Mage: {
+ set: 'fall2023ScarletWarlockMageSet',
+ },
+ fall2023Rogue: {
+ set: 'fall2023WitchsBrewRogueSet',
+ },
+ fall2023Warrior: {
+ set: 'fall2023ScaryMovieWarriorSet',
},
};
@@ -2861,12 +2893,26 @@ const shield = {
},
summer2023Rogue: {
set: 'summer2023GuppyRogueSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
},
summer2023Warrior: {
set: 'summer2023GoldfishWarriorSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
},
summer2023Healer: {
set: 'summer2023KelpHealerSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
+ },
+ fall2023Rogue: {
+ set: 'fall2023WitchsBrewRogueSet',
+ text: t('shieldSpecialFall2023RogueText'),
+ notes: t('shieldSpecialFall2023RogueNotes', { str: 8 }),
+ },
+ fall2023Warrior: {
+ set: 'fall2023ScaryMovieWarriorSet',
+ },
+ fall2023Healer: {
+ set: 'fall2023BogCreatureHealerSet',
},
};
@@ -3642,15 +3688,31 @@ const weapon = {
},
summer2023Rogue: {
set: 'summer2023GuppyRogueSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
},
summer2023Warrior: {
set: 'summer2023GoldfishWarriorSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
},
summer2023Mage: {
set: 'summer2023CoralMageSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
},
summer2023Healer: {
set: 'summer2023KelpHealerSet',
+ canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
+ },
+ fall2023Rogue: {
+ set: 'fall2023WitchsBrewRogueSet',
+ },
+ fall2023Healer: {
+ set: 'fall2023BogCreatureHealerSet',
+ },
+ fall2023Warrior: {
+ set: 'fall2023ScaryMovieWarriorSet',
+ },
+ fall2023Mage: {
+ set: 'fall2023ScarletWarlockMageSet',
},
};
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index bd826e5d716..8b15c330e80 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -153,13 +153,13 @@ const premium = {
value: 2,
text: t('hatchingPotionSpooky'),
limited: true,
- event: EVENTS.fall2021,
+ event: EVENTS.fall2023,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndOctober'),
- previousDate: t('septemberYYYY', { year: 2019 }),
+ previousDate: t('octoberYYYY', { year: 2021 }),
}),
canBuy () {
- return moment().isBefore(EVENTS.fall2021.end);
+ return moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end);
},
},
Ghost: {
@@ -244,13 +244,13 @@ const premium = {
value: 2,
text: t('hatchingPotionGlow'),
limited: true,
- event: EVENTS.birthday10,
+ event: EVENTS.fall2023,
_addlNotes: t('eventAvailabilityReturning', {
- availableDate: t('dateStartFebruary'),
- previousDate: t('octoberYYYY', { year: 2021 }),
+ availableDate: t('dateEndOctober'),
+ previousDate: t('januaryYYYY', { year: 2023 }),
}),
canBuy () {
- return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end);
+ return moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end);
},
},
Frost: {
@@ -436,13 +436,13 @@ const premium = {
value: 2,
text: t('hatchingPotionVampire'),
limited: true,
- event: EVENTS.birthday10,
+ event: EVENTS.fall2023,
_addlNotes: t('eventAvailabilityReturning', {
- availableDate: t('dateStartFebruary'),
- previousDate: t('octoberYYYY', { year: 2022 }),
+ availableDate: t('dateEndOctober'),
+ previousDate: t('januaryYYYY', { year: 2023 }),
}),
canBuy () {
- return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end);
+ return moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end);
},
},
AutumnLeaf: {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 3219ce95928..92e16d7813d 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
- if (moment().isBetween(EVENTS.potions202308.start, EVENTS.potions202308.end)) {
+ if (moment().isBetween(EVENTS.fall2023.start, EVENTS.fall2023.end)) {
return [
{
type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
},
{
type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Thunderstorm',
+ path: 'premiumHatchingPotions.Glow',
},
{
type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Porcelain',
+ path: 'premiumHatchingPotions.Spooky',
},
{
- type: 'hatchingPotions',
- path: 'hatchingPotions.Zombie',
+ type: 'premiumHatchingPotion',
+ path: 'premiumHatchingPotions.Vampire',
},
];
}
@@ -32,7 +32,7 @@ const featuredItems = {
},
{
type: 'food',
- path: 'food.Meat',
+ path: 'food.RottenMeat',
},
{
type: 'hatchingPotions',
@@ -40,40 +40,24 @@ const featuredItems = {
},
{
type: 'eggs',
- path: 'eggs.Fox',
+ path: 'eggs.Cactus',
},
];
},
quests () {
- if (moment().isBetween(EVENTS.bundle202308.start, EVENTS.bundle202308.end)) {
+ if (moment().isBetween(EVENTS.bundle202310.start, EVENTS.bundle202310.end)) {
return [
{
type: 'bundles',
- path: 'bundles.hugabug',
- },
- {
- type: 'quests',
- path: 'quests.octopus',
- },
- {
- type: 'quests',
- path: 'quests.rock',
- },
- ];
- }
- if (moment().isBetween('2023-03-28T08:00-05:00', EVENTS.spring2023.end)) {
- return [
- {
- type: 'quests',
- path: 'quests.egg',
+ path: 'bundles.sandySidekicks',
},
{
type: 'quests',
- path: 'quests.yarn',
+ path: 'quests.beetle',
},
{
type: 'quests',
- path: 'quests.ghost_stag',
+ path: 'quests.frog',
},
];
}
@@ -93,7 +77,7 @@ const featuredItems = {
},
];
},
- seasonal: 'summer2022MantaRayMageSet',
+ seasonal: 'fall2017TrickOrTreatSet',
timeTravelers: [
// TODO
],
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 2b201c2c7b2..e4ccd37c4e3 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -313,7 +313,7 @@ spells.special = {
target: 'user',
notes: t('spellSpecialSpookySparklesNotes'),
canOwn () {
- return moment().isBetween('2021-10-11T08:00-04:00', EVENTS.fall2022.end);
+ return moment().isBetween('2023-10-03T08:00-04:00', EVENTS.fall2023.end);
},
cast (user, target, req) {
if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language));
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index b5f60177bbf..3f77a98439d 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -29,16 +29,16 @@ export default {
pinnedSets: CURRENT_EVENT
? {
- rogue: 'summer2023GuppyRogueSet',
- warrior: 'summer2023GoldfishWarriorSet',
- wizard: 'summer2023CoralMageSet',
- healer: 'summer2023KelpHealerSet',
+ rogue: 'fall2023WitchsBrewRogueSet',
+ warrior: 'fall2023ScaryMovieWarriorSet',
+ wizard: 'fall2023ScarletWarlockMageSet',
+ healer: 'fall2023BogCreatureHealerSet',
}
: {},
- availableSpells: CURRENT_EVENT && moment().isBetween('2023-07-11T08:00-04:00', CURRENT_EVENT.end)
+ availableSpells: CURRENT_EVENT && moment().isBetween('2023-10-03T08:00-04:00', CURRENT_EVENT.end)
? [
- 'seafoam',
+ 'spookySparkles',
]
: [],
@@ -46,5 +46,5 @@ export default {
? []
: [],
- featuredSet: 'summer2022MantaRayMageSet',
+ featuredSet: 'fall2022HarpyMageSet',
};
diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js
index d964d310bbd..02ec113f0ed 100644
--- a/website/server/controllers/api-v3/chat.js
+++ b/website/server/controllers/api-v3/chat.js
@@ -14,7 +14,7 @@ import {
NotAuthorized,
} from '../../libs/errors';
import { removeFromArray } from '../../libs/collectionManipulators';
-import { getUserInfo, getGroupUrl, sendTxn } from '../../libs/email';
+import { getUserInfo, getGroupUrl } from '../../libs/email';
import * as slack from '../../libs/slack';
import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory';
import { getAuthorEmailFromMessage } from '../../libs/chat';
@@ -28,7 +28,6 @@ import { getAnalyticsServiceByEnvironment } from '../../libs/analyticsService';
const analytics = getAnalyticsServiceByEnvironment();
const ACCOUNT_MIN_CHAT_AGE = Number(nconf.get('ACCOUNT_MIN_CHAT_AGE'));
-const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map(email => ({ email, canSend: true }));
/**
* @apiDefine MessageNotFound
@@ -164,8 +163,6 @@ api.postChat = {
{ name: 'GROUP_URL', content: groupUrl },
];
- sendTxn(FLAG_REPORT_EMAILS, 'slur-report-to-mods', report);
-
// Slack the mods
slack.sendSlurNotification({
authorEmail,
@@ -241,8 +238,6 @@ api.postChat = {
{ name: 'GROUP_URL', content: groupUrl },
];
- sendTxn(FLAG_REPORT_EMAILS, 'shadow-muted-post-report-to-mods', report);
-
// Slack the mods
slack.sendShadowMutedPostNotification({
authorEmail,
@@ -447,26 +442,6 @@ api.clearChatFlags = {
const authorEmail = getAuthorEmailFromMessage(message);
const groupUrl = getGroupUrl(group);
- sendTxn(FLAG_REPORT_EMAILS, 'unflag-report-to-mods', [
- { name: 'MESSAGE_TIME', content: (new Date(message.timestamp)).toString() },
- { name: 'MESSAGE_TEXT', content: message.text },
-
- { name: 'ADMIN_USERNAME', content: user.profile.name },
- { name: 'ADMIN_UUID', content: user._id },
- { name: 'ADMIN_EMAIL', content: adminEmailContent },
- { name: 'ADMIN_MODAL_URL', content: `/profile/${user._id}` },
-
- { name: 'AUTHOR_USERNAME', content: message.user },
- { name: 'AUTHOR_UUID', content: message.uuid },
- { name: 'AUTHOR_EMAIL', content: authorEmail },
- { name: 'AUTHOR_MODAL_URL', content: `/profile/${message.uuid}` },
-
- { name: 'GROUP_NAME', content: group.name },
- { name: 'GROUP_TYPE', content: group.type },
- { name: 'GROUP_ID', content: group._id },
- { name: 'GROUP_URL', content: groupUrl },
- ]);
-
res.respond(200, {});
},
};
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index d8f5a086e81..e9e4f03ee14 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -146,7 +146,7 @@ api.getHeroes = {
// Note, while the following routes are called getHero / updateHero
// they can be used by admins to get/update any user
-const heroAdminFields = 'auth balance contributor flags items lastCron party preferences profile.name purchased secret permissions';
+const heroAdminFields = 'auth balance contributor flags items lastCron party preferences profile purchased secret permissions';
const heroAdminFieldsToFetch = heroAdminFields; // these variables will make more sense when...
const heroAdminFieldsToShow = heroAdminFields; // ... apiTokenObscured is added
@@ -200,6 +200,7 @@ api.getHero = {
if (!heroRes.contributor) heroRes.contributor = {};
heroRes.secret = hero.getSecretData();
+ heroRes.profile.flags = hero.getFlagData();
res.respond(200, heroRes);
},
diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js
index 11469a56847..ac8a85815c9 100644
--- a/website/server/controllers/api-v3/members.js
+++ b/website/server/controllers/api-v3/members.js
@@ -11,6 +11,7 @@ import {
import { model as Group } from '../../models/group';
import { model as Challenge } from '../../models/challenge';
import {
+ BadRequest,
NotFound,
NotAuthorized,
} from '../../libs/errors';
@@ -27,6 +28,7 @@ import {
} from '../../models/message';
import highlightMentions from '../../libs/highlightMentions';
import { handleGetMembersForChallenge } from '../../libs/challenges/handleGetMembersForChallenge';
+import { chatReporterFactory } from '../../libs/chatReporting/chatReporterFactory';
const { achievements } = common;
@@ -777,4 +779,92 @@ api.transferGems = {
},
};
+/**
+ * @api {post} /api/v3/members/:memberId/flag Flag (report) a user
+ * @apiDescription Sends an email to staff about another user or their profile
+ * @apiName FlagUser
+ * @apiGroup Members
+ *
+ * @apiParam (Path) {UUID} memberId The unique ID of the user being flagged
+ * @apiParam (Body) {String} [comment] explain why the user was flagged
+ * @apiParam (Body) {String} [source] URL or view from which the user was flagged
+ *
+ * @apiSuccess {Object} data The flagged user
+ * @apiSuccess {UUID} data.id The id of the flagged user
+ * @apiSuccess {String} data.username The username of the flagged user
+ * @apiSuccess {Object} data.profile The flagged user's profile information
+ * @apiSuccess {String} data.profile.blurb Text of the flagged user's profile bio
+ * @apiSuccess {Object} data.profile.flags Data about flags the profile has received.
+ * Restricted to the reporting user's own flag
+ * unless the reporting user is a moderator.
+ * Each key is a UUID, and fields are comment,
+ * source, and timestamp.
+ * @apiSuccess {String} data.profile.imageUrl URL of the flagged user's profile image
+ * @apiSuccess {String} data.profile.name The flagged user's display name
+ *
+ * @apiError (400) {BadRequest} AlreadyFlagged A profile cannot be flagged
+ * more than once by the same user.
+ * @apiError (400) {BadRequest} MemberIdRequired The `memberId` param is required
+ * and must be a valid `UUID`.
+ * @apiError (404) {NotFound} UserWithIdNotFound The `memberId` param did not
+ * belong to an existing user.
+ */
+api.flagUser = {
+ method: 'POST',
+ url: '/members/:memberId/flag',
+ middlewares: [authWithHeaders()],
+ async handler (req, res) {
+ const chatReporter = chatReporterFactory('User', req, res);
+ const flaggedUser = await chatReporter.flag();
+ res.respond(200, flaggedUser);
+ },
+};
+
+/**
+ * @api {post} /api/v3/members/:memberId/clear-flags Delete flags from a user
+ * @apiDescription Removes any abuse reports flagged on a user profile.
+ * @apiPermission Admin
+ * @apiName ClearUserFlags
+ * @apiGroup Members
+ *
+ * @apiParam (Path) {UUID} memberId The unique ID of the flagged user to reset
+ *
+ * @apiSuccess {Object} data An empty object
+ *
+ * @apiError (400) {BadRequest} MemberIdRequired The `memberId` param is required
+ * and must be a valid `UUID`.
+ * @apiError (400) {BadRequest} MustBeAdmin Must be a moderator to use this route
+ * @apiError (404) {NotFound} UserWithIdNotFound The `memberId` param did not
+ * belong to an existing user.
+ */
+
+api.clearUserFlags = {
+ method: 'POST',
+ url: '/members/:memberId/clear-flags',
+ middlewares: [authWithHeaders()],
+ async handler (req, res) {
+ const { user } = res.locals;
+ const { memberId } = req.params;
+
+ req.checkParams('memberId', res.t('memberIdRequired')).notEmpty().isUUID();
+ const validationErrors = req.validationErrors();
+ if (validationErrors) throw validationErrors;
+
+ if (!user.hasPermission('moderator')) {
+ throw new BadRequest('Only a moderator may clear reports from a profile.');
+ }
+ const flaggedUser = await User.findOne(
+ { _id: memberId },
+ { profile: 1 },
+ ).exec();
+ if (!flaggedUser) {
+ throw new NotFound(res.t('userWithIDNotFound', { userId: memberId }));
+ }
+ flaggedUser.profile.flags = {};
+ await flaggedUser.save();
+
+ res.respond(200, {});
+ },
+};
+
export default api;
diff --git a/website/server/libs/chatReporting/chatReporterFactory.js b/website/server/libs/chatReporting/chatReporterFactory.js
index 39f8810ba54..e0b9e7b0196 100644
--- a/website/server/libs/chatReporting/chatReporterFactory.js
+++ b/website/server/libs/chatReporting/chatReporterFactory.js
@@ -1,11 +1,14 @@
import GroupChatReporter from './groupChatReporter';
import InboxChatReporter from './inboxChatReporter';
+import ProfileReporter from './profileReporter';
export function chatReporterFactory (type, req, res) { // eslint-disable-line import/prefer-default-export, max-len
if (type === 'Group') {
return new GroupChatReporter(req, res);
} if (type === 'Inbox') {
return new InboxChatReporter(req, res);
+ } if (type === 'Profile' || type === 'User') {
+ return new ProfileReporter(req, res);
}
throw new Error('Invalid chat reporter type.');
diff --git a/website/server/libs/chatReporting/groupChatReporter.js b/website/server/libs/chatReporting/groupChatReporter.js
index 18caf90c9a6..b6e09e0eb78 100644
--- a/website/server/libs/chatReporting/groupChatReporter.js
+++ b/website/server/libs/chatReporting/groupChatReporter.js
@@ -6,17 +6,12 @@ import {
BadRequest,
NotFound,
} from '../errors';
-import { sendTxn } from '../email';
import * as slack from '../slack';
import { model as Group } from '../../models/group';
import { chatModel as Chat } from '../../models/message';
import apiError from '../apiError';
const COMMUNITY_MANAGER_EMAIL = nconf.get('EMAILS_COMMUNITY_MANAGER_EMAIL');
-const FLAG_REPORT_EMAILS = nconf
- .get('FLAG_REPORT_EMAIL')
- .split(',')
- .map(email => ({ email, canSend: true }));
const USER_AGE_FOR_FLAGGING = 3; // accounts less than this many days old don't increment flagCount
export default class GroupChatReporter extends ChatReporter {
@@ -51,13 +46,6 @@ export default class GroupChatReporter extends ChatReporter {
}
async notify (group, message, userComment, automatedComment = '') {
- let emailVariables = await this.getMessageVariables(group, message);
- emailVariables = emailVariables.concat([
- { name: 'REPORTER_COMMENT', content: userComment || '' },
- ]);
-
- sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', emailVariables);
-
slack.sendFlagNotification({
authorEmail: this.authorEmail,
flagger: this.user,
diff --git a/website/server/libs/chatReporting/inboxChatReporter.js b/website/server/libs/chatReporting/inboxChatReporter.js
index 94c6302cf4a..8424a6a7d23 100644
--- a/website/server/libs/chatReporting/inboxChatReporter.js
+++ b/website/server/libs/chatReporting/inboxChatReporter.js
@@ -1,21 +1,16 @@
-import nconf from 'nconf';
import { model as User } from '../../models/user';
import ChatReporter from './chatReporter';
import {
BadRequest,
} from '../errors';
-import { getUserInfo, sendTxn } from '../email';
+import { getUserInfo } from '../email';
import * as slack from '../slack';
import apiError from '../apiError';
import * as inboxLib from '../inbox';
import { getAuthorEmailFromMessage } from '../chat';
-const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL')
- .split(',')
- .map(email => ({ email, canSend: true }));
-
export default class InboxChatReporter extends ChatReporter {
constructor (req, res) {
super(req, res);
@@ -49,13 +44,6 @@ export default class InboxChatReporter extends ChatReporter {
_id: 'N/A',
};
- let emailVariables = await this.getMessageVariables(group, message);
- emailVariables = emailVariables.concat([
- { name: 'REPORTER_COMMENT', content: userComment || '' },
- ]);
-
- sendTxn(FLAG_REPORT_EMAILS, 'flag-report-to-mods-with-comments', emailVariables);
-
slack.sendInboxFlagNotification({
messageUserEmail: this.messageUserEmail,
flagger: this.user,
diff --git a/website/server/libs/chatReporting/profileReporter.js b/website/server/libs/chatReporting/profileReporter.js
new file mode 100644
index 00000000000..008146dcf54
--- /dev/null
+++ b/website/server/libs/chatReporting/profileReporter.js
@@ -0,0 +1,81 @@
+import { model as User } from '../../models/user';
+import * as slack from '../slack';
+
+import ChatReporter from './chatReporter';
+import {
+ BadRequest,
+ NotFound,
+} from '../errors';
+
+export default class ProfileReporter extends ChatReporter {
+ constructor (req, res) {
+ super(req, res);
+
+ this.user = res.locals.user;
+ }
+
+ async validate () {
+ this.req.checkParams('memberId', this.res.t('memberIdRequired')).notEmpty().isUUID();
+
+ const validationErrors = this.req.validationErrors();
+ if (validationErrors) throw validationErrors;
+
+ const flaggedUser = await User.findOne(
+ { _id: this.req.params.memberId },
+ { auth: 1, profile: 1 },
+ ).exec();
+ if (!flaggedUser) {
+ throw new NotFound(this.res.t('userWithIDNotFound', { userId: this.req.params.memberId }));
+ }
+
+ if (flaggedUser.profile.flags && flaggedUser.profile.flags[this.user._id]
+ && !this.user.hasPermission('moderator')) {
+ throw new BadRequest('A profile can not be flagged more than once by the same user.');
+ }
+
+ const { comment, source } = this.req.body;
+
+ return { flaggedUser, comment, source };
+ }
+
+ async flagProfile (flaggedUser, comment, source) {
+ const timestamp = new Date();
+ // Log user ids that have flagged the account
+ if (!flaggedUser.profile.flags) {
+ flaggedUser.profile.flags = {};
+ }
+
+ flaggedUser.profile.flags[this.user._id] = {
+ comment,
+ source,
+ timestamp,
+ };
+ flaggedUser.markModified('profile.flags');
+ await flaggedUser.save();
+ return timestamp;
+ }
+
+ notify (flaggedUser, comment, source) {
+ slack.sendProfileFlagNotification({
+ reporter: this.user,
+ flaggedUser,
+ userComment: comment,
+ source,
+ });
+ }
+
+ async flag () {
+ const { flaggedUser, comment, source } = await this.validate();
+ const timestamp = await this.flagProfile(flaggedUser, comment, source);
+ this.notify(flaggedUser, comment, source);
+ if (!this.user.hasPermission('moderator')) {
+ flaggedUser.profile.flags = {};
+ flaggedUser.profile.flags[this.user._id] = {
+ comment,
+ source,
+ timestamp,
+ };
+ }
+ return flaggedUser;
+ }
+}
diff --git a/website/server/libs/slack.js b/website/server/libs/slack.js
index 615c7d4284d..0f2997a239c 100644
--- a/website/server/libs/slack.js
+++ b/website/server/libs/slack.js
@@ -176,6 +176,43 @@ function sendInboxFlagNotification ({
.catch(err => logger.error(err, 'Error while sending flag data to Slack.'));
}
+function sendProfileFlagNotification ({
+ reporter,
+ flaggedUser,
+ userComment,
+ source,
+}) {
+ const title = 'User Profile Report';
+ const titleLink = `${BASE_URL}/profile/${flaggedUser._id}`;
+ let text = `@${reporter.auth.local.username} (${reporter._id}; language: ${reporter.preferences.language}) flagged @${flaggedUser.auth.local.username}'s profile from ${source}`;
+ if (userComment) {
+ text += ` and commented: ${userComment}`;
+ }
+ let profileData = `Display Name: ${flaggedUser.profile.name}`;
+ if (flaggedUser.profile.imageUrl) {
+ profileData += `\n\nImage URL: ${flaggedUser.profile.imageUrl}`;
+ }
+ if (flaggedUser.profile.blurb) {
+ profileData += `\n\nAbout: ${flaggedUser.profile.blurb}`;
+ }
+
+ flagSlack
+ .send({
+ text,
+ attachments: [{
+ fallback: 'Flag Profile',
+ color: 'danger',
+ title,
+ title_link: titleLink,
+ text: profileData,
+ mrkdwn_in: [
+ 'text',
+ ],
+ }],
+ })
+ .catch(err => logger.error(err, 'Error while sending flag data to Slack.'));
+}
+
function sendSubscriptionNotification ({
buyer,
recipient,
@@ -302,6 +339,7 @@ function sendSlurNotification ({
export {
sendFlagNotification,
sendInboxFlagNotification,
+ sendProfileFlagNotification,
sendSubscriptionNotification,
sendShadowMutedPostNotification,
sendSlurNotification,
diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
index e1b00de15b1..a64d49fde94 100644
--- a/website/server/models/user/hooks.js
+++ b/website/server/models/user/hooks.js
@@ -24,7 +24,7 @@ schema.plugin(baseModel, {
// noSet is not used as updating uses a whitelist and creating only accepts
// specific params (password, email, username, ...)
noSet: [],
- private: ['auth.local.hashed_password', 'auth.local.passwordHashMethod', 'auth.local.salt', '_cronSignature', '_ABtests', 'secret'],
+ private: ['auth.local.hashed_password', 'auth.local.passwordHashMethod', 'auth.local.salt', '_cronSignature', '_ABtests', 'secret', 'profile.flags'],
toJSONTransform: function userToJSON (plainObj, originalDoc) {
plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs
diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
index 6272c84b722..760e81ac352 100644
--- a/website/server/models/user/methods.js
+++ b/website/server/models/user/methods.js
@@ -548,6 +548,12 @@ schema.methods.getSecretData = function getSecretData () {
return user.secret;
};
+schema.methods.getFlagData = function getFlagData () {
+ const user = this;
+
+ return user.profile.flags;
+};
+
schema.methods.updateBalance = async function updateBalance (amount,
transactionType,
reference,
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 5bc38ff7692..947cf0a0b4c 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -625,6 +625,7 @@ export default new Schema({
required: true,
trim: true,
},
+ flags: { $type: Schema.Types.Mixed },
},
stats: {
hp: { $type: Number, default: shared.maxHealth },