Feat: Add /disablecommunity and /enablecommunity commands for superadmins#807
Feat: Add /disablecommunity and /enablecommunity commands for superadmins#807Matobi98 wants to merge 9 commits into
Conversation
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
WalkthroughAdds an ChangesCommunity enable/disable administration
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@bot/modules/community/commands.ts`:
- Around line 255-256: The code builds a RegExp from raw input and passes it to
Community.findOne({ group: regex }), allowing regex metacharacters in input to
change matching; fix by first normalizing and escaping the user-supplied group
username (remove an optional leading '@' from input, then escape all regex
metacharacters) before constructing the RegExp used as regex, so
Community.findOne still queries the group field case-insensitively but cannot be
manipulated by special characters.
- Around line 324-331: The DM to the owner (creator) via
ctx.telegram.sendMessage can throw and currently prevents sending the final
success reply; wrap the notification call in its own try/catch (or use .catch)
so failures are handled/logged without interrupting flow, e.g., call
ctx.telegram.sendMessage(creator.tg_id, ...) inside try { ... } catch (err) { /*
log err */ } and then always execute and return
ctx.reply(ctx.i18n.t('operation_successful')); ensure you reference creator,
ctx.telegram.sendMessage and ctx.reply when making the change.
In `@locales/en.yaml`:
- Line 731: Update the locale string key community_closed_by_admin to remove the
literal '@' before the template variable so it uses a plain ${communityName}
(since communityName is community.name and may contain spaces/special chars);
locate the community_closed_by_admin entry in locales/en.yaml and replace "An
administrator has closed your community @${communityName}" with "An
administrator has closed your community ${communityName}".
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b31e5825-8461-4827-bc64-94a62b556484
📒 Files selected for processing (13)
bot/middleware/user.tsbot/modules/community/commands.tsbot/modules/community/index.tslocales/de.yamllocales/en.yamllocales/es.yamllocales/fa.yamllocales/fr.yamllocales/it.yamllocales/ko.yamllocales/pt.yamllocales/ru.yamllocales/uk.yaml
![mostronatorcoder[bot]](https://avatars.githubusercontent.com/in/2922838?s=60&v=4){kind=small}
|
I requested changes. Main blocker: the new /closecommunity confirmation message uses |
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
bot/modules/community/commands.ts (1)
50-56:⚠️ Potential issue | 🟠 Major | ⚡ Quick winEscape
groupNamebefore building regex insetComm.Raw user input in
RegExpcan change match behavior and select the wrong community.Suggested fix
if (groupName[0] == '@') { // Allow find communities case insensitive - const regex = new RegExp(['^', groupName, '$'].join(''), 'i'); + const escapedGroupName = groupName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + const regex = new RegExp(`^${escapedGroupName}$`, 'i'); community = await Community.findOne({ group: regex, enabled: { $ne: false }, });🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@bot/modules/community/commands.ts` around lines 50 - 56, The code builds a RegExp from raw user input (groupName) which allows regex metacharacters to alter matching; in setComm, before creating the regex used in Community.findOne, escape groupName (e.g., implement/consume an escapeRegExp utility and apply it to groupName) so special characters are treated literally, then construct the regex with '^' + escapedGroupName + '$' and the 'i' flag; update the regex creation and use the escaped variable in the Community.findOne query.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@bot/modules/community/actions.ts`:
- Around line 126-132: The code may pass a null community into the wizard if
Community.findOne returns nothing; update the handler that calls
Community.findOne (using ctx.match?.[1]) to check the returned community before
calling ctx.scene.enter('ADD_EARNINGS_INVOICE_WIZARD_SCENE_ID', { community }),
and if community is null/undefined, bail out with a user-facing
error/notification (e.g., ctx.reply or ctx.answerCbQuery) or redirect elsewhere
instead of entering the scene; reference the Community lookup, ctx.match?.[1],
ctx.scene.enter and ADD_EARNINGS_INVOICE_WIZARD_SCENE_ID to locate where to add
the guard.
---
Duplicate comments:
In `@bot/modules/community/commands.ts`:
- Around line 50-56: The code builds a RegExp from raw user input (groupName)
which allows regex metacharacters to alter matching; in setComm, before creating
the regex used in Community.findOne, escape groupName (e.g., implement/consume
an escapeRegExp utility and apply it to groupName) so special characters are
treated literally, then construct the regex with '^' + escapedGroupName + '$'
and the 'i' flag; update the regex creation and use the escaped variable in the
Community.findOne query.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: f1a251f7-caf1-4e25-bdf7-e44240309060
📒 Files selected for processing (17)
bot/modules/community/actions.tsbot/modules/community/commands.tsbot/modules/community/index.tsbot/modules/community/messages.tsbot/modules/orders/scenes.tsbot/modules/user/scenes/settings.tslocales/de.yamllocales/en.yamllocales/es.yamllocales/fa.yamllocales/fr.yamllocales/it.yamllocales/ko.yamllocales/pt.yamllocales/ru.yamllocales/uk.yamlmodels/community.ts
✅ Files skipped from review due to trivial changes (5)
- locales/pt.yaml
- locales/ko.yaml
- locales/es.yaml
- locales/fr.yaml
- locales/uk.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
- locales/ru.yaml
There was a problem hiding this comment.
♻️ Duplicate comments (1)
bot/modules/community/commands.ts (1)
50-56:⚠️ Potential issue | 🟠 Major | ⚡ Quick winEscape
groupNamebefore building the regex insetComm.
groupNameis interpolated intoRegExpwithout escaping, so metacharacters can change matching behavior and target the wrong community.Suggested fix
- const regex = new RegExp(['^', groupName, '$'].join(''), 'i'); + const escapedGroupName = groupName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + const regex = new RegExp(`^${escapedGroupName}$`, 'i'); community = await Community.findOne({ group: regex, enabled: { $ne: false }, });🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@bot/modules/community/commands.ts` around lines 50 - 56, The code builds a RegExp from user-controlled groupName in setComm, allowing metacharacters to alter matching; fix by escaping regex metacharacters in groupName before creating the RegExp used in Community.findOne (preserve the '^' and '$' anchors and the 'i' flag), e.g. create an escapedGroupName from groupName using a regex-escape routine (replace /[.*+?^${}()|[\]\\]/g) and then build the RegExp from '^' + escapedGroupName + '$' and use that in the existing Community.findOne({ group: regex, enabled: { $ne: false } }) call.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Duplicate comments:
In `@bot/modules/community/commands.ts`:
- Around line 50-56: The code builds a RegExp from user-controlled groupName in
setComm, allowing metacharacters to alter matching; fix by escaping regex
metacharacters in groupName before creating the RegExp used in Community.findOne
(preserve the '^' and '$' anchors and the 'i' flag), e.g. create an
escapedGroupName from groupName using a regex-escape routine (replace
/[.*+?^${}()|[\]\\]/g) and then build the RegExp from '^' + escapedGroupName +
'$' and use that in the existing Community.findOne({ group: regex, enabled: {
$ne: false } }) call.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b45942b4-e690-415e-97eb-eb0d2cdb26b2
📒 Files selected for processing (2)
bot/modules/community/actions.tsbot/modules/community/commands.ts
|
Please update pr description accordingly as it now adds /enablecommunity and /disablecommunity commands |
Luquitasjeffrey
changed the title
/closecommunity command so superadmins can close any community
Luquitasjeffrey
left a comment
Luquitasjeffrey
left a comment
There was a problem hiding this comment.
Almost done, but there is a bug if the user wants to enter the order creation wizzard, it doesn't responds anything to the user:
And this appears in the logs:
Please fix those two bugs and this gets my ACK
There was a problem hiding this comment.
I think this behaviour should be changed:
If community was disabled it should set user's default_community_id to null, so they can continue operating on the global order channel.
Right now it's only printing the message but it isn't setting user's community id to null
The message is messleading, this isn't unlinking the user with the deleted community, if the user attempts to create an order on a deleted community the message should say something like:
Your default community has ben disabled, I unlinked you from that community. Try creating your order again.
And it sets users community_id to null
2 participants
Summary
Closes #804
Add
/disablecommunityand/enablecommunitycommands so superadmins can disable orre-enable any community by ID or Telegram group handle, with creator notifications on
each status change. Disabled communities are excluded from discovery, listings, and
earnings management.
Changes
New commands:
/disablecommunityand/enablecommunityUsage:
/disablecommunity id|@groupUsername
/enablecommunity id|@groupUsername
superAdminMiddleware_idor a@groupUsernamecommunity.enabledflag and sends a DM to the creator notifying themModel change
enabled: Booleanfield (defaulttrue) to theCommunityschema{ enabled: { $ne: false } }so disabled communities are invisible to regular usersInternationalization
Added translations for all new messages across 10 languages (
en,es,de,fr,it,pt,ru,uk,ko,fa).Summary by CodeRabbit
New Features
Changes
Internationalization