cosgrove 0.0.2 → 0.0.3rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e5cfb51b16658b05b8c58d32f848b18d42ac2e
-  data.tar.gz: 08f1f4ad0169c0512c6c415f76f4d6e0ad6d4f15
+  metadata.gz: fe7cb0da9ef53e623117b7abb364748436eb0836
+  data.tar.gz: 02a2f8d029e6195789bfc782d4788e9433cb853c
 SHA512:
-  metadata.gz: f78010b967c9ebfd56ffa15d65b4a7c7db4c40971c909f4f2e64b8f1c20f9614ee3b59a5832d8859cfd485cb1f888e9ca6bbbd7e61d41e4d2edc218dcb559737
-  data.tar.gz: d9273d53aa1d6e71e0f24600c472e2ef3d73677242992736b43e20e44d0c1662d7694f1b85d4702c07a6cb2d866936cc06aebd716e73b2bbb182dba1431f22fe
+  metadata.gz: '0983ecb03bc98fc988dac73ac9c8e2536afa914b39aa03feca0c3ccc964b9dc3aa38e2220ebf542fc0d8f75205c5513b28bb86c6ec675c125c947f83bf461e55'
+  data.tar.gz: 1393a41d3cd24cb51d29cd39de009d8ccc29a272f52be17ff6aca72645b537b63606d474abe2299583e18a408e68fda7fc7d4cd8afe91c6416d3a69c4d55f45c

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'mechanize', git: 'https://github.com/sparklemotion/mechanize.git', branch: 'upgrade_net-http-persistent'
+gem 'steem_api', github: 'steem-third-party/steem_api'
+
 gemspec

data/Gemfile.lock

@@ -1,20 +1,47 @@
+GIT
+  remote: git://github.com/steem-third-party/steem_api.git
+  revision: de44a65a21fa9f31db2a160132713a46b7cc7330
+  specs:
+    steem_api (1.0.0)
+      activerecord (>= 4, < 6)
+      activerecord-sqlserver-adapter (>= 4, < 6)
+      awesome_print (~> 1.7, >= 1.7.0)
+      nokogiri (~> 1.8)
+      rest-client (~> 2.0)
+      tiny_tds (~> 1.3)
+
+GIT
+  remote: https://github.com/sparklemotion/mechanize.git
+  revision: f68b1a0bdeee9ec7c9a8b7854f8e6b81d62c43b2
+  branch: upgrade_net-http-persistent
+  specs:
+    mechanize (2.7.5)
+      domain_name (~> 0.5, >= 0.5.1)
+      http-cookie (~> 1.0)
+      mime-types (>= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (>= 2.5.2)
+      nokogiri (~> 1.6)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+
 PATH
   remote: .
   specs:
-    cosgrove (0.0.2)
+    cosgrove (0.0.3rc1)
       activesupport (~> 5.1, >= 5.1.1)
       ai4r (~> 1.13, >= 1.13)
       awesome_print (~> 1.7, >= 1.7.0)
       discordrb (~> 3.2, >= 3.2.1)
+      golos_cloud (~> 1.0, >= 1.0.0)
       mechanize (~> 2.7, >= 2.7.5)
       mongoid (~> 6.1, >= 6.1.0)
       phantomjs (~> 2.1, >= 2.1.1.0)
-      radiator (~> 0.3, >= 0.3.1)
+      radiator (~> 0.3, >= 0.3.15)
       railties (~> 5.1, >= 5.1.1)
       rdiscount (~> 2.2, >= 2.2.0.1)
       rmagick (~> 2.16, >= 2.16.0)
       steem-slap (~> 0.0, >= 0.0.2)
-      steem_api (~> 1.1, >= 1.1.0)
       steem_data (~> 0.0, >= 0.0.3)
       wolfram-alpha (~> 0.3, >= 0.3.1)
 
@@ -40,7 +67,7 @@ GEM
       activemodel (= 5.1.4)
       activesupport (= 5.1.4)
       arel (~> 8.0)
-    activerecord-sqlserver-adapter (5.1.2)
+    activerecord-sqlserver-adapter (5.1.5)
       activerecord (~> 5.1.0)
       tiny_tds
     activesupport (5.1.4)
@@ -53,14 +80,14 @@ GEM
     ai4r (1.13)
     arel (8.0.0)
     awesome_print (1.8.0)
-    bitcoin-ruby (0.0.11)
+    bitcoin-ruby (0.0.14)
     bson (4.2.2)
     builder (3.2.3)
-    coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.2)
+    crass (1.0.3)
     discordrb (3.2.1)
       discordrb-webhooks (~> 3.2.0.1)
       opus-ruby
