fix: misc fixes

.rubocop.yml

@@ -2,12 +2,21 @@ AllCops:
   NewCops: enable
   ActiveSupportExtensionsEnabled: true
 
-Layout/LineLength:
-  Max: 80
+Layout/ArgumentAlignment:
+  EnforcedStyle: with_fixed_indentation
 
 Layout/EndAlignment:
   EnforcedStyleAlignWith: variable
 
+Layout/FirstArgumentIndentation:
+  EnforcedStyle: consistent
+
+Layout/FirstArrayElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/LineLength:
+  Max: 80
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 

Gemfile

@@ -10,9 +10,7 @@ gem 'rake'
 # Base
 gem 'discordrb', github: 'shardlab/discordrb', branch: 'main'
 # dirty hack to fix bundix problems
-gem 'discordrb-webhooks',
-    github: 'anna328p/discordrb',
-    branch: 'main'
+gem 'discordrb-webhooks', github: 'anna328p/discordrb', branch: 'main'
 
 gem 'rbnacl'
 

bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../lib/qbot'
+
+QBot.init_log
+QBot.parse_options(ARGV)
+QBot.init_config
+QBot::Database.init_db
+
+binding.irb

flake.nix

@@ -29,10 +29,8 @@ rec {
 		in 
 			genAttrs systems.flakeExposed;
 
-		qbotPkgArgs = pkgs: rec {
+		mkQBotArgs = pkgs: rec {
 			ruby = pkgs.ruby_3_2;
-			bundler = pkgs.bundler.override { inherit ruby; };
-			bundix = pkgs.bundix.override { inherit bundler; };
 
 			# TODO: remove once nixpkgs#272969 is merged
 			rustc = rust-overlay.packages.${pkgs.system}.rust;
@@ -47,7 +45,14 @@ rec {
 				config.allowUnfree = true;
 			};
 
-			qbot = pkgs.callPackage ./. (qbotPkgArgs pkgs);
+			qbotArgs = mkQBotArgs pkgs;
+
+			inherit (qbotArgs) ruby;
+
+			bundler = pkgs.bundler.override { inherit ruby; };
+			bundix = pkgs.bundix.override { inherit bundler; };
+
+			qbot = pkgs.callPackage ./. qbotArgs;
 		};
 
 		# withCommon : (Dict Any -> Dict Any) -> Dict (Dict Any)
@@ -56,14 +61,14 @@ rec {
 	in {
 		overlays = rec {
 			qbot = final: prev: {
-				qbot = final.callPackage ./. (qbotPkgArgs final);
+				qbot = final.callPackage ./. (mkQBotArgs final);
 			};
 
 			default = qbot;
 		};
 
 		nixosModules = rec {
-			qbot = import ./module.nix { inherit nixConfig; };
+			qbot = import nix/module.nix { inherit nixConfig; };
 			default = qbot;
 		};
 
@@ -83,14 +88,12 @@ rec {
 		});
 
 		apps = withCommon (env: let
-			inherit (env) pkgs;
-
-			pkgArgs = qbotPkgArgs pkgs;
+			inherit (env) pkgs bundler bundix;
 
 			update-deps = pkgs.writeShellApplication {
 				name = "update-deps";
 
-				runtimeInputs = [ pkgArgs.bundler pkgArgs.bundix ];
+				runtimeInputs = [ bundler bundix ];
 
 				text = ''
 					rm -f Gemfile.lock

lib/qbot.rb

@@ -18,7 +18,6 @@
 require_relative 'qbot/db_config'
 require_relative 'qbot/db'
 require_relative 'qbot/jobs'
-require_relative 'qbot/index_models'
 require_relative 'qbot/i18n'
 require_relative 'qbot/helpers'
 require_relative 'qbot/colorlib'

lib/qbot/aur.rb

@@ -0,0 +1,2 @@
+url = "https://aur.archlinux.org/packages-meta-ext-v1.json.gz"
+

lib/qbot/db/concerns/configurable/option_types.rb

@@ -119,8 +119,6 @@ def initialize(format: nil)
       end
 
       def format_value(value)
-        return t('types.empty') unless value
-
         if @format
           Kernel.format(FORMATS[@format], value)
         else

modules/colors.rb

@@ -295,6 +295,12 @@ def self.create_color_roles(server, lightness, radius, count, &)
   rescue ActiveRecord::RecordNotFound
     embed t('colors.extra-roles.del.not-found', role.mention)
   end
+end
+# rubocop: enable Metrics/ModuleLength
+
+## Event container for the Colors module
+module ColorsEvents
+  extend Discordrb::EventContainer
 
   # Color roles on join
 
@@ -341,4 +347,7 @@ def give_random_color(server, user)
     nil
   end
 end
-# rubocop: enable Metrics/ModuleLength
+
+module Colors
+  include! ColorsEvents
+end

modules/polls.rb

@@ -85,6 +85,10 @@ def self.poll_allowed?(event, channel)
 
     nil
   end
+end
+
+module PollsEvents
+  extend Discordrb::EventContainer
 
   reaction_add do |event|
     footer_text = event.message.embeds.first&.footer&.text
@@ -103,3 +107,7 @@ def self.poll_allowed?(event, channel)
     end
   end
 end
+
+module Polls
+  include! PollsEvents
+end

modules/tio.rb

@@ -54,6 +54,10 @@ def self.get_codespans(text)
 
     embed langs.keys.join(', ').truncate(2048)
   end
+end
+
+module TioEvents
+  extend Discordrb::EventContainer
 
   reaction_add(emoji: '❌') do |event|
     if (ftext = event.message.embeds.first&.footer&.text) \
@@ -67,3 +71,7 @@ def self.get_codespans(text)
     end
   end
 end
+
+module Tio
+  include! TioEvents
+end

scripts/compare_locales.rb

@@ -122,33 +122,33 @@ def val(node)
     # Filter for method calls
     next unless node.type == :send
 
-    line = node.loc.line
-    col = node.loc.column
+    loc = KeyLoc.new(path:, line: node.loc.line, col: node.loc.column)
 
     case node.children
     # Find invocations of t()
     in [_, :t, key, *]
-      list << KeyLoc.new(path:, line:, col:, key: val(key))
+      loc.key = val(key)
 
     # Find all bot commands
     in [_, :command, name, *]
-      list << KeyLoc.new(path:, line:, col:, key: "descriptions.#{val name}")
+      loc.key = "descriptions.#{val(name)}"
 
     # Find list of locales
     in [[[:const, _, :I18n], :config], :available_locales=, [*, locales]]
-      list << KeyLoc.new(path:, line:, col:, key: "locales.#{val name}")
+      loc.key = "locales.#{val(name)}"
 
     else next
     end
+
+    list << loc
   }
 }.inject(:+)
 
 # print translations used in code, but not present in the base file.
 
 puts Paint["Translations missing from #{base_name}:", :yellow, :bright]
 
-key_groups = \
-  key_matches
+key_groups = key_matches
   .reject { base_flat.keys.include? _1.key }
   .group_by(&:key)
 

share/locales/en.yml

@@ -16,14 +16,19 @@ en:
     userconfig: 'Configure user settings that apply across servers'
 
     listsnippets: 'Lists available snippets'
-    snippet: 'Posts a snippet'
+    getsnippet: 'Finds a snippet by name, and posts its text'
+    snippets: 'Manages snippets'
 
     color: 'Sets your user color role'
     closestcolor: 'Gives you the closest color, by hex code'
     listcolors: 'Lists colors available on the server'
-    createcolorroles: 'Creates color roles'
+    gencolors: 'Creates a set of color roles'
     randcolors: 'Randomizes colors for all users'
 
+    extracolorroles: 'Lists extra color roles'
+    addextracolorrole: 'Adds an existing role as an extra color role'
+    delextracolorrole: 'Removes an extra color role'
+
     query: 'Adds a query to the list of queries'
     openqueries: 'Lists open queries'
     closequery: 'Closes a query by ID'
@@ -36,6 +41,8 @@ en:
     invite: 'Sends a link to invite the bot to your server'
     voicekick: 'Move a user to the AFK channel or given channel'
 
+    slowmode: 'Sets the slowmode delay for the current channel'
+
     archwiki: 'Searches the Arch wiki'
     packagesearch: 'Searches for a package in the Arch repositories'
     package: 'Shows info for a given package'
@@ -44,7 +51,7 @@ en:
 
     poll: 'Sets up a poll in a channel'
 
-    figlet: 'Converts some text into ASCII art'
+    figlet: 'Converts text into ASCII art'
 
     nimi: 'Queries definitions for a toki pona word'
     tpo: 'Queries usage data for a toki pona word from tokipona.org'
@@ -55,21 +62,35 @@ en:
     listnotes: 'Lists all notes for this server'
     noteid: 'Finds a note by ID'
     delnote: 'Deletes a note'
+    exportnotes: "Uploads a JSON file containing all of this server's notes"
+
+    bottom: 'Converts text in Unicode to the [Bottom](https://github.com/bottom-software-foundation/spec) emoji encoding'
+    regress: 'Converts text in the [Bottom](https://github.com/bottom-software-foundation/spec) emoji encoding to Unicode'
+
+    ipa: 'Converts phonetic transcriptions from [X-SAMPA](https://en.wikipedia.org/wiki/X-SAMPA) to [IPA](https://en.wikipedia.org/wiki/International_Phonetic_Alphabet)'
+
+    sp: 'Renders Toki Pona text in the _sitelen pona_ alphabet'
+    sppreview: 'Renders some Toki Pona text in all available _sitelen pona_ typefaces'
+
+    tio: 'Runs some code using the service [Try It Online](https://tio.run)'
+    tiolangs: 'Lists all programming languages available on [Try It Online](https://tio.run)'
 
   admin:
     eval:
       nope: 'nope'
 
   arch:
     wiki:
-      no-results: 'No results found'
+      no-results: 'No results found.'
 
     ps:
-      no-results: 'No results found'
+      no-results: 'No results found.'
       title: 'Search results for `%s`'
       result-footer: 'version **%s** | built **%s** | [web link](%s)'
 
     package:
+      not-found: '❔ Package not found.'
+
       url: 'Upstream URL'
       license: 'License'
       csize: 'Size'
@@ -113,7 +134,7 @@ en:
 
       creating: '🎨 Creating %d new color roles'
       created: '`(%d/%d)` Created role %s with color `%s`.'
-      success: '✅ Created %s roles.'
+      success: '✅ Created %d roles.'
 
     rc:
       begin: '🔄 Randomizing colors for %s users.'
@@ -150,14 +171,38 @@ en:
       no-perms: 'You do not have permission to delete query #%s.'
 
   snippets:
+    help: >-
+      You can append the following verbs to this command:
+        - `list`, `show`: See the list of all snippets.
+        - `set`, `edit`: Given a name and text, create a new snippet by that name or set the value of an existing snippet.
+        - `remove`, `rm`, `delete`: Given a name, remove the snippet by that name, if it exists.
+        - `property`: Set properties of snippets.
+
+    edit:
+      success: 'Successfully edited snippet `%s`.'
+      not-found: 'Could not find a snippet with name `%s`.'
+
+    remove:
+      success: 'Successfully removed snippet `%s`, if it existed.'
+
+    prop:
+      help: >-
+        The following properties are available: `%s`.
+        To set a property, append the property, the name of the snippet to modify, and the new value;
+        for example, `snippet property embed foo true`.
+
+      success: 'Successfully set property `%s` of snippet `%s` to `%s`.'
+
     list:
       none-found: 'No available snippets.'
       title: 'Available snippets'
+
     snippet:
       not-found: 'Snippet not found.'
 
   notes:
     add:
+      invalid-args: '⚠️ Invalid arguments given.'
       success: 'Note **`%s`** (`#%s`) added successfully.'
       failure: "⚠️  **Note could not be saved due to these errors:**\n%s."
     get:
@@ -178,7 +223,8 @@ en:
     attrib:
       title: 'toki pona data sources'
       text: >-
-        toki pona was created by Sonja Lang. the pu dictionary is in the public domain.
+        toki pona was created by Sonja Lang.
+        the dictionary in _Toki Pona: The Language of Good_, known as _pu_, is in the public domain.
         tokipona.org data was gathered by Sonja Lang and can be found at %s.
         other data was taken from ilo Salana, which is in the public domain.
 
@@ -230,6 +276,7 @@ en:
         channel: 'channel IDs'
         user: 'user IDs'
         role: 'role IDs'
+        bare: 'any IDs'
     enum:
       name: 'selection'
       desc: 'fixed set of choices'
@@ -312,3 +359,5 @@ en:
 
   fun:
     ping: 'I got pinged :o'
+
+  nyi: 'This feature is not yet implemented.'