Merge branch 'rewrite' of https://github.com/nyxx-discord/running_on_dart into rewrite

Author: l7ssha

.dockerignore

@@ -21,3 +21,5 @@ build/
 lib_old/
 
 **/node_modules/**
+
+.roo/**

.env.example

@@ -1,12 +1,9 @@
 # Core bot configuration
 ROD_TOKEN=YOUR_DISCORD_BOT_TOKEN_HERE
 ROD_PREFIX=n>>
-ROD_ADMIN_ID=YOUR_ADMIN_USER_ID
 ROD_ADMIN_IDS=SPACE_SEPARATED_ADMIN_USER_IDS
 ROD_INTENT_FEATURES_ENABLE=true
 BOT_NAME=Running on Dart
-SYNC_COMMANDS=true
-ROD_DEBUG=0
 ROD_DEV=0
 ROD_DEV_GUILD_ID=YOUR_DEV_GUILD_ID
 ROD_ADMIN_GUILD=YOUR_ADMIN_GUILD_ID
@@ -22,6 +19,7 @@ POSTGRES_PASSWORD=CHANGE_ME
 WEB_SERVER_ENABLE=0
 WEB_SERVER_PORT=8088
 WEB_SERVER_HOST=0.0.0.0
+WEB_SERVER_ALLOWED_ORIGIN=https://localhost:8088
 DISCORD_CLIENT_ID=YOUR_DISCORD_OAUTH_CLIENT_ID
 DISCORD_CLIENT_SECRET=YOUR_DISCORD_OAUTH_CLIENT_SECRET
 DISCORD_REDIRECT_URI=https://localhost:8088/redirect

.gitignore

@@ -26,3 +26,5 @@ sessions/
 
 public/
 !public/.gitkeep
+
+.roo/**

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.17.0
+- New `poop user` command
+- Improved SQL query for searching active tags
+- Extended list of bad characters for "poop" feature
+- Various test improvements
+
 ## 4.16.1
 - Improve pooping command
 

README.md

@@ -11,9 +11,6 @@ Core bot settings
 - `ROD_PREFIX` (optional, default `n>>`): The prefix to use for text commands.
 - `ROD_INTENT_FEATURES_ENABLE`: A bool (`true` or `false`) indicating whether to enable features requiring privileged intents, namely `GUILD_MESSAGES` and `GUILD_MEMBERS`.
 - `ROD_ADMIN_IDS`: The space-separated IDs (snowflakes) of the users that can use administrator commands.
-- `ROD_ADMIN_ID` (optional): Single administrator user ID (snowflake). Use `ROD_ADMIN_IDS` to provide multiple admins.
-- `SYNC_COMMANDS` (optional, default `true`): Whether to sync application commands on startup.
-- `ROD_DEBUG` (optional, default `0`): Enable extra debug logging (`1`/`0` or `true`/`false`).
 - `ROD_DEV` (optional, default `false`): A bool indicating whether to run in development mode.
 - `BOT_NAME` (optional, default `Nataly`): Displayed bot name in some contexts.
 
@@ -36,6 +33,7 @@ Web server
 - `WEB_SERVER_ENABLE` (optional, default `0`): Enable the built-in web server (`1`/`0`).
 - `WEB_SERVER_HOST` (optional, default `0.0.0.0`): Host/interface to bind the web server to.
 - `WEB_SERVER_PORT` (optional, default `8088`): Port for the web server.
+- `WEB_SERVER_ALLOWED_ORIGIN` (optional, default `https://localhost:8088`): Allowed origins for CORS headers.
 - `DISCORD_CLIENT_ID` (optional): Discord OAuth2 application client ID.
 - `DISCORD_CLIENT_SECRET` (optional): Discord OAuth2 application client secret.
 - `DISCORD_REDIRECT_URI` (optional, default `https://localhost:8088/redirect`): OAuth2 redirect URI.

docker-compose.prod.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   running_on_dart:
-    image: ghcr.io/nyxx-discord/running_on_dart:4.16.1
+    image: ghcr.io/nyxx-discord/running_on_dart:4.17.0
     container_name: running_on_dart
     restart: unless-stopped
     ports:

lib/src/cli.dart

@@ -2,13 +2,14 @@ import 'package:running_on_dart/src/settings.dart';
 import 'package:running_on_dart/src/web_app/jwt.dart';
 
 bool handleCli(List<String> args) {
-  if (args.isNotEmpty && dev) {
-    final commandArg = args.first;
-    if (commandArg == 'generate-test-jwt') {
-      print(generateJwt('1300543841996374131', maxAge: Duration(days: 31), permissions: []));
-      return true;
-    }
+  if (args.isEmpty || !dev) {
+    return false;
   }
 
-  return false;
+  final commandArg = args.first;
+  if (commandArg == 'generate-test-jwt') {
+    print(generateJwt('1300543841996374131', maxAge: Duration(days: 31), permissions: []));
+  }
+
+  return true;
 }

lib/src/commands/admin.dart

@@ -27,9 +27,9 @@ final poopUserCommand = UserCommand("poop-username", (UserContext context) async
 
   final poopModule = Injector.appInstance.get<PoopNameModule>();
 
-  await poopModule.poopMember(member, dryRun: false);
+  final result = await poopModule.poopMember(member, dryRun: false);
 
-  await context.respond(MessageBuilder(content: "Done..."), level: ResponseLevel.private);
+  await context.respond(MessageBuilder(content: result ? 'Done...' : 'Not needed...'), level: ResponseLevel.private);
 }, checks: [GuildCheck.all(), PermissionsCheck(Permissions.manageNicknames)]);
 
 final admin = ChatGroup(

lib/src/repository/tag.dart

@@ -83,15 +83,15 @@ FROM (
     (similarity(name, @q) * 5.0 + similarity(content, @q) * 1.0) AS score
   FROM tags
   WHERE enabled = TRUE
-    AND (@authorId::text IS NULL OR author_id::text = @authorId)
-    AND (@guildId::text IS NULL OR guild_id::text = @guildId)
+    AND (author_id = @authorId OR @authorId IS NULL)
+    AND (guild_id = @guildId OR @guildId IS NULL)
     AND (
       name ILIKE '%' || @q || '%'
       OR content ILIKE '%' || @q || '%'
       OR name % @q
       OR content % @q
     )
-) s
+) AS scored_tags
 WHERE score >= @simThresh
 ORDER BY score DESC, name ASC
 LIMIT @limit OFFSET @offset

lib/src/settings.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:nyxx/nyxx.dart';
 
-String get version => '4.16.1';
+String get version => '4.17.0';
 String get frontendVersion => '1.0.0';
 
 /// Get a [String] from an environment variable, throwing an exception if it is not set.