Font Awesome 7

extra/update-font-awesome-metadata.ts

@@ -54,11 +54,11 @@ switch (outputFormat) {
     ${JSON.stringify(values)}
   );
 
-  window.getFontAwesome6Metadata = () => {
+  window.getFontAwesome7Metadata = () => {
     return new Map(metadata);
   };
 
-  window.getFontAwesome6IconMetadata = (name) => {
+  window.getFontAwesome7IconMetadata = (name) => {
     return metadata.get(aliases.get(name) || name);
   };
 })();\n`;

ts/WoltLabSuite/Core/Ui/Style/FontAwesome.ts

@@ -48,7 +48,7 @@ class UiStyleFontAwesome implements DialogCallbackObject {
           this.iconList = document.getElementById("fontAwesomeIcons") as HTMLElement;
 
           const icons: string[] = [];
-          window.getFontAwesome6Metadata().forEach(([, hasRegular], name) => {
+          window.getFontAwesome7Metadata().forEach(([, hasRegular], name) => {
             if (hasRegular) {
               icons.push(`<li><fa-icon size="48" name="${name}" solid></fa-icon><small>${name}</small></li>`);
             }

ts/WoltLabSuite/WebComponent/fa-icon.ts

@@ -1,16 +1,16 @@
 (() => {
-  let isFA6Free: boolean;
-  function isFontAwesome6Free(): boolean {
-    if (isFA6Free === undefined) {
-      isFA6Free = true;
+  let isFA7Free: boolean;
+  function isFontAwesome7Free(): boolean {
+    if (isFA7Free === undefined) {
+      isFA7Free = true;
 
       const iconFont = window.getComputedStyle(document.documentElement).getPropertyValue("--fa-font-family");
-      if (iconFont === "Font Awesome 6 Pro") {
-        isFA6Free = false;
+      if (iconFont === "Font Awesome 7 Pro") {
+        isFA7Free = false;
       }
     }
 
-    return isFA6Free;
+    return isFA7Free;
   }
 
   type IconSize = number;
@@ -83,14 +83,14 @@
     }
 
     private isValidIconName(name: string | null): boolean {
-      return name !== null && window.getFontAwesome6IconMetadata(name) !== undefined;
+      return name !== null && window.getFontAwesome7IconMetadata(name) !== undefined;
     }
 
     private hasNonSolidStyle(name: string): boolean {
-      if (isFontAwesome6Free()) {
-        const [, hasRegularVariant] = window.getFontAwesome6IconMetadata(name)!;
+      if (isFontAwesome7Free()) {
+        const [, hasRegularVariant] = window.getFontAwesome7IconMetadata(name)!;
         if (!hasRegularVariant) {
-          // Font Awesome 6 Free only includes solid icons with the
+          // Font Awesome 7 Free only includes solid icons with the
           // the exception to some special icons that use the weight
           // to differentiate two related icons. One such example is
           // the `bell` icon that comes in `solid` and `regular` flavor.
@@ -116,7 +116,7 @@
       if (this.name === "spinner") {
         root.append(this.createSpinner());
       } else {
-        const [codepoint] = window.getFontAwesome6IconMetadata(this.name)!;
+        const [codepoint] = window.getFontAwesome7IconMetadata(this.name)!;
         root.append(codepoint);
       }
     }

ts/WoltLabSuite/WebComponent/global.d.ts

@@ -28,7 +28,7 @@ declare global {
     };
     TIME_NOW: number;
 
-    getFontAwesome6IconMetadata: (name: string) => IconMetadata | undefined;
+    getFontAwesome7IconMetadata: (name: string) => IconMetadata | undefined;
 
     HTMLParsedElement: HTMLParsedElement;
     WoltLabLanguage: typeof Language;

ts/global.d.ts

@@ -40,8 +40,8 @@ declare global {
     WSC_API_URL: string;
     WSC_RPC_API_URL: string;
 
-    getFontAwesome6Metadata: () => Map<string, IconMetadata>;
-    getFontAwesome6IconMetadata: (name: string) => IconMetadata | undefined;
+    getFontAwesome7Metadata: () => Map<string, IconMetadata>;
+    getFontAwesome7IconMetadata: (name: string) => IconMetadata | undefined;
 
     jQuery: JQueryStatic;
     WCF: any;