libfchat 1.8 → 2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b4088d994319f517d0b3a0e1318d01b55f9e170a
+  data.tar.gz: 63efbbaf06c0ec58a11037e6c4193030398af55c
+SHA512:
+  metadata.gz: dac120724c1989743ddea6e27e18e1cc9179625cc2769f6f9ac90ca52a45cc8c61c2b8d5f40b4fd5ef347bdf61f7b6cc79a563d1403880206552c803ae5e2815
+  data.tar.gz: f7e6929005dbd654761250182e9678f7dbf2ac28fc61b87beab9992fab5fcaf9015b7f602da6786638ad3e29711c6a5df1d4e768123cd588dd9796b8e3df3767

data/lib/libfchat/fchat.rb

@@ -14,7 +14,7 @@ module Libfchat
   require 'libfchat/version'
   require 'libfchat/webapi'
   require 'pp'
-  
+
   class Fchat
     attr_reader :ticket
     attr_reader :websocket
@@ -22,7 +22,7 @@ module Libfchat
     attr_reader :version
     attr_reader :clientname
     attr_reader :me
-    
+
     attr_reader :chat_max
     attr_reader :priv_max
     attr_reader :lfrp_max
@@ -38,7 +38,7 @@ module Libfchat
     attr_accessor :logger
 
     ##
-    # Initialize the object with the name and version. 
+    # Initialize the object with the name and version.
     # Default to just identifying as the library
 
     def initialize(clientname="libfchat-ruby by Jippen Faddoul ( http://github.com/jippen/libfchat-ruby )",version=Libfchat::VERSION, level=Logger::DEBUG)
@@ -86,7 +86,7 @@ module Libfchat
 
     def login(server,account,password,character,timeout=30)
       webapi = Libfchat::WebAPI.new
-      @ticket = webapi.get_ticket(account,password)
+      @ticket = webapi.getApiTicket(account, password)
       @me = character
 
       EM.run {
@@ -123,7 +123,7 @@ module Libfchat
     # ====================================================== #
     #               Always respond to these                  #
     # ====================================================== #
-    
+
     ##
     # Respond to keepalive ping messages
     def got_PIN(message)
@@ -155,7 +155,7 @@ module Libfchat
         raise "ERROR: Do not know how to handle VAR #{message}"
       end
     end
-    
+
     ##
     # Store list of ops
     def got_ADL(message)
@@ -195,7 +195,7 @@ module Libfchat
           'message' => ""
         }
     end
- 
+
     ##
     # Handle user changing status
     def got_STA(message)
@@ -205,7 +205,7 @@ module Libfchat
           'message' => message['statusmsg']
         }
     end
- 
+
     ##
     # Handle user logging off
     def got_FLN(message)
@@ -214,7 +214,7 @@ module Libfchat
         room['characters'].delete(message['character'])
       end
     end
- 
+
     ##
     # Store data about newly joined chatroom
     def got_JCH(message)
@@ -271,7 +271,7 @@ module Libfchat
     # ====================================================== #
 
     ##
-    # Performs an account ban against a characters account. 
+    # Performs an account ban against a characters account.
     #
     # *This command requires chat op or higher.*
     def ACB(character)
@@ -332,7 +332,7 @@ module Libfchat
     end
 
     ##
-    # This command is used by an admin or channel owner to set a new 
+    # This command is used by an admin or channel owner to set a new
     # channel description.
     #
     # *This command requires channel op or higher.*
@@ -533,7 +533,7 @@ module Libfchat
     end
 
     ##
-    # Advertises the first open private channel owned by the client 
+    # Advertises the first open private channel owned by the client
     # in the given channel
     def RAN(channel)
       json = {:channel => channel }

data/lib/libfchat/version.rb

@@ -2,5 +2,5 @@ module Libfchat
   # We're doing this because we might write tests that deal
   # with other versions of Libfchat and we are unsure how to
   # handle this better.
-  VERSION = "1.8" unless defined?(::Libfchat::VERSION)
+  VERSION = "2.0" unless defined?(::Libfchat::VERSION)
 end

data/lib/libfchat/webapi.rb

