tipjar 0.1.195 → 0.1.196

data/lib/bitbot/plugin/common.rb

@@ -85,24 +85,6 @@ module Bitbot::Common
     end
   end
 
-  def satoshi_to_gbp(satoshi)
-    rate = exchange_rate("GBP")
-    if rate
-      "$%.2f" % (satoshi.to_f / 10**8 * rate)
-    else
-      "$?"
-    end
-  end
-
-  def satoshi_to_eur(satoshi)
-    rate = exchange_rate("EUR")
-    if rate
-      "$%.2f" % (satoshi.to_f / 10**8 * rate)
-    else
-      "$?"
-    end
-  end
-
   def satoshi_with_usd(satoshi)
     btc_str = satoshi_to_str(satoshi)
     if satoshi < 0
@@ -111,9 +93,8 @@ module Bitbot::Common
       btc_str = btc_str.irc(:green)
     end
 
-    usd_str = "[".irc(:grey) + satoshi_to_usd(satoshi).irc(:white) + "]".irc(:grey)
+    usd_str = "[".irc(:grey) + satoshi_to_usd(satoshi).irc(:light_grey) + "]".irc(:grey)
 
     "#{btc_str} #{usd_str}"
   end
 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 "Sorry, TipJar is initializing its database. Please try again in a minute."
+      m.reply "Sorry, TipJar is initializing it's database. Please try again later."
       return
     end
 
@@ -30,4 +30,3 @@ module Bitbot::Deposit
     on_deposit(m, false)
   end
 end
-

data/lib/bitbot/plugin/tip.rb

@@ -24,7 +24,7 @@ module Bitbot::Tip
     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
+      m.reply "Insufficient funds! It's the thought that counts though....", true
       return
     end
 
@@ -54,8 +54,6 @@ module Bitbot::Tip
       m.channel.name.irc(:bold) +
       " bringing your balance to " +
       satoshi_with_usd(db.get_balance_for_user_id(recipient_user_id)) +
-      ". Type 'help' to list TipJar's commands."
+      ". Type 'help' to list TipJar commands."
   end
 end
-
-

data/lib/bitbot/plugin/withdraw.rb

@@ -14,7 +14,7 @@ module Bitbot::Withdraw
       begin
         db.create_transaction_from_withdrawal(user_id, satoshi, withdrawal_fee, address)
       rescue Bitbot::InsufficientFundsError
-        m.reply "You don't have enough to withdraw #{satoshi_to_str(satoshi)} + 0.0005 tx fee"
+        m.reply "You don't have enough to withdraw #{satoshi_to_str(satoshi)} + 0.0005 fee"
         return
       end
 
@@ -24,7 +24,7 @@ module Bitbot::Withdraw
           "in transaction #{response["tx_hash"].irc(:grey)}."
       else
         m.reply "Something may have gone wrong with your withdrawal. Please contact " +
-          "your friendly TipJar admin to investigate where your money is."
+          "your friendly TipJar administrator to investigate where your money is."
       end
     else
       m.reply "Usage: withdraw <amount in BTC> <address>"
@@ -32,4 +32,3 @@ module Bitbot::Withdraw
     end
   end
 end
-

data/tipjar.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{tipjar}
-  s.version = "0.1.195"
+  s.version = "0.1.196"
   s.platform = Gem::Platform::RUBY
   s.authors = ["WeirdThall", "Zach Wily"]
   s.email = ["weirdthall@gmail.com", "zach@zwily.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipjar
 version: !ruby/object:Gem::Version
-  version: 0.1.195
+  version: 0.1.196
   prerelease: 
 platform: ruby
 authors: