Skip to content

Commit 198210b

Browse files
authored
Merge branch 'main' into moderation-refactor
2 parents e275646 + 7349fb5 commit 198210b

File tree

17 files changed

+775
-128
lines changed

17 files changed

+775
-128
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ Our new telegram bot.
2020
```sh
2121
pnpm run dev
2222
```
23+
24+
### Maybe useful references
25+
- [How to send private messages](https://github.com/PoliNetworkOrg/PoliNetworkBot_CSharp/blob/03c7434f06323ffdec301cb105d1d3b2c1ed4a95/PoliNetworkBot_CSharp/Code/Utils/SendMessage.cs#L90)

TODO.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
- [x] check harmful messages
2828
- [x] check spam across different groups (mute + del)
2929
- [ ] exception to send our whatsapp links?
30-
- [ ] do not delete Direttivo's allowed messages
30+
- [x] do not delete Direttivo's allowed messages (/grant command)
3131
- [x] check if user has username
32-
- [ ] group-specific moderation (eg. #cerco #vendo in polihouse)
32+
- [x] group-specific moderation (eg. #cerco #vendo in polihouse) see [here](https://github.com/PoliNetworkOrg/PoliNetworkBot_CSharp/blob/03c7434f06323ffdec301cb105d1d3b2c1ed4a95/PoliNetworkBot_CSharp/Code/Bots/Moderation/Blacklist/Blacklist.cs#L84)
3333
- [x] role management
3434
- [x] setrole: set role for some username (only Direttivo, maybe HR)
3535
- [x] getrole: get user role

biome.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.3.11/schema.json",
33
"vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
44
"files": { "ignoreUnknown": false },
55
"formatter": {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"test": "vitest",
1414
"typecheck": "tsc --noEmit",
1515
"check": "biome check",
16-
"check:fix": "biome check --write"
16+
"check:fix": "biome check --write --unsafe"
1717
},
1818
"keywords": [],
1919
"author": "",
2020
"license": "ISC",
2121
"devDependencies": {
22-
"@biomejs/biome": "2.2.4",
22+
"@biomejs/biome": "2.3.11",
2323
"@trpc/server": "11.5.1",
2424
"@types/node": "^22.13.1",
2525
"globals": "^15.14.0",
@@ -37,7 +37,7 @@
3737
"@grammyjs/menu": "^1.3.1",
3838
"@grammyjs/parse-mode": "^1.11.1",
3939
"@grammyjs/runner": "^2.0.3",
40-
"@polinetwork/backend": "^0.12.0",
40+
"@polinetwork/backend": "^0.13.1",
4141
"@t3-oss/env-core": "^0.13.4",
4242
"@trpc/client": "^11.5.1",
4343
"@types/ssdeep.js": "^0.0.2",

pnpm-lock.yaml

Lines changed: 50 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bot.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { logger } from "./logger"
1212
import { AutoModerationStack } from "./middlewares/auto-moderation-stack"
1313
import { BotMembershipHandler } from "./middlewares/bot-membership-handler"
1414
import { checkUsername } from "./middlewares/check-username"
15+
import { GroupSpecificActions } from "./middlewares/group-specific-actions"
1516
import { messageLink } from "./middlewares/message-link"
1617
import { MessageUserStorage } from "./middlewares/message-user-storage"
1718
import { UIActionsLogger } from "./middlewares/ui-actions-logger"
@@ -76,6 +77,7 @@ bot.use(MenuGenerator.getInstance())
7677
bot.use(commands)
7778
bot.use(new BotMembershipHandler())
7879
bot.use(new AutoModerationStack())
80+
bot.use(new GroupSpecificActions())
7981
bot.use(new UIActionsLogger())
8082

8183
bot.on("message", async (ctx, next) => {

src/commands/banall.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,9 @@ import z from "zod"
33
import { api } from "@/backend"
44
import { modules } from "@/modules"
55
import { getTelegramId } from "@/utils/telegram-id"
6-
import type { Role } from "@/utils/types"
6+
import { numberOrString, type Role } from "@/utils/types"
77
import { _commandsBase } from "./_base"
88

9-
const numberOrString = z.string().transform((s) => {
10-
const n = Number(s)
11-
if (!Number.isNaN(n) && s.trim() !== "") return n
12-
return s
13-
})
14-
159
const BYPASS_ROLES: Role[] = ["president", "owner", "direttivo"]
1610

1711
_commandsBase
@@ -26,7 +20,7 @@ _commandsBase
2620
{
2721
key: "username",
2822
type: numberOrString,
29-
description: "The username or the user id of the user you want to update the role",
23+
description: "The username or the user id of the user you want to ban from all groups",
3024
},
3125
{
3226
key: "reason",

0 commit comments

Comments
 (0)