Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: show tip only once in a single command #204

Merged
merged 2 commits into from
Mar 24, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions packages/core/src/command.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,6 @@ export function apply(ctx: Context, config: Config) {
}
}
url ||= image.url
if (config.showTips) {
const tips = getTips(session)
if (tips) {
const tip = Random.pick(tips)
children.unshift(
<p>
<i18n path='.tips'></i18n>
<i18n path={tip}></i18n>
</p>,
)
}
}

if (config.asset && ctx.assets) {
url = await ctx.booru.imgUrlToAssetUrl(url)
Expand Down Expand Up @@ -170,6 +158,19 @@ export function apply(ctx: Context, config: Config) {
output.push(children)
}

if (config.showTips) {
const tips = getTips(session)
if (tips) {
const tip = Random.pick(tips)
output.push(
<p>
<i18n path='.tips'></i18n>
<i18n path={tip}></i18n>
</p>,
)
}
}

switch (session.resolve(config.outputMethod)) {
case 'one-by-one':
return output.map((children) => <message>{children}</message>)
Expand Down