cosgrove 0.0.4.0pre3 → 0.0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4199a721cb39937e39933953807d5c4260530443cad30ef3158c899f3dcb673f
-  data.tar.gz: 9e59b88a764d8039d58ff8104beafc79dbc01bfbdb73f6f2f5de0d311cbe157b
+  metadata.gz: ac52acfd0be7b7e7002d387b8fce1a1117445b85013718d37ccadfba1ecdbe26
+  data.tar.gz: 493af9d457fb7a85f6a7884213231d2205586c8dc90c8565fb917a0a7c2c6053
 SHA512:
-  metadata.gz: 4a0ed9862bee58cdfcf793f7606b3c59a7ddb5c90db3d0b620937adce79caff76f1343eff326aba285a2b3fc8231f8703234ca9d89dddd760be61d1f8f991e2d
-  data.tar.gz: d7fbcaebb0f4fa4f947e0438f333a8a1b4a6d56ef785f508c43b47f503170aca9a846e113cbbae4512521da2490237b898cac9cd610ba746572147d086896cf3
+  metadata.gz: dccc4c63467587e805a4f3b0f264a482c0c0169c45a7c1de463427d8e95ad1211ea512d52665e16f3c7472760ab77627a2f0cd8c942981b7f818569d8801bbe3
+  data.tar.gz: 6f3245b5cfcb629cae002adf24b59f61dddd31b37ff00476bb69a173df84f5dc197221f1cdb3a026b9ff3003d31e4903d660f8d491765bc3e8308636bd149e67

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
-Gemfile.lock
 *.rbc
 /.config
 /coverage/
@@ -43,7 +42,7 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 

data/Gemfile

@@ -2,5 +2,8 @@ source 'https://rubygems.org'
 
 gem 'mechanize'
 gem 'pry'
+gem 'irb'
+gem 'rb-readline'
+gem 'hive_sql'
 
 gemspec

data/README.md

