From 8e516d9d59165a6e7dd9bafca83202cf1864e273 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Thu, 14 Jul 2022 02:43:29 +0600
Subject: [PATCH] beginning of 2.2 (fix)

- added download popup to solve the issue with downloads on ios
- merged big and small popups into one
- made buttons in donation menu act like buttons
- began to clean up localisation
- added ability to embed repo url into localisation strings
- moved ffmpeg args to config for more flexibility (and hopefully future changes)
- removed error response in stream that could result in a crash
- removed notice for ios users from about cause it's no longer relevant
- made error popup look and act like the rest
- a tiny bit of clean up
- changelog is now made out of latest commit
---
 modules/page-renderer.js      | 6 ++++--
 modules/sub/current-commit.js | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/page-renderer.js b/modules/page-renderer.js
index 6e852f61..567701e1 100644
--- a/modules/page-renderer.js
+++ b/modules/page-renderer.js
@@ -1,4 +1,5 @@
 import { services, appName, authorInfo, version, quality, repo, donations } from "./config.js";
+import { getCommitInfo } from "./sub/current-commit.js";
 import loc from "./sub/loc.js";
 
 let s = services
@@ -19,6 +20,7 @@ for (let i in donations) {
     donate += `<div class="subtitle">${i} (${loc("en", 'desc', 'clickToCopy').trim()})</div><div id="don-${i}" class="text-to-copy" onClick="copy('don-${i}')">${donations[i]}</div>`
 }
 
+let com = getCommitInfo();
 export default function(obj) {
     let isIOS = obj.useragent.toLowerCase().match("iphone os")
     try {
@@ -85,10 +87,10 @@ export default function(obj) {
             <div id="popup-header" class="popup-header">
                 <button id="close" class="button mono" onclick="popup('changelog', 0)" aria-label="${loc(obj.lang, 'accessibility', 'close')}">x</button>
                 <div id="title" class="popup-title">${loc(obj.lang, 'title', 'changelog')}</div>
-                <div id="desc" class="popup-subtitle">${loc(obj.lang, 'changelog', 'subtitle')}(${obj.hash})</div>
+                <div id="desc" class="popup-subtitle">${com[0]} (${obj.hash})</div>
             </div>
             <div id="content" class="popup-content">
-                <div id="desc" class="popup-desc about-padding">${loc(obj.lang, 'changelog', 'text')}</div>
+                <div id="desc" class="popup-desc about-padding">${com[1]}</div>
                 <div id="desc" class="popup-desc"><a class="text-backdrop" href="${repo}/commits">${loc(obj.lang, 'changelog', 'github')}</a></div>
             </div>
         </div>
diff --git a/modules/sub/current-commit.js b/modules/sub/current-commit.js
index 869ff785..140fb209 100644
--- a/modules/sub/current-commit.js
+++ b/modules/sub/current-commit.js
@@ -4,5 +4,7 @@ export function shortCommit() {
     return execSync('git rev-parse --short HEAD').toString().trim()
 }
 export function getCommitInfo() {
-    return execSync(`git show -s --format='%s;;;%B'`).toString().trim().slice(1,-1).replace(/[\r\n]/gm, '\n').split(';;;')
+    let d = execSync(`git show -s --format='%s;;;%B'`).toString().trim().slice(1,-1).replace(/[\r\n]/gm, '\n').split(';;;')
+    d[1] = d[1].replace(d[0], '').trim().toString().replace(/[\r\n]/gm, '<br>')
+    return d
 }
\ No newline at end of file