Skip to content

Commit a5feefb

Browse files
authored
chore: merge dev to main (#202)
2 parents 9d33202 + 51faf39 commit a5feefb

File tree

7 files changed

+40
-7
lines changed

7 files changed

+40
-7
lines changed

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
# [1.9.0-dev.2](https://github.com/revenge-mod/revenge-bundle/compare/v1.9.0-dev.1...v1.9.0-dev.2) (2025-10-02)
2+
3+
4+
### Bug Fixes
5+
6+
* Clear data -> Clear Data ([5b28d26](https://github.com/revenge-mod/revenge-bundle/commit/5b28d26db47c3783b9f447cb43bf8e47ac4b6673))
7+
8+
# [1.9.0-dev.1](https://github.com/revenge-mod/revenge-bundle/compare/v1.8.2-dev.2...v1.9.0-dev.1) (2025-10-02)
9+
10+
11+
### Features
12+
13+
* enabled and disabled sort option for plugins ([#93](https://github.com/revenge-mod/revenge-bundle/issues/93)) ([388f2a6](https://github.com/revenge-mod/revenge-bundle/commit/388f2a632cfd07155aefb49902bd6174af8d467b))
14+
15+
## [1.8.2-dev.2](https://github.com/revenge-mod/revenge-bundle/compare/v1.8.2-dev.1...v1.8.2-dev.2) (2025-10-02)
16+
17+
18+
### Bug Fixes
19+
20+
* update AssetId in Search component and AddonPage ([#200](https://github.com/revenge-mod/revenge-bundle/issues/200)) ([809214d](https://github.com/revenge-mod/revenge-bundle/commit/809214d082a294e52d260ed6a9fa034dea971c2c))
21+
22+
## [1.8.2-dev.1](https://github.com/revenge-mod/revenge-bundle/compare/v1.8.1...v1.8.2-dev.1) (2025-09-26)
23+
24+
25+
### Bug Fixes
26+
27+
* slash commands not sending messages ([#201](https://github.com/revenge-mod/revenge-bundle/issues/201)) ([db2be1c](https://github.com/revenge-mod/revenge-bundle/commit/db2be1ca7ccfed659a143d3ac38d8eec81e731b0))
28+
129
## [1.8.1](https://github.com/revenge-mod/revenge-bundle/compare/v1.8.0...v1.8.1) (2025-07-24)
230

331

src/core/commands/debug.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ export default () => <ApplicationCommand>{
2828
if (ephemeral?.value) {
2929
messageUtil.sendBotMessage(ctx.channel.id, content);
3030
} else {
31-
messageUtil.sendMessage(ctx.channel.id, { content });
31+
const fixNonce = Date.now().toString();
32+
messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {nonce:fixNonce});
3233
}
3334
}
3435
};

src/core/commands/plugins.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export default () => <ApplicationCommand>{
3636
if (ephemeral?.value) {
3737
messageUtil.sendBotMessage(ctx.channel.id, content);
3838
} else {
39-
messageUtil.sendMessage(ctx.channel.id, { content });
39+
const fixNonce = Date.now().toString();
40+
messageUtil.sendMessage(ctx.channel.id, { content }, void 0, {nonce:fixNonce});
4041
}
4142
}
4243
};

src/core/i18n/default.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"CLEAR": "Clear",
1414
"CLEAR_BUNDLE": "Clear JS Bundle",
1515
"CLEAR_BUNDLE_DESC": "Clear the cached bundle. This will force a re-download of the bundle next app launch.",
16-
"CLEAR_DATA": "Clear data",
16+
"CLEAR_DATA": "Clear Data",
1717
"CLEAR_DATA_FAILED": "Failed to clear data for {name}",
1818
"CLEAR_DATA_SUCCESSFUL": "Cleared data for {name}",
1919
"CODENAME": "Codename",
@@ -116,4 +116,4 @@
116116
"URL_PLACEHOLDER": "https://github.com/revenge-mod",
117117
"VERSION": "Version",
118118
"VERSIONS": "Versions"
119-
}
119+
}

src/core/ui/components/AddonPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export default function AddonPage<T extends object>({ CardComponent, ...props }:
175175
<View style={{ flexDirection: "row", gap: 8 }}>
176176
<Search style={{ flexGrow: 1 }} isRound={!!props.sortOptions} onChangeText={v => setSearch(v)} />
177177
{props.sortOptions && <IconButton
178-
icon={findAssetId("ic_forum_channel_sort_order_24px")}
178+
icon={findAssetId("ArrowsUpDownIcon")}
179179
variant="tertiary"
180180
disabled={!!search}
181181
onPress={() => showSimpleActionSheet({

src/core/ui/settings/pages/Plugins/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ function PluginPage(props: PluginPageProps) {
4343
]}
4444
sortOptions={{
4545
"Name (A-Z)": (a, b) => a.name.localeCompare(b.name),
46-
"Name (Z-A)": (a, b) => b.name.localeCompare(a.name)
46+
"Name (Z-A)": (a, b) => b.name.localeCompare(a.name),
47+
"Enabled": (a, b) => Number(b.isEnabled()) - Number(a.isEnabled()),
48+
"Disabled": (a, b) => Number(a.isEnabled()) - Number(b.isEnabled())
49+
4750
}}
4851
safeModeHint={{ message: Strings.SAFE_MODE_NOTICE_PLUGINS }}
4952
items={items}

src/lib/ui/components/Search.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export interface SearchProps {
1212
}
1313

1414
function SearchIcon() {
15-
return <Image style={{ width: 16, height: 16 }} source={findAssetId("search")!} />;
15+
return <Image style={{ width: 16, height: 16 }} source={findAssetId("MagnifyingGlassIcon")!} />;
1616
}
1717

1818
export default ({ onChangeText, placeholder, style, isRound }: SearchProps) => {

0 commit comments

Comments
 (0)