Merge branch 'master' into newads

backend/src/api/routes/admin.ts

@@ -1,11 +1,24 @@
 // import joi from "joi";
 import { Router } from "express";
 import { authenticateRequest } from "../../middlewares/auth";
-import { asyncHandler, checkIfUserIsAdmin } from "../../middlewares/api-utils";
+import {
+  asyncHandler,
+  checkIfUserIsAdmin,
+  validateConfiguration,
+} from "../../middlewares/api-utils";
 import * as AdminController from "../controllers/admin";
 
 const router = Router();
 
+router.use(
+  validateConfiguration({
+    criteria: (configuration) => {
+      return configuration.admin.endpointsEnabled;
+    },
+    invalidMessage: "Admin endpoints are currently disabled.",
+  })
+);
+
 router.get(
   "/",
   authenticateRequest({

backend/src/api/routes/quotes.ts

@@ -151,7 +151,7 @@ router.post(
   }),
   checkUserPermissions({
     criteria: (user) => {
-      return !user.cannotReport;
+      return user.canReport !== false;
     },
   }),
   asyncHandler(QuoteController.reportQuote)

backend/src/api/routes/users.ts

@@ -585,7 +585,7 @@ router.post(
   }),
   checkUserPermissions({
     criteria: (user) => {
-      return !user.cannotReport;
+      return user.canReport !== false;
     },
   }),
   asyncHandler(UserController.reportUser)

backend/src/constants/base-configuration.ts

@@ -22,6 +22,9 @@ export const BASE_CONFIGURATION: MonkeyTypes.Configuration = {
     submissionsEnabled: false,
     maxFavorites: 0,
   },
+  admin: {
+    endpointsEnabled: false,
+  },
   apeKeys: {
     endpointsEnabled: false,
     acceptKeys: false,
@@ -202,6 +205,16 @@ export const CONFIGURATION_FORM_SCHEMA: ObjectSchema<MonkeyTypes.Configuration>
           },
         },
       },
+      admin: {
+        type: "object",
+        label: "Admin",
+        fields: {
+          endpointsEnabled: {
+            type: "boolean",
+            label: "Endpoints Enabled",
+          },
+        },
+      },
       apeKeys: {
         type: "object",
         label: "Ape Keys",

backend/src/types/types.d.ts

@@ -62,6 +62,9 @@ declare namespace MonkeyTypes {
         maxMail: number;
       };
     };
+    admin: {
+      endpointsEnabled: boolean;
+    };
     apeKeys: {
       endpointsEnabled: boolean;
       acceptKeys: boolean;
@@ -176,7 +179,7 @@ declare namespace MonkeyTypes {
     uid: string;
     quoteMod?: boolean;
     configurationMod?: boolean;
-    cannotReport?: boolean;
+    canReport?: boolean;
     banned?: boolean;
     canManageApeKeys?: boolean;
     favoriteQuotes?: Record<string, string[]>;

frontend/static/languages/czech_10k.json

@@ -4298,7 +4298,6 @@
     "pódium",
     "semeno",
     "vzdělaný",
-    "tý",
     "vyrůstat",
     "poděkovat",
     "sklonit",

frontend/static/languages/czech_1k.json

@@ -541,7 +541,6 @@
     "došlo",
     "začátku",
     "pomalu",
-    "m",
     "prostor",
     "vlasy",
     "obvykle",
@@ -658,7 +657,7 @@
     "jednom",
     "pan",
     "noc",
-    "cm",
+    "centimetr",
     "tebe",
     "kterém",
     "jedním",
@@ -901,7 +900,6 @@
     "nejde",
     "vliv",
     "světla",
-    "č.",
     "přičemž",
     "kraje"
   ]

frontend/static/layouts/_list.json

@@ -1386,6 +1386,39 @@
       "row5": [" "]
     }
   },
+  "gallaya_angle_ansi": {
+    "keymapShowTopRow": false,
+    "type": "ansi",
+    "keys": {
+      "row1": ["`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+"],
+      "row2": ["bB", "lL", "dD", "cC", "qQ", "jJ", "fF", "oO", "uU", ",<", "[{", "]}", "\\|"],
+      "row3": ["nN", "rR", "sS", "fF", "gG", "pP", "hH", "aA", "eE", "iI", "/?"],
+      "row4": ["xX", "mM", "wW", "vV", "zZ", "kK", "yY", "'\"", ";:", ".>"],
+      "row5": [" "]
+    }
+  },
+  "gallaya_angle_iso": {
+    "keymapShowTopRow": false,
+    "type": "iso",
+    "keys": {
+      "row1": ["`¬", "1!", "2\"", "3£", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+"],
+      "row2": ["bB", "lL", "dD", "cC", "zZ", "jJ", "fF", "oO", "uU", ",<", "[{", "]}" ],
+      "row3": ["nN", "rR", "sS", "fF", "gG", "pP", "hH", "aA", "eE", "iI", "/?", "#~"],
+      "row4": ["qQ", "xX", "mM", "wW", "vV", "\\|", "kK", "yY", "'@", ";:", ".>"],
+      "row5": [" "]
+    }
+  },
+  "gallaya_matrix": {
+    "keymapShowTopRow": false,
+    "type": "ansi",
+    "keys": {
+      "row1": ["`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+"],
+      "row2": ["bB", "lL", "dD", "cC", "zZ", "jJ", "fF", "oO", "uU", ",<", "[{", "]}", "\\|"],
+      "row3": ["nN", "rR", "sS", "fF", "gG", "pP", "hH", "aA", "eE", "iI", "/?"],
+      "row4": ["qQ", "xX", "mM", "wW", "vV", "kK", "yY", "'\"", ";:", ".>"],
+      "row5": [" "]
+    }
+  },  
   "nila": {
     "keymapShowTopRow": false,
     "type": "ansi",

frontend/static/quotes/english.json

@@ -3757,12 +3757,6 @@
       "id": 636,
       "length": 128
     },
-    {
-      "text": "The human whose name is written in this note shall die. This note will not take effect unless the writer has the person's face in their mind when writing his/her name. Therefore, people sharing the same name will not be affected.",
-      "source": "Death Note",
-      "id": 637,
-      "length": 229
-    },
     {
       "text": "It was the most horrible, the most repellent thing she had ever seen, far more nauseating than anything she had ever imagined with her conscious mind, or that had ever tormented her in her most terrible nightmares.",
       "source": "A Wrinkle in Time",
@@ -18841,12 +18835,6 @@
       "id": 3250,
       "length": 137
     },
-    {
-      "text": "On the eve of a day that's forgotten and fake and the trees they await and clouds anticipate the start of a day when we put on our face a mask that portrays that we don't need grace. On the eve of a day that is bigger than us but we open our eyes because we're told that we must and the trees wave their arms and the clouds try to plead, desperately yelling there's something we need. I'm not free, I asked forgiveness three times, same amount that I denied; I three-time MVPed this crime. I'm afraid to tell you who I adore, won't tell you who I'm singing towards.",
-      "source": "Ode To Sleep",
-      "id": 3251,
-      "length": 565
-    },
     {
       "text": "The more things change, the more they stay the same. I'm not sure who the first person who said that was. Probably Shakespeare. Or maybe Sting. But at the moment, it's the sentence that best explains my tragic flaw: my inability to change. I don't think I'm alone in this. The more I get to know other people, the more I realize it's kind of everyone's flaw. Staying exactly the same for as long as possible, standing perfectly still... it feels safer somehow.",
       "source": "Everwood",
@@ -21709,12 +21697,6 @@
       "id": 3749,
       "length": 150
     },
-    {
-      "text": "Baby, don't you know, all o'them tears gon' come and go. Baby you just gotta make up your mind that every little thing is gonna be alright. Baby, don't you know, all o'them tears gon' come and go, baby you just gotta make up your mind. We decide it.",
-      "source": "Be Alright",
-      "id": 3750,
-      "length": 249
-    },
     {
       "text": "Who cares if you disagree? You are not me. Who made you king of anything? So you dare tell me who to be? Who died and made you king of anything?",
       "source": "King of Anything",
@@ -22514,10 +22496,10 @@
       "length": 265
     },
     {
-      "text": "All we can know, is that we know nothing. And that's the height of human wisdom.",
+      "text": "All we can know is that we know nothing. And that's the height of human wisdom.",
       "source": "War and Peace",
       "id": 3886,
-      "length": 80
+      "length": 79
     },
     {
       "text": "I am, somehow, less interested in the weight and convolutions of Einstein's brain than in the near certainty that people of equal talent have lived and died in cotton fields and sweatshops.",
@@ -24764,10 +24746,10 @@
       "length": 109
     },
     {
-      "text": "This was a triumph! I'm making a note here: huge success! It's hard to overstate my satisfaction. Aperture Science: we do what we must because we can. For the good of all of us, except the ones who are dead. But there's no sense crying over every mistake. You just keep on trying 'til you run out of cake. And the science gets done, and you make a neat gun for the people who are still alive.",
+      "text": "This was a triumph! I'm making a note here: huge success! It's hard to overstate my satisfaction. Aperture Science: we do what we must, because we can. For the good of all of us, except the ones who are dead. But there's no sense crying over every mistake. You just keep on trying 'til you run out of cake. And the science gets done, and you make a neat gun for the people who are still alive.",
       "source": "Portal",
       "id": 4276,
-      "length": 392
+      "length": 393
     },
     {
       "text": "When you're a kid, they tell you it's all, \"Grow up. Get a job. Get married. Get a house. Have a kid, and that's it.\" But the truth is the world is so much stranger than that. It's so much darker. And so much madder. And so much better.",
@@ -25406,7 +25388,7 @@
       "length": 272
     },
     {
-      "text": "The letter she left was one line long. \"Goodbye forever I'm gone\". It was sitting on a table in a room in a red brick box that we used to call our home.",
+      "text": "The letter she left was one line long. \"Goodbye forever I'm gone.\" It was sitting on a table in a room in a red brick box that we used to call our home.",
       "source": "Goodbye I'm Gone",
       "id": 4386,
       "length": 152
@@ -26228,7 +26210,7 @@
       "length": 348
     },
     {
-      "text": "We live in the flicker - may it last as long as the old earth keeps rolling!",
+      "text": "We live in the flicker - may it last as long as the old Earth keeps rolling!",
       "source": "Heart of Darkness",
       "id": 4532,
       "length": 76
@@ -33355,12 +33337,6 @@
       "length": 97,
       "id": 5840
     },
-    {
-      "text": "If you only do what you can do, you will never be more than you are now.",
-      "source": "Master Shifu",
-      "length": 72,
-      "id": 5842
-    },
     {
       "text": "Size matters not. Look at me. Judge me by my size, do you? Hmm? Hmm. And well you should not. For my ally is the Force, and a powerful ally it is. Life creates it, makes it grow. Its energy surrounds us and binds us. Luminous beings are we, not this crude matter. You must feel the Force around you; here, between you, me, the tree, the rock, everywhere, yes. Even between the land and the ship.",
       "source": "Master Yoda",
@@ -36019,9 +35995,9 @@
       "id": 6388
     },
     {
-      "text": "I'm going to this right, show you I'm not movin'! Wherever you go I won't far to follow.",
+      "text": "I'm going to this right, show you I'm not movin'! Wherever you go, I won't be far to follow.",
       "source": "Waitress, Never Ever Getting Rid of Me",
-      "length": 88,
+      "length": 92,
       "approvedBy": "Smithster",
       "id": 6389
     },
@@ -36222,9 +36198,9 @@
       "id": 6417
     },
     {
-      "text": "Dude.. where’s your suit? Just once, when I say 'suit up' I wish you’d put on a suit.",
+      "text": "Dude... where's your suit? Just once, when I say \"suit up\" I wish you'd put on a suit.",
       "source": "How I met your mother",
-      "length": 85,
+      "length": 86,
       "approvedBy": "Smithster",
       "id": 6418
     },

