Skip to content

Commit 77bc8fc

Browse files
committed
fix: misc fixes
1 parent ab2eb9d commit 77bc8fc

File tree

8 files changed

+44
-1
lines changed

8 files changed

+44
-1
lines changed

assets/locales/en/args.json

+3
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
},
88
"whoknows": {
99
"artist": "artist name"
10+
},
11+
"emoji": {
12+
"emoji": "emoji"
1013
}
1114
}

assets/locales/en/commands.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -173,5 +173,9 @@
173173
"**Code**: <pre><code class=\"language-javascript\">{{code}}</code></pre>",
174174
"**Output**: <pre><code class=\"language-javascript\">{{output}}</code></pre>",
175175
"⏱️ **Time taken**: {{time}}ms"
176-
]
176+
],
177+
"emoji": {
178+
"invalid": "🤔 That doesn't look like a valid emoji. $t(errors:common.checkSpelling)",
179+
"done": "{{emoji}} Done!"
180+
}
177181
}

assets/locales/pt/args.json

+3
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
},
88
"whoknows": {
99
"artist": "nome do artista"
10+
},
11+
"emoji": {
12+
"emoji": "emoji"
1013
}
1114
}

assets/locales/pt/commands.json

+4
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,9 @@
111111
},
112112
"unlinkfm": {
113113
"done": "Sua conta last.fm foi desvinculada com sucesso."
114+
},
115+
"emoji": {
116+
"invalid": "🤔 Hm, não reconheço esse emoji. $t(errors:common.tryAgain)",
117+
"done": "{{emoji}} Pronto!"
114118
}
115119
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { Context } from '../../../multiplatformEngine/common/context.js'
2+
import { updateUserByID } from '../../../databaseEngine/index.js'
3+
4+
type Args = {
5+
emoji: string
6+
}
7+
const regexExp = /(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])/gi;
8+
export default async (ctx: Context, { emoji }: Args) => {
9+
// check if emoji is valid
10+
const match = emoji.match(regexExp)
11+
if (!match) {
12+
ctx.reply(`commands:emoji.invalid`)
13+
return
14+
}
15+
16+
await updateUserByID(ctx.registeredUserData.id, { likedEmoji: emoji })
17+
ctx.reply(`commands:emoji.done`, { emoji })
18+
}
19+
20+
export const info = {
21+
aliases: ['em'],
22+
args: [{
23+
name: 'emoji',
24+
required: true
25+
}]
26+
}

src/commandEngine/commands/targeted+registered/mealbum.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default async (ctx: Context) => {
66

77
ctx.reply(`commands:mealbum`, {
88
user: ctx.registeredUser?.name,
9+
isListening: data.isNowPlaying ? 'isPlaying' : 'wasPlaying',
910
artist: data.artist,
1011
album: data.album,
1112
playCount: data.playCount,

src/commandEngine/commands/targeted+registered/meartist.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default async (ctx: Context) => {
66

77
ctx.reply(`commands:meartist`, {
88
user: ctx.registeredUser?.name,
9+
isListening: data.isNowPlaying ? 'isPlaying' : 'wasPlaying',
910
artist: data.artist,
1011
playCount: data.playCount,
1112
tags: ctx.registeredUserData.sendTags ? `\n*${data.tags.map(a => `#${a}`).join(' ')}*` : '',

src/commandEngine/commands/targeted+registered/metrack.ts

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default async (ctx: Context) => {
66

77
ctx.reply(`commands:youtrack`, {
88
user: ctx.registeredUser?.name,
9+
isListening: data.isNowPlaying ? 'isPlaying' : 'wasPlaying',
910
track: data.name,
1011
artist: data.artist,
1112
album: data.album,

0 commit comments

Comments
 (0)