Merge branch 'master' into release

.github/workflows/release.yml

@@ -23,17 +23,27 @@ jobs:
               run: ./devtools.sh init
 
             - name: Build
-              run: pnpm run build-chrome
+              run: |
+                  pnpm run build-chrome
+                  pnpm run build-firefox
 
             - name: Compress files
               uses: vimtor/[email protected]
               with:
-                  files: dist/
-                  dest: gaming-gundai.zip
+                  files: dist/chrome
+                  dest: gaming-gundai-chrome.zip
+
+            - name: Compress files
+              uses: vimtor/[email protected]
+              with:
+                  files: dist/firefox
+                  dest: gaming-gundai-firefox.zip
 
             - name: Release
               uses: softprops/action-gh-release@v1
               if: startsWith(github.ref, 'refs/tags/')
               with:
                   token: ${{ secrets.GITHUB_TOKEN }}
-                  files: gaming-gundai.zip
+                  files: |
+                      gaming-gundai-chrome.zip
+                      gaming-gundai-firefox.zip

package.json

@@ -2,7 +2,7 @@
     "name": "gunma-univ-gaming-edition",
     "description": "The browser extension of Gunma University Gaming Edition",
     "license": "MIT",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "scripts": {
         "build": "pnpm run build-chrome",
         "build:dev": "pnpm run build-chrome:dev",
@@ -30,6 +30,7 @@
         "@types/node": "^20.8.10",
         "@types/react": "^18.2.36",
         "@types/react-dom": "^18.2.14",
+        "@types/webextension-polyfill": "^0.10.6",
         "@types/webpack": "^5.28.4",
         "@typescript-eslint/eslint-plugin": "^6.9.1",
         "@typescript-eslint/parser": "^6.9.1",
@@ -71,6 +72,7 @@
         "ts-node": "^10.9.1",
         "tsconfig-paths-webpack-plugin": "^4.1.0",
         "typescript": "^5.2.2",
+        "webextension-polyfill": "^0.10.0",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4",
         "webpack-remove-empty-scripts": "^1.0.4"

public/manifest_chrome.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "ゲーミング群馬大学 -Gaming Gunma University-",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "辺境の地にある群馬大学のウェブサイトをゲーミングでエキサイティングにします",
     "author": "[email protected]",
     "permissions": ["storage", "tabs"],
@@ -33,22 +33,27 @@
     "content_scripts": [
         {
             "matches": ["*://idp.gunma-u.ac.jp/pub/login.cgi*", "*://idp.gunma-u.ac.jp/pub/allotplogin_force.cgi*"],
+            "css": ["common.css", "sso.css"],
             "js": ["common.js", "sso.js"]
         },
         {
             "matches": ["*://mdl.media.gunma-u.ac.jp/*"],
+            "css": ["common.css", "moodle.css"],
             "js": ["common.js", "moodle.js"]
         },
         {
             "matches": ["*://*.kyomu-sys.gunma-u.ac.jp/*"],
+            "css": ["common.css", "kyomu.css"],
             "js": ["common.js", "kyomu.js"]
         },
         {
             "matches": ["*://www.media.gunma-u.ac.jp/*"],
+            "css": ["common.css", "media.css"],
             "js": ["common.js", "media.js"]
         },
         {
             "matches": ["*://opac.lib.gunma-u.ac.jp/*"],
+            "css": ["common.css", "mylib.css"],
             "js": ["common.js", "mylib.js"]
         }
     ]

public/manifest_firefox.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "ゲーミング群馬大学 -Gaming Gunma University-",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "辺境の地にある群馬大学のウェブサイトをゲーミングでエキサイティングにします",
     "author": "[email protected]",
     "permissions": ["storage", "tabs"],
@@ -27,29 +27,39 @@
         "open_in_tab": true
     },
     "background": {
-        "service_worker": "background.js",
-        "type": "module"
+        "scripts": ["background.js"]
     },
     "content_scripts": [
         {
             "matches": ["*://idp.gunma-u.ac.jp/pub/login.cgi*", "*://idp.gunma-u.ac.jp/pub/allotplogin_force.cgi*"],
+            "css": ["common.css", "sso.css"],
             "js": ["common.js", "sso.js"]
         },
         {
             "matches": ["*://mdl.media.gunma-u.ac.jp/*"],
+            "css": ["common.css", "moodle.css"],
             "js": ["common.js", "moodle.js"]
         },
         {
             "matches": ["*://*.kyomu-sys.gunma-u.ac.jp/*"],
+            "css": ["common.css", "kyomu.css"],
             "js": ["common.js", "kyomu.js"]
         },
         {
             "matches": ["*://www.media.gunma-u.ac.jp/*"],
+            "css": ["common.css", "media.css"],
             "js": ["common.js", "media.js"]
         },
         {
             "matches": ["*://opac.lib.gunma-u.ac.jp/*"],
+            "css": ["common.css", "mylib.css"],
             "js": ["common.js", "mylib.js"]
         }
-    ]
+    ],
+    "browser_specific_settings": {
+        "gecko": {
+            "id": "[email protected]",
+            "strict_min_version": "42.0"
+        }
+    }
 }

