Merge branch 'main' of https://github.com/rgantzos/ScratchTools

Author: rgantzos

.github/workflows/extract-classnames.yml

@@ -8,6 +8,7 @@ on:
 
 permissions:
   contents: write
+  pull-requests: write
 
 jobs:
   extract:
@@ -25,10 +26,23 @@ jobs:
       - name: Run extraction script
         run: node .github/scripts/extract-classnames.js
 
-      - name: Commit and push updated class-names.json
+      - name: Check for changes
+        id: git-diff
         run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add class-names.json
-          git commit -m "Update class-names.json" || echo "No changes"
-          git push
+          if git diff --quiet --exit-code class-names.json; then
+            echo "changed=false" >> $GITHUB_OUTPUT
+          else
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create or Update Pull Request
+        if: steps.git-diff.outputs.changed == 'true'
+        uses: peter-evans/create-pull-request@v6
+        with:
+          commit-message: "Update class-names.json"
+          branch: update-class-names
+          title: "Update class names"
+          body: "Automated update of class-names.json"
+          labels: automated
+          assignees: rgantzos
+          delete-branch: true

api/main.js

@@ -426,7 +426,7 @@ ScratchTools.waitForElements(
           scratchClass("menu_hoverable_");
 
         var div = document.createElement("div");
-        div.className = "settings-menu_option_3rMur";
+        div.className = "settings-menu_option_GGukG";
 
         var icon = document.createElement("img");
         icon.src = ScratchTools.icons.main;

class-names.json

@@ -1 +1,44 @@
-[]
+[
+  {
+    "className": "ste-search-user",
+    "features": [
+      "advanced-search"
+    ]
+  },
+  {
+    "className": "ste-search-user-pfp",
+    "features": [
+      "advanced-search"
+    ]
+  },
+  {
+    "className": "ste-search-user-data",
+    "features": [
+      "advanced-search"
+    ]
+  },
+  {
+    "className": "ste-search-user-username",
+    "features": [
+      "advanced-search"
+    ]
+  },
+  {
+    "className": "ste-search-user-bio",
+    "features": [
+      "advanced-search"
+    ]
+  },
+  {
+    "className": "ste-search-user-btn",
+    "features": [
+      "advanced-search"
+    ]
+  },
+  {
+    "className": "ste-search-border-top",
+    "features": [
+      "advanced-search"
+    ]
+  }
+]

extras/feature-locales/en.json

@@ -1,11 +1,12 @@
 export default async function ({ feature, console }) {
   const availableWidth = 405;
+  const blankChar = "\u2800";
 
   function getSpaceWidth() {
     const span = document.createElement("span");
     span.style.visibility = "hidden";
     span.style.whiteSpace = "pre";
-    span.textContent = " ";
+    span.textContent = blankChar;
     document.body.appendChild(span);
     const spaceWidth = span.getBoundingClientRect().width;
     document.body.removeChild(span);
@@ -26,7 +27,7 @@ export default async function ({ feature, console }) {
   function clearCenterAlignment(textarea) {
     const lines = textarea.value.split("\n");
     const uncenteredLines = lines.map((line) => {
-      return line.replace(/^\s+/, "");
+      return line.replace(/^[\s\u2800]+/, "");
     });
     textarea.value = uncenteredLines.join("\n");
   }
@@ -49,7 +50,7 @@ export default async function ({ feature, console }) {
           const textWidth = getTextWidth(line);
           const totalSpaces = (availableWidth - textWidth) / spaceWidth / 2;
           const spaces =
-            totalSpaces > 0 ? " ".repeat(Math.floor(totalSpaces)) : "";
+            totalSpaces > 0 ? blankChar.repeat(Math.floor(totalSpaces)) : "";
           return spaces + line;
         });
         activeElement.value = centeredLines.join("\n");

features/align-to-center/script.js

@@ -1,4 +1,19 @@
 [
+  {
+    "version": 2,
+    "id": "picture-in-picture",
+    "versionAdded": "v5.0.0"
+  },
+  {
+    "version": 2,
+    "id": "mutual-following",
+    "versionAdded": "v5.0.0"
+  },
+  {
+    "version": 2,
+    "id": "studio-invite-comments",
+    "versionAdded": "v4.2.0"
+  },
   {
     "version": 2,
     "id": "copy-paste-lists",
@@ -578,7 +593,7 @@
   },
   {
     "title": "Frontpage Curator Name as Link",
-    "description": "Makes the name of the Frontpage Curator to a clickable link to his profile.",
+    "description": "Turns the Front Page Curator's name into a clickable link to their profile.",
     "credits": ["Dr_Lego"],
     "urls": ["https://scratch.mit.edu/users/Dr_Lego/"],
     "file": "frontpage-curator",

features/features.json

@@ -2,6 +2,7 @@
   "title": "Follow on Project Page",
   "description": "Follow users directly from the project page instead of going to their profile.",
   "credits": [
+    { "username": "MaterArc", "url": "https://scratch.mit.edu/users/MaterArc/" },
     { "username": "green_thing_game2", "url": "https://scratch.mit.edu/users/green_thing_game2/" },
     { "username": "rgantzos", "url": "https://scratch.mit.edu/users/rgantzos/" }
   ],

features/follow-on-projects/data.json

@@ -30,11 +30,11 @@ export default async function ({ feature, console }) {
           (following ? "Unfollow" : "Follow") + " " + username;
         let data = await (
           await fetch(
-            "https://scratch.mit.edu/site-api/users/followers/rgantzosTEST/remove/?usernames=" +
+            "https://scratch.mit.edu/site-api/users/followers/" + username + "/remove/?usernames=" +
               auth.user.username,
             {
               headers: {
-                "x-csrftoken": "VZ0lgYGuLZzG5nD4nNirmbbze7CulCmP",
+                "x-csrftoken": document.cookie.match(/scratchcsrftoken=([^;]+)/)?.[1],
                 "x-requested-with": "XMLHttpRequest",
               },
               referrer: "https://scratch.mit.edu/users/" + username + "/",
@@ -53,15 +53,14 @@ export default async function ({ feature, console }) {
           (following ? "Unfollow" : "Follow") + " " + username;
         let data = await (
           await fetch(
-            "https://scratch.mit.edu/site-api/users/followers/rgantzosTEST/add/?usernames=" +
+            "https://scratch.mit.edu/site-api/users/followers/" + username + "/add/?usernames=" +
               auth.user.username,
             {
               headers: {
-                "x-csrftoken": "VZ0lgYGuLZzG5nD4nNirmbbze7CulCmP",
+                "x-csrftoken": document.cookie.match(/scratchcsrftoken=([^;]+)/)?.[1],
                 "x-requested-with": "XMLHttpRequest",
               },
               referrer: "https://scratch.mit.edu/users/" + username + "/",
-              body: '{"id":"' + username + '"}',
               method: "PUT",
               mode: "cors",
               credentials: "include",

features/follow-on-projects/script.js

@@ -1,7 +1,8 @@
 {
   "title": "Projects from Country",
-  "description": "On the explore page, makes projects from other countries less visible. This is to only show projects in languages that you understand.",
+  "description": "On the explore page, makes projects from countries that speak other languages less visible.",
   "credits": [
+    { "username": "MaterArc", "url": "https://scratch.mit.edu/users/MaterArc/" },
     { "username": "KitsunLilly", "url": "https://scratch.mit.edu/users/KitsunLilly/" },
     { "username": "rgantzos", "url": "https://scratch.mit.edu/users/rgantzos/" }
   ],

features/localized-explore/data.json

@@ -9,9 +9,27 @@ export default async function ({ feature, console }) {
     ).json()
   ).profile.country;
 
-  ScratchTools.waitForElements("div.thumbnail.project", detectCountry);
+  async function getLanguage(country) {
+    try {
+      const res = await fetch(
+        `https://data.scratchtools.app/language/${encodeURIComponent(country)}?fullText=true`
+      );
+      if (!res.ok) return null;
+      const data = await res.json();
+      if (data && data[0] && data[0].languages) {
+        return Object.values(data[0].languages)[0];
+      }
+      return null;
+    } catch {
+      return null;
+    }
+  }
 
-  async function detectCountry(element) {
+  const myLanguage = await getLanguage(myCountry);
+
+  ScratchTools.waitForElements("div.thumbnail.project", detectLanguage);
+
+  async function detectLanguage(element) {
     let author = element.querySelector(".thumbnail-creator a");
 
     let data = await (
@@ -23,7 +41,9 @@ export default async function ({ feature, console }) {
       )
     ).json();
 
-    if (data.profile.country !== myCountry) {
+    const authorLanguage = await getLanguage(data.profile.country);
+
+    if (authorLanguage !== myLanguage) {
       element.classList.add("ste-outside-country");
       if (feature.settings.get("hide-completely")) {
         element.classList.add("ste-country-hide");
@@ -35,7 +55,6 @@ export default async function ({ feature, console }) {
 
   feature.settings.addEventListener("changed", function ({ key, value }) {
     if (key === "hide-completely") {
-      console.log(value);
       if (value) {
         document
           .querySelectorAll(".ste-outside-country")
@@ -51,6 +70,6 @@ export default async function ({ feature, console }) {
   });
 
   feature.addEventListener("enabled", function() {
-    ScratchTools.waitForElements("div.thumbnail.project", detectCountry);
+    ScratchTools.waitForElements("div.thumbnail.project", detectLanguage);
   })
 }