From 0b3e88932c2ae2340702eb62372e7993e8c0205d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 26 Mar 2024 14:55:27 +0100
Subject: [PATCH] bump version

---
 customize.dist/pages.js       | 6 ++++--
 package.json                  | 2 +-
 www/common/common-util.js     | 7 +++++++
 www/common/cryptpad-common.js | 3 +--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 4ae8ac0ef..51ebb4d08 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -5,12 +5,13 @@
 define([
     '/common/hyperscript.js',
     '/common/common-language.js',
+    '/common/common-util.js',
     '/customize/application_config.js',
     '/customize/messages.js',
     'jquery',
     '/api/config',
     'optional!/api/instance',
-], function (h, Language, AppConfig, Msg, $, ApiConfig, Instance) {
+], function (h, Language, Util, AppConfig, Msg, $, ApiConfig, Instance) {
     var Pages = {};
 
     Pages.setHTML = function (e, html) {
@@ -98,7 +99,8 @@ define([
         return h('a', attrs, [icon, text]);
     };
 
-    Pages.versionString = "5.7.0";
+    let urlArgs = ApiConfig.requireConf && ApiConfig.requireConf.urlArgs;
+    Pages.versionString = Util.getVersionFromUrlArgs(urlArgs);
 
     var customURLs = Pages.customURLs = {};
     (function () {
diff --git a/package.json b/package.json
index b6d10c67c..958780fef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowledge server",
-  "version": "5.7.0",
+  "version": "2024.3.0",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",
diff --git a/www/common/common-util.js b/www/common/common-util.js
index 675733c04..fd96f12c4 100644
--- a/www/common/common-util.js
+++ b/www/common/common-util.js
@@ -752,6 +752,13 @@
         return [...Array(length).keys()];
     };
 
+    Util.getVersionFromUrlArgs = urlArgs => {
+        let arr = /ver=([0-9.]+)(-[0-9]*)?/.exec(urlArgs);
+        let ver = Array.isArray(arr) && arr[1];
+        return ver || undefined;
+    };
+
+
     if (typeof(module) !== 'undefined' && module.exports) {
         module.exports = Util;
     } else if ((typeof(define) !== 'undefined' && define !== null) && (define.amd !== null)) {
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 39e75b9a3..ed69a18db 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -2228,8 +2228,7 @@ define([
         // Check for CryptPad updates
         var urlArgs = newUrlArgs || (Config.requireConf ? Config.requireConf.urlArgs : null);
         if (!urlArgs) { return; }
-        var arr = /ver=([0-9.]+)(-[0-9]*)?/.exec(urlArgs);
-        var ver = arr[1];
+        let ver = Util.getVersionFromUrlArgs(urlArgs);
         if (!ver) { return; }
         var verArr = ver.split('.');
         //verArr[2] = 0;