@@ -4,26 +4,139 @@ module Libfchat
   rescue LoadError
     #I don't actually NEED rubygems, unless on 1.8
   end
-  require 'net/http'
+  require 'net/https'
   require 'multi_json'
-  
+
   class WebAPI
     attr_reader :ticket
+    attr_reader :baseurl
 
-    def get_ticket(account,password)
-      uri = URI('http://www.f-list.net/json/getApiTicket.php')
-      res = Net::HTTP.post_form(uri,
-                                'account' => account,
-                                'password' => password)
+    def initialize(baseurl="https://www.f-list.net")
+      @baseurl = baseurl
+    end
 
+    def post(endpoint, params)
+      uri = URI("#{@baseurl}#{endpoint}")
+      if @ticket
+        params['ticket'] = @ticket
+      end
+      res = Net::HTTP.post_form(uri, params)
       json = MultiJson.load(res.body)
-      if json['ticket']
-        @ticket = json['ticket']
-      else
+      if json['error'] != ""
+        raise json['error']
+      end
+      return json
+    end
+
+    def get(endpoint)
+      uri = URI(@baseurl)
+      res = Net::HTTP.get(uri)
+      json = MultiJson.load(res.body)
+      if json['error'] != ""
         raise json['error']
       end
       return json
     end
 
+    def get_ticket(account, password)
+      # Deprecated
+      return self.getApiTicket(account, password)
+    end
+
+    def getApiTicket(account, password)
+      json = self.post("/json/getApiTicket.php",
+                      'account' => account,
+                      'password' => password)
+
+      if json['ticket']
+        @ticket = json['ticket']
+        return json
+      end
+    end
+
+    # Bookmarks
+    def bookmark_add(name)
+      return self.post("/json/api/bookmark-add.php",
+                      'name' => name)
+    end
+
+    def bookmark_list()
+      return self.get("/json/api/bookmark-list.php")
+    end
+
+    def bookmark_remove(name)
+      return self.post("/json/api/bookmark-remove.php",
+                      'name' => name)
+    end
+
+    # Character data
+    def character_data(name)
+      return self.post("/json/api/character-data.php",
+                      'name' => name)
+    end
+
+    def character_list()
+      return self.get("/json/api/character-list.php")
+    end
+
+    # Misc data
+    def group_list()
+      return self.get("/json/api/group-list.php")
+    end
+
+    def ignore_list()
+      return self.get("/json/api/ignore-list.php")
+    end
+
+    def info_list()
+      return self.get("/json/api/info-list.php")
+    end
+
+    def kink_list()
+      return self.get("/json/api/kink-list.php")
+    end
+
+    def mapping_list()
+      return self.get("/json/api/mapping-list.php")
+    end
+
+    # Handling friend requests, friend list data
+    def friend_list()
+      return self.get("/json/api/friend-list.php")
+    end
+
+    def friend_remove(source_name, dest_name)
+      return self.post("/json/api/friend-remove.php",
+                      "source_name" => source_name,
+                      "dest_name" => dest_name)
+    end
+
+    def request_accept(request_id)
+      return self.post("/json/api/request-accept.php",
+                      "request_id" => request_id)
+    end
+
+    def request_cancel(request_id)
+      return self.post("/json/api/request-cancel.php",
+                      "request_id" => request_id)
+    end
+
+    def request_deny(request_id)
+      return self.post("/json/api/request-deny.php",
+                      "request_id" => request_id)
+    end
+
+    def request_list()
+      return self.get("/json/api/request-list.php")
+    end
+
+    def request_pending()
+      return self.get("/json/api/request-pending.php")
+    end
+
+    def request_send()
+      return self.get("/json/api/request-send.php")
+    end
+
   end
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: libfchat
 version: !ruby/object:Gem::Version
-  version: '1.8'
-  prerelease: 
+  version: '2.0'
 platform: ruby
 authors:
 - Ryan Gooler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: miniunit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '0'
 description: A library for connecting to F-chat ( http://f-list.net )
 email: cheetahmorph@gmail.com
 executables: []
@@ -87,26 +78,25 @@ files:
 homepage: http://github.com/jippen/libfchat-ruby
 licenses:
 - MIT
+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: 1.8.28
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library for connection to F-chat
 test_files: []