slacktail 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e33683910867a751ceb282ae4c4d3ce24fff694a54b7a1d54038301e9fa2d70
-  data.tar.gz: 79c8568107c9ff8374514dd56e6dbc85f815750b7d9b95dcb0ee4026e844c2dd
+  metadata.gz: 400b1fcdd1396dd38411535c29dd04e35af8ee7f4e6322fb35c05ed0756a0ecc
+  data.tar.gz: 61212806581ab04e7e4143753503f2996859e302866bd24632ac49971f2eb25d
 SHA512:
-  metadata.gz: eb2530f19b0d19657b255442152a55be621f2598911b2b837cad816a710fd406c9485da98408b1e6767af8016031d42b8394c1dc1a5b2766c89171de77aef876
-  data.tar.gz: 1ced8967e9816012bbb7fb244b41a5d644ee4bac12c83d9d64319fff7e5c40fe91005ff3519e10ad18d28dc0bb6723a7ea94a76606f0d24fed27e621885e4b10
+  metadata.gz: 91568775807417de6cbe7c3e379bd4bc4ad9665939e4e1045128427cacbb0e7a0802f8a3e1e1430e4a873f053fa5e9e667b8b7ccf9038403666519d9134bed36
+  data.tar.gz: 4ba8d8cd483f3d04bf0230070de96290aefb36fd5f36d7ae031d707e4aae6e248728cd535f0801f8ceee3ff11da9ce28b3d9d326b522e8fd2f269849f07fe896

data/bin/slacktail

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'slacktail'
+require 'pretty_trace/enable-trim'
 
 runner = MisterBin::Runner.new handler: Slacktail::Command
 

data/lib/slacktail/base.rb

@@ -1,5 +1,7 @@
 module Slacktail
   class Base
+    include HasClient
+
     attr_reader :data
     
     def initialize(data)

data/lib/slacktail/command.rb

@@ -20,6 +20,7 @@ module Slacktail
       say "Connecting... " if Client.can_connect?
 
       client.on :message do |data|
+        # File.write 'debug.yml', data.to_yaml
         @message = Message.new data
         @message.render unless skip?
       end

data/lib/slacktail/has_text.rb

@@ -7,11 +7,30 @@ module Slacktail
     end
 
     def text!
-      data.text ? data.text.gsub(/```\n?/, '').strip : ''
+      return '' unless data.text
+
+      result = data.text
+      result = sanitize_text result
+      result = evaluate_users result
+      result
     end
 
     def text_lines
       word_wrap("   #{text}").split("\n").map(&:strip)
     end
+
+  private
+
+    def sanitize_text(text)
+      data.text.gsub(/```\n?/, '').strip
+    end
+
+    def evaluate_users(text)
+      text.gsub(/<@([^>]+)>/) do
+        user = client.users[$1]&.name || "anonymous"
+        "@#{user}"
+      end
+    end
+
   end
 end

data/lib/slacktail/message.rb

@@ -1,6 +1,6 @@
 module Slacktail
   class Message < Base
-    include MessageView, HasText, HasClient
+    include MessageView, HasText
 
     def channel
       @channel ||= channel!
@@ -14,7 +14,7 @@ module Slacktail
       if attachments.any?
         attachments.first.color.to_colsole_color
       else
-        :cyn
+        :rst
       end
     end
 
@@ -27,13 +27,13 @@ module Slacktail
     end
 
     def user
-      if data.username
-        data.username
+      result = if data.user
+        client.users[data.user]&.name
       elsif data.bot_id
-        client.bots[data.bot_id].name
-      else
-        "anonymous"
+        client.bots[data.bot_id]&.name
       end
+
+      result || "anonymous"
     end
 
     def attachments

data/lib/slacktail/version.rb

@@ -1,3 +1,3 @@
 module Slacktail
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/slacktail.rb

@@ -5,9 +5,9 @@ require 'tty-markdown'
 require 'byebug' if ENV['BYEBUG']
 
 requires \
+  'slacktail/has_client',
   'slacktail/base',
   'slacktail/message_view',
   'slacktail/has_text',
-  'slacktail/has_client',
   'slacktail'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slacktail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Danny Ben Shitrit