src/class/Moodle/common.ts

@@ -1,3 +1,5 @@
+import Browser from "webextension-polyfill";
+
 import changeQueryInnerHTML from "../../utils/changeQueryInnerHTML";
 
 export const injectLink = () => {
@@ -10,7 +12,7 @@ export const injectLink = () => {
 
 export const replaceLMSLogo = () => {
     document.querySelectorAll(".logo").forEach((e) => {
-        if (e.getAttribute("src")) e.setAttribute("src", chrome.runtime.getURL("assets/GULMS.png"));
+        if (e.getAttribute("src")) e.setAttribute("src", Browser.runtime.getURL("assets/GULMS.png"));
     });
 };
 

src/class/Moodle/enableRainbow.ts

@@ -1,3 +1,5 @@
+import Browser from "webextension-polyfill";
+
 import changeQueryInnerHTML from "../../utils/changeQueryInnerHTML";
 import { RainbowApplicator } from "../ClassApplicator";
 import { GundaiWebSite } from "../UnivWebsite";
@@ -26,7 +28,7 @@ const textAndBg = (rainbow: RainbowApplicator) => {
 };
 const replaceIconToGamimg = () => {
     document.querySelectorAll("img.userpicture").forEach((e) => {
-        if (e.getAttribute("src")) e.setAttribute("src", chrome.runtime.getURL("assets/partyparrot.gif"));
+        if (e.getAttribute("src")) e.setAttribute("src", Browser.runtime.getURL("assets/partyparrot.gif"));
     });
 };
 const replaceTextToGaimg = (moodle: GundaiWebSite<MoodleAdditionalInfo>) => {

src/class/StorageTool/index.ts

@@ -1,19 +1,31 @@
 // 最近が物忘れが激しい。どうしてだろうか。
 // 人間は嫌なことやつらいこと、思い出さないようなことはすぐに忘れるようにできているらしい。
-// となると、最近はつらいことが多いのかもしれない。例えばchrome.storage.sync.get()の返り値がany型であることとか。
+// なんか非同期処理が動かないとき闇雲にasync awaitをつけるのがつらい。
+
+import Browser from "webextension-polyfill";
+
+import { WebsiteIds } from "@/data/websites";
 
 import IsTrue from "../../utils/isTrue";
 
-export type StorageKeys = "dark" | "rainbow" | "enabled-hidden" | "show-hidden-option" | "installed" | "auto-2fa";
+export type StorageKeys =
+    | "dark"
+    | "rainbow"
+    | "enabled-hidden"
+    | "show-hidden-option"
+    | "installed"
+    | "auto-2fa"
+    | "quick-switch";
+export type StorageIds = WebsiteIds | "other";
 
 export default class StorageTool {
-    id: string;
-    constructor(id: string) {
+    id: StorageIds;
+    constructor(id: StorageIds) {
         this.id = id;
     }
 
     static getChromeStorage() {
-        return chrome.storage ? chrome.storage.sync : null;
+        return Browser.storage ? Browser.storage.sync : null;
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/class/UnivWebsite/index.ts

@@ -2,6 +2,8 @@
 // しかし今の日本では大学は高校の延長線上であり、学士を得るための場所と化している。
 // こういった人々の認識が変わって欲しいと日々願っている。
 
+import { WebsiteIds } from "@/data/websites";
+
 import isTrue from "../../utils/isTrue";
 import { DarkApplicator, HiddenApplicator, RainbowApplicator } from "../ClassApplicator";
 import StorageTool from "../StorageTool";
@@ -11,7 +13,7 @@ import StorageTool from "../StorageTool";
 // 型変数とoptionsプロパティによって任意の情報を追加できる
 export class UnivWebsite<T> {
     // 基本情報
-    id: string;
+    id: WebsiteIds;
 
     storage: StorageTool;
 
@@ -28,7 +30,7 @@ export class UnivWebsite<T> {
     }
 
     // コンストラクタ
-    constructor(id: string) {
+    constructor(id: WebsiteIds) {
         this.id = id;
         this.options = {} as T;
         this.#funcs = [];

src/class/index.ts

@@ -1,24 +1,9 @@
 // 中間管理職は上司と部下の間に立つ存在であり、糊である
 
-import { Kyomu } from "./Kyomu";
-import { Media } from "./Media";
-import { Moodle } from "./Moodle";
-import { MyLibrary } from "./MyLibrary";
-import { SSO } from "./SSO";
-import { UnivWebsite } from "./UnivWebsite";
-
 export { Kyomu } from "./Kyomu";
 export { Media } from "./Media";
 export { Moodle } from "./Moodle";
 export { MyLibrary } from "./MyLibrary";
 export { SSO } from "./SSO";
+export { default as StorageTool } from "./StorageTool";
 export { GundaiWebSite, UnivWebsite } from "./UnivWebsite";
-
-export const WebSiteClasses = (function () {
-    const sites: { [id: string]: UnivWebsite<unknown> } = {};
-
-    [Kyomu, Media, Moodle, MyLibrary, SSO].forEach((site) => {
-        sites[site.id] = site;
-    });
-    return sites;
-})();

src/components/SwitchItem.tsx

@@ -17,5 +17,5 @@ export function SwitchItem({
     color?: ComponentColor;
     readonly?: boolean;
 }) {
-    return <ToggleWithStorage section={config.id} dataKey={category} color={color} readonly={readonly} />;
+    return <ToggleWithStorage dataId={config.class.id} dataKey={category} color={color} readonly={readonly} />;
 }

src/components/ToggleWithStorage.tsx

@@ -4,23 +4,23 @@ import { useCallback, useEffect, useState } from "react";
 import { Toggle } from "react-daisyui";
 import { ComponentColor } from "react-daisyui/dist/types";
 
-import { WebSiteClasses } from "@/class";
-import { StorageKeys } from "@/class/StorageTool";
+import StorageTool, { StorageIds, StorageKeys } from "@/class/StorageTool";
 import IsTrue from "@/utils/isTrue";
 import { sendMsgToAllTab } from "@/utils/sendMsgToAllTab";
 
 interface ToggleProps {
-    section: string;
+    dataId: StorageIds;
     dataKey: StorageKeys;
     color?: ComponentColor;
     readonly?: boolean;
 }
 
-export function ToggleWithStorage({ section, color, dataKey, readonly }: ToggleProps) {
+export function ToggleWithStorage({ dataId, color, dataKey, readonly }: ToggleProps) {
     const [enabled, setEnabled] = useState(false);
+    const storage = new StorageTool(dataId);
 
     useEffect(() => {
-        WebSiteClasses[section].storage.get(dataKey).then((value) => {
+        storage.get(dataKey).then((value) => {
             const istrue = IsTrue(value);
             if (istrue !== undefined) setEnabled(istrue);
         });
@@ -30,7 +30,7 @@ export function ToggleWithStorage({ section, color, dataKey, readonly }: ToggleP
         if (readonly) return;
         return (e: React.ChangeEvent<HTMLInputElement>) => {
             setEnabled(e.target.checked);
-            WebSiteClasses[section].storage.set(dataKey, e.target.checked.toString());
+            storage.set(dataKey, e.target.checked.toString());
             sendMsgToAllTab<string>("reload");
         };
     }, []);