ruboty-fop 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212794e3bd6576267d491e38b97bb94c39cb8066e711a2a3ca441f34bdfc1297
-  data.tar.gz: c7cdf07a5c44abcfcb71605b552ecfd10c56a2389038fa868ec2f8cf0983f47f
+  metadata.gz: 738aecee9800922f4f72ee55b24ea1cea5350203e58587f46c66ea2c547dfba3
+  data.tar.gz: 84f602dd1affa279e20883a36927c23a1fb4e3ac0c69a782bb826faaef33d084
 SHA512:
-  metadata.gz: 2ec6dc54f568315dce5bbf54adb3b2663bfd393ecc867a07a37d2d41aa329270a17ee104db4ee67073ed940bb113f545b67770496f6ffefada81cf93d668bbe6
-  data.tar.gz: 23756a9ba67258cc7fb07ac7efae9b89b22efc86834a7dc9f38b1e5bcbfbcf88e08d853e99028126c2b8ca9169c4097af2ee7dd6b1dc87646a5db5d0651b2232
+  metadata.gz: 58ecdfe269f3aa4ce77c1ea9fa27ce3fef6b77a836e9ba721dba5e6506a8a30310354510ead2b56aef13b758ed83db12eb2998bf71d63c111151187814cbae62
+  data.tar.gz: ef763b7848544704a10719f3ecfc28d1c9cf9d31e28464bce5f060a72f96ab3601cf0ee9c32ec61db26df27483efb2320fc4d0b3245c7eb71e8a132bbb28ac20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboty-fop (0.0.2)
+    ruboty-fop (0.0.3)
       fop
       ruboty
 

data/lib/ruboty-fop/version.rb

@@ -1,3 +1,3 @@
 module RubotyFop
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ruboty/handlers/fop.rb

@@ -38,8 +38,8 @@ CARD:
 
 CLASS: #{fop.valid_dom_classes.map { |_| "`#{_.code}` #{_.name}" }.join(", ")}
 FARE:
-#{fop.valid_dom_fares.map { |_| "- dom: `#{_.code}` #{_.name}: #{_.remark}" }.join("\n")}
-#{fop.valid_intl_fares.map { |_| "- intl: `#{_.code}` #{_.name}: #{_.remark}" }.join("\n")}
+#{fop.valid_dom_fares.map { |_| "- dom: `#{_.code}` #{_.name}: #{_.remark.gsub(/\*|_/,'')}" }.join("\n")}
+#{fop.valid_intl_fares.map { |_| "- intl: `#{_.code}` #{_.name}: #{_.remark.gsub(/\*|_/,'')}" }.join("\n")}
         EOF
       rescue ::Fop::Error
         message.reply e.inspect
@@ -128,15 +128,15 @@ FARE:
 #{from.code} (#{from.name}) - #{to.code} (#{to.name})
 #{klass ? "#{klass.name}, " : nil}#{fare.name}, #{status.name} (#{card.name})
 
-*single-trip #{result.miles} miles, #{result.fop} FOP*
-*round-trip #{result.miles * 2} miles, #{result.fop * 2} FOP*
+#{bold}single-trip #{result.miles} miles, #{result.fop} FOP#{bold}
+#{italic}round-trip #{result.miles * 2} miles, #{result.fop * 2} FOP#{italic}
 
-Mileage:
-- #{result.flight_miles} (#{result.flight_miles_remark})
-#{result.bonus_miles ? "- #{result.bonus_miles} (#{result.bonus_miles_remark})" : nil}
-FOP:
-- #{result.flight_miles} * #{result.fop_rate}
-#{result.fop_bonus ? "- #{result.fop_bonus } (#{result.fop_bonus_remark})" : nil}
+#{bold}Mileage:#{bold}
+- #{result.flight_miles} (#{result.flight_miles_remark.gsub(/\*|_/,'')})
+#{result.bonus_miles ? "- #{result.bonus_miles} (#{result.bonus_miles_remark.gsub(/\*|_/,'')})" : nil}
+#{bold}FOP:#{bold}
+#{result.flight_miles} x #{result.fop_rate}
+#{result.fop_bonus ? "- #{result.fop_bonus } (#{result.fop_bonus_remark.gsub(/\*|_/,'')})" : nil}
         EOF
       rescue ::Fop::Error => e
         message.reply e.message
@@ -191,7 +191,7 @@ FOP:
       def find_dom_fare(str)
         fare = fop.valid_dom_fares.find { |_| _.code == str }
         unless fare
-          list = fop.valid_dom_fares.map { |_| "- `#{_.code}` #{_.name}: #{_.remark}" }.join("\n")
+          list = fop.valid_dom_fares.map { |_| "- `#{_.code}` #{_.name}: #{_.remark.gsub(/\*|_/,'')}" }.join("\n")
           if str
             raise ::Fop::Error, "fare #{str.inspect} is not valid\n#{list}"
           else
@@ -204,7 +204,7 @@ FOP:
       def find_intl_fare(str)
         fare = fop.valid_intl_fares.find { |_| _.code == str }
         unless fare
-          list = fop.valid_intl_fares.map { |_| "- `#{_.code}` #{_.name}: #{_.remark}" }.join("\n")
+          list = fop.valid_intl_fares.map { |_| "- `#{_.code}` #{_.name}: #{_.remark.gsub(/\*|_/,'')}" }.join("\n")
           if str
             raise ::Fop::Error, "fare #{str.inspect} is not valid\n#{list}"
           else
@@ -248,6 +248,20 @@ FOP:
       def parse_options(str)
         str&.scan(/-(.+?) (.+?)(?:\s+|$)/)&.map{ |_| [_[0].to_sym, _[1]] }.to_h || {}
       end
+
+      def bold
+       markdown? ? '**' : '*'
+      end
+
+      def italic
+        '_'
+      end
+
+      def markdown?
+        return @use_markdown if @markdown_detected
+        @markdown_detected = true
+        @use_markdown = ENV['RUBOTY_FOP_MARKDOWN'] || Ruboty::AdapterBuilder.adapter_classes.last.name.include?('Discord')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-fop
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sorah Fukumori