zetabot 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46af2180fa140b7a4a13ff6aa3238a10641aa49aacd602c1681aa188ba086925
-  data.tar.gz: e9fadf22b7c2ea0e310ab6161a06be6e259ca5b85c469e0cc36e6b0c65be54bc
+  metadata.gz: f8e39c59a8f99836efb2437f8201d1ee3adab62989ef546b30e31a51774ab1ea
+  data.tar.gz: 20fc3e2ddb8926fc0f81da0b5d325d88974e1a43cf7ec9b6217cf5fc02a80095
 SHA512:
-  metadata.gz: df6c87ba8cffd091d528aeae97be147f5e0e4ed3fd13f1523c43b79112ceb75ffe749040875b08a0921c80336dc59400c17cd3e56d3689061b1dd619414a7a1e
-  data.tar.gz: 807a2d87d838cb17b5e79adcc5ba154d2b207446edf0135eecf58ca846f3b22b44e410cf491096a59f3b165f246cfef787c3422f3fb84cd98865eefbe9744f0f
+  metadata.gz: 89cb309e5b06b123427b3aca1d4e24f3c80414717b87cf1fd5cadd752f19d750aa01799bd948d06bb806db03325746414ad691c7408dcb9c5c0ff9cfb1661143
+  data.tar.gz: 994491b4d87d4e16bc9e03209f4b0fdda5d385fccc42ac2dd5174eb4bf2362ee4e17e793c9825a2cd02a80b57eb57a125ba108bd499dcd0ffb34f2b7140b5a47

data/.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "4.0.9"

data/.rspec

@@ -0,0 +1,2 @@
+--require spec_helper
+--format progress

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    zetabot (2.1.1)
+    zetabot (2.2.1)
       actionview
+      base64
+      bigdecimal
+      cgi
       chronic
       chronic_duration
-      cinch
-      cinch-cooldown
-      cinch-quotes
       cinch-toolbox
       crack
+      csv
       daemons
       destructor
       discourse_api
@@ -18,17 +19,20 @@ PATH
       faraday
       geocoder
       gist
-      github_api
       haml
       hashie
       httparty
       humanize-bytes
       ipaddress
+      ircinch
+      logger
       mechanize
       mkfifo
-      nokogiri (~> 1.13.6)
+      nokogiri (>= 1.13.6)
+      ostruct
       pdf-reader
       persist
+      pstore
       recursive-open-struct
       rest-client
       tag_formatter
@@ -41,291 +45,316 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.1.0)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    Ascii85 (2.0.1)
+    actionview (8.1.4)
+      activesupport (= 8.1.4)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (8.1.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.4)
-      public_suffix (>= 2.0.2, < 6.0)
-    afm (0.2.2)
-    ansi (1.5.0)
-    ast (2.4.2)
-    binding.repl (3.0.0)
-    builder (3.2.4)
-    cd (1.0.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    afm (1.0.1)
+    ansi (1.6.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.1.3)
+    builder (3.3.0)
+    cd (1.0.2)
+    cgi (0.5.2)
     chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
-    cinch (2.3.4)
-    cinch-cooldown (1.2.1)
-      cinch (~> 2)
-      time-lord (~> 1.0, >= 1.0.1)
-    cinch-quotes (0.0.4)
-      cinch (~> 2.0)
     cinch-toolbox (1.1.7)
       nokogiri (~> 1.6)
-    clipboard (1.3.6)
-    code (0.9.3)
+    clipboard (2.0.0)
+    code (0.9.5)
       coderay (~> 1.1)
       method_source (>= 0.9, < 2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
-    crack (0.4.5)
+    concurrent-ruby (1.3.8)
+    connection_pool (3.0.2)
+    core_docs (0.9.13)
+      yard (~> 0.9.11)
+    crack (1.0.1)
+      bigdecimal
       rexml
-    crass (1.0.6)
+    crass (1.0.8)
+    csv (3.3.6)
     daemons (1.4.1)
-    debugging (1.1.2)
-      binding.repl (~> 3.0)
+    debugging (2.1.1)
       paint (>= 0.9, < 3.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     destructor (0.1.0)
-    diff-lcs (1.5.0)
-    discourse_api (1.1.0)
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0)
+    diff-lcs (1.6.2)
+    discourse_api (2.1.0)
+      faraday (~> 2.7)
+      faraday-follow_redirects
+      faraday-multipart
       rack (>= 1.6)
     dnsbl-client (1.1.1)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.7.20261007)
+    drb (2.2.3)
     dronebl.rb (0.1.0.0)
       httparty (~> 0.13)
       nokogiri (~> 1.6)
-    erubi (1.12.0)
-    every_day_irb (2.1.1)
+    erb (6.0.7)
+    erubi (1.13.1)
+    every_day_irb (2.3.0)
       cd (~> 1.0)
-    fancy_irb (1.4.3)
+      irb
+    fancy_irb (2.1.3)
+      irb (>= 1.7, < 2.0)
       paint (>= 0.9, < 3.0)
-      unicode-display_width (>= 1.1)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    ffi (1.15.5)
-    geocoder (1.8.1)
-    gist (6.0.0)
-    github_api (0.19.0)
-      addressable (~> 2.4)
-      descendants_tracker (~> 0.0.4)
-      faraday (>= 0.8, < 2)
-      hashie (~> 3.5, >= 3.5.2)
-      oauth2 (~> 1.0)
-    haml (6.1.1)
+      unicode-display_width (>= 2.5)
+    faraday (2.15.0)
+      faraday-net_http (>= 2.0, < 3.6)
+      json
+      logger
+    faraday-follow_redirects (0.5.0)
+      faraday (>= 1, < 3)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.5.0)
+      net-http (~> 0.5)
+    ffi (1.17.4)
+    geocoder (1.8.6)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
+    gist (6.1.0)
+    haml (7.5.1)
+      prism (>= 1.1.0)
       temple (>= 0.8.2)
       thor
       tilt
+    hashdiff (1.2.1)
     hashery (2.1.2)
-    hashie (3.6.0)
+    hashie (5.2.0)
+      logger
     hirb (0.7.3)
     http-accept (1.7.0)
-    http-cookie (1.0.5)
+    http-cookie (1.1.6)
       domain_name (~> 0.5)
-    httparty (0.21.0)
+    httparty (0.24.3)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     humanize-bytes (2.2.0)
-    i18n (1.13.0)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    interactive_editor (0.0.11)
-      spoon (>= 0.0.1)
-    io-console (0.5.11)
+    interactive_editor (0.0.12)
+      spoon (~> 0.0.6)
+    io-console (0.9.4)
     ipaddress (0.8.3)
-    irb (1.4.1)
-      reline (>= 0.3.0)
-    irbtools (3.0.5)
-      binding.repl (~> 3.0)
-      clipboard (~> 1.3)
-      code (>= 0.9.2, < 2.0)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    irbtools (4.2.0)
+      clipboard (>= 1.4, < 3.0)
+      code (>= 0.9.5, < 2.0)
       coderay (~> 1.1)
-      debugging (~> 1.1)
-      every_day_irb (~> 2.0)
-      fancy_irb (~> 1.2, >= 1.2.1)
+      core_docs (~> 0.9.13)
+      debugging (~> 2.1)
+      every_day_irb (~> 2.3)
+      fancy_irb (~> 2.1, >= 2.1.3)
       hirb (~> 0.7, >= 0.7.3)
-      interactive_editor (~> 0.0, >= 0.0.10)
-      irb (>= 0.9.6)
-      methodfinder (~> 2.2, >= 2.2.2)
-      object_shadow (~> 1.1)
-      ori (~> 0.1.0)
-      os
+      interactive_editor (~> 0.0, >= 0.0.12)
+      irb (~> 1.16)
+      looksee (>= 5.0, < 7.0)
+      methodfinder (~> 2.2, >= 2.2.5)
+      object_shadow (~> 1.1, >= 1.1.2)
+      os (~> 1.1, >= 1.1.4)
       paint (>= 0.9, < 3.0)
-      ruby_engine (~> 1.0)
-      ruby_info (~> 1.0)
+      ruby_engine (~> 2.0)
       ruby_version (~> 1.0)
-      wirb (~> 2.0, >= 2.2.1)
+      wirb (~> 3.0)
+    ircinch (2.4.5)
+      ostruct
     iso8601 (0.13.0)
-    jwt (2.7.0)
+    json (3.1.0)
     liner (0.2.4)
