diff --git a/lib/plugins/tag/asset_img.ts b/lib/plugins/tag/asset_img.ts
index 8a9941b74a..cc68a3c4a3 100644
--- a/lib/plugins/tag/asset_img.ts
+++ b/lib/plugins/tag/asset_img.ts
@@ -18,6 +18,7 @@ export = (ctx: Hexo) => {
for (let i = 0; i < len; i++) {
const asset = PostAsset.findOne({post: this._id, slug: args[i]});
if (asset) {
+ // img tag will call url_for so no need to call it here
args[i] = encodeURL(new URL(asset.path, ctx.config.url).pathname);
return img(ctx)(args);
}
diff --git a/lib/plugins/tag/asset_link.ts b/lib/plugins/tag/asset_link.ts
index f132730db2..ae4014744c 100644
--- a/lib/plugins/tag/asset_link.ts
+++ b/lib/plugins/tag/asset_link.ts
@@ -1,4 +1,4 @@
-import { encodeURL, escapeHTML } from 'hexo-util';
+import { url_for, escapeHTML } from 'hexo-util';
import type Hexo from '../../hexo';
/**
@@ -28,7 +28,7 @@ export = (ctx: Hexo) => {
const attrTitle = escapeHTML(title);
if (escape === 'true') title = attrTitle;
- const link = encodeURL(new URL(asset.path, ctx.config.url).pathname);
+ const link = url_for.call(ctx, asset.path);
return `${title}`;
};
diff --git a/lib/plugins/tag/asset_path.ts b/lib/plugins/tag/asset_path.ts
index 60e4c31746..e8c7dbad5d 100644
--- a/lib/plugins/tag/asset_path.ts
+++ b/lib/plugins/tag/asset_path.ts
@@ -1,4 +1,4 @@
-import { encodeURL } from 'hexo-util';
+import { url_for } from 'hexo-util';
import type Hexo from '../../hexo';
/**
@@ -17,7 +17,7 @@ export = (ctx: Hexo) => {
const asset = PostAsset.findOne({post: this._id, slug});
if (!asset) return;
- const path = encodeURL(new URL(asset.path, ctx.config.url).pathname);
+ const path = url_for.call(ctx, asset.path);
return path;
};
diff --git a/lib/plugins/tag/post_link.ts b/lib/plugins/tag/post_link.ts
index 9aec591a9d..5d12fc7cc0 100644
--- a/lib/plugins/tag/post_link.ts
+++ b/lib/plugins/tag/post_link.ts
@@ -1,4 +1,4 @@
-import { encodeURL, escapeHTML } from 'hexo-util';
+import { url_for, encodeURL, escapeHTML } from 'hexo-util';
import { postFindOneFactory } from './';
import type Hexo from '../../hexo';
@@ -41,14 +41,7 @@ export = (ctx: Hexo) => {
const attrTitle = escapeHTML(post.title || post.slug);
if (escape === 'true') title = escapeHTML(title);
- // guarantee the base url ends with a slash. (case of using a subdirectory in the url of the site)
- let baseUrl = ctx.config.url;
- if (!baseUrl.endsWith('/')) {
- baseUrl += '/';
- }
-
- const url = new URL(post.path, baseUrl).pathname + (hash ? `#${hash}` : '');
- const link = encodeURL(url);
+ const link = url_for.call(ctx, post.path + (hash ? `#${hash}` : ''));
return `${title}`;
};
diff --git a/lib/plugins/tag/post_path.ts b/lib/plugins/tag/post_path.ts
index fdc33eccab..6a00426f5e 100644
--- a/lib/plugins/tag/post_path.ts
+++ b/lib/plugins/tag/post_path.ts
@@ -1,4 +1,4 @@
-import { encodeURL } from 'hexo-util';
+import { url_for } from 'hexo-util';
import { postFindOneFactory } from './';
import type Hexo from '../../hexo';
@@ -17,7 +17,7 @@ export = (ctx: Hexo) => {
const post = factory({ slug }) || factory({ title: slug });
if (!post) return;
- const link = encodeURL(new URL(post.path, ctx.config.url).pathname);
+ const link = url_for.call(ctx, post.path);
return link;
};
diff --git a/test/scripts/tags/post_link.ts b/test/scripts/tags/post_link.ts
index c2e990d007..f72f910da7 100644
--- a/test/scripts/tags/post_link.ts
+++ b/test/scripts/tags/post_link.ts
@@ -81,7 +81,7 @@ describe('post_link', () => {
});
it('should keep subdir', () => {
- hexo.config.url = 'http://example.com/subdir';
+ hexo.config.root = '/subdir/';
postLink(['foo']).should.eql('Hello world');
});
});