app/js/tl/parse.js

@@ -620,7 +620,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type, onlyContent) {
                             if (media.pleroma && media.pleroma.mime_type.indexOf('video') !== -1) {
                                 viewer =
                                     viewer +
-                                    `<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}-image-${key2}" 
+                                    `<a onclick="imgv('${id}','${key2}','${acct_id}')" id="${id}'-image-${key2}" 
 								data-url="${url}" data-type="video" class="img-parsed">
 									<video src="${purl}" class="${sense} toot-img pointer" style="max-width:100%;" loop="true" alt="attached media">
 							</a></span>`

app/js/ui/img.js

@@ -47,9 +47,6 @@ function imgCont(type) {
 	}
 	var murl = $('#' + id + '-image-' + key).attr('data-url')
 	var ourl = $('#' + id + '-image-' + key).attr('data-original')
-	if (!ourl || ourl == 'null') {
-		ourl = murl
-	}
 	var type = $('#' + id + '-image-' + key).attr('data-type')
 	$('#imagemodal').attr('data-id', id)
 	$('#imagemodal').attr('data-acct', acct_id)
@@ -57,7 +54,7 @@ function imgCont(type) {
 	$('#imagemodal').attr('data-image', murl)
 	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
 	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes') {
+	if (remote_img == 'yes' && ourl != 'null') {
 		murl = ourl
 	}
 	if (murl) {