-    loofah (2.20.0)
+    logger (1.7.0)
+    loofah (2.25.2)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mechanize (2.9.1)
+      nokogiri (>= 1.12.0)
+    looksee (5.1.0)
+    mechanize (2.14.1)
       addressable (~> 2.8)
+      base64
       domain_name (~> 0.5, >= 0.5.20190701)
       http-cookie (~> 1.0, >= 1.0.3)
-      mime-types (~> 3.0)
+      mime-types (~> 3.3)
       net-http-digest_auth (~> 1.4, >= 1.4.1)
       net-http-persistent (>= 2.5.2, < 5.0.dev)
+      nkf
       nokogiri (~> 1.11, >= 1.11.2)
       rubyntlm (~> 0.6, >= 0.6.3)
       webrick (~> 1.7)
       webrobots (~> 0.1.2)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    method_source (1.0.0)
-    methodfinder (2.2.4)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.7)
-    minitest (5.18.0)
+    memoizable (0.5.1)
+    method_source (1.1.0)
+    methodfinder (2.3.1)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.1020)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
     mkfifo (0.1.1)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.3.0)
+    multi_xml (0.9.1)
+      bigdecimal (>= 3.1, < 5)
+    multipart-post (2.4.1)
+    net-http (0.10.0)
+      net-protocol (>= 0.3.0)
+      uri (>= 0.11.1)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
+    net-http-persistent (4.0.8)
+      connection_pool (>= 2.2.4, < 4)
+    net-protocol (0.4.0)
+      timeout
     net_http_timeout_errors (1.0.0)
     netrc (0.11.0)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nkf (0.3.0)
+    nokogiri (1.19.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
-    oauth2 (1.4.11)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-    object_shadow (1.1.1)
-    oga (3.4)
+    object_shadow (1.1.2)
+    oga (3.5)
       ast
-      ruby-ll (~> 2.1)
-    ori (0.1.0)
+      ruby-ll (~> 2.2)
     os (1.1.4)
-    paint (2.2.1)
+    ostruct (0.6.3)
+    paint (2.3.0)
     parslet (2.0.0)
-    pdf-reader (2.11.0)
-      Ascii85 (~> 1.0)
-      afm (~> 0.2.1)
+    pdf-reader (2.16.0)
+      Ascii85 (>= 1.0, < 3.0, != 2.0.0)
+      afm (>= 0.2.1, < 2)
       hashery (~> 2.0)
-      ruby-rc4
       ttfunk
     persist (1.0.0)
-    public_suffix (5.0.1)
-    racc (1.8.0)
-    rack (3.0.7)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.1)
+    prism (1.9.0)
+    pstore (0.2.1)
+    public_suffix (7.0.5)
+    racc (1.8.1)
+    rack (3.2.7)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    rake (10.5.0)
-    recursive-open-struct (1.1.3)
-    reline (0.3.1)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rake (13.4.2)
+    rbs (4.2.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.1.0)
+      erb
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
+      tsort
+    recursive-open-struct (2.1.1)
+      ostruct
+    reline (0.7.0)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    ruby-ll (2.1.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    ruby-ll (2.2.0)
       ansi
       ast
-    ruby-rc4 (0.1.5)
-    ruby2_keywords (0.0.5)
-    ruby_engine (1.0.1)
-    ruby_info (1.0.1)
-    ruby_version (1.0.2)
-    rubyntlm (0.6.3)
+    ruby_engine (2.0.3)
+    ruby_version (1.0.3)
+    rubyntlm (0.6.8)
+      base64
+    securerandom (0.4.1)
     signed_multiset (0.2.1)
     spoon (0.0.6)
       ffi
     tag_formatter (0.0.3)
-    temple (0.10.0)
-    thor (1.2.1)
-    thread_safe (0.3.6)
-    tilt (2.1.0)
-    time-lord (1.0.1)
+    temple (0.10.7)
+    thor (1.5.0)
+    tilt (2.9.0)
+    timeout (0.6.1)
+    tsort (0.2.0)
     ttfunk (1.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.1.0)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
     unitwise (2.3.0)
       liner (~> 0.2)
       memoizable (~> 0.4)
       parslet (~> 2.0)
       signed_multiset (~> 0.2)
-    video_info (4.0.0)
+    uri (1.1.2)
+    video_info (4.2.0)
       iso8601 (~> 0.13.0)
       net_http_timeout_errors (~> 1.0.0)
       oga (~> 3.4)
-    webrick (1.8.1)
+    webmock (3.34.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.9.2)
     webrobots (0.1.2)
-    wirb (2.2.2)
-      paint (>= 0.9, < 3.0)
-    wolfram (0.2.1)
-      nokogiri (>= 1.4.3)
+    wirb (3.0.0)
+      paint (>= 0.9, < 4.0)
+    wolfram (0.3.0)
+      nokogiri (~> 1, >= 1.4.3)
     wolfram-alpha (0.3.1)
       nokogiri
+    yard (0.9.45)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.4)
+  bundler (>= 2.4)
   irbtools
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
+  webmock (~> 3.0)
   zetabot!
 
 BUNDLED WITH