@@ -5,9 +5,9 @@ Cosgrove is a STEEM Centric Discord Bot Framework that allows you to write your
 One example of a bot that uses this framework is [@banjo](https://steemit.com/steemdata/@inertia/introducing-banjo) on SteemSpeak.
 
 ## New features
-
-* Support for SteemApi (replacing SteemData)
-* Optimized interactive messages to update as data is queried
+  
+* Engine support provided by the `Cosgrove::Utils` module.
+* Bug fixes
 * Gem updates.
 
 ## Features
@@ -27,6 +27,8 @@ One example of a bot that uses this framework is [@banjo](https://steemit.com/st
   * Callback `on_success_upvote_job` which can be used to, for example, reply to the post after being upvoted.
   * Market data now uses Bittrex instead of Poloniex.
   * `operators` to keep track of steem accounts that can do things like block upvotes (by blockchain mute).
+  * Support for HiveSQL
+  * Optimized interactive messages to update as data is acquired in realtime
 
 ## Installation
 
@@ -65,6 +67,11 @@ Add a config file to your `ruby` project called `config.yml`:
   :steem_account: 
   :steem_posting_wif: 
   :steem_api_url: https://api.steemit.com
+  :steem_engine_api_url: https://api.steem-engine.com/rpc
+  :hive_engine_api_url: https://api.hive-engine.com/rpc
+  :hive_account: 
+  :hive_posting_wif: 
+  :hive_api_url: https://api.steem.house
 :discord:
   :log_mode: info
 ```
@@ -87,21 +94,19 @@ SecureRandom.hex(32)
 4. Give that URL to the Discord server/guild owner and have them authorize the bot.
 5. Set the `token` and `client_id` in your bot constructor (see below).
 
-## SteemSQL
+## HiveSQL
 
-Some features provided by `cosgrove` require access to [SteemSQL](http://steemsql.com/), which is a Microsoft SQL database containing all the Steem blockchain data.
+Some features provided by `cosgrove` require access to [HiveSQL](http://hivesql.io/), which is a Microsoft SQL database containing all the Steem blockchain data.
 
 **Please note:**
 
-> SteemSQL has moved to a monthly subscription model and the default free account/password “steemit/steemit” has been disabled.
-
-If you intend to use SteemSQL, you can provide the credentials in `authorize-steem-sql.sh`, then use this terminal command to enable SteemSQL just before running your bot.  Copy the example `example-authorize-steem-sql.sh` and add your credentials:
+If you intend to use HiveSQL, you can provide the credentials in `authorize-hive-sql.sh`, then use this terminal command to enable HiveSQL just before running your bot.  Copy the example `example-authorize-hive-sql.sh` and add your credentials:
 
 ```bash
-source path/to/authorize-steem-sql.sh
+source path/to/authorize-hive-sql.sh
 ```
 
-Features that currently require SteemSQL:
+Features that currently require HiveSQL:
 
 * Details in `$mvests` command
 * Any command that tries to suggest account names
@@ -127,6 +132,34 @@ end
 bot.run
 ```
 
+### Engine Lookups
+
+Here's an example of a bot that does Engine API calls when you type: `$bal ENG alice`
+
+```ruby
+require 'cosgrove'
+
+include Cosgrove::Utils
+
+bot = Cosgrove::Bot.new
+
+bot.command :bal do |event, *args|
+  symbol = args[0].strip.upcase
+  account = args[0].strip.downcase
+  params = {
+    query: {
+      symbol: symbol,
+      account: account
+    }
+  }
+  result = steem_engine_contracts(:findOne, params)
+  
+  "#{result['balance']}'s '#{result['symbol']}: #{result['balance']}"
+end
+
+bot.run
+```
+
 ## Tests
 
 * Clone the client repository into a directory of your choice:
@@ -147,6 +180,7 @@ bot.run
 See my previous Ruby How To posts in: [#radiator](https://steemit.com/created/radiator) [#ruby](https://steemit.com/created/ruby)
 
 Also see:
+* [Cosgrove: Database Update](https://steemit.com/radiator/@inertia/cosgrove-database-update)
 * [Introducing: Cosgrove - A STEEM Centric Discord Bot Framework](https://steemit.com/radiator/@inertia/introducing-cosgrove-a-steem-centric-discord-bot-framework)
 * [How to Write a Discord Bot in Ruby](https://steemit.com/radiator/@inertia/how-to-write-a-discord-bot-in-ruby)
 

data/cosgrove.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors = ['Anthony Martin']
   spec.email = ['cosgrove@martin-studio.com']
 
-  spec.summary = %q{Cosgrove Discord Bo t}
+  spec.summary = %q{Cosgrove Discord Bot}
   spec.description = %q{STEEM centric Discord bot.}
   spec.homepage = 'https://github.com/steem-third-party/cosgrove'
   spec.license = 'CC0-1.0'
@@ -17,27 +17,27 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.15', '>= 1.15.4'
+  spec.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.1'
   spec.add_development_dependency 'rake', '~> 12.1', '>= 12.1.0'
   spec.add_development_dependency 'minitest-proveit', '~> 1.0', '>= 1.0.0'
   spec.add_development_dependency 'minitest', '~> 5.10', '>= 5.10.3'
   spec.add_development_dependency 'minitest-line', '~> 0.6', '>= 0.6.4'
   spec.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
-  spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
+  spec.add_development_dependency 'vcr', '~> 4.0', '>= 4.0.0'
   spec.add_development_dependency 'simplecov', '~> 0.11', '>= 0.11.2'
-  spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.16'
+  spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.19'
 
-  spec.add_dependency 'radiator', '~> 0.4', '>= 0.4.3'
-  spec.add_dependency 'steem_api', '~> 1.1', '>= 1.1.2pre3'
+  spec.add_dependency 'radiator', '~> 0.4', '>= 0.4.8'
+  spec.add_dependency 'hive_sql', '~> 1.0', '>= 1.0.2'
   spec.add_dependency 'discordrb', '~> 3.2', '>= 3.2.1'
   spec.add_dependency 'ai4r', '~> 1.13', '>= 1.13'
   spec.add_dependency 'steem-slap', '~> 0.0', '>= 0.0.2'
-  spec.add_dependency 'activesupport', '~> 5.1', '>= 5.1.1'
-  spec.add_dependency 'railties', '~> 5.1', '>= 5.1.1'
+  spec.add_dependency 'activesupport', '~> 6.0', '>= 6.0.3'
+  spec.add_dependency 'railties', '~> 6.0', '>= 6.0.3'
   spec.add_dependency 'rdiscount', '~> 2.2', '>= 2.2.0.1'
   spec.add_dependency 'phantomjs', '~> 2.1', '>= 2.1.1.0'
   spec.add_dependency 'mechanize', '~> 2.7', '>= 2.7.5'
   spec.add_dependency 'wolfram-alpha', '~> 0.3', '>= 0.3.1'
-  spec.add_dependency 'rmagick', '~> 2.16', '>= 2.16.0'
+  spec.add_dependency 'rmagick', '~> 3.1', '>= 3.1.0'
   spec.add_dependency 'awesome_print', '~> 1.7', '>= 1.7.0'
 end

data/example-authorize-hive-sql.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export HIVESQL_HOST=vip.hivesql.io
+export HIVESQL_USERNAME=
+export HIVESQL_PASSWORD=

data/lib/cosgrove.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'yaml'
+require 'active_support/all'
 require 'action_view'
 require 'radiator'
 require 'awesome_print'
-require 'steem_api'
 # require 'pry' # for binding.pry
 
 Bundler.require
@@ -13,7 +13,7 @@ defined? Thread.report_on_exception and Thread.report_on_exception = true
 
 module Cosgrove
   PWD = Dir.pwd.freeze
-  KNOWN_CHAINS = [:steem, :test]
+  KNOWN_CHAINS = [:steem, :test, :hive]
   
   require 'cosgrove/version'
   require 'cosgrove/phantomjs'
@@ -25,5 +25,6 @@ module Cosgrove
   require 'cosgrove/market'
   require 'cosgrove/upvote_job'
   require 'cosgrove/comment_job'
+  require 'cosgrove/find_communities_job'
   require 'cosgrove/bot'
 end

data/lib/cosgrove/account.rb

@@ -1,4 +1,5 @@
 require 'digest/bubblebabble'
+require "yaml/store"
 
 module Cosgrove
   class Account
@@ -10,7 +11,7 @@ module Cosgrove
     
     attr_accessor :account_name, :discord_ids
     
-    def initialize(account_name, chain = :steem)
+    def initialize(account_name, chain = :hive)
       @chain = chain.to_sym
       raise "Unknown Chain: #{@chain}" unless Cosgrove::KNOWN_CHAINS.include? @chain
       
@@ -22,14 +23,14 @@ module Cosgrove
       end
     end
     
-    def self.find_by_discord_id(discord_id, chain = :steem)
-      return if Account.yml[chain.to_s].nil?
+    def self.find_by_discord_id(discord_id, chain = :hive)
+      return if Account.chain_data(chain.to_s).nil?
       
       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|
+      Account.chain_data(chain.to_s).each do |k, v|
         ids = v[DISCORD_IDS]
         return Account.new(k, chain) if !!ids && ids.include?(discord_id)
       end
@@ -37,8 +38,8 @@ module Cosgrove
       return nil
     end
     
-    def self.find_by_memo_key(memo_key, secure, chain = :steem)
-      Account.yml[chain.to_s].each do |k, v|
+    def self.find_by_memo_key(memo_key, secure, chain = :hive)
+      Account.chain_data(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, secure, chain) == memo_key
         end
@@ -47,13 +48,9 @@ module Cosgrove
       return nil
     end
     
-    def chain_data
-      @chain_data ||= Account.yml[@chain.to_s] || {}
-    end
-    
-    def details
-      chain_data[@account_name] ||= {}
-      chain_data[@account_name]
+    def details(chain = :hive)
+      Account.chain_data(chain.to_s)[@account_name] ||= {}
+      Account.chain_data(chain.to_s)[@account_name]
     end
     
     def hidden?
@@ -69,7 +66,7 @@ module Cosgrove
       details[DISCORD_IDS] << discord_id.to_i
       details[DISCORD_IDS] = details[DISCORD_IDS].uniq
       
-      Account.save_yml!
+      Account.save_chain_data!(:hive)
     end
     
     def memo_key(discord_id)
@@ -111,5 +108,21 @@ module Cosgrove
         {}
       end
     end
+    
+    def self.store
+      @store ||= YAML::Store.new(ACCOUNTS_FILE)
+    end
+    
+    def self.save_chain_data!(chain, data = @chain_data)
+      store.transaction {
+        store[chain] = data
+      }
+    end
+    
+    def self.chain_data(chain)
+      store.transaction {
+        @chain_data = store[chain] || {}
+      }
+    end
   end
 end

data/lib/cosgrove/bot.rb

@@ -27,8 +27,8 @@ module Cosgrove
     end
     
     def add_all_messages
-      # A user typed a link to steemit.com
-      self.message(content: /http[s]*:\/\/steemit\.com\/.*/, ignore_bots: false) do |event|
+      # A user typed a link to steemit.com (or some condenser site)
+      self.message(content: /http[s]*:\/\/.*\/(.*\/)?@.+\/.+/, ignore_bots: false) do |event|
         link = event.content.split(' ').first
         Cosgrove::latest_steemit_link[event.channel.name] = link
         append_link_details(event, link)
@@ -41,7 +41,7 @@ module Cosgrove
         help << "`$slap [target]` - does a slap on the `target`"
         help << "`$verify <account> [chain]` - check `account` association with Discord users (`chain` default `steem`)"
         help << "`$register <account> [chain]` - associate `account` with your Discord user (`chain` default `steem`)"
-        help << "`$upvote [url]` - upvote from #{steem_account}; empty or `^` to upvote last steemit link"
+        help << "`$upvote [url]` - upvote from #{hive_account}; empty or `^` to upvote last steemit link"
         help.join("\n")
       end
       
@@ -49,12 +49,12 @@ module Cosgrove
         "cosgrove: #{Cosgrove::VERSION} :: https://github.com/steem-third-party/cosgrove"
       end
       
-      self.command :verify do |event, key, chain = :steem|
+      self.command :verify do |event, key, chain = :hive|
         return if event.channel.pm? && !cosgrove_allow_pm_commands
         cb_account = nil
         
         if key.nil?
-          event.respond "To create an account: https://steemit.com/enter_email?r=#{steem_account}"
+          event.respond "To create an account: https://hive.blog/enter_email?r=#{hive_account}"
           return
         end
         
@@ -86,7 +86,7 @@ module Cosgrove
         end
       end
       
-      self.command :register do |event, account_name, chain = :steem|
+      self.command :register do |event, account_name, chain = :hive|
         return if event.channel.pm? && !cosgrove_allow_pm_commands
         
         discord_id = event.author.id
@@ -111,7 +111,7 @@ module Cosgrove
         end
         
         memo_key = cb_account.memo_key(discord_id)
-        op = find_transfer(chain: chain, account: steem_account, from: account.name, to: steem_account, memo_key: memo_key)
+        op = find_transfer(chain: chain, account: hive_account, from: account.name, to: hive_account, memo_key: memo_key)
           
         if !!op
           cb_account.add_discord_id(discord_id)
@@ -127,7 +127,7 @@ module Cosgrove
           
           "Ok.  #{chain.to_s.upcase} account #{account.name} has been registered with <@#{discord_id}>."
         else
-          "To register `#{account.name}` with <@#{discord_id}>, send `0.001 #{core_asset}` or `0.001 #{debt_asset}` to `#{steem_account}` with memo: `#{memo_key}`\n\nThen type `$register #{account.name}` again."
+          "To register `#{account.name}` with <@#{discord_id}>, send `0.001 #{core_asset}` or `0.001 #{debt_asset}` to `#{hive_account}` with memo: `#{memo_key}`\n\nThen type `$register #{account.name}` again."
         end
       end
       

data/lib/cosgrove/comment_job.rb

@@ -6,9 +6,9 @@ module Cosgrove
     include Support
     
     def perform(event, slug, template, message = nil)
-      chain = :steem
+      chain = :hive
       author_name, permlink = parse_slug slug
-      muted = muted by: steem_account, chain: chain
+      muted = muted by: hive_account, chain: chain
       
       author = find_author(chain: chain, author_name: author_name)
       
@@ -50,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 find_comment(chain: :steem, author_name: steem_account, parent_permlink: post.permlink).any?
+      elsif find_comment(chain: :hive, author_name: hive_account, parent_permlink: post.permlink).any?
         title = post.title
         title = post.permlink if title.empty?
         "I already commented on #{title} by #{post.author}."
@@ -65,7 +65,7 @@ module Cosgrove
       comment = {
         type: :comment,
         parent_permlink: post.permlink,
-        author: steem_account,
+        author: hive_account,
         permlink: "re-#{post.author.gsub(/[^a-z0-9\-]+/, '-')}-#{post.permlink}-#{now.utc.strftime('%Y%m%dt%H%M%S%Lz')}", # e.g.: 20170225t235138025z
         title: '',
         body: merge(template, message, event.author.username),

data/lib/cosgrove/config.rb

@@ -36,6 +36,14 @@ module Cosgrove
       [chain[:steem_api_failover_urls]].flatten.compact
     end
     
+    def hive_api_url
+      chain[:hive_api_url]
+    end
+    
+    def hive_api_failover_urls
+      [chain[:hive_api_failover_urls]].flatten.compact
+    end
+    
     def test_api_url
       chain[:test_api_url]
     end
@@ -44,6 +52,14 @@ module Cosgrove
       [chain[:test_api_failover_urls]].flatten.compact
     end
     
+    def steem_engine_api_url
+      (chain[:steem_engine_api_url] rescue nil) || 'https://api.steem-engine.com/rpc'
+    end
+    
+    def hive_engine_api_url
+      (chain[:hive_engine_api_url] rescue nil) || 'https://api.hive-engine.com/rpc'
+    end
+    
     def steem_account
       chain[:steem_account]
     end
@@ -52,10 +68,22 @@ module Cosgrove
       chain[:steem_posting_wif]
     end
     
+    def hive_account
+      chain[:hive_account]
+    end
+    
+    def hive_posting_wif
+      chain[:hive_posting_wif]
+    end
+    
     def test_posting_wif
       chain[:test_posting_wif]
     end
     
+    def meeseeker_url
+      chain[:meeseeker][:url]
+    end
+    
     def discord_channels
       return ENV['CHANNELS'].to_s.split(' ') if !!ENV['CHANNELS']