twterm 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed5b1fe74b479cd44e106d99f63dcbc348d3f3c67b4f1dd537edd9c8dd9044c
-  data.tar.gz: 1969619f0f236f559409b7eaf4f9ac49e8d7226e5068e405ebd18955080b7260
+  metadata.gz: 5059f1ee80a71d21c74f4131143a74c250a39db8f34ef758f594a07a9c05c980
+  data.tar.gz: 27dff9906c217a17b482c6c3df44e87bbac5df74b624a8d430f0baadbaa308a9
 SHA512:
-  metadata.gz: 2a78e4c7a2b71df77830a3639d16610de65f05ae4ca9d2a56790e7a542eb41b5a476db5e60adc784eb0905649eab2827acfdd2c93111e4d3a49afd5785f51002
-  data.tar.gz: d7625b41113573124d36363e5848e794698c17cb332aef8e47bdf9c54548a750ebc8003a92051a72fca8414c9b5393fffbb3b31aaf54c0bed3ce664f78c79263
+  metadata.gz: 104eb1d6cbd160193ab940e7190126d8280a81247a68e404864f70a2aa5e06b2448075c3a53e360d8b76edc091fa375c3f09d63db7d85f8a0c9837689bbfbd21
+  data.tar.gz: d6b06359ee0330e8a3f4631286564dd49f7a56f3e0cf979bd98a2cb693380b4a981abda81343b73c43825489b26063c17f8f70add1d53ed0b6b6aaf65cb45026

data/lib/twterm/environment.rb

@@ -6,10 +6,10 @@ module Twterm
       @uname = `uname`.strip
 
       @terminal_notifier_available = TerminalNotifier.available?
-      @with_eog = system('which eog 2>&1 >/dev/null')
-      @with_imgcat = system('which imgcat 2>&1 >/dev/null')
-      @with_tmux = system('which tmux 2>&1 >/dev/null') && !ENV['TMUX'].nil?
-      @with_qlmanage = system('which qlmanage 2>&1 >/dev/null')
+      @with_eog = system('which eog >/dev/null 2>&1')
+      @with_imgcat = system('which imgcat >/dev/null 2>&1')
+      @with_tmux = system('which tmux >/dev/null 2>&1') && !ENV['TMUX'].nil?
+      @with_qlmanage = system('which qlmanage >/dev/null 2>&1')
     end
 
     def darwin?

data/lib/twterm/event/open_photo.rb

@@ -6,7 +6,7 @@ module Twterm
   module Event
     class OpenPhoto < AbstractEvent
       def fields
-        { photo: Twitter::Media::Photo }
+        { photo: Addressable::URI }
       end
     end
   end

data/lib/twterm/event/status_deleted.rb

@@ -0,0 +1,11 @@
+require 'twterm/event/abstract_event'
+
+module Twterm
+  module Event
+    class StatusDeleted < AbstractEvent
+      def fields
+        { status_id: Integer }
+      end
+    end
+  end
+end

data/lib/twterm/photo_viewer.rb

@@ -25,11 +25,11 @@ module Twterm
 
     attr_reader :backends, :preferences
 
-    # @param photo [Twitter::Media::Photo]
+    # @param url [Addressable::URI]
     # @return [void]
-    def view(photo)
+    def view(url)
       backends.each do |key, backend|
-        backend.view(photo) if preferences[:photo_viewer_backend, key]
+        backend.view(url) if preferences[:photo_viewer_backend, key]
       end
     end
   end

data/lib/twterm/photo_viewer_backend/abstract_photo_viewer_backend.rb

@@ -5,7 +5,7 @@ module Twterm
     # @abstract
     class AbstractPhotoViewerBackend
       # @abstract
-      def view(_photo)
+      def view(_url)
         raise NotImplementedError, '`view` method must be implemented'
       end
 
@@ -18,7 +18,7 @@ module Twterm
         system('stty -raw echo')
       end
 
-      # @param url [String]
+      # @param url [#to_s]
       # @yieldparam file [File]
       def with_downloaded_file(url, &block)
         uri = URI.parse(url)

data/lib/twterm/photo_viewer_backend/browser_backend.rb

@@ -7,8 +7,8 @@ module Twterm
     class BrowserBackend < AbstractPhotoViewerBackend
       include Publisher
 
-      def view(photo)
-        event = Event::OpenURI.new(photo.media_url_https)
+      def view(url)
+        event = Event::OpenURI.new(url)
         publish(event)
       end
     end

data/lib/twterm/photo_viewer_backend/imgcat_backend.rb

@@ -9,12 +9,12 @@ module Twterm
     class ImgcatBackend < AbstractPhotoViewerBackend
       include Publisher
 
