beeline-rb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb82e60fd4d94693d41b751a344ce3ec7cbe88e2b8a9322f52ca7a987d0ca762
-  data.tar.gz: 5c3996593694fd9440f0f83ab248225c0b187cc5d86231ed975d218850107389
+  metadata.gz: e249c6436484ce2d8c39b13459e8b9de1efb88328e2855f52e0f9abc34462e8f
+  data.tar.gz: ef04c49732843fa6dc5edb4abb4e6300ded0472a5e935e92e5106de39694a88f
 SHA512:
-  metadata.gz: 4467d4566ea3e550c4b6406fe6f3e8a44d0b5f1379a0a59b25c2c2008a656cf49863086f875bd75ee185f8f48ec5362946c39e3f64e4700433ee30d24c96aace
-  data.tar.gz: 94bc32b5c17add1a54073a622818b705210beca53b9ce94aaf93957f852e5e60af0b164426dfa90bc064c7028afc545846f4e45f14f0109fe3e989b02d5c79c5
+  metadata.gz: a63a7990d697520bb59ced2c8d71caf813bc0f1a805cebbbaa3cb22cebaf1d6fbf0f623c3b2d4aa770c3347c211860f35652aebd4388aaaa34a3bb08fc763985
+  data.tar.gz: ee3966e55f683cf1667447de4a343cfe42abae522d9ed0344d7e8c997c29a21cbb7a98cd06d807ed8e917060c0fa1a30e6340c31e7f692882bee7cf43d53bb6a

data/README.md

