rikutelebot 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8892ad352c873f513b2588d71fe9b0f0c17a53af
-  data.tar.gz: d820b5a330d778962a825338df10e5d40a101fe6
+  metadata.gz: 58ceab6f43a9ad90430bcb34a0a6dd64642c243d
+  data.tar.gz: 6a8fc7789a20af74bf18e3691039176aca42e877
 SHA512:
-  metadata.gz: 9dd0ed4d1327577a6b3c3dbc54cbda31776c698884e431a5a678eec5b607bc07dd8013069bbdfe12cf3e061be262d3ec81fb009b30dd98f3ffbf6d874014f8eb
-  data.tar.gz: d0e2bcdc3ba354bee1da8452b04d752055a7c7c2c46b75c968700a195771975c79180bfce139bd2569c63358930dd94646bd61ae423f1dbd556bfa8dad9643c6
+  metadata.gz: 01d4b98d9be68d842002f3215d5ea05d89d2ed684fce3169a4c8b0fa29218c9a1a5cd4d428925d7be6f399a78d6ab4f06ae6424dee1594eec9e42df82bc0f918
+  data.tar.gz: 6e6158136e3907b5eaa262aa524e2cb3de04e885660a89153214ffd4cdc95397e93fc43718b23cb8a74925927baeaea0ef97f05534cd3ce0881ef1ceed022d8b

data/lib/rikutelebot/version.rb

@@ -1,3 +1,3 @@
 module Rikutelebot
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/rikutelebot.rb

@@ -1,10 +1,14 @@
 require "rikutelebot/version"
 require 'open-uri'
 require 'json'
+require 'monads/many'
+
+
 
 module Rikutelebot
+	include Monads
 
-	Config = Struct.new(:token, :offset) do
+	Config = Struct.new(:token, :offset, :io) do
 		def getupdatesurl
 			"https://api.telegram.org/bot#{token}/getUpdates?offset=#{offset}"
 		end
@@ -20,20 +24,47 @@ module Rikutelebot
 		end
 	end
 
-	Command = Struct.new(:command, :args) do
+	Command = Struct.new(:command, :block)
 
-	end
 
 	class Bot
 		def initialize
-			@conf = Config.new nil, (File.exist?('offset') ? File.read('offset').to_i : 0)
+			@conf = Config.new
 			@state = false
 			@commands = []
 			yield @conf
+			@conf.offset = @conf.io.get_key 'offset'
+		end
+
+		def on(command, &block)
+			@commands << Command.new(command, block)
+			self
 		end
 
-		def get_message_array
-			
+		def get_command text
+			c = text.chars
+			return nil if c.first != '/'
+			c.shift
+			buf = ''
+			while c.first != ' ' and c.first != '@' and !c.empty?
+				buf += c.shift
+			end
+			return buf
+		end
+
+		def run!
+			loop do
+				on_message do |message|
+					a = get_command(message.text)
+					next if a.nil?
+					Many.new(
+						@commands.select do |cmd|
+							cmd.command == a 
+						end
+					).block.call(message).values
+				end
+				sleep 0.1
+			end
 		end
 
 		def on_message
@@ -41,26 +72,27 @@ module Rikutelebot
 			j = JSON.parse open(@conf.getupdatesurl).read()
 			return if j['result'].length == 0 or j.nil?
 			for update in j['result']
-				fn = update['message']['from']['first_name']
-				ln = update['message']['from']['last_name']
-				id = update['message']['from']['id']
-				un = update['message']['from']['username']
+				begin
+					fn = update['message']['from']['first_name']
+					ln = update['message']['from']['last_name']
+					id = update['message']['from']['id']
+					un = update['message']['from']['username']
 
-				usr = User.new(fn, ln, id, un)
+					usr = User.new(fn, ln, id, un)
 
-				id = update['message']['chat']['id']
-				title = update['message']['chat']['title']
-				un = update['message']['chat']['username'] || "(#{id}:#{title})"
+					id = update['message']['chat']['id']
+					title = update['message']['chat']['title']
+					un = update['message']['chat']['username'] || "(#{id}:#{title})"
 
-				chat = Chat.new(id, title, un)
+					chat = Chat.new(id, title, un)
 
-				yield Message.new(usr, chat, update['message']['text']) unless update['message']['text'].nil?
+					yield Message.new(usr, chat, update['message']['text']) unless update['message']['text'].nil?
+				rescue
+					next
+				end
 			end
 			@conf.offset = j['result'].last['update_id'] + 1
-			File.open('offset', 'w') do |f|
-				f.write @conf.offset
-				f.close
-			end
+			@conf.io.set_key 'offset', @conf.offset.to_s
 		end
 
 		def commands

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rikutelebot
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Riku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler