Support caption format variable for image alt tags

qsniyg · Jan 30, 2025 · f495cf1 · f495cf1
1 parent 9e36ccb
commit f495cf1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -8,12 +8,13 @@ New features:
 Improvements:
 
  * Various improvements/fixes to existing rules (including Flickr, Twitch, Reddit)
+ * Fill `caption` format variable for image alt tags (thanks to Dietz on discord for reporting)
 
 Bugfixes:
 
  * Fix backslash escapes breaking parsing for format strings
 
-Special thanks to arlenestrigger, fyhtma, BlindWanda, chr1sx, James Joint, musicianjam888, Velocidensity, Egor Popov, Froktime, siloricity, Gooberpatrol66 for their contributions and reports for this release
+Special thanks to arlenestrigger, fyhtma, BlindWanda, chr1sx, James Joint, musicianjam888, Velocidensity, Egor Popov, Froktime, siloricity, Gooberpatrol66, Dietz for their contributions and reports for this release
 
 ---
 

diff --git a/src/userscript.ts b/src/userscript.ts
@@ -130126,7 +130126,7 @@ var $$IMU_EXPORT$$;
 			return null;
 		};
 
-		var fill_obj_filename = function(newobj, url, respdata) {
+		var fill_obj_filename = function(newobj, url, respdata, popup_el) {
 			if (typeof newobj.filename !== "string")
 				newobj.filename = "";
 
@@ -130237,7 +130237,7 @@ var $$IMU_EXPORT$$;
 			// to avoid formatting the filename multiple times
 			if (!("_orig_filename" in newobj)) newobj._orig_filename = orig_filename;
 
-			var format_vars = {
+			var format_vars:any = {
 				filename: newobj._orig_filename
 			};
 
@@ -130347,6 +130347,11 @@ var $$IMU_EXPORT$$;
 					format_vars.ext = "." + wanted_ext;
 			}
 
+			// thanks to Dietz on discord for reporting:
+			if (!format_vars.caption && popup_el) {
+				format_vars.caption = get_caption(newobj, popup_el);
+			}
+
 			newobj.format_vars = shallowcopy(format_vars);
 
 			var new_filename = get_filename_from_format(settings.filename_format, format_vars);
@@ -130419,7 +130424,7 @@ var $$IMU_EXPORT$$;
 				if (resp.finalUrl)
 					theobj.url = resp.finalUrl;
 
-				fill_obj_filename(theobj, theobj.url, resp);
+				fill_obj_filename(theobj, theobj.url, resp, popup_el);
 				popup_obj = theobj;
 
 				if (openb === "newtab" || openb === "newtab_bg") {
@@ -132100,7 +132105,7 @@ var $$IMU_EXPORT$$;
 
 				popup_createui_func = create_ui;
 
-				fill_obj_filename(newobj, url, data.data.respdata);
+				fill_obj_filename(newobj, url, data.data.respdata, popup_el);
 
 				create_ui();
 

diff --git a/userscript.user.js b/userscript.user.js
@@ -116089,7 +116089,7 @@ var $$IMU_EXPORT$$;
 			}
 			return null;
 		};
-		var fill_obj_filename = function(newobj, url, respdata) {
+		var fill_obj_filename = function(newobj, url, respdata, popup_el) {
 			if (typeof newobj.filename !== "string")
 				newobj.filename = "";
 			var modified_date = null;
@@ -116273,6 +116273,10 @@ var $$IMU_EXPORT$$;
 				if (wanted_ext)
 					format_vars.ext = "." + wanted_ext;
 			}
+			// thanks to Dietz on discord for reporting:
+			if (!format_vars.caption && popup_el) {
+				format_vars.caption = get_caption(newobj, popup_el);
+			}
 			newobj.format_vars = shallowcopy(format_vars);
 			var new_filename = get_filename_from_format(settings.filename_format, format_vars);
 			if (new_filename) {
@@ -116328,7 +116332,7 @@ var $$IMU_EXPORT$$;
 				var resp = data.data.resp || data.data.respdata;
 				if (resp.finalUrl)
 					theobj.url = resp.finalUrl;
-				fill_obj_filename(theobj, theobj.url, resp);
+				fill_obj_filename(theobj, theobj.url, resp, popup_el);
 				popup_obj = theobj;
 				if (openb === "newtab" || openb === "newtab_bg") {
 					open_in_tab_imu(theobj, openb === "newtab_bg");
@@ -117705,7 +117709,7 @@ var $$IMU_EXPORT$$;
 					add_leftright_gallery_button_if_valid(true);
 				}
 				popup_createui_func = create_ui;
-				fill_obj_filename(newobj, url, data.data.respdata);
+				fill_obj_filename(newobj, url, data.data.respdata, popup_el);
 				create_ui();
 				var a = document_createElement("a");
 				set_el_all_initial(a);