-   2.4.22
+  4.0.23

data/README.md

@@ -3,7 +3,7 @@ Cinch IRC bot written with plenty of help. I will not claim any of the plugins
 And will try to get the correct credits in source
 
 # Installation
-Zeta requires ruby >= 2.7.6 and rubygems. Installation beyond that is simple
+Zeta requires ruby >= 3.2 (tested on 4.0) and rubygems. Installation beyond that is simple
 
 _Steps_
 * gem install zetabot
@@ -15,7 +15,7 @@ _Docker_
 Zeta will need its config file mounted in the `.zeta/config.rb` image for her to function. 
 
 ```dockerfile
-FROM docker.io/ruby:2.7.6
+FROM docker.io/ruby:4.0
 RUN useradd zeta -m
 USER zeta
 WORKDIR /home/zeta/
@@ -28,6 +28,17 @@ CMD [ "zetabot"]
 _Plugins_
 All plugins are automatically loaded that are in the plugins directory
 
+_Development_
+
+```sh
+bundle install
+bundle exec rake   # runs the rspec suite
+```
+
+The specs boot the real bot against a temporary `$HOME` (see `spec/fixtures/config.rb`)
+and feed raw IRC lines through Cinch, recording what the bot sends. No network access is
+needed; HTTP APIs are stubbed with WebMock. Known bugs are kept as `pending` examples.
+
 ## Commands
 roles: owner,admin,operator,halfop,voice,nobody
 prefix: ?

data/Zeta.gemspec

@@ -26,24 +26,33 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 3.2"
 
-  spec.add_development_dependency "bundler", "~> 2.4"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.4"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "webmock", "~> 3.0"
   spec.add_development_dependency "irbtools"
 
+  # Former default gems that are bundled/removed in Ruby 3.4+ / 4.0
+  spec.add_dependency 'logger'
+  spec.add_dependency 'ostruct'
+  spec.add_dependency 'base64'
+  spec.add_dependency 'bigdecimal'
+  spec.add_dependency 'csv'
+  spec.add_dependency 'pstore'
+  spec.add_dependency 'cgi'
+
   spec.add_dependency 'daemons'
   spec.add_dependency 'destructor'
   spec.add_dependency 'tzinfo'
   spec.add_dependency 'unitwise'
 
-  spec.add_dependency 'cinch'
-  spec.add_dependency 'cinch-cooldown'
+  spec.add_dependency 'ircinch' # maintained, drop-in fork of the archived cinch gem
   spec.add_dependency 'cinch-toolbox'
-  spec.add_dependency 'cinch-quotes'
 
   spec.add_dependency 'mkfifo'
-  spec.add_dependency 'nokogiri', "~> 1.13.6"
+  spec.add_dependency 'nokogiri', ">= 1.13.6"
   spec.add_dependency 'dronebl.rb'
   spec.add_dependency 'dnsbl-client'
 
@@ -69,7 +78,6 @@ Gem::Specification.new do |spec|
   # API
   spec.add_dependency 'wolfram'
   spec.add_dependency 'wolfram-alpha'
-  spec.add_dependency 'github_api'
   spec.add_dependency 'gist'
   spec.add_dependency 'discourse_api'
   spec.add_dependency 'video_info'

data/lib/Zeta/access.rb

@@ -64,7 +64,7 @@ module Cinch
           when :a, :admin # Admin
             return true if channel.admins.include? user
             false
-          when :o, :op # Op
+          when :o, :op, :operator # Op
             return true if channel.ops.include? user
             false
           when :h, :halfop # Half-Op