frontend/static/quotes/german.json

@@ -3306,6 +3306,30 @@
       "source": "Angela Merkel",
       "length": 148,
       "id": 558
+    },
+    {
+	    "text": "An sich ist nichts weder gut noch böse, das Denken macht es erst dazu.",
+	    "source": "William Shakespeare",
+	    "length": 70,
+	    "id": 559
+    },
+    {
+	    "text": "Wir können den Wind nicht ändern, aber die Segel anders setzen.",
+	    "source": "Aristoteles",
+	    "length": 63,
+	    "id": 560
+    },
+    {
+	    "text": "Es gibt keinen bequemen Weg, der von der Erde zu den Sternen führt.",
+	    "source": "Seneca",
+	    "length": 67,
+	    "id": 561
+    },
+    {
+	    "text": "Es ist besser, ein einziges kleines Licht anzuzünden, als die Dunkelheit zu verfluchen.",
+	    "source": "Konfuzius",
+	    "length": 87,
+	    "id": 562
     }
   ]
 }

frontend/static/quotes/polish.json

@@ -463,12 +463,6 @@
       "length": 105,
       "id": 76
     },
-    {
-      "text": "Będziesz jeździć, dupą po nieheblowanej desce! Ostatni raz za kierownik wsiadłeś, ostatni raz!",
-      "source": "Vabank",
-      "length": 94,
-      "id": 77
-    },
     {
       "text": "Nie będziesz dzwoniła do swoich byłych fagasów z mojej komóry, bejbe, pakuj się.",
       "source": "Chłopaki nie płaczą",