@@ -1,7 +1,7 @@
-beeline
+[beeline](https://github.com/inertia186/beeline-rb)
 =======
 
-BeeLine is a BeeChat Client Framework for Ruby.
+BeeLine is a [BeeChat](https://beechat.hive-engine.com/) Client Framework for Ruby.
 
 #### Installation
 
@@ -90,4 +90,4 @@ If you're using Tender, I'd love to hear from you.  Drop me a line and tell me w
   
 ## License
 
-I don't believe in intellectual "property".  If you do, consider BeeLine as licensed under a Creative Commons [![CC0](http://i.creativecommons.org/p/zero/1.0/80x15.png)](http://creativecommons.org/publicdomain/zero/1.0/) License.
+I don't believe in intellectual "property".  If you do, consider BeeLine as licensed under a Creative Commons <a href="http://creativecommons.org/publicdomain/zero/1.0/"><img src="http://i.creativecommons.org/p/zero/1.0/80x15.png" alt="CC0" /></a> License.

data/example-config.yml

@@ -1,5 +1,8 @@
 # Example config.yml
 
+:beechat:
+  :frienships:
+    :accept: 'auto'
 :chain:
   :hive_account: social
   :hive_public_key: STM5ctejUsoZ9FwfCaVbNvWYYgNMBo9TVsHSE8wHrqAmNJi6sDctt

data/lib/beeline/bot.rb

@@ -39,5 +39,11 @@ module Beeline
         chat_message(conversation_id, from, reply)
       end
     end
+    
+    def process_friendship_requested(payload)
+      return unless friendships[:accept] == 'auto'
+      
+      accept_pending_friend_requests
+    end
   end
 end

data/lib/beeline/client.rb

@@ -6,7 +6,7 @@ module Beeline
   class Client
     include Beeline::Config
     
-    attr_reader :commands, :messages
+    attr_reader :commands, :messages, :session
     
     INITIAL_LATCH = 0.01
     MAX_LATCH = 3.0
@@ -60,24 +60,40 @@ module Beeline
         extensions: [PermessageDeflate],
         headers: {
           'User-Agent' => AGENT_ID,
-          'Cookie' => session.tokens
+          'Authorization' => "Bearer #{session.token}"
         },
         ping: WS_KEEPALIVE_TIME
       )
     end
     
     def authenticate
-      if result = socket.send({type: 'authenticate', payload: {username: hive_account, token: session.ws_token}}.to_json)
+      if result = socket.send({type: 'authenticate', payload: {username: hive_account, token: session.token}}.to_json)
         puts "Authentication sent: #{session.inspect}"
         
         ping
+        
+        accept_pending_friend_requests
       else
         puts "Could not authenticate."
       end
     end
     
     def chat_message(conversation_id, to, message)
-      socket.send({type: 'chat-message', payload: {conversation_id: conversation_id, to: to, message: message}}.to_json)
+      if socket.send({type: 'chat-message', payload: {conversation_id: conversation_id, to: to, message: message}}.to_json)
+        puts "Reply sent to #{to}"
+      end
+    end
+    
+    def accept_pending_friend_requests
+      return unless friendships[:accept] == 'auto'
+      
+      session.friend_requests.each do |friend_request|
+        if socket.send({type: 'accept-friendship', payload: {id: friend_request['id']}}.to_json)
+          puts "Accept friendship sent for #{friend_request['username']}"
+        else
+          puts "Could not accept friendship request: #{friend_request}"
+        end
+      end
     end
     
     # @private

data/lib/beeline/config.rb

@@ -2,6 +2,10 @@ require 'yaml'
 
 module Beeline
   module Config
+    def friendships
+      beechat[:friendships] || {}
+    end
+    
     def hive_account
       chain[:hive_account]
     end
@@ -14,8 +18,12 @@ module Beeline
       chain[:hive_public_key]
     end
   private
+    def beechat
+      @beechat_hash ||= yml[:beechat] || {}
+    end
+    
     def chain
-      @chain_hash ||= yml[:chain]
+      @chain_hash ||= yml[:chain] || {}
     end
     
     def yml

data/lib/beeline/session.rb

@@ -9,13 +9,12 @@ module Beeline
     include Config
     include Hive::Utils
     
-    attr_reader :ws_session, :cookies
+    attr_reader :ws_session
     
     def initialize
       @base_uri = nil
       @ws_uri = nil
-      @cookies = nil
-      @ws_session = nil
+      @beeline_session = nil
       @http = nil
     end
     
@@ -27,23 +26,12 @@ module Beeline
       @ws_uri ||= URI.parse(BEE_WS_URL)
     end
     
-    def tokens
-      login if @cookies.nil?
+    def token
+      login if @beeline_session.nil?
       
-      return if @cookies.nil?
+      return if @beeline_session.nil?
       
-      [
-        @cookies.split('; ').select{|t| t.start_with? 'token='}.first,
-        @cookies.split('; ').select{|t| t.start_with? 'refresh_token='}.first
-      ].join('; ')
-    end
-    
-    def ws_token
-      login if @ws_session.nil?
-      
-      return if @ws_session.nil?
-      
-      @ws_session['ws_token']
+      @beeline_session['token']
     end
     
     def http(&block)
@@ -53,7 +41,7 @@ module Beeline
     end
     
     def login
-      return @ws_session if !!@ws_session
+      return @beeline_session if !!@beeline_session
       
       timestamp = (Time.now.to_f * 1000).to_i
       message = "#{hive_account}#{timestamp}"
@@ -66,8 +54,7 @@ module Beeline
         response = http.request request
         
         if response.code == '200'
-          @cookies = response['Set-Cookie']
-          @ws_session = JSON[response.body]
+          @beeline_session = JSON[response.body]
         else
           JSON[response.body]
         end
@@ -75,14 +62,14 @@ module Beeline
     end
     
     def verify
-      raise "Unable to verify before logging in" unless !!@ws_session
+      raise "Unable to verify before logging in" unless !!@beeline_session
       
       resource = "#{base_uri.path}/users/verify"
       
       http do |http|
         request = Net::HTTP::Get.new resource
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{token}"
         response = http.request request
         
         JSON[response.body]
@@ -90,19 +77,18 @@ module Beeline
     end
     
     def refresh_token
-      raise "Unable to refresh token before logging in" unless !!@ws_session
+      raise "Unable to refresh token before logging in" unless !!@beeline_session
       
       resource = "#{base_uri.path}/refresh-token"
       
       http do |http|
         request = Net::HTTP::Get.new resource
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{@beeline_session['refresh_token']}"
         response = http.request request
         
         if response.code == '200'
-          @cookies = response['Set-Cookie']
-          @ws_session = JSON[response.body]
+          @beeline_session['token'] = JSON[response.body]['token']
         else
           JSON[response.body]
         end
@@ -110,14 +96,14 @@ module Beeline
     end
     
     def get(resource)
-      raise "Unable to request #{resource} before logging in" unless !!@ws_session
+      raise "Unable to request #{resource} before logging in" unless !!@beeline_session
       
       resource = "#{base_uri.path}#{resource}"
       
       http do |http|
         request = Net::HTTP::Get.new resource
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{token}"
         response = http.request request
         
         JSON[response.body]
@@ -125,10 +111,11 @@ module Beeline
     end
     
     def friends; get('/users/friends'); end
+    def friend_requests; get('/users/friend-requests'); end
     def settings; get('/users/settings'); end
     
     def settings=(new_settings)
-      raise "Unable to post settings before logging in" unless !!@ws_session
+      raise "Unable to post settings before logging in" unless !!@beeline_session
       
       resource = "#{base_uri.path}/users/settings"
       
@@ -137,7 +124,7 @@ module Beeline
         request.body = new_settings.to_json
         request['Content-Type'] = 'application/json; charset=UTF-8'
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{token}"
         response = http.request request
         
         JSON[response.body]
@@ -147,7 +134,7 @@ module Beeline
     def channels; get('/users/channels'); end
     
     def channels=(new_channels)
-      raise "Unable to post channels before logging in" unless !!@ws_session
+      raise "Unable to post channels before logging in" unless !!@beeline_session
       
       resource = "#{base_uri.path}/users/channels"
       
@@ -156,7 +143,7 @@ module Beeline
         request.body = new_channels.to_json
         request['Content-Type'] = 'application/json; charset=UTF-8'
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{token}"
         response = http.request request
         
         JSON[response.body]
@@ -167,7 +154,7 @@ module Beeline
     def conversations; get('/messages/conversations'); end
     
     def conversation(*id)
-      raise "Unable to get conversation before logging in" unless !!@ws_session
+      raise "Unable to get conversation before logging in" unless !!@beeline_session
       
       id = [id].flatten
       resource = "#{base_uri.path}/messages/conversation?ids=#{id.join(',')}"
@@ -175,7 +162,7 @@ module Beeline
       http do |http|
         request = Net::HTTP::Get.new resource
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{token}"
         response = http.request request
         
         JSON[response.body]
@@ -185,7 +172,7 @@ module Beeline
     def new_conversations; get('/messages/new'); end
     
     def chats(id, before = nil, limit = nil)
-      raise "Unable to get conversation before logging in" unless !!@ws_session
+      raise "Unable to get conversation before logging in" unless !!@beeline_session
       
       resource = "#{base_uri.path}/messages/chats?conversation_id=#{id}"
       resource += "&before=#{before.utc.iso8601}" if !!before
@@ -194,7 +181,7 @@ module Beeline
       http do |http|
         request = Net::HTTP::Get.new resource
         request['User-Agent'] = AGENT_ID
-        request['Cookie'] = tokens
+        request['Authorization'] = "Bearer #{token}"
         response = http.request request
         
         JSON[response.body]

data/lib/beeline/version.rb

@@ -1,4 +1,4 @@
 module Beeline
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   AGENT_ID = "beeline/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beeline-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Anthony Martin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler