couple more bug fixes

sky-is-winning · Aug 5, 2024 · cc9d39f · cc9d39f
1 parent d80af71
commit cc9d39f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/generate-page-data.js b/src/generate-page-data.js
@@ -57,6 +57,7 @@ export default class GeneratePageData {
 
         let truePageName = page.slice(1)
         let pageName = truePageName.replaceAll("_", " ");
+        this.templateGenerator.setPageName(pageName);
         for (const replacer of REPLACERS) {
             pageName = pageName.replaceAll(replacer[1], replacer[0]);
         }
@@ -232,15 +233,15 @@ function hideNav() {
             line = line.trim();
             if (inTable) {
                 tableLines += `\n${line}`;
-                if (line == "|}") {
+                if (line.endsWith("|}")) {
                     inTable = false;
                     let wikitable = await this.templateGenerator.generateWikitable(tableLines);
                     content += wikitable;
                     tableLines = "";
                 }
             } else if (inTemplate) {
                 templateLines += `\n${line}`;
-                if (line == "}}") {
+                if (line.endsWith("}}")) {
                     inTemplate = false;
                     let template = await this.templateGenerator.generateTemplate(templateLines);
                     content += template;

diff --git a/src/generate-template.js b/src/generate-template.js
@@ -7,7 +7,15 @@ export default class GenerateTemplate {
         this.webserver = wikiParser.webserver;
     }
 
-    generateAmbox(wt) {
+    setPageName(pageName) {
+        this.pageName = pageName;
+    }
+
+    getPageName() {
+        return this.pageName;
+    }
+
+    async generateAmbox(wt) {
         let boxContent = this.extractTemplate(wt, "Ambox")[0];
 
         // Use a regex to split the content into key-value pairs
@@ -26,7 +34,7 @@ export default class GenerateTemplate {
         let ambox = `<table class="metadata plainlinks ambox ambox-${boxData.type}" style="">`;
         ambox += `<tbody><tr>`;
         ambox += `<td class="mbox-image><div style="width:${boxData.image.size}"><span typeof="mw:File"><span><img src="${boxData.image.address}" width="${boxData.image.size}" height="auto" class="mw-file-element"/></span></span></span></div></td>`;
-        ambox += `<td class="mbox-text" style="">${boxData.text}</td>`;
+        ambox += `<td class="mbox-text" style="">${await this.parseLine(boxData.text)}</td>`;
         ambox += `</tr></tbody></table>`;
         return ambox;
     }
@@ -336,6 +344,10 @@ export default class GenerateTemplate {
     async generateTemplate(template, bypassNoInclude = false) {
         template = template.replaceAll("n/a", "NA");
 
+        if (template === "BASEPAGENAME") {
+            return this.getPageName();
+        }
+
         let templateName = template.split("|")[0];
         const templateData = template.split("|").slice(1);