steam-trade 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0bd2f1adc5cad7bf56acff4e6f8e19548d8c302
-  data.tar.gz: 3a8c9e35440d23c3db1f44ae05d328b0644d816e
+  metadata.gz: a214ab20a7c1cba3c0147c74099425a334b28ec3
+  data.tar.gz: 7b7d54c1e6b45ceb7097a9c5d9e3b19d03a1f89b
 SHA512:
-  metadata.gz: ea1ac8bc6445fd8d90267e8c817ca717ba4eab9812d656d0a646353a8f5e6b9d7ef0bfaa56b27661aa343243c412285cb135f03c2ae80037756baae49e9acb52
-  data.tar.gz: 71202a2e7c02caa910271880e75eafc8cee5ab1426779a0410aaddce19b9047177a95f258f29c5a6c6512d54385ceccb47719f148010744889b79e20cfe29adf
+  metadata.gz: 83c85b9d9f2ffe433820c37bf7258d99363229cc0ff151e01cb00e678b897b23238739bed86fe3a79377fed71aa2c14317df4c65e98325451c02b36ffbd00484
+  data.tar.gz: a6045c9e2fbc067bc8db2b1c9af4c3a032bee4fcd6a5a4d1d1cd0b954809357c760b71c27798523f9b4458b08ce7eacdca6965b493f6a589958d6bcb1988693b

data/README.md

@@ -1,4 +1,7 @@
-# steam-trade V0.2.0
+# steam-trade V0.2.3
+
+**PLEASE IF SOMETHING DOES NOT WORK PROPERLY MAKE A GITHUB ISSUE**
+
 Please check constantly for updates cause i'm still making this gem.
 
 This gem simplifes/allows sending steam trade offers programmatically.
@@ -7,6 +10,16 @@ this gem is primarly for trading cards, tho can be used to CS:GO and other games
 
 # Changelog
 ```
+0.2.3:
+- hotfix
+
+0.2.2:
+- fixed issues with ruby 2.4+
+- added class methods for fa(), normal_get_inventory(), raw_get_inventory, sets_count()
+
+0.2.1:
+- many many bugs fixed
+
 0.2.0:
 - hotfix
 
@@ -50,7 +63,7 @@ this gem is primarly for trading cards, tho can be used to CS:GO and other games
   - [Logging-in](#logging-in)
     - [Hander.new() (this is how you login)](#handlernew)
       - [Handler.new() (normal login)](#handlernewusername-passwordshared_secrettime_differenceremember_me)
-      - [Handler.new() (cookies login)](#handlernewcookies_hash)
+      - [Handler.new() (cookies login)](#handlernewcookies_hashshared_secrettime_differenceremember_me)
     - [get_auth_cookies()](#get_auth_cookies)
     - [mobile_info()](#mobile_infoidentity_secret)
   - [Getting someone's inventory](#getting-someones-inventory)
@@ -125,13 +138,19 @@ puts account.fa('v3dWNq2Ncutc7RelwRVXswT8CJX=v3dWNq2Ncutc7WelwRVXswT8CJk=') => r
 
 ```
 
-##### `Handler.new(cookies_hash)`
+##### `Handler.new(cookies_hash,shared_secret,time_difference,remember_me)`
 - `cookies_hash` is hash containing `steamLogin`, `steamLoginSecure` and `steamMachineAuth` cookies.
 this can be used with `get_auth_cookies()` for faster login.
+- `shared_secret` is used to generate steam authentication codes so you won't have to write them manually each time you login.
+- `time_difference`is the difference between your time and steam servers, this affects how 2FA codes are generated (**this MUST BE an integer**)
+- `remember_me` is a boolean used to indicate whether you want cookies which expire shortly if set to **false** or stay valid for weeks if set to **true**
+
 
 ```ruby
 require 'steam-trade'
 account = Handler.new(JSON.parse(File.read('./creds.json'))) # creds.json is created by get_auth_cookies()
+
+account = Handler.new(JSON.parse(File.read('./creds.json')), 'shared_secret', 50)
 ```
 
 #### `get_auth_cookies()`
