kanal-interfaces-telegram 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0443fcd3d0798e1f0d9765f25790852ec5f99635b88d78dd51b30a4c1491166
-  data.tar.gz: a0c4f6a617e075a62e2d2a15802d25267eb297b0cf85991c4ffd7c2908a470bb
+  metadata.gz: d561c375f8a3d3802d78a2c03b7b8859d4d6db10cd6a4fb55242dc11776c2448
+  data.tar.gz: 1fe7521d6848968a584173484fbdeca37ebbf1d9cebc0ffa07cff2d8ceab6298
 SHA512:
-  metadata.gz: 541a8cdc495e3def560db1209f9a0274b476b528d2887d1686de7557dae3d8e3cb24447ddedb763b0a11d64baf040d02cb888c4d01037a3df54e2c3714501c07
-  data.tar.gz: a6d4e89bda323eff32315cbc0acaf47e6bdd5f87c685c2e7a499f5f955d44b905373e477ec0a6e02e4464015adea1b59154966436fc14f77c4b4603411f5c1a8
+  metadata.gz: 93dec85818dcf56c4d578a4ad82564bfd4dde43e101d04bea1c7f32095aab0c9ca89db0e725829c2482fc179b1bceee3d6391bbda1ac5cd9f4c83dc6b1ddb641
+  data.tar.gz: 29e6de8af8c702984d6829f74c7ddd3393b315aade1b31a1c64f4000d0564f2528022ae5ebd4d77e952a18e009aa83c77a215735c355b9308fb4b993638ef072

data/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

data/.idea/kanal-interfaces-telegram.iml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="axiom-types (v0.1.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="backport (v1.2.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="benchmark (v0.2.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.5, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="coercible (v1.0.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="descendants_tracker (v0.0.4, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="docile (v1.4.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-inflector (v1.0.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="e2mmap (v0.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v2.7.4, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-multipart (v1.0.4, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-net_http (v3.0.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ice_nine (v0.11.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.6.3, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kanal (v0.3.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kramdown (v2.4.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kramdown-parser-gfm (v1.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="multipart-post (v2.3.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.14.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.22.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parser (v3.2.0.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="racc (v1.6.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.6.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="reverse_markdown (v2.1.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.12.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.12.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.12.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.12.3, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.12.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.44.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.24.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.7.3, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby2_keywords (v0.0.5, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.22.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.3, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov_json_formatter (v0.1.4, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="solargraph (v0.48.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="telegram-bot-ruby (v0.23.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thor (v1.2.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.11, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.4.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="virtus (v2.0.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="webrick (v1.7.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="yard (v0.9.28, RVM: ruby-2.7.6) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake" />
+    </option>
+  </component>
+</module>

data/.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.7.6" project-jdk-type="RUBY_SDK" />
+</project>

data/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/kanal-interfaces-telegram.iml" filepath="$PROJECT_DIR$/.idea/kanal-interfaces-telegram.iml" />
+    </modules>
+  </component>
+</project>

data/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

data/CHANGELOG.md

@@ -1,10 +1,7 @@
 ## [Unreleased]
 
-## [0.2.0] - 2023-01-30
-
-- Library now can send images via .tg_image_path
-- Populating separate field in input
-- Using output.tg_chat_id and not the one inside interface, this is preparations for future sending outputs in separate methods... Probably
+## [0.3.0] - 2023-03-10
+- Reworked interface with the new Kanal release, now it uses Interface base class properly
 
 ## [0.1.0] - 2022-11-21
 

data/Gemfile

@@ -9,7 +9,7 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-gem "kanal"
+gem "kanal", "0.4.0"
 
 group :development do
   gem "rubocop", "~> 1.21"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kanal-interfaces-telegram (0.2.0)
+    kanal-interfaces-telegram (0.2.1)
       telegram-bot-ruby
 
 GEM
@@ -31,7 +31,7 @@ GEM
     ice_nine (0.11.2)
     jaro_winkler (1.5.4)
     json (2.6.3)
-    kanal (0.3.0)
+    kanal (0.4.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -39,6 +39,8 @@ GEM
     multipart-post (2.3.0)
     nokogiri (1.14.0-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.14.0-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
@@ -118,9 +120,10 @@ GEM
 
 PLATFORMS
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  kanal
+  kanal (= 0.4.0)
   kanal-interfaces-telegram!
   rake (~> 13.0)
   rspec (~> 3.0)
@@ -131,4 +134,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.19
+   2.4.5

data/lib/kanal/interfaces/telegram/plugins/telegram_integration_plugin.rb

@@ -18,8 +18,12 @@ module Kanal
           def register_parameters(core)
             core.register_input_parameter :tg_message, readonly: true
             core.register_input_parameter :tg_text, readonly: true
+            core.register_input_parameter :tg_callback, readonly: true
+            core.register_input_parameter :tg_callback_text, readonly: true
             core.register_input_parameter :tg_chat_id, readonly: true
             core.register_input_parameter :tg_username, readonly: true
+            core.register_input_parameter :tg_image_link, readonly: true
+            core.register_input_parameter :tg_audio_link, readonly: true
 
             core.register_output_parameter :tg_chat_id
             core.register_output_parameter :tg_text
@@ -35,7 +39,11 @@ module Kanal
             end
 
             core.hooks.attach :input_before_router do |input|
-              input.body = input.tg_text
+              if input.tg_callback
+                input.body = input.tg_callback_text
+              else
+                input.body = input.tg_text
+              end
             end
 
             core.hooks.attach :output_before_returned do |input, output|

data/lib/kanal/interfaces/telegram/telegram_interface.rb

@@ -16,6 +16,8 @@ module Kanal
 
           @bot_token = bot_token
 
+          @bot = ::Telegram::Bot::Client.new(bot_token)
+
           @core.register_plugin Kanal::Plugins::Batteries::BatteriesPlugin.new
           @core.register_plugin Kanal::Interfaces::Telegram::Plugins::TelegramIntegrationPlugin.new
         end
@@ -23,34 +25,96 @@ module Kanal
         def start
           ::Telegram::Bot::Client.run(@bot_token) do |bot|
             bot.listen do |message|
-              input = @core.create_input
+              puts "message class: #{message.class}"
+
+              if message.instance_of?(::Telegram::Bot::Types::CallbackQuery)
+                input = @core.create_input
+
+                input.tg_callback = message
+                input.tg_callback_text = message.data
+                input.tg_chat_id = message.from.id
+                input.tg_username = message.from.username
+
+                puts input.tg_username
+                puts input.tg_chat_id
+
+                router.consume_input input
 
-              input.tg_message = message
-              input.tg_text = message.text
-              input.tg_chat_id = message.chat.id
-              input.tg_username = message.try(:chat).try(:username) || input.tg_message.try(:from).try(:username)
+                # output = router.create_output_for_input input
+                #
+                # send_output bot, output
+              else
+                input = @core.create_input
 
-              output = router.create_output_for_input input
+                if message.text.nil?
+                  message.text = "EMPTY TEXT"
+                end
 
-              bot.api.send_message(
-                chat_id: output.tg_chat_id,
-                text: output.tg_text,
-                reply_markup: output.tg_reply_markup
-              )
+                input.tg_message = message
+                input.tg_text = message.text
+                input.tg_chat_id = message.chat.id
+                input.tg_username = message.chat.username || input.tg_message.from.username
 
-              image_path = output.tg_image_path
+                puts input.tg_username
+                puts input.tg_chat_id
 
-              if image_path && File.exist?(image_path)
-                bot.api.send_photo(
-                  chat_id: message.chat.id,
-                  photo: Faraday::UploadIO.new(image_path, guess_mimetype(image_path))
-                )
+                if message.photo.count > 0
+                  puts message.photo[0].file_id
+                  file = bot.api.get_file(file_id: message.photo[2].file_id)
+                  file_path = file.dig('result', 'file_path')
+                  photo_url = "https://api.telegram.org/file/bot#{@bot_token}/#{file_path}"
+                  puts photo_url
+                  input.tg_image_link = photo_url
+                end
+
+                if message.audio.instance_of?(::Telegram::Bot::Types::Audio)
+                  file = bot.api.get_file(file_id: message.audio.file_id)
+                  file_path = file.dig('result', 'file_path')
+                  audio_url = "https://api.telegram.org/file/bot#{@bot_token}/#{file_path}"
+                  puts audio_url
+                  input.tg_audio_link = audio_url
+                end
+
+                router.consume_input input
+
+                # output = router.create_output_for_input input
+                #
+                # send_output bot, output
               end
             end
           end
         end
 
+        def consume_output(output)
+          send_output @bot, output
+        end
+
         private
+        def send_output(bot, output)
+          bot.api.send_message(
+            chat_id: output.tg_chat_id,
+            text: output.tg_text,
+            reply_markup: output.tg_reply_markup
+          )
+
+          image_path = output.tg_image_path
+
+          if !image_path.nil? && File.exist?(image_path)
+            bot.api.send_photo(
+              chat_id: output.tg_chat_id,
+              photo: Faraday::UploadIO.new(output.tg_image_path, guess_mimetype(output.tg_image_path))
+            )
+          end
+
+          audio_path = output.tg_audio_path
+
+          if !output.tg_audio_path.nil? && File.exist?(audio_path)
+            bot.api.send_audio(
+              chat_id: output.tg_chat_id,
+              audio: Faraday::UploadIO.new(output.tg_audio_path, "audio/mpeg3")
+            )
+          end
+        end
 
         def guess_mimetype(filename)
           images = {
@@ -60,13 +124,13 @@ module Kanal
           }
 
           # TODO: rewrite with .find or .each
-          for mime, types in [images] do
-            for type in types do
-              return mime if filename.include? type
+          for pack in [images] do
+            for mime, types in pack do
+              for type in types do
+                return mime if filename.include? type
+              end
             end
           end
-
-          "application/octet-stream"
         end
       end
     end

data/lib/kanal/interfaces/telegram/version.rb

@@ -3,7 +3,7 @@
 module Kanal
   module Interfaces
     module Telegram
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/kanal/interfaces/telegram.rb

@@ -2,6 +2,9 @@
 
 require_relative "telegram/version"
 
+require "kanal/core/core"
+require "kanal/interfaces/telegram/telegram_interface"
+
 module Kanal
   module Interfaces
     module Telegram

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanal-interfaces-telegram
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - idchlife
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-29 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: telegram-bot-ruby
@@ -32,6 +32,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".idea/.gitignore"
+- ".idea/kanal-interfaces-telegram.iml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/vcs.xml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"