tipjar 0.1.16 → 0.1.18

data/README.md

@@ -1,7 +1,6 @@
-# Bitbot v0.0.5
+# Bitbot v0.1.16
 
 An IRC bit-tip style bot using blockchain.info as a payment route.
-* 0.0.5 Update schema to reflect different bot name etc
 
 ## Security
 

data/bitbot.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email       = ["weirdthall@gmail.com",  "zach@zwily.com"]
   s.homepage    = %q{http://github.com/zwily/bitbot}
   s.summary     = %q{Bitcoin IRC Tip Bot}
-  s.description  = ["A Bitcoin IRC Tip Bot on freenode"]
+  s.decription  = ["A Bitcoin IRC Tip Bot on freenode"]
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/bitbot/plugin/prize.rb

@@ -1,29 +1,40 @@
-module Bitbot::Prize
-# create and initialise the random number generator
-  prng = Random.new
-# create the rules for winning
+# coding: utf-8
 
-# No win
-# [1-865] 86.5% chance
+module Bitbot::Prize
+  def on_prize(m, recipient, amount, message)
+    # Look up sender
+    user_id = db.get_or_create_user_id_for_username(m.user.user)
 
+    # Look up recipient
+    recipient_ircuser = m.channel.users.keys.find {|u| u.name == recipient }
+    unless recipient_ircuser
+      m.user.msg("Could not find #{recipient} in the channel list.")
+      return
+    end
+    recipient_user_id = db.get_or_create_user_id_for_username(recipient_ircuser.user)
 
-# Standard chat win of 10 + 1 - 500 satoshi max of 501 satoshi (0.00501mBTC)
-# [866 - 940] 7.5% chance
-  def prize_win_std
-  end
+    # Convert amount to satoshi
+    satoshi = str_to_satoshi(amount)
+    if satoshi <= 0
+      m.user.msg("Cannot send a negative amount.")
+      return
+    end
 
-# Minor prize win of 1000 satoshi max 1000 satoshi (0.01mBTC)
-# [941-990] 5% chance
-  def prize_win_minor
-  end
+    # Attempt the transaction (will raise on InsufficientFunds)
+    begin
+      db.create_transaction_from_tip(user_id, recipient_user_id, satoshi, message)
+    rescue Bitbot::InsufficientFundsError
+      m.reply "Insufficient funds! It's the thought that counts though :).", true
+      return
+    end
 
-# Major prize win of 10000 satoshi max of 10000 satoshi (0.1mBTC)
-# [991-1000] 1% chance
-  def prize_win_major
-  end
+    # Success! Let the room know...
+    m.reply "[✔] Verified: ".irc(:grey).irc(:bold) +
+      m.user.user.irc(:bold) +
+      " ➜ ".irc(:grey) +
+      satoshi_with_usd(satoshi) +
+      " ➜ ".irc(:grey) +
+      recipient_ircuser.user.irc(:bold)
 
-# Check every 10 mins for bot balance, if less than 0.1mBTC then pause all payouts and print out message
-# this can also be run from plugin.rb on a set timer rather than duplicating here
-  def prize_win_balance_check
-  end
+    end
 end

data/lib/bitbot/plugin/version.rb

@@ -1,5 +1,5 @@
 module Bitbot::Version
   def on_version
-    m.user.msg "I am version 0.0.5 BETA.  I am owned and operated by WeirdThall."
+    m.user.msg "I am version 0.1.18 BETA.  I am owned and operated by WeirdThall."
   end
 end

data/lib/bitbot/plugin.rb

@@ -15,7 +15,7 @@ require 'bitbot/plugin/update_exchange_rates'
 require 'bitbot/plugin/txfee'
 require 'bitbot/plugin/doc'
 require 'bitbot/plugin/online'
-require 'bitbot/plugin/prize'
+# require 'bitbot/plugin/prize'
 
 class Bitbot::Plugin
   include Cinch::Plugin
@@ -33,7 +33,7 @@ class Bitbot::Plugin
   include Bitbot::Txfee
   include Bitbot::Doc
   include Bitbot::Online
-  include Bitbot::Prize
+#  include Bitbot::Prize
 
   def initialize(bot)
     super
@@ -43,41 +43,52 @@ class Bitbot::Plugin
   set :prefix, ""
 
   #
-  # Private messages
+  # Private messages ~ replies sent via PRIVMSG
   #
   match /^help(.*)$/, :method => :on_help, :react_on => :private
   match /^balance$/, :method => :on_balance, :react_on => :private
   match /^history$/, :method => :on_history, :react_on => :private
   match /^withdraw(.*)$/, :method => :on_withdraw, :react_on => :private
   match /^deposit$/, :method => :on_deposit, :react_on => :private
-  match /^\+tip\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_tip, :react_on => :private
+  match /^ping$/, :method => :on_ping, :react_on => :private
+#  match /^\+prize\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_prize, :react_on => :private
 
   #
-  # Channel messages
+  # Private messages ~ replies sent via channel
+  #
+  match /^\+tip\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_tip, :react_on => :channel
+
+  #
+  # Channel messages ~ replies sent via channel
   #
   match /^\+help(.*)$/, :method => :on_help, :react_on => :channel
   match /^\+tipstats$/, :method => :on_tipstats, :react_on => :channel
   match /^\+tip\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_tip, :react_on => :channel
-  match /^\+doc$/, :method => :on_tipstats, :react_on => :channel
-  match /^\+ticker$/, :method => :on_tipstats, :react_on => :channel
+  match /^\+doc$/, :method => :on_doc, :react_on => :channel
+  match /^\+ticker$/, :method => :on_ticker, :react_on => :channel
+  match /^\+txfee$/, :method => :on_txfee, :react_on => :channel
+  match /^\+version$/, :method => :on_version, :react_on => :channel
+
+  #
+  # Channel messages ~ replies sent via PRIVMSG
+  #
+  match /^\+balance$/, :method => :on_balance, :react_on => :private
+  match /^\+help$/, :method => :on_help, :react_on => :private
+  match /^\+history$/, :method => :on_history, :react_on => :private
 
   #
   # Timer jobs
   #
   timer 60, :method => :on_update_exchange_rates
   timer 60, :method => :on_update_addresses
-  timer 10, :method => :on_prize_win_check_balance
+#  timer 10, :method => :on_prize_win_check_balance
 
   #
   # Also run the timer jobs on connect
   #
   listen_to :connect, :method => :on_update_exchange_rates
   listen_to :connect, :method => :on_update_addresses
-  listen_to :connect, :method => :on_online
-  listen_to :connect, :method => :on_doc
+#  listen_to :connect, :method => :on_online
+#  listen_to :connect, :method => :on_doc
 
-  #
-  # Run these jobs on every channel message
-  #
-  listen_to :channel, :method => :on_prize
 end

data/tipjar.gemspec

@@ -1,18 +1,18 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = %q{tipjar}
-  s.version     = "0.1.16"
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["WeirdThall", "Zach Wily"]
-  s.email       = ["weirdthall@gmail.com",  "zach@zwily.com"]
-  s.homepage    = %q{http://github.com/zwily/bitbot}
-  s.summary     = %q{Bitcoin IRC Tip Bot}
-  s.description  = ["A Bitcoin IRC Tip Bot on freenode"]
+  s.name = %q{tipjar}
+  s.version = "0.1.18"
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["WeirdThall", "Zach Wily"]
+  s.email = ["weirdthall@gmail.com", "zach@zwily.com"]
+  s.homepage = %q{http://github.com/weirdthall/TipJar}
+  s.summary = %q{Bitcoin IRC Tip Bot}
+  s.description = ["A Bitcoin IRC Tip Bot on freenode"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.default_executable = %q{bitbot}
   s.require_paths = ["lib"]
 
@@ -25,4 +25,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.5"
   s.add_development_dependency "yard"
 end
-

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: tipjar
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
+  prerelease: 
 platform: ruby
 authors:
 - WeirdThall
@@ -9,67 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,18 +95,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: '["A Bitcoin IRC Tip Bot on freenode"]'
+description: ! '["A Bitcoin IRC Tip Bot on freenode"]'
 email:
 - weirdthall@gmail.com
 - zach@zwily.com
@@ -133,27 +146,29 @@ files:
 - lib/bitbot/plugin/withdraw.rb
 - lib/ircstring.rb
 - tipjar.gemspec
-homepage: http://github.com/zwily/bitbot
+homepage: http://github.com/weirdthall/TipJar
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Bitcoin IRC Tip Bot
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: edb9688b3b0718910793eb0f8ba0345894ded926
-  data.tar.gz: 3113b6d46e45d00c61d7ddd3d79ab4af579efe50
-SHA512:
-  metadata.gz: adb39aa9775bb90b9e542fc2f8f7badf672eefd1410b38b7dbccaa13c273e9d8d1c929e2d7e8942c56f924a27aac98d4425b5c31541080d324eec0d7f5dfd629
-  data.tar.gz: cdfa0c618e46776e828873028c1d5118d52d52b9c87d91d4c58373380a5b483515a475ea68ff868be9bd487133dcd5292e9630424f3e577f399aa74d7b5b3181