Merge branch 'develop' of codeberg.org:calckey/calckey into develop

This commit is contained in:
ThatOneCalculator 2023-01-13 10:46:14 -08:00
commit 22e2c5d246
No known key found for this signature in database
GPG key ID: 8703CACD01000000
3 changed files with 26 additions and 11 deletions

View file

@ -19,6 +19,7 @@
"lodash": "^4.17.21"
},
"optionalDependencies": {
"@swc/core-android-arm64": "1.3.11",
"@tensorflow/tfjs-node": "3.21.1"
},
"dependencies": {

View file

@ -64,14 +64,11 @@ export async function toDbReaction(
// 文字列タイプのリアクションを絵文字に変換
if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
// Unicode絵文字
// Unicode emoji
const match = emojiRegex.exec(reaction);
if (match) {
// 合字を含む1つの絵文字
const unicode = match[0];
// 異体字セレクタ除去
return unicode.match('\u200d') ? unicode : unicode.replace(/\ufe0f/g, '');
//return only first emoji
return match[0];
}
const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);

View file

@ -70,6 +70,7 @@ importers:
'@sinonjs/fake-timers': 9.1.2
'@swc/cli': ^0.1.59
'@swc/core': ^1.3.26
'@swc/core-android-arm64': 1.3.11
'@syuilo/aiscript': 0.11.1
'@tensorflow/tfjs': ^4.2.0
'@tensorflow/tfjs-node': 3.21.1
@ -331,6 +332,7 @@ importers:
ws: 8.11.0
xev: 3.0.2
optionalDependencies:
'@swc/core-android-arm64': 1.3.11
'@tensorflow/tfjs-node': 3.21.1_seedrandom@3.0.5
devDependencies:
'@types/bcryptjs': 2.4.2
@ -1593,6 +1595,17 @@ packages:
source-map: 0.7.4
dev: false
/@swc/core-android-arm64/1.3.11:
resolution: {integrity: sha512-M7FamR3kFpVTyTw73FzKcOZmS7/TWHX75eqtwBTaU9fW4shf0KTLr/h9DnMxNKAnwUMeub/lqlINUe5EKFIKwQ==}
engines: {node: '>=10'}
cpu: [arm64]
os: [android]
requiresBuild: true
dependencies:
'@swc/wasm': 1.2.130
dev: false
optional: true
/@swc/core-darwin-arm64/1.3.26:
resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
engines: {node: '>=10'}
@ -1689,6 +1702,12 @@ packages:
'@swc/core-win32-ia32-msvc': 1.3.26
'@swc/core-win32-x64-msvc': 1.3.26
/@swc/wasm/1.2.130:
resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
requiresBuild: true
dev: false
optional: true
/@syuilo/aiscript/0.11.1:
resolution: {integrity: sha512-chwOIA3yLUKvOB0G611hjLArKTeOWNmTm3lHERSaDW1d+dS6do56naX6Lkwy2UpnwWC0qzeNSgg35elk6t2gZg==}
dependencies:
@ -3215,7 +3234,7 @@ packages:
/axios/0.24.0:
resolution: {integrity: sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==}
dependencies:
follow-redirects: 1.15.2_debug@4.3.4
follow-redirects: 1.15.2
transitivePeerDependencies:
- debug
dev: false
@ -3223,7 +3242,7 @@ packages:
/axios/0.25.0_debug@4.3.4:
resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
dependencies:
follow-redirects: 1.15.2_debug@4.3.4
follow-redirects: 1.15.2
transitivePeerDependencies:
- debug
dev: true
@ -6376,7 +6395,7 @@ packages:
readable-stream: 2.3.7
dev: false
/follow-redirects/1.15.2_debug@4.3.4:
/follow-redirects/1.15.2:
resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
engines: {node: '>=4.0'}
peerDependencies:
@ -6384,8 +6403,6 @@ packages:
peerDependenciesMeta:
debug:
optional: true
dependencies:
debug: 4.3.4
/for-each/0.3.3:
resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}