@@ -75,11 +102,17 @@ GEM
     erubi (1.7.0)
     event_emitter (0.2.6)
     ffi (1.9.18)
+    golos_cloud (1.0.0)
+      activerecord (>= 4, < 6)
+      activerecord-sqlserver-adapter (>= 4, < 6)
+      nokogiri (~> 1.8)
+      rest-client (~> 2.0)
+      tiny_tds (~> 1.3)
     hashdiff (0.3.7)
-    hashie (3.5.6)
+    hashie (3.5.7)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (0.9.0)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     little-plugger (1.1.4)
@@ -89,21 +122,12 @@ GEM
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mechanize (2.7.5)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (>= 1.17.2)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.6)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.1)
     minitest-line (0.6.4)
       minitest (~> 5.0)
     minitest-proveit (1.0.0)
@@ -113,9 +137,10 @@ GEM
     mongoid (6.2.1)
       activemodel (~> 5.1)
       mongo (>= 2.4.1, < 3.0.0)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (2.9.4)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
     netrc (0.11.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
@@ -123,14 +148,11 @@ GEM
     opus-ruby (1.0.1)
       ffi
     phantomjs (2.1.1.0)
-    pry (0.11.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
     rack (2.0.3)
-    rack-test (0.7.0)
+    rack-test (0.8.2)
       rack (>= 1.0, < 3)
-    radiator (0.3.3)
+    radiator (0.3.15)
       awesome_print (~> 1.7, >= 1.7.0)
       bitcoin-ruby (~> 0.0, >= 0.0.11)
       ffi (~> 1.9, >= 1.9.18)
@@ -149,7 +171,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.1.0)
+    rake (12.3.0)
     rbnacl (3.4.0)
       ffi
     rdiscount (2.2.0.1)
@@ -165,36 +187,30 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     steem-slap (0.0.3)
-    steem_api (1.1.0)
-      activerecord (>= 4, < 6)
-      activerecord-sqlserver-adapter (>= 4, < 6)
-      nokogiri (~> 1.8)
-      rest-client (~> 2.0)
-      tiny_tds (~> 1.3)
     steem_data (0.0.3)
       mongoid (~> 6.1, >= 6.1.0)
     thor (0.20.0)
     thread_safe (0.3.6)
     tiny_tds (1.3.0)
       mini_portile2 (~> 2.0)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
     vcr (3.0.3)
-    webmock (3.1.0)
+    webmock (3.2.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     webrobots (0.1.2)
-    websocket (1.2.4)
+    websocket (1.2.5)
     websocket-client-simple (0.3.0)
       event_emitter
       websocket
     wolfram-alpha (0.3.1)
       nokogiri
-    yard (0.9.9)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -202,15 +218,16 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.15, >= 1.15.4)
   cosgrove!
+  mechanize!
   minitest (~> 5.9, >= 5.9.0)
   minitest-line (~> 0.6, >= 0.6.3)
   minitest-proveit (~> 1.0, >= 1.0.0)
-  pry (~> 0.10, >= 0.10.3)
   rake (~> 12.1, >= 12.1.0)
   simplecov (~> 0.11, >= 0.11.2)
+  steem_api!
   vcr (~> 3.0, >= 3.0.3)
   webmock (~> 3.0, >= 3.0.1)
   yard (~> 0.8, >= 0.8.7.6)
 
 BUNDLED WITH
-   1.15.4
+   1.16.0.pre.3

data/README.md

@@ -65,7 +65,7 @@ Add a config file to your `ruby` project called `config.yml`:
   :steem_posting_wif: 
   :golos_account: 
   :golos_posting_wif: 
-  :steem_api_url: https://steemd.steemit.com
+  :steem_api_url: https://api.steemit.com
   :golos_api_url: https://ws.golos.io
 :discord:
   :log_mode: info

data/cosgrove.gemspec

@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
   spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
   spec.add_development_dependency 'yard', '~> 0.8', '>= 0.8.7.6'
-  spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.3'
+  # spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.3'
 
-  spec.add_dependency 'radiator', '~> 0.3', '>= 0.3.1'
+  spec.add_dependency 'radiator', '~> 0.3', '>= 0.3.15'
   spec.add_dependency 'steem_data', '~> 0.0', '>= 0.0.3'
-  spec.add_dependency 'steem_api', '~> 1.1', '>= 1.1.0'
+  spec.add_dependency 'golos_cloud', '~> 1.0', '>= 1.0.0'
   spec.add_dependency 'discordrb', '~> 3.2', '>= 3.2.1'
   spec.add_dependency 'ai4r', '~> 1.13', '>= 1.13'
   spec.add_dependency 'mongoid', '~> 6.1', '>= 6.1.0'

data/lib/cosgrove.rb

@@ -5,7 +5,8 @@ require 'action_view'
 require 'radiator'
 require 'awesome_print'
 require 'steem_data'
-# require 'pry'
+# require 'irb' # for binding.irb
+# require 'pry' # for binding.pry
 
 Bundler.require
 
@@ -13,6 +14,10 @@ defined? Thread.report_on_exception and Thread.report_on_exception = true
 
 SteemData.load
 
+# This will cause a nil to be returned instead of raising an error, allowing us
+# to fall back to SteemApi and/or RPC.
+Mongoid.raise_not_found_error = false
+
 module Cosgrove
   PWD = Dir.pwd.freeze
   KNOWN_CHAINS = [:steem, :golos, :test]

data/lib/cosgrove/account.rb

@@ -8,13 +8,13 @@ module Cosgrove
     ACCOUNTS_FILE ||= "#{Cosgrove::PWD}/accounts.yml".freeze
     DISCORD_IDS = 'discord_ids'.freeze
     
-    attr_accessor :chain, :account_name, :discord_ids
+    attr_accessor :account_name, :discord_ids
     
     def initialize(account_name, chain = :steem)
-      raise "Unknown Chain: #{chain}" unless Cosgrove::KNOWN_CHAINS.include? chain.to_sym
+      @chain = chain.to_sym
+      raise "Unknown Chain: #{@chain}" unless Cosgrove::KNOWN_CHAINS.include? @chain
       
       @account_name = account_name.to_s.downcase
-      @chain = chain
       @discord_ids = []
       
       if !!details
@@ -27,6 +27,8 @@ module Cosgrove
       
       discord_id = discord_id.to_s.split('@').last.split('>').first.to_i
       
+      return nil if discord_id == 0
+      
       Account.yml[chain.to_s].each do |k, v|
         ids = v[DISCORD_IDS]
         return Account.new(k, chain) if !!ids && ids.include?(discord_id)
@@ -38,7 +40,7 @@ module Cosgrove
     def self.find_by_memo_key(memo_key, secure, chain = :steem)
       Account.yml[chain.to_s].each do |k, v|
         v[DISCORD_IDS].each do |discord_id|
-          return Account.new(k, chain) if Account.gen_memo_key(k, discord_id, chain, secure) == memo_key
+          return Account.new(k, chain) if Account.gen_memo_key(k, discord_id, secure, chain) == memo_key
         end
       end
       
@@ -75,9 +77,12 @@ module Cosgrove
     end
     
     def chain_account
+      return @chain_account if !!@chain_account
+      
       if !!@account_name
-        response = api(chain).get_accounts([@account_name])
-        account = response.result.first
+        api(@chain).get_accounts([@account_name]) do |accounts, errors|
+          @chain_account = accounts.first
+        end
       end
     end
   private

data/lib/cosgrove/bot.rb

@@ -58,6 +58,7 @@ module Cosgrove
       
       self.command :verify do |event, key, chain = :steem|
         return if event.channel.pm? && !cosgrove_allow_pm_commands
+        cb_account = nil
         
         mongo_behind_warning(event)
         if key.nil?
@@ -72,12 +73,10 @@ module Cosgrove
         else
           discord_id = key.split('@').last.split('>').first.to_i
           cb_account = Cosgrove::Account.find_by_discord_id(discord_id, chain)
-          
-          account = if !!cb_account
-            find_account(cb_account.account_name, event)
-          end
         end
         
+        account = cb_account.chain_account if account.nil? && !!cb_account
+        
         if !!account && !!cb_account && cb_account.discord_ids.any?
           if cb_account.hidden?
             "#{chain.to_s.upcase} account `#{account.name}` has been registered."
@@ -99,10 +98,19 @@ module Cosgrove
         return if event.channel.pm? && !cosgrove_allow_pm_commands
         
         mongo_behind_warning(event)
-        account = find_account(account_name, event)
         discord_id = event.author.id
         
-        return nil unless !!account
+        if discord_id.to_i == 0
+          event.respond 'Problem with discord id.'
+          return
+        end
+        
+        account = find_account(account_name, event, chain)
+        
+        if account.nil?
+          event.respond 'Try again later.'
+          return
+        end
         
         cb_account = Cosgrove::Account.new(account.name, chain)
         
@@ -112,26 +120,7 @@ module Cosgrove
         end
         
         memo_key = cb_account.memo_key(discord_id)
-        op = SteemData::AccountOperation.type('transfer').
-          where(account: steem_account, from: account.name, to: steem_account, memo: {'$regex' => ".*#{memo_key}.*"}).last
-          
-        if op.nil?
-          # Fall back to RPC.  The transaction is so new, SteemData hasn't seen it
-          # yet, SteemData is behind, or there is no such transfer.
-          
-          response = api(chain).get_account_history(steem_account, -1000, 1000)
-          op = response.result.map do |history|
-            e = history.last.op
-            type = e.first
-            next unless type == 'transfer'
-            o = e.last
-            next unless o.from == account.name
-            next unless o.to == steem_account
-            next unless o.memo =~ /.*#{memo_key}.*/
-            
-            o
-          end.compact.last
-        end
+        op = find_transfer(chain: chain, account: steem_account, from: account.name, to: steem_account, memo_key: memo_key)
           
         if !!op
           cb_account.add_discord_id(discord_id)

data/lib/cosgrove/comment_job.rb

@@ -6,23 +6,15 @@ module Cosgrove
     include Support
     
     def perform(event, slug, template, message = nil)
+      chain = :steem
       author_name, permlink = parse_slug slug
-      muted = muted by: steem_account, chain: :steem
+      muted = muted by: steem_account, chain: chain
       
-      posts = SteemData::Post.root_posts.where(author: author_name, permlink: permlink)
+      author = find_author(chain: chain, author_name: author_name)
       
-      post = posts.first
-      author = SteemData::Account.find_by(name: author_name)
+      return if author.nil?
       
-      if post.nil?
-        # Fall back to RPC
-        response = api(:steem).get_content(author_name, permlink)
-        unless response.result.author.empty?
-          post = response.result
-          created = Time.parse(post.created + 'Z')
-          cashout_time = Time.parse(post.cashout_time + 'Z')
-        end
-      end
+      post = find_comment(chain: chain, author: author_name, permlink: permlink)
       
       if post.nil?
         cannot_find_input(event)
@@ -32,6 +24,11 @@ module Cosgrove
       created ||= post.created
       cashout_time ||= post.cashout_time
       
+      if created.class == String
+        created = Time.parse(created + 'Z')
+        cashout_time = Time.parse(cashout_time + 'Z')
+      end
+      
       nope = if post.nil?
         "Sorry, couldn't find that."
       elsif cashout_time < Time.now.utc
@@ -53,7 +50,7 @@ module Cosgrove
         'Unable to vote.'
       # elsif template == :welcome && author.post_count != 1
       #   'Sorry, this function is intended to welcome new authors.'
-      elsif SteemData::Post.where(author: steem_account, parent_permlink: post.permlink).any?
+      elsif find_comment(chain: :steem, author: steem_account, parent_permlink: post.permlink).any?
         title = post.title
         title = post.permlink if title.empty?
         "I already commented on #{title} by #{post.author}."