-      def view(photo)
+      def view(url)
         Curses.close_screen unless Curses.closed?
 
         puts "\e[H\e[2JDownloading..."
 
-        with_downloaded_file(photo.media_url_https) do |file|
+        with_downloaded_file(url) do |file|
           begin
             puts "\e[H\e[2JRendering..."
             system "imgcat #{file.path}"

data/lib/twterm/photo_viewer_backend/quick_look_backend.rb

@@ -3,8 +3,8 @@ require 'twterm/photo_viewer_backend/abstract_photo_viewer_backend'
 module Twterm
   module PhotoViewerBackend
     class QuickLookBackend < AbstractPhotoViewerBackend
-      def view(photo)
-        with_downloaded_file(photo.media_url_https) do |file|
+      def view(url)
+        with_downloaded_file(url) do |file|
           `qlmanage -p #{file.path} 2>/dev/null`
         end
       end

data/lib/twterm/streaming_client.rb

@@ -84,7 +84,7 @@ module Twterm
             when Twitter::Streaming::FriendList
               user_stream_connected!
             when Twitter::Streaming::DeletedTweet
-              publish(Event::Status::Delete.new(event.id))
+              publish(Event::StatusDeleted.new(event.id))
             end
           end
         rescue Twitter::Error::TooManyRequests

data/lib/twterm/tab/key_assignments_cheatsheet.rb

@@ -39,6 +39,7 @@ module Twterm
           open_link: 'Open URLs',
           reply: 'Reply',
           retweet: 'Retweet',
+          quote: 'Quote',
           user: 'User',
         },
         ['Cursor', :cursor] => {

data/lib/twterm/tab/status_tab.rb

@@ -185,7 +185,7 @@ module Twterm
         when Twitter::Entity::URI
           publish(Event::OpenURI.new(item.expanded_url))
         when Twitter::Media::Photo
-          publish(Event::OpenPhoto.new(item))
+          publish(Event::OpenPhoto.new(item.media_url_https))
         when Twitter::Media::AnimatedGif, Twitter::Media::Video
           url = item.video_info.variants.max { |v| v.bitrate }.url
           publish(Event::OpenURI.new(url))

data/lib/twterm/tab/statuses/abstract_statuses_tab.rb

@@ -1,7 +1,7 @@
 require 'concurrent'
 
 require 'twterm/event/open_uri'
-require 'twterm/event/status/delete'
+require 'twterm/event/status_deleted'
 require 'twterm/event/status_garbage_collected'
 require 'twterm/image_builder/user_name_image_builder'
 require 'twterm/publisher'
@@ -77,7 +77,7 @@ module Twterm
 
           @status_ids = Concurrent::Array.new
 
-          subscribe(Event::Status::Delete) { |e| delete(e.status_id) }
+          subscribe(Event::StatusDeleted) { |e| delete(e.status_id) }
           subscribe(Event::StatusGarbageCollected) { |e| @status_ids.delete(e.id) }
         end
 

data/lib/twterm/tab/user_tab.rb

@@ -1,6 +1,7 @@
+require 'twterm/event/open_photo'
 require 'twterm/event/open_uri'
-require 'twterm/publisher'
 require 'twterm/image_builder/user_name_image_builder'
+require 'twterm/publisher'
 require 'twterm/tab/abstract_tab'
 require 'twterm/tab/user_list_management'
 
@@ -44,18 +45,21 @@ module Twterm
       end
 
       def items
-        items = %i(
-          open_timeline_tab
-          show_friends
-          show_followers
-          show_likes
-          manage_lists
-        )
-        items << :compose_direct_message unless myself?
-        items << :open_website  unless user.website.nil?
-        items << :toggle_follow unless myself?
-        items << :toggle_mute   unless myself?
-        items << :toggle_block  unless myself?
+        items = [
+          :open_timeline_tab,
+          :show_friends,
+          :show_followers,
+          :show_likes,
+          :profile_image,
+          (:profile_background_image unless user.profile_background_image.nil?),
+          :manage_lists,
+          (:compose_direct_message unless myself?),
+          (:open_website unless user.website.nil?),
+          (:toggle_follow unless myself?),
+          (:toggle_mute unless myself?),
+          (:toggle_block unless myself?),
+          :open_in_browser,
+        ].compact
 
         items
       end
@@ -139,11 +143,26 @@ module Twterm
         user_id == client.user_id
       end
 
+      def open_in_browser
+        event = Event::OpenURI.new(user.url)
+        publish(event)
+      end
+
       def open_list_management_tab
         tab = Tab::UserListManagement.new(app, client, user_id)
         app.tab_manager.add_and_show(tab)
       end
 
+      def open_profile_background_image
+        event = Event::OpenPhoto.new(user.profile_background_image)
+        publish(event)
+      end
+
+      def open_profile_image
+        event = Event::OpenPhoto.new(user.profile_image)
+        publish(event)
+      end
+
       def open_timeline_tab
         tab = Tab::Statuses::UserTimeline.new(app, client, user_id)
         app.tab_manager.add_and_show(tab)
@@ -161,10 +180,16 @@ module Twterm
           compose_direct_message
         when :manage_lists
           open_list_management_tab
+        when :open_in_browser
+          open_in_browser
         when :open_timeline_tab
           open_timeline_tab
         when :open_website
           open_website
+        when :profile_background_image
+          open_profile_background_image
+        when :profile_image
+          open_profile_image
         when :show_likes
           show_likes
         when :show_followers
@@ -291,10 +316,16 @@ module Twterm
               else
                 Image.string('Mute this user')
               end
+            when :open_in_browser
+              Image.string("Open this user in browser (#{user.url})")
             when :open_timeline_tab
               Image.number(user.statuses_count) - Image.whitespace - Image.plural(user.statuses_count, 'tweet')
             when :open_website
               Image.string("Open website (#{user.website})")
+            when :profile_background_image
+              Image.string('View profile background image')
+            when :profile_image
+              Image.string('View profile image')
             when :show_likes
               Image.number(user.favorites_count) - Image.whitespace - Image.plural(user.favorites_count, 'like')
             when :show_followers

data/lib/twterm/tweetbox.rb

@@ -38,9 +38,9 @@ module Twterm
     def reply(status)
       screen_name = app.user_repository.find(status.user_id).screen_name
       leading_text = "\e[1mReplying to @#{screen_name}\e[0m\n\n#{status.text}"
-      prompt = "> @#{screen_name} "
+      prompt = { prompt: '> ', init_text: "@#{screen_name} " }
 
-      ask_and_post(leading_text, prompt, -> body { "@#{screen_name} #{body}" }, { in_reply_to_status_id: status.id })
+      ask_and_post(leading_text, prompt, -> body { body }, { in_reply_to_status_id: status.id })
     end
 
     private
@@ -51,6 +51,13 @@ module Twterm
       app.completion_manager.set_default_mode!
 
       thread = Thread.new do
+        if prompt.is_a?(Hash)
+          if prompt.include?(:init_text)
+            init_readline_text(prompt[:init_text])
+          end
+          prompt = prompt[:prompt] || '> '
+        end
+
         raw_text = ''
 
         loop do
@@ -102,6 +109,16 @@ module Twterm
       ask(prompt, postprocessor) { |text| client.post(postprocessor.call(text), options) }
     end
 
+    def init_readline_text(text)
+      old_pre_input_hook = Readline.pre_input_hook
+      Readline.pre_input_hook = lambda do
+        old_pre_input_hook.call if old_pre_input_hook
+        Readline.insert_text(text)
+        Readline.redisplay
+        Readline.pre_input_hook = old_pre_input_hook
+      end
+    end
+
     def reset
       reset_prog_mode
       sleep 0.1

data/lib/twterm/user.rb

@@ -1,8 +1,8 @@
 module Twterm
   class User
     attr_reader :description, :favorites_count, :followers_count,
-                :friends_count, :id, :location, :name, :protected,
-                :screen_name, :statuses_count, :url, :verified, :website
+                :friends_count, :id, :location, :name, :protected, :profile_image,
+                :profile_background_image, :screen_name, :statuses_count, :url, :verified, :website
     alias_method :protected?, :protected
     alias_method :verified?, :verified
 
@@ -24,6 +24,8 @@ module Twterm
       @followers_count = user.followers_count
       @url = user.url
       @verified = user.verified?
+      @profile_image = user.profile_image_uri_https
+      @profile_background_image = user.profile_banner_uri_https
 
       self
     end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-07 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -258,9 +258,9 @@ files:
 - lib/twterm/event/screen/refresh.rb
 - lib/twterm/event/screen/resize.rb
 - lib/twterm/event/status/abstract_status_event.rb
-- lib/twterm/event/status/delete.rb
 - lib/twterm/event/status/mention.rb
 - lib/twterm/event/status/timeline.rb
+- lib/twterm/event/status_deleted.rb
 - lib/twterm/event/status_garbage_collected.rb
 - lib/twterm/event/user_garbage_collected.rb
 - lib/twterm/event_dispatcher.rb

data/lib/twterm/event/status/delete.rb

@@ -1,13 +0,0 @@
-require 'twterm/event/abstract_event'
-
-module Twterm
-  module Event
-    module Status
-      class Delete < AbstractStatusEvent
-        def fields
-          { status_id: Integer }
-        end
-      end
-    end
-  end
-end