@@ -168,6 +187,8 @@ you might want to read this [guide](https://dev.doctormckay.com/topic/332-identi
 
 ```ruby
 require 'steam-trade'
+inventory = Handler.normal_get_inventory("nomg3r")
+
 
 logged = Handler.new('username','password','shared_secret')
 logged.mobile_info('identity_secret')
@@ -213,6 +234,9 @@ This command will return a hash nearly identitical to the one received from stea
 
 ```ruby
 require 'steam-trade'
+inv = Handler.raw_get_inventory("nomg3r")
+
+
 logged = Handler.new('username','password','shared_secret')
 inv = logged.raw_get_inventory() #works
 inv = logged.raw_get_inventory(false) # returns non trimmed
@@ -422,6 +446,8 @@ polling = Thread.new(logged) { |logged|
   - `'totalcards'` is an integer equals to the number of non-foil cards account for
 ```ruby
 require 'steam-trade'
+data = Handler.sets_count("CardExchange")
+
 
 logged = Handler.new('username','password','shared_secret')
 logged.mobile_info('identity_secret')
@@ -459,6 +485,8 @@ handler.update_blueprint()
 **NOTE**: using this command with a new shared_secret will not change/set the current saved shared_secret for the account
 ```ruby
 require 'steam-trade'
+puts Hander.fa('random_shared_secret')
+
 
 logged = Handler.new('username','password','inital_shared_secret')
 puts logged.fa() #=> random code for your account

data/lib/Badge.rb

@@ -27,6 +27,7 @@ module BadgeCommands
                         targetname = ''
                   end
             }
+
             hash = raw_get_inventory(steamid)
             sorted = {}
             classxinstance = {}
@@ -198,6 +199,7 @@ module BadgeCommands
                   w_title = bigdata[appid]['title']
                   text << "             #{w_title}, sets = #{sets}, appid = #{appid}"
                   hashofcards[appid].each { |cardname, owned|
+                        next if !owned.is_a(Numeric)
                         text << "#{cardname} xxx #{owned}"
                   }
                   text << ""
@@ -207,6 +209,203 @@ module BadgeCommands
             output "badges.txt has been created"
       end
 
+      def self.included(base)
+           base.extend(BadgeCommands_ClassMethods)
+      end
+
+      module BadgeCommands_ClassMethods
+            @@libdir = Util.gem_libdir
+            def sets_count(steamid, use_nonmarketable = true)
+
+
+
+
+                  steamid,token = verify_profileid_or_trade_link_or_steamid(steamid)
+
+                  hash = raw_get_inventory(steamid)
+                  sorted = {}
+                  classxinstance = {}
+
+                  hash["descriptions"].delete_if {|desc|
+                        conc = desc["classid"] + "_" +  desc["instanceid"]
+                        classxinstance[conc] = desc
+                        true
+                  }
+
+
+
+                  hash["assets"].each { |asset|
+                        identity = asset["classid"] + "_" + asset["instanceid"]
+                        assetdesc = classxinstance[identity]
+                        if use_nonmarketable == false
+                              if assetdesc["marketable"] == 0 || assetdesc["tags"][-1]["localized_tag_name"] != "Trading Card" || assetdesc["tags"][-2]["localized_tag_name"] == "Foil"
+                                    next
+                              end
+                        else
+                              if  assetdesc["tags"][-1]["localized_tag_name"] != "Trading Card" ||assetdesc["tags"][-2]["localized_tag_name"] == "Foil"
+                                    next
+                              end
+                        end
+
+                        name = assetdesc["name"].sub(" (Trading Card)", "")
+                        appid =assetdesc["market_fee_app"].to_s
+                        if sorted.has_key?(appid) == true
+                              if sorted[appid].has_key?(name) == true
+                                    sorted[appid][name] = sorted[appid][name] + 1
+                              elsif sorted[appid].has_key?(name) == false
+                                    sorted[appid][name] = 1
+                              end
+                        elsif sorted.has_key?(appid) == false
+                              sorted[appid] = {}
+                              sorted[appid][name] = 1
+                        end
+                  }
+
+                  bigdata = JSON.parse(File.read("#{@@libdir}blueprints/byappid.json",:external_encoding => 'utf-8',:internal_encoding => 'utf-8'))
+
+                  counted = {}
+
+                  sorted.each { |appid,cards|
+                        begin
+                              counted[appid.to_s] = bigdata[appid].merge(cards)
+                        rescue
+                              output "badges blueprint does not include #{appid}"
+                        end
+                  }
+
+                  setsowned = {}
+                  numberofsets = 0
+                  total_non_foil = 0
+
+                  counted.each { |appid,cards|
+                        lowest = 9999
+                        cards.each { |cardname, amount|
+                                    next if amount.class == String # apptitle
+                                    if amount < lowest then lowest = amount end
+                                    total_non_foil =  total_non_foil + amount
+                        }
+                        setsowned[appid.to_s] = lowest
+                        numberofsets = numberofsets + lowest
+                  }
+
+                  persona = ''
+                  write_badges(counted,setsowned,numberofsets,total_non_foil, use_nonmarketable,persona,steamid)
+                  if use_nonmarketable == false
+                        return {'sets' => counted, 'appxsets' => setsowned, 'totalsets' => numberofsets, 'totalcards' => total_non_foil, 'marketable' => false}
+                  else
+                         return {'sets' => counted, 'appxsets' => setsowned, 'totalsets' => numberofsets, 'totalcards' => total_non_foil, 'marketable' => true}
+                  end
+            end
+
+
+
+
+            def update_blueprint()
+                  session = Mechanize.new
+
+                  session.pre_connect_hooks << lambda do |agent, request|
+                     request['Origin'] = 'http://steam.tools'
+                     request['Referer'] = 'http://steam.tools/cards/'
+                     request['User-Agent'] ='Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36 OPR/52.0.2871.99'
+                   end
+
+
+                  pag = session.get('http://cdn.steam.tools/data/set_data.json')
+                  data = JSON.parse(pag.content)
+                  old = JSON.parse(File.read("#{@@libdir}blueprints/byappid.json" ,:external_encoding => 'utf-8',:internal_encoding => 'utf-8'))
+
+                  newapps = []
+                  data["sets"].each { |set|
+                        newapps << set['appid']
+                  }
+                  get = []
+                  haveapps = old.keys
+                  newapps.each { |app|
+                        get << app if haveapps.include?(app) == false
+                  }
+
+                  progress = 0
+                  error = 0
+                  (output("your blueprint is up-to-date");return) if get.length.zero?
+                  get.each {|app|
+                        begin
+                              card = {}
+                              steam_nokogiri = Nokogiri::HTML(session.get("http://www.steamcardexchange.net/index.php?inventorygame-appid-#{app}").content)
+                              title = steam_nokogiri.css('h2[class=empty]').text.force_encoding(Encoding::UTF_8)
+                              steam_nokogiri.css('div[class=name-image-container]').css('span').each do |e|
+                                    card[e.text.force_encoding(Encoding::UTF_8)] = 0
+                              end
+                              card['title'] = title
+                              full_data = card
+
+                              old[app] = full_data
+                              File.open("#{@@libdir}blueprints/byappid.json", 'w:UTF-8') {|f| f.puts old.to_json}
+
+                              progress = progress + 1
+                              output "#{progress} / #{get.length} done, error = #{error}"
+                        rescue Exception => e
+                              File.open("#{@@libdir}blueprints/byappid.json", 'w:UTF-8') {|f| f.puts old.to_json}
+                              error = error + 1
+                              progress = progress + 1
+                              output "#{progress} / #{get.length} done, error = #{error}"
+                              output "error occured saved data"
+                              raise e
+                        end
+                  }
+
+
+            end
+
+
+
+
+
+            private
+            def write_badges(hashofcards,eachappidsets,totalsets,total_non_foil,use_nonmarketable,persona,steamid)
+                  if persona == ''
+                        filename = steamid
+                  else
+                        filename = persona
+                  end
+
+
+                   bigdata = JSON.parse(File.read("#{@@libdir}blueprints/byappid.json",:external_encoding => 'utf-8',:internal_encoding => 'utf-8'))
+                  eachappidsets = eachappidsets.sort_by do |k,v|
+                    v
+                  end
+                  eachappidsets.reverse!
+                  output "Writing the badges to #{filename}_badges.txt "
+                  text = []
+                  text << "for #{persona}(#{steamid})"
+                  if use_nonmarketable == false
+                        text << "only marketable cards are counted"
+                        text << "total non-foil trading cards #{total_non_foil}"
+                  else
+                        text << "total non-foil trading cards #{total_non_foil}"
+                        text << "all cards counted including non-marketable"
+                  end
+
+
+                  text << "total sets in target account #{totalsets}"
+                  text << ""
+                  text << ""
+                  eachappidsets.each { |appid, sets|
+                        w_title = bigdata[appid]['title']
+                        text << "             #{w_title}, sets = #{sets}, appid = #{appid}"
+                        hashofcards[appid].each { |cardname, owned|
+                              next if !owned.is_a?(Numeric)
+                              text << "#{cardname} xxx #{owned}"
+                        }
+                        text << ""
+                        text << ""
+                  }
+                  File.open("./#{filename}_badges.txt",'w:UTF-8') {|f| f.puts text}
+                  output "badges.txt has been created"
+            end
+
+
+
+      end
 
 
 end

data/lib/Guard.rb

@@ -30,6 +30,40 @@ module GuardCommands
 
       end
 
+      def self.included(base)
+           base.extend(Guard_ClassMethods)
+     end
+
+      module Guard_ClassMethods
+            def fa(shared_secret,time_difference = 0)
+                  raise "No shared_secret given" if shared_secret == nil # cause upon initialization @secret = nil
+                  timestamp = Time.new.to_i + time_difference
+                  math = timestamp.to_i / 30
+                  math = math.to_i
+                  time_buffer =[math].pack('Q>')
+
+                  hmac = OpenSSL::HMAC.digest('sha1', Base64.decode64(shared_secret), time_buffer)
+
+                  start = hmac[19].ord & 0xf
+                  last = start + 4
+                  pre = hmac[start..last]
+                  fullcode = pre.unpack('I>')[0] & 0x7fffffff
+
+                  chars = '23456789BCDFGHJKMNPQRTVWXY'
+                  code= ''
+                  for looper in 0..4 do
+                        copy = fullcode #divmod
+                        i = copy % chars.length #divmod
+                        fullcode = copy / chars.length #divmod
+                        code = code + chars[i]
+                  end
+                  return code
+
+            end
+
+
+      end
+
       private
       def generate_confirmation_key(tag_string, time_stamp)
             buffer = [time_stamp].pack('Q>') + tag_string.encode('ascii')

data/lib/Inventory.rb

@@ -300,5 +300,204 @@ module InventoryCommands
       end
 
 
+      def self.included(base)
+           base.extend(Inventory_ClassMethods)
+      end
+
+      module Inventory_ClassMethods
+            @@libdir = Util.gem_libdir
+            @@session = Mechanize.new
+            def normal_get_inventory(steamid ,appid = 753)
+                  appid = appid.to_s
+                  context = 6
+e
+                  if appid.to_s != "753"
+                        context = 2
+                  end
+                  #end verify given another game
+                  # end verify given appid only
+                  #verify trade link
+                  steamid,token = verify_profileid_or_trade_link_or_steamid(steamid)
+                  raise "invalid steamid : #{steamid}, length of received :: #{steamid.to_s.length}, normal is 17" if steamid.to_s.length != 17
+                  ## verify appid
+                  if ["753","730",'570','440'].include?(appid.to_s) == false
+                        allgames = JSON.parse(File.read("#{@@libdir}blueprints/game_inv_list.json"))
+                        raise "invalid appid: #{appid}" if allgames.include?(appid.to_s) == false
+                  end
+                  ## end verify appid
+
+                  items = []
+                  last_id = 0
+                  until last_id == false
+                        received = get_inventory_chunk_normal_way(appid,context,steamid,last_id)
+                        last_id = received['new_last_id']
+                        items = items + received['assets']
+                        output "loaded #{items.length}"
+                  end
+
+                  output "total loaded #{items.length} asset"
+
+
+                  return items
+            end ##end normal get
+
+            ###
+
+
+            def get_inventory_chunk_normal_way(appid,context,steamid,last_id)
+                        html = ''
+                        tries = 1
+
+                        until html != ''
+                              begin
+                                    html = @@session.get("https://steamcommunity.com/inventory/#{steamid}/#{appid}/#{context}?start_assetid=#{last_id}&count=5000").content
+                              rescue
+                                    raise "Cannot get inventory, tried 3 times" if tries == 3
+                                    tries = tries + 1
+                                    sleep(0.5)
+                              end
+                        end
+
+
+                        get = JSON.parse(html)
+                        raise "something totally unexpected happened while getting inventory with appid #{appid} of steamid #{steamid} with contextid #{context}" if get.key?("error") == true
+                        if get["total_inventory_count"] == 0
+                              output "EMPTY :: inventory with appid #{appid} of steamid #{steamid} with contextid #{context}"
+                              return {'assets' => [], 'new_last_id' =>false}
+                        end
+                        if get.keys[3].to_s == "last_assetid"
+
+                                new_last_id = get.values[3].to_s
+
+                        else
+                                new_last_id = false
+
+                        end
+
+                        assets = get["assets"]
+                        descriptions = get["descriptions"]
+
+
+                        descriptions_classids = {} ###sorting descriptions by key value || key is classid of the item's description
+                        descriptions.each {|description|
+                             classidxinstance = description["classid"] + '_' + description["instanceid"] # some items has the same classid but different instane id
+                             descriptions_classids[classidxinstance] = description
+                        }
+
+                        assets.each { |asset| ## merging assets with names
+                             classidxinstance = asset["classid"] + '_' + asset["instanceid"]
+                             asset.replace(asset.merge(descriptions_classids[classidxinstance]))
+                        }
+
+
+                      return {'assets' => assets, 'new_last_id' =>new_last_id}
+
+            end ## end inventory get normal
+
+
+
+            def raw_get_inventory(steamid, *params)#steamid = @steamid ,appid = 753, trim = true
+                  raise "expected 2 paramters, given #{params.length}"if params.length > 2
+                  appid = 753
+                  trim = true
+                  context = 6
+                  v = params.length
+                  if params.length == 2
+                        (appid = params[0]; v= v - 1;) if (3..6).to_a.include?(params[0].to_i.to_s.length)
+                       (trim = params[1]; v= v - 1;) if [TrueClass,FalseClass].include?(params[1].class)
+                  elsif params.length == 1
+                        (appid = params[0]; v= v - 1;) if (3..6).to_a.include?(params[0].to_i.to_s.length)
+                        (trim = params[0]; v= v - 1;) if [TrueClass,FalseClass].include?(params[0].class)
+                  end
+                  raise "invalid params given" if v != 0
+
+                  steamid,token = verify_profileid_or_trade_link_or_steamid(steamid)
+                  raise "invalid steamid : #{steamid}, length of received :: #{steamid.to_s.length}, normal is 17" if steamid.to_s.length != 17
+                  ## verify appid
+                  if ["753","730",'570','440'].include?(appid.to_s) == false
+                        allgames = JSON.parse(File.read("#{@libdir}blueprints/game_inv_list.json"))
+                        raise "invalid appid: #{appid}" if allgames.include?(appid.to_s) == false
+                  end
+                  ## end verify appid
+
+                  if appid.to_s != "753"
+                        context = 2
+                  end
+
+
+                  last_id = 0
+                  hash = {"assets" => [], "descriptions" => []}
+                  until last_id == false
+                        received = get_inventory_chunk_raw_way(appid,context,steamid,last_id,trim)
+                        last_id = received['new_last_id']
+                        hash["assets"] = hash["assets"] + received['assets']
+                        hash["descriptions"] = hash["descriptions"] + received["descriptions"]
+                        output "loaded #{hash["assets"].length}"
+                  end
+
+                  output "total loaded #{hash["assets"].length} asset"
+
+
+                  return hash
+            end
+
+
+
+
+            def get_inventory_chunk_raw_way(appid,context,steamid,last_id,trim)
+
+
+                  html = ''
+                  tries = 1
+
+                  until html != ''
+                        begin
+                              html = @@session.get("https://steamcommunity.com/inventory/#{steamid}/#{appid}/#{context}?start_assetid=#{last_id}&count=5000").content
+                        rescue
+                              raise "Cannot get inventory, tried 3 times" if tries == 3
+                              tries = tries + 1
+                              sleep(0.5)
+                        end
+                  end
+
+                  get = JSON.parse(html)
+                  raise "something totally unexpected happened while getting inventory with appid #{appid} of steamid #{steamid} with contextid #{context}" if get.key?("error") == true
+                  if get["total_inventory_count"] == 0
+                        output "EMPTY :: inventory with appid #{appid} of steamid #{steamid} with contextid #{context}"
+                        return {'assets' => [], "descriptions" => [], 'new_last_id' =>false}
+                  end
+                  if get.keys[3].to_s == "last_assetid"
+
+                          new_last_id = get.values[3].to_s
+
+                  else
+                          new_last_id = false
+
+                  end
+
+                  assets = get["assets"]
+                  descriptions = get["descriptions"]
+                  if trim == true
+                        descriptions.each { |desc|
+                              desc.delete_if {|key, value| key != "appid" && key != "classid" && key != "instanceid" && key != "tags" && key != "type" && key != "market_fee_app" && key != "marketable" &&key != "name" }
+                              desc["tags"].delete_at(0)
+                              desc["tags"].delete_at(0)
+                        }
+                  end
+
+                 return {'assets' => get["assets"], "descriptions" => get["descriptions"], 'new_last_id' =>new_last_id}
+
+          end
+
+
+      end
+
+
+
+
+
+
+
+
 
 end

data/lib/LoginExecutor.rb

@@ -8,45 +8,79 @@ module LoginCommands
             encrypted_password = data["password"]
             timestamp = data["timestamp"]
             repeater = 0
-            until repeater == true
-                  if @secret != nil
-                        guardcode = fa(@secret,@time_difference)
-                  else
-                        puts "please write your 2FA code"
-                        guardcode = gets.chomp
-                  end
 
 
+            send = {
+                  'password' => encrypted_password,
+                  'username' => @username,
+                  'twofactorcode' =>'', #update
+                  'emailauth' => '',
+                  'loginfriendlyname' => '',
+                  'captchagid' => '-1',
+                  'captcha_text' => '',
+                  'emailsteamid' => '',
+                  'rsatimestamp' => timestamp,
+                  'remember_login' => @remember
+            }
+            login = @session.post('https://store.steampowered.com/login/dologin', send ).content
+            firstreq = JSON.parse(login)
+
+            raise "Incorrect username or password" if firstreq["message"] == "The account name or password that you have entered is incorrect."
+
+
+            until firstreq["success"] == true
+                  sleep(0.3)
+                  gid = '-1'
+                  cap = ''
+                  if firstreq['captcha_needed'] == true
+                        gid = firstreq['captcha_needed']
+                        File.delete("./#{username}_captcha.png") if File.exist?("./#{username}_captcha.png")
+                        @session.get("https://store.steampowered.com/login/rendercaptcha?gid=#{gid}").save "./#{@username}_captcha.png"
+                        puts "you need to write a captcha to continue"
+                        puts "there is an image named #{@username}_captcha in the script directory"
+                        puts "open it and write the captha here"
+                        cap = gets.chomp
+                  end
+                  emailauth = ''
+                  facode = ''
+                  emailsteamid = ''
+                  if firstreq['requires_twofactor'] == true
+                        if @secret.nil?
+                              puts "write 2FA code"
+                              facode = gets.chomp
+                        else
+                              facode = fa(@secret,@time_difference)
+                        end
+                  elsif firstreq['emailauth_needed'] == true
+                        emailsteamid = firstreq['emailsteamid']
+                        puts "Guard code was sent to your email"
+                        puts "write the code"
+                        emailauth = gets.chomp
+                  end
+
                   send = {
                         'password' => encrypted_password,
                         'username' => @username,
-                        'twofactorcode' =>guardcode, #update
-                        'emailauth' => '',
+                        'twofactorcode' => facode, #update
+                        'emailauth' => emailauth,
                         'loginfriendlyname' => '',
-                        'captchagid' => '-1',
-                        'captcha_text' => '',
-                        'emailsteamid' => '',
+                        'captchagid' => gid,
+                        'captcha_text' => cap,
+                        'emailsteamid' => emailsteamid,
                         'rsatimestamp' => timestamp,
                         'remember_login' => @remember
                   }
+                  output "attempting to login"
+                  login = @session.post('https://store.steampowered.com/login/dologin', send ).content
+                  firstreq = JSON.parse(login)
+
+            end
+            response = firstreq
+
+
 
-                  login = @session.post('https://store.steampowered.com/login/dologin', send )
-                  response = JSON::parse(login.body)
-                  output "logging-in"
-                  if response["success"] == true
-                        repeater = true
-                  elsif repeater == 3
-                        raise "Login failed username: #{@username}, password: #{@password}, shared_scret: #{@secret} tried 3 times"
-                 else
-                       print response
-                       puts "re-trying to login"
-                       puts "sleeping for 6 seconds"
-                       sleep(6)
-                       repeater = repeater + 1
-                 end
 
 
-            end
             if @steamid != nil && @steamid != response["transfer_parameters"]["steamid"]
                   puts "the steamid you provided does not belong to the account you entered"
                   puts "steamid will be overwritten"
@@ -73,8 +107,11 @@ module LoginCommands
             cookie = Mechanize::Cookie.new :domain => 'steamcommunity.com', :name =>'sessionid', :value =>steampowered_sessionid, :path => '/'
             @session.cookie_jar << cookie
             @loggedin = true
-            @api_key = Nokogiri::HTML(@session.get("https://steamcommunity.com/dev/apikey").content).css('#bodyContents_ex').css('p').first.text.sub('Key: ','')
-
+            begin
+                  @api_key = Nokogiri::HTML(@session.get("https://steamcommunity.com/dev/apikey").content).css('#bodyContents_ex').css('p').first.text.sub('Key: ','')
+            rescue
+                  output "Could not retrieve api_key"
+            end
             data = get_player_summaries(@steamid)
             data.each { |element|
                   if element["steamid"].to_s == @steamid.to_s
@@ -83,7 +120,7 @@ module LoginCommands
             }
             output "logged in as #{@persona}"
             output "your steamid is #{@steamid}"
-            output "loaded API_KEY : #{@api_key}"
+            output "loaded API_KEY : #{@api_key}" if !@api_key.nil?
       end
 ########################################################################################
 
@@ -97,8 +134,13 @@ module LoginCommands
             timestamp = data["timestamp"]
 
             key   = OpenSSL::PKey::RSA.new
-            key.e = OpenSSL::BN.new(exp)
-            key.n = OpenSSL::BN.new(mod)
+            if RUBY_VERSION.to_f <= 2.3
+                  key.e = OpenSSL::BN.new(exp)
+                  key.n = OpenSSL::BN.new(mod)
+            elsif RUBY_VERSION.to_f >= 2.4
+                  #key.set_key(n, e, d)
+                  key.set_key(OpenSSL::BN.new(mod), OpenSSL::BN.new(exp),nil)
+            end
             ep = Base64.encode64(key.public_encrypt(password.force_encoding("utf-8"))).gsub("\n", '')
             return {'password' => ep, 'timestamp' => timestamp }
       end

data/lib/Misc.rb

@@ -34,7 +34,7 @@ module MiscCommands
 
 
 
-      private
+
       def partner_id_to_steam_id(account_id)
             unknown_constant = 17825793 # or 0x1100001 idk wtf is this but ....
             first_bytes = [account_id.to_i].pack('i>')
@@ -43,10 +43,11 @@ module MiscCommands
             return collect.unpack('Q>')[0].to_s
       end
 
+
       def output(message)
             time = Time.new
             add = time.strftime("%d-%m-%Y %H:%M:%S")
-            puts "#{add} :: #{message}" if @messages == true
+            puts "#{add} :: #{message}" if message != ''
       end
 
       def verify_profileid_or_trade_link_or_steamid(steamid)
@@ -74,22 +75,18 @@ module MiscCommands
             begin
                   value = @session.cookie_jar.jar["steamcommunity.com"]["/"]["sessionid"].value
             rescue
-                  value = nil
-            end
-            if value == nil
-                  begin
-                        value = @session.cookie_jar.jar["store.steampowered.com"]["/"]["sessionid"].value
-                  rescue
-                        value = nil
-                  end
+                  @session.get('http://steamcommunity.com')
+                  value = @session.cookie_jar.jar["steamcommunity.com"]["/"]["sessionid"].value
             end
+            return value
+      end
 
-            if value == nil
-                  @session.cookies.each { |c|
-                        if c.name == "sessionid"
-                               value = c.value
-                         end
-                  }
+      def store_cookie()
+            begin
+                  value = @session.cookie_jar.jar["store.steampowered.com"]["/"]["sessionid"].value
+            rescue
+                  @session.get('http://store.steampowered.com')
+                  value = @session.cookie_jar.jar["store.steampowered.com"]["/"]["sessionid"].value
             end
             return value
       end
@@ -110,6 +107,52 @@ module MiscCommands
       end
 
 
+
+
+      def self.included(base)
+           base.extend(Misc_ClassMethods)
+      end
+
+      module Misc_ClassMethods
+            def partner_id_to_steam_id(account_id)
+                  unknown_constant = 17825793 # or 0x1100001 idk wtf is this but ....
+                  first_bytes = [account_id.to_i].pack('i>')
+                  last_bytes = [unknown_constant].pack('i>')
+                  collect = last_bytes + first_bytes
+                  return collect.unpack('Q>')[0].to_s
+            end
+
+            private
+            def output(message)
+                  time = Time.new
+                  add = time.strftime("%d-%m-%Y %H:%M:%S")
+                  puts "#{add} :: #{message}"
+            end
+
+            def verify_profileid_or_trade_link_or_steamid(steamid)
+                  if steamid.to_i == 0 && steamid.include?("?partner=") ##supplied trade link
+                      partner_raw = steamid.split('partner=',2)[1].split('&',2)[0]
+                      token = steamid.split('token=', 2)[1]
+                      steamid = partner_id_to_steam_id(partner_raw)
+                      return [steamid,token]
+                  elsif steamid.to_i == 0
+                        session = Mechanize.new
+                        parser = Nokogiri::XML(session.get("https://steamcommunity.com/id/#{steamid}?xml=1").content)
+                        if parser.xpath('//error').text == ('The specified profile could not be found.')
+                              raise "No profile with #{steamid} as profileid"
+                        end
+                        steamid = parser.xpath('//steamID64').text
+                        return steamid
+                  elsif steamid.to_s.length == 17
+                        return steamid
+                  else
+                        raise "invalid steamid : #{steamid}, length of received :: #{steamid.to_s.length}, normal is 17" if steamid.to_s.length != 17
+                  end
+            end
+
+      end ## end module
+
+
 end
 
 module Util

data/lib/meta/version.rb

@@ -1,4 +1,4 @@
 module   Meta
-      VERSION = "0.2.1"
+      VERSION = "0.2.3"
       GEM_NAME = "steam-trade"
 end

data/lib/steam-trade.rb

@@ -80,18 +80,18 @@ class Handler
 
                   if params.length == 3
                         raise "shared_secret must be string, received #{parasm[0].class}" if params[0].class != String
-                        raise "time difference must be an integer(Fixnum), received #{params[1].class}" if params[1].class != Fixnum
+                        raise "time difference must be a Numeric, received #{params[1].class}" if !params[1].is_a?(Numeric)
                         raise "remember_me must be a boolean, received #{params[2].class}" if !([TrueClass,FalseClass].include?(params[2].class))
                         @secret = params[0] if params[0].class == String
-                        @time_difference = params[1] if params[1].class == Fixnum
+                        @time_difference = params[1] if params[1].is_a?(Numeric)
                         @remember = params[2] if [TrueClass,FalseClass].include?(params[2].class)
                   elsif params.length == 2
                         if params[0].class == String
-                              raise "invalid fourth parameter type, received #{params[1].class}" if !([TrueClass,FalseClass].include?(params[1].class)) && params[1].class != Fixnum
+                              raise "invalid fourth parameter type, received #{params[1].class}" if !([TrueClass,FalseClass].include?(params[1].class)) && !params[1].is_a?(Numeric)
                               @secret = params[0]
-                              @time_difference = params[1] if params[1].class == Fixnum
+                              @time_difference = params[1] if params[1].is_a?(Numeric)
                               @remember = params[1] if [TrueClass,FalseClass].include?(params[1].class)
-                        elsif params[0].class == Fixnum
+                        elsif params[0].is_a?(Numeric)
                              raise "remember_me must be a boolean, received #{params[1].class}" if !([TrueClass,FalseClass].include?(params[1].class))
                              @time_difference = params[0]
                              @remember = params[1]
@@ -99,9 +99,9 @@ class Handler
                              raise "invalid third parameter type"
                        end
                  elsif params.length == 1
-                        raise "invalid third parameter type, received #{params[0].class}" if !([TrueClass,FalseClass].include?(params[0].class)) && params[0].class != Fixnum && params[0].class != String
+                        raise "invalid third parameter type, received #{params[0].class}" if !([TrueClass,FalseClass].include?(params[0].class)) && !params[0].is_a?(Numeric) && params[0].class != String
                        @secret = params[0] if params[0].class == String
-                       @time_difference = params[0] if params[0].class == Fixnum
+                       @time_difference = params[0] if params[0].is_a?(Numeric)
                        @remember = params[0] if [TrueClass,FalseClass].include?(params[0].class)
                  end
 
@@ -113,9 +113,9 @@ class Handler
                        if params.length == 0
 
 
-                             raise "invalid parameter type, received #{password.class}" if !(password.class == String || password.class == Fixnum || [TrueClass,FalseClass].include?(password.class) )
+                             raise "invalid parameter type, received #{password.class}" if !(password.class == String || params[0].is_a?(Numeric) || [TrueClass,FalseClass].include?(password.class) )
                              @secret = password if  password.class == String
-                             @time_difference =  password if  password.class == Fixnum
+                             @time_difference =  password if  password.is_a?(Numeric)
                              @remember =  password if [TrueClass,FalseClass].include?(password.class)
 
 
@@ -124,10 +124,10 @@ class Handler
 
                              if password.class == String
                                    @secret = password
-                                   raise "invalid paramter type, received #{params[0].class}" if !([TrueClass,FalseClass].include?(params[0].class) || params[0].class == Fixnum )
-                                   @time_difference = params[0] if params[0].class == Fixnum
+                                   raise "invalid paramter type, received #{params[0].class}" if !([TrueClass,FalseClass].include?(params[0].class) || params[0].is_a?(Numeric) )
+                                   @time_difference = params[0] if params[0].is_a?(Numeric)
                                    @remember = params[0] if [TrueClass,FalseClass].include?(params[0].class)
-                             elsif password.class == Fixnum
+                             elsif password.is_a?(Numeric)
                                    @time_difference = password
                                    raise "invalid paramter type, received #{params[0].class}" if !([TrueClass,FalseClass].include?(params[0].class))
                                    @remember = params[0] if [TrueClass,FalseClass].include?(params[0].class)
@@ -139,8 +139,8 @@ class Handler
                        elsif params.length == 2
                              raise "shared_secret must be a string, recieved #{password.class}" if password.class != String
                              @secret = password if  password.class == String
-                             raise "time difference must be an integer (Fixnum), received #{params[0].class}" if params[0].class != Fixnum
-                             @time_difference = params[0] if params[0].class == Fixnum
+                             raise "time difference must be a Numeric, received #{params[0].class}" if !params[0].is_a?(Numeric)
+                             @time_difference = params[0] if params[0].is_a?(Numeric)
                              raise "remeber_me must be a boolean, recieved #{params[1].class}" if !([TrueClass,FalseClass].include?(params[1].class))
                              @remember = params[1] if [TrueClass,FalseClass].include?(params[1].class)
 
@@ -161,9 +161,7 @@ class Handler
       end
 
       def set_inventory_cache(timer = 120)
-            integer = 5
-            float = 5.5
-            if timer.class == integer.class || timer.class == float.class
+            if timer.is_a?(Numeric)
                   @inventory_validity = timer.to_i
                   output "inventory validity set to #{timer}"
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steam-trade
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - OmG3r
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler