grinch 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bdf33a559d3d5eb8554340981ca88fc329085886c870db0af86eb651d21ccb
-  data.tar.gz: 7b793e554505585038fb85cc83a3d0a0b42381898bf0935af4d44ba2c4369ff0
+  metadata.gz: 599ce33b0690279ec66619db60107d39af1085244c24488e99e8b7463a9bf997
+  data.tar.gz: '097b6c4e200d0bc3ec0c953d39c55c9ff99a948e9ff57c34a95c04be776ddae5'
 SHA512:
-  metadata.gz: d82d81004649adea9f10e9996f24e4fca7411718d2877125e5ff66f49533a1f9b3867926072913198e336cab28829b8238712cf8b9d6df874aae6f0a3610c10b
-  data.tar.gz: ee26329f1ae9592b2f68beb3c463f86fef9fd76af4d3982ed68008dc5efff364e4f701c4960d6676325fcf35ee3b1edd44fb4a32ec37320c2966be7d3932d672
+  metadata.gz: 7f58e236d6481c75f145f0792c0629822d173b6780b7ed050c24d997b15816d9360ffe989fc4b10ceb49fff95a255aeb81b4ad128017c046def8e06889f92f40
+  data.tar.gz: 1c1f1b6d39f4d25f9a9ed0a88725d325dd6690e87f446c41a68833d168243144852d1bbd7ae2995089e671157781de3b55d19b528f5fc05a9de2cab6d50363fe

data/lib/cinch/formatting.rb

@@ -119,7 +119,7 @@ module Cinch
     # @return [String] The filtered string
     # @since 2.2.0
     def self.unformat(string)
-      string.gsub(/[\x02\x0f\x16\x1f\x12]|\x03(\d{1,2}(,\d{1,2})?)?/, '')
+      string.gsub(/[\x02\x0f\x16\x1d\x1f\x12]|\x03(\d{1,2}(,\d{1,2})?)?/, '')
     end
   end
 end

data/lib/cinch/message.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require "time"
 require "cinch/formatting"
 
@@ -21,7 +22,7 @@ module Cinch
 
     # @return [Array<String>]
     attr_reader :params
-    
+
     # @return [Hash]
     attr_reader :tags
 
@@ -87,7 +88,7 @@ module Cinch
     def initialize(msg, bot)
       @raw     = msg
       @bot     = bot
-      @matches = {:ctcp => {}, :action => {}, :other => {}}
+      @matches = { ctcp: {}, action: {}, other: {} }
       @events  = []
       @time    = Time.now
       @statusmsg_mode = nil
@@ -97,13 +98,11 @@ module Cinch
     # @api private
     # @return [void]
     def parse
-      match = @raw.match(/(?:^@([^:]+))?(?::?(\S+) )?(\S+)(.*)/)
+      match = @raw.match(/\A(?:@([^ ]+) )?(?::(\S+) )?(\S+)(.*)/)
       tags, @prefix, @command, raw_params = match.captures
 
       if @bot.irc.network.ngametv?
-        if @prefix != "ngame"
-          @prefix = "%s!%s@%s" % [@prefix, @prefix, @prefix]
-        end
+        @prefix = "%s!%s@%s" % [@prefix, @prefix, @prefix] if @prefix != "ngame"
       end
 
       @params  = parse_params(raw_params)
@@ -168,9 +167,7 @@ module Cinch
         type = :other
       end
 
-      if strip_colors
-        text = Cinch::Formatting.unformat(text)
-      end
+      text = Cinch::Formatting.unformat(text) if strip_colors
 
       @matches[type][regexp] ||= text.match(regexp)
     end
@@ -192,9 +189,7 @@ module Cinch
     # @return [void]
     def reply(text, prefix = false)
       text = text.to_s
-      if @channel && prefix
-        text = text.split("\n").map {|l| "#{user.nick}: #{l}"}.join("\n")
-      end
+      text = text.split("\n").map { |l| "#{user.nick}: #{l}" }.join("\n") if @channel && prefix
 
       reply_target.send(text)
     end
@@ -205,9 +200,7 @@ module Cinch
     # @return (see #reply)
     def safe_reply(text, prefix = false)
       text = text.to_s
-      if channel && prefix
-        text = "#{@user.nick}: #{text}"
-      end
+      text = "#{@user.nick}: #{text}" if channel && prefix
       reply_target.safe_send(text)
     end
 
@@ -236,6 +229,7 @@ module Cinch
     # @return [void]
     def ctcp_reply(answer)
       return unless ctcp?
+
       @user.notice "\001#{@ctcp_command} #{answer}\001"
     end
 
@@ -248,19 +242,20 @@ module Cinch
     end
 
     private
+
     def reply_target
-      if @channel.nil? || @statusmsg_mode.nil?
-        return @target
-      end
+      return @target if @channel.nil? || @statusmsg_mode.nil?
+
       prefix = @bot.irc.isupport["PREFIX"][@statusmsg_mode]
-      return Target.new(prefix + @channel.name, @bot)
+      Target.new(prefix + @channel.name, @bot)
     end
+
     def regular_command?
       !numeric_reply? # a command can only be numeric or "regular"…
     end
 
     def parse_params(raw_params)
-      params     = []
+      params = []
       if match = raw_params.match(/(?:^:| :)(.*)$/)
         params = match.pre_match.split(" ")
         params << match[1]
@@ -268,44 +263,46 @@ module Cinch
         params = raw_params.split(" ")
       end
 
-      return params
+      params
     end
-    
+
     def parse_tags(raw_tags)
       return {} if raw_tags.nil?
-      
+
       def to_symbol(string)
-        return string.gsub(/-/, "_").downcase.to_sym
+        string.tr("-", "_").downcase.to_sym
       end
-      
+
       tags = {}
       raw_tags.split(";").each do |tag|
         tag_name, tag_value = tag.split("=")
-        if tag_value =~ /,/
-          tag_value = tag_value.split(',')
+        if /,/.match?(tag_value)
+          tag_value = tag_value.split(",")
         elsif tag_value.nil?
           tag_value = tag_name
         end
-        if tag_name =~ /\//
-          vendor, tag_name = tag_name.split('/')
+        if %r{/}.match?(tag_name)
+          vendor, tag_name = tag_name.split("/")
           tags[to_symbol(vendor)] = {
-            to_symbol(tag_name) => tag_value
+            to_symbol(tag_name) => tag_value,
           }
         else
           tags[to_symbol(tag_name)] = tag_value
         end
       end
-      return tags
+      tags
     end
 
     def parse_user
       return unless @prefix
+
       nick = @prefix[/^(\S+)!/, 1]
       user = @prefix[/^\S+!(\S+)@/, 1]
       host = @prefix[/@(\S+)$/, 1]
 
       return nil if nick.nil?
-      return @bot.user_list.find_ensured(user, nick, host)
+
+      @bot.user_list.find_ensured(user, nick, host)
     end
 
     def parse_channel
@@ -327,9 +324,7 @@ module Cinch
         if ch.nil? && numeric_reply? && @params.size > 1
           ch, status = privmsg_channel_name(@params[1])
         end
-        if ch
-          return @bot.channel_list.find_ensured(ch), status
-        end
+        return @bot.channel_list.find_ensured(ch), status if ch
       end
     end
 
@@ -346,8 +341,9 @@ module Cinch
 
     def parse_server
       return unless @prefix
-      return if @prefix.match(/[@!]/)
-      return @prefix[/^(\S+)/, 1]
+      return if @prefix =~ /[@!]/
+
+      @prefix[/^(\S+)/, 1]
     end
 
     def parse_error
@@ -366,27 +362,30 @@ module Cinch
     def parse_ctcp_message
       # has to be called after parse_params
       return unless ctcp?
+
       @params.last =~ /\001(.+)\001/
-      $1
+      Regexp.last_match(1)
     end
 
     def parse_ctcp_command
       # has to be called after parse_ctcp_message
       return unless ctcp?
+
       @ctcp_message.split(" ").first
     end
 
     def parse_ctcp_args
       # has to be called after parse_ctcp_message
       return unless ctcp?
+
       @ctcp_message.split(" ")[1..-1]
     end
 
     def parse_action_message
       # has to be called after parse_ctcp_message
       return nil unless action?
+
       @ctcp_message.split(" ", 2).last
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grinch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - William Woodruff
@@ -114,7 +114,7 @@ files:
 - lib/cinch/utilities/encoding.rb
 - lib/cinch/utilities/kernel.rb
 - lib/cinch/version.rb
-homepage: 
+homepage: https://github.com/woodruffw/grinch
 licenses:
 - MIT
 metadata: {}