missed add new line

The .disabled class conflicting with existing disabled state implementations

test/api/unit/middlewares/blocker.test.js

@@ -117,6 +117,15 @@ describe('Blocker middleware', () => {
 
       checkIPBlockedErrorThrown(next);
     });
+
+    it('throws when the ip is blocked', () => {
+      req.ip = '192.168.1.1';
+      sandbox.stub(nconf, 'get').withArgs('BLOCKED_IPS').returns('192.168.1.1');
+      const attachBlocker = requireAgain(pathToBlocker).default;
+      attachBlocker(req, res, next);
+
+      checkIPBlockedErrorThrown(next);
+    });
   });
 
   describe('Blocking clients', () => {

website/client/src/assets/css/sprites/spritesmith-main.css

@@ -56203,13 +56203,13 @@
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Cupid {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Cupid.png');
+.Pet-PandaCub-Cryptid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Cryptid.png');
   width: 81px;
   height: 99px;
 }
-.Pet-PandaCub-Cyptid {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Cyptid.png');
+.Pet-PandaCub-Cupid {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Cupid.png');
   width: 81px;
   height: 99px;
 }

website/client/src/components/tasks/taskModal.vue

@@ -35,7 +35,7 @@
           </button>
           <button
             class="btn btn-secondary d-flex align-items-center justify-content-center"
-            :class="{disabled: !canSave}"
+            :class="{'btn-disabled': !canSave}"
             type="button"
             @click="submit()"
           >
@@ -162,13 +162,13 @@
             >
               <div
                 class="habit-option-icon svg-icon no-transition"
-                :class="task.up ? '' : 'disabled'"
+                :class="task.up ? '' : 'icon-disabled'"
                 v-html="icons.positive"
               ></div>
             </div>
             <div
               class="habit-option-label no-transition"
-              :class="task.up ? cssClass('icon') : 'disabled'"
+              :class="task.up ? cssClass('icon') : 'label-disabled'"
             >
               {{ $t('positive') }}
             </div>
@@ -188,13 +188,13 @@
             >
               <div
                 class="habit-option-icon no-transition svg-icon negative mx-auto"
-                :class="task.down ? '' : 'disabled'"
+                :class="task.down ? '' : 'icon-disabled'"
                 v-html="icons.negative"
               ></div>
             </div>
             <div
               class="habit-option-label no-transition"
-              :class="task.down ? cssClass('icon') : 'disabled'"
+              :class="task.down ? cssClass('icon') : 'label-disabled'"
             >
               {{ $t('negative') }}
             </div>
@@ -592,7 +592,7 @@
           <button
             class="btn btn-primary btn-footer
             d-flex align-items-center justify-content-center"
-            :class="{disabled: !canSave}"
+            :class="{'btn-disabled': !canSave}"
             type="button"
             @click="submit()"
           >
@@ -881,12 +881,14 @@
       }
     }
 
-    .disabled {
+    .btn-disabled {
       background-color: $white;
       border: 2px solid transparent;
       color: $gray-200;
       line-height: 1.714;
       box-shadow: 0px 1px 3px 0px rgba(26, 24, 29, 0.12), 0px 1px 2px 0px rgba(26, 24, 29, 0.24);
+      cursor: not-allowed;
+      opacity: 0.6;
 
       &:focus {
         background-color: $white;
@@ -948,7 +950,7 @@
       height: 10px;
       color: $white;
 
-      &.disabled {
+      &.icon-disabled {
         color: $gray-200;
       }
 
@@ -962,7 +964,7 @@
       font-weight: bold;
       text-align: center;
 
-      &.disabled {
+      &.label-disabled {
         color: $gray-100;
         font-weight: normal;
       }
@@ -1018,7 +1020,7 @@
     border: 0;
   }
 
-  .disabled .input-group-text {
+  .input-group-outer.disabled .input-group-text {
     color: $gray-200;
   }
 

website/common/locales/en/admin.json

@@ -4,4 +4,4 @@
     "newsroom": "Newsroom",
     "adminBlockerTypeDescription": "<b>IP-Address</b> - Block access for a specific IP-Address\n\nClient - Block access for a client based on the \"x-client\" header.\n\nE-Mail - Blocks e-mails from being used for signup.",
     "adminBlockerAreaDescription": "A blocker can either apply to the full site, completely blocking any access. Or it can apply to purchases, which still allows the site to be accessed."
-}
+}

website/common/locales/en/backgrounds.json

@@ -1038,6 +1038,7 @@
   "backgrounds082025": "SET 135: Released August 2025",
   "backgroundSunnyStreetWithShopsText": "Sunny Street with Shops",
   "backgroundSunnyStreetWithShopsNotes": "Enjoy the sights and sounds of a Sunny Street with Shops.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

website/common/locales/en/communityGuidelines.json

@@ -43,7 +43,7 @@
   "commGuideList05F": "Creation of a duplicate account to avoid consequences",
   "commGuideList05G": "Intentional deception of Staff in order to avoid consequences or to get another user in trouble",
   "commGuideList05H": "Severe or repeated attempts to defraud or pressure other players for real-money items",
-  "commGuideList05A": "Other breaches of the Terms of Service not specified here",
+  "commGuideList05A": "Other breaches of the Terms and Conditions not specified here",
 
   "commGuideHeadingModerateInfractions": "Moderate Infractions",
   "commGuidePara054": "These infractions will have moderate consequences. When in conjunction with multiple infractions, the consequences may grow more severe.",

website/common/locales/en/front.json

@@ -91,7 +91,7 @@
   "sync": "Sync",
   "tasks": "Tasks",
   "teams": "Teams",
-  "terms": "Terms of Service",
+  "terms": "Terms and Conditions",
   "tumblr": "Tumblr",
   "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear local storage and most cookies for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.",
   "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.",

website/common/locales/en/gear.json

@@ -1739,7 +1739,7 @@
   "armorArmoireFlyFishingWadersText": "Fly Fishing Waders",
   "armorArmoireFlyFishingWadersNotes": "Stay perfectly warm and dry when you wade into a stream, pond, lake, or river. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Fly Fishing Set (Item 2 of 3)",
   "armorArmoireRedWaistcoatText": "Red Waistcoat",
-  "armorArmoireRedWaistcoatNotes": "Look smart and stunning as you tackle your tasks. There's something secret hidden in the vest pocket—what do you think it could be? Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Red Waistcoat Set (Item 2 of 2)",
+  "armorArmoireRedWaistcoatNotes": "Look smart and stunning as you tackle your tasks. There’s something secret hidden in the vest pocket—what do you think it could be? Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Red Waistcoat Set (Item 2 of 2)",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",

website/common/locales/en_GB/communityguidelines.json

@@ -24,7 +24,7 @@
     "commGuideHeadingSevereInfractions": "Severe Infractions",
     "commGuidePara052": "Severe infractions greatly harm the safety of Habitica's community and users, and therefore have severe consequences as a result.",
     "commGuidePara053": "The following are examples of some severe infractions. This is not a comprehensive list.",
-    "commGuideList05A": "Other breaches of the Terms of Service not specified here",
+    "commGuideList05A": "Other breaches of the Terms and Conditions not specified here",
     "commGuideList05B": "Hate Speech/Images, Harassment/Stalking, Cyber-Bullying, Flaming, and Trolling",
     "commGuideList05C": "Violation of Probation",
     "commGuideList05D": "Impersonation of Staff - this includes claiming player-created spaces not affiliated with Habitica are official and/or moderated by Habitica or its Staff",

website/common/locales/en_GB/front.json

@@ -87,7 +87,7 @@
     "sync": "Sync",
     "tasks": "Tasks",
     "teams": "Teams",
-    "terms": "Terms of Service",
+    "terms": "Terms and Conditions",
     "tumblr": "Tumblr",
     "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear local storage and most cookies for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your login details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.",
     "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.",

website/server/controllers/api-v4/admin.js

@@ -187,5 +187,4 @@ api.deleteBlocker = {
     res.respond(200, savedBlocker);
   },
 };
-
 export default api;

website/server/middlewares/blocker.js

@@ -1,3 +1,4 @@
+import nconf from 'nconf';
 import {
   Forbidden,
 } from '../libs/errors';
@@ -9,7 +10,19 @@ import { model as Blocker } from '../models/blocker';
 // NOTE: it's meant to be used behind a proxy (for example a load balancer)
 // that uses the 'x-forwarded-for' header to forward the original IP addresses.
 
-const blockedIps = [];
+// A list of comma separated IPs to block
+// It works fine as long as the list is short,
+// if the list becomes too long for an env variable we'll switch to Redis.
+const BLOCKED_IPS_RAW = nconf.get('BLOCKED_IPS');
+
+const blockedIps = BLOCKED_IPS_RAW
+  ? BLOCKED_IPS_RAW
+    .trim()
+    .split(',')
+    .map(blockedIp => blockedIp.trim())
+    .filter(blockedIp => Boolean(blockedIp))
+  : [];
+
 const blockedClients = [];
 
 Blocker.watchBlockers({