tipjar 0.1.171 → 0.1.191

data/README.md

@@ -1,4 +1,4 @@
-# Bitbot v0.1.16
+# Bitbot v0.1.19
 
 An IRC bit-tip style bot using blockchain.info as a payment route.
 

data/lib/bitbot/plugin/common.rb

@@ -111,7 +111,7 @@ module Bitbot::Common
       btc_str = btc_str.irc(:green)
     end
 
-    usd_str = "[".irc(:grey) + satoshi_to_usd(satoshi).irc(:blue) + "]".irc(:grey)
+    usd_str = "[".irc(:grey) + satoshi_to_usd(satoshi).irc(:orange) + "]".irc(:grey)
 
     "#{btc_str} #{usd_str}"
   end

data/lib/bitbot/plugin/deposit.rb

@@ -3,7 +3,7 @@ module Bitbot::Deposit
     user_id = db.get_or_create_user_id_for_username(m.user.user)
 
     unless cached_addresses
-      m.reply "TipJar is not initialized yet. Please try again later."
+      m.reply "Sorry, TipJar is initializing its database. Please try again in a minute."
       return
     end
 

data/lib/bitbot/plugin/log.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'isaac'
+# https://github.com/vangberg/isaac
+
+on :channel, /.*/ do
+  open("#{channel}.log", "a") do |log|
+    log.puts "#{nick}: #{message}"
+  end
+
+  puts "#{channel}: #{nick}: #{message}"
+end

data/lib/bitbot/plugin/version.rb

@@ -1,5 +1,5 @@
 module Bitbot::Version
   def on_version
-    m.user.msg "I am version 0.1.16 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

@@ -43,24 +43,38 @@ 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
@@ -74,7 +88,7 @@ class Bitbot::Plugin
   #
   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
 
 end

data/tipjar.gemspec

@@ -2,13 +2,14 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{tipjar}
-  s.version = "0.1.171"
+  s.version = "0.1.191"
   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.license = "MIT"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipjar
 version: !ruby/object:Gem::Version
-  version: 0.1.171
+  version: 0.1.191
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -120,7 +120,6 @@ files:
 - .gitignore
 - Gemfile
 - README.md
-- README_old.md
 - Rakefile
 - bin/bitbot
 - bitbot.gemspec
@@ -133,6 +132,7 @@ files:
 - lib/bitbot/plugin/doc.rb
 - lib/bitbot/plugin/help.rb
 - lib/bitbot/plugin/history.rb
+- lib/bitbot/plugin/log.rb
 - lib/bitbot/plugin/online.rb
 - lib/bitbot/plugin/ping.rb
 - lib/bitbot/plugin/prize.rb
@@ -147,7 +147,8 @@ files:
 - lib/ircstring.rb
 - tipjar.gemspec
 homepage: http://github.com/weirdthall/TipJar
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:

data/README_old.md

@@ -1,140 +0,0 @@
-# Bitbot
-
-An IRC bit-tip style bot. Just for fun, don't use with lots of coins.
-
-## Security
-
-**You probably don't want to use this.**
-
-This section is first because anything Bitcoin related seems to attract
-l33t hax0rs. This is just a toy. You probably shouldn't use it, and if
-you do, you shouldn't put much money into it. Here's why:
-
-Bitbot does not operate on nicknames, but usernames. Therefore, it's
-only secure on IRC networks where usernames are forced. *This probably
-isn't true of whatever IRC network you're on.* (On our IRC network,
-usernames cannot be spoofed.) In order to be secure, the bot would need
-to authenticate users in some other way, perhaps by using NickServ or
-something. Pull requests accepted.
-
-Bitbot uses an online wallet at https://blockchain.info. This was
-because it was the easiest path forward, but it is not the most secure.
-Blockchain.info itself seems reasonably secure, but if someone were to
-breach its servers, they would be able to steal all the coins stored by
-Bitbot. A better setup would be for Bitbot to perform its own
-transactions on the Bitcoin network. Pull requests accepted. :)
-
-Bitbot is based on a Ruby IRC library called
-[Cinch](https://github.com/cinchrb/cinch). I have no idea how secure
-Cinch is - it's possible that it has a remote code execution
-vulnerability. If it does, an attacker can steal all the coins from
-Bitbot.
-
-Hopefully the above has scared you off from installing this and using it
-on Freenode. If it didn't, then you deserve to lose whatever you put in.
-You could just send it to me directly instead:
-`1zachsQ82fM7DC4HZQXMAAmkZ2Qg7pH2V`.
-
-## How Does It Work
-
-Bitbot lets people in IRC send each other Bitcoin. It's loosely modelled
-after the [Reddit Bitcointip](http://redd.it/13iykn).
-
-The big difference is that in Bitbot, tips between users do not show up
-in the blockchain. Bitbot maintains a wallet with all of the deposited
-funds, and then keeps a record of transactions between users. Only
-deposits and withdrawals to and from Bitbot show up in the Bitcoin
-blockchain.
-
-We do this because our tips are generally pretty tiny, and if each one
-were a real transaction, our entire "Bitconomy" would be eaten up by
-transaction fees.
-
-## Installation
-
- * Install the dependencies (sqlite3)
-
- * Install the gem:
-
-```bash
-gem install bitbot
-```
-
- * Create an online wallet at https://blockchain.info/wallet/ . Create a
-   secondary password on it, and I suggest locking access to the IP from
-   which your bot will be running for an little extra security. It's
-   probably also good to set up (encrypted) wallet backups to go to your
-   email address.
-
- * Create a data directory for Bitbot:
-
-```bash
-$ mkdir ~/.bitbot
-```
-
- * Create a bitbot.yml file that looks like this:
-
-```yaml
-irc:
-  server: irc.example.com
-  port: 8765
-  ssl: true
-  nick: bitbot
-  username: bitbot@example.com
-  password: blahblah
-
-blockchain:
-  wallet_id: <long guid>
-  password1: <password>
-  password2: <secondary password>
-  withdrawal_fee: <fee in satoshi, default: 50000>
-
-data:
-  path: /home/me/.bitbot
-```
-
- * Start the bot:
-
-```bash
-$ bitbot start <path to config.yml> 
-```
-
-## Usage
-
-### Help
-
-To get help, `/msg bitbot help`. He will respond with a list of commands
-he supports:
-
-```
-bitbot: Commands: deposit, balance, history, withdrawal
-```
-
-### Deposit
-
-To make a deposit to your Bitbot account, ask bitbot for your depositing
-address: `/msg bitbot deposit`. Bitbot will respond with a Bitcoin
-address to send coins to. Once 
-
-### Tipping
-
-To tip somebody, you must both be in a room with Bitbot. The syntax is
-`+tip <nickname> <amount in BTC> <message>`. When Bitbot sees that, it
-verifies that you have the funds to tip, does a `whois` on the recipient
-nickname, and then transfers the funds. He then responds with a
-confirmation:
-
-```
-bob: how do i make rails tests fast?
-john: refactor your app so you can test it without rails
-bob: +tip john 0.01 ur so smart
-bitbot:  [✔] Verified: bob ➜ ฿+0.01 [$1.12] ➜ john
-```
-
-### Withdrawing
-
-When you want to withdraw funds to another Bitcoin address, just tell
-Bitbot: `/msg bitbot withdraw <amount> <address>`. 
-
-Bitbot will verify that you have enough money, and send `<amount>` BTC -
-0.0005 (to cover the transaction fee) to the specified `<address>`.