summaryrefslogtreecommitdiff
path: root/src/misc/convert-host.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-09 23:59:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-09 23:59:32 +0900
commit33a9783ae5cf18e913cfe3f0223ed89aa94e63b4 (patch)
tree6eae0a7d9791876eff8c7bac4fb3dcdd0679a8bf /src/misc/convert-host.ts
parentUpdate update.ts (diff)
downloadmisskey-33a9783ae5cf18e913cfe3f0223ed89aa94e63b4.tar.gz
misskey-33a9783ae5cf18e913cfe3f0223ed89aa94e63b4.tar.bz2
misskey-33a9783ae5cf18e913cfe3f0223ed89aa94e63b4.zip
ドメインは常にPunycodeで保存するように
Diffstat (limited to 'src/misc/convert-host.ts')
-rw-r--r--src/misc/convert-host.ts15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/misc/convert-host.ts b/src/misc/convert-host.ts
index 8f2f1c7aba..f7feebd55c 100644
--- a/src/misc/convert-host.ts
+++ b/src/misc/convert-host.ts
@@ -1,27 +1,22 @@
import config from '../config';
-import { toUnicode, toASCII } from 'punycode';
+import { toASCII } from 'punycode';
import { URL } from 'url';
export function getFullApAccount(username: string, host: string) {
- return host ? `${username}@${toApHost(host)}` : `${username}@${toApHost(config.host)}`;
+ return host ? `${username}@${toPuny(host)}` : `${username}@${toPuny(config.host)}`;
}
export function isSelfHost(host: string) {
if (host == null) return true;
- return toApHost(config.host) === toApHost(host);
+ return toPuny(config.host) === toPuny(host);
}
export function extractDbHost(uri: string) {
const url = new URL(uri);
- return toDbHost(url.hostname);
+ return toPuny(url.hostname);
}
-export function toDbHost(host: string) {
- if (host == null) return null;
- return toUnicode(host.toLowerCase());
-}
-
-export function toApHost(host: string) {
+export function toPuny(host: string) {
if (host == null) return null;
return toASCII(host.toLowerCase());
}