twterm 2.3.0 → 2.4.0

data/lib/twterm/photo_viewer_backend/quick_look_backend.rb

@@ -0,0 +1,13 @@
+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|
+          `qlmanage -p #{file.path} 2>/dev/null`
+        end
+      end
+    end
+  end
+end

data/lib/twterm/preferences.rb

@@ -27,6 +27,11 @@ module Twterm
     # @return [Twterm::Preferences] an instance having the default value
     def self.default
       new({
+        photo_viewer_backend: {
+          browser: true,
+          imgcat: false,
+          quick_look: false,
+        },
         notification_backend: {
           inline: true,
           terminal_notifier: false,
@@ -45,6 +50,11 @@ module Twterm
       bool = -> x { x == true || x == false }
 
       {
+        photo_viewer_backend: {
+          browser: bool,
+          imgcat: bool,
+          quick_look: bool,
+        },
         notification_backend: {
           inline: bool,
           terminal_notifier: bool,

data/lib/twterm/publisher.rb

@@ -1,5 +1,5 @@
 require 'twterm/event_dispatcher'
-require 'twterm/event/base'
+require 'twterm/event/abstract_event'
 require 'twterm/utils'
 
 module Twterm
@@ -7,7 +7,7 @@ module Twterm
     include Utils
 
     def publish(event)
-      check_type Event::Base, event
+      check_type Event::AbstractEvent, event
 
       EventDispatcher.instance.dispatch(event)
       event

data/lib/twterm/rest_client.rb

@@ -85,7 +85,7 @@ module Twterm
       user_id ||= self.user_id
 
       send_request do
-        rest_client.favorites(user_id, count: 200)
+        rest_client.favorites(user_id, count: 200, tweet_mode: :extended)
       end.then do |tweets|
         tweets.map { |tweet| status_repository.create(tweet) }
       end
@@ -145,7 +145,7 @@ module Twterm
 
     def home_timeline
       send_request do
-        rest_client.home_timeline(count: 200)
+        rest_client.home_timeline(count: 200, tweet_mode: :extended)
       end.then do |tweets|
         tweets
         .select(&@mute_filter)
@@ -163,7 +163,7 @@ module Twterm
 
     def list_timeline(list_id)
       send_request do
-        rest_client.list_timeline(list_id, count: 200)
+        rest_client.list_timeline(list_id, count: 200, tweet_mode: :extended)
       end.then do |statuses|
         statuses
         .select(&@mute_filter)
@@ -219,7 +219,7 @@ module Twterm
 
     def mentions
       send_request do
-        rest_client.mentions(count: 200)
+        rest_client.mentions(count: 200, tweet_mode: :extended)
       end.then do |statuses|
         statuses
         .select(&@mute_filter)
@@ -300,7 +300,7 @@ module Twterm
 
     def search(query)
       send_request do
-        rest_client.search(query, count: 100).attrs[:statuses]
+        rest_client.search(query, count: 100, tweet_mode: :extended).attrs[:statuses]
       end.then do |statuses|
         statuses
         .map(&Twitter::Tweet.method(:new))

data/lib/twterm/screen.rb

@@ -1,3 +1,4 @@
+require 'twterm/event/screen/refresh'
 require 'twterm/event/screen/resize'
 require 'twterm/key_mapper'
 require 'twterm/subscriber'
@@ -18,15 +19,10 @@ module Twterm
       start_color
       use_default_colors
 
+      subscribe(Event::Screen::Refresh) { refresh }
       subscribe(Event::Screen::Resize, :resize)
     end
 
-    def refresh
-      app.tab_manager.refresh_window
-      app.tab_manager.current_tab.render
-      MessageWindow.instance.show
-    end
-
     def respond_to_key(key)
       k = KeyMapper.instance
 
@@ -57,6 +53,12 @@ module Twterm
 
     attr_reader :app, :client
 
+    def refresh
+      app.tab_manager.refresh_window
+      app.tab_manager.current_tab.render
+      MessageWindow.instance.show
+    end
+
     def resize(event)
       return if closed?
 

data/lib/twterm/status.rb

@@ -43,7 +43,13 @@ module Twterm
       end
 
       @id = tweet.id
-      @text = CGI.unescapeHTML(tweet.full_text.dup)
+      text =
+        if tweet.truncated? && tweet.attrs[:extended_tweet]
+          tweet.attrs[:extended_tweet][:full_text]
+        else
+          tweet.attrs[:text] || tweet.attrs[:full_text]
+        end
+      @text = CGI.unescapeHTML(text)
       @created_at = tweet.created_at.dup.localtime
       @in_reply_to_status_id = tweet.in_reply_to_status_id
       @quoted_status_id = tweet.quoted_status_id

data/lib/twterm/tab/{base.rb → abstract_tab.rb}

@@ -6,7 +6,7 @@ require 'twterm/subscriber'
 
 module Twterm
   module Tab
-    class Base
+    class AbstractTab
       include Curses
       include Subscriber
 

data/lib/twterm/tab/direct_message/conversation.rb

@@ -2,14 +2,14 @@ require 'twterm/direct_message_composer'
 require 'twterm/event/direct_message/fetched'
 require 'twterm/image_builder/user_name_image_builder'
 require 'twterm/subscriber'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/loadable'
 require 'twterm/tab/searchable'
 
 module Twterm
   module Tab
     module DirectMessage
-      class Conversation < Base
+      class Conversation < AbstractTab
         include Searchable
         include Subscriber
         include Loadable

data/lib/twterm/tab/direct_message/conversation_list.rb

@@ -2,14 +2,14 @@ require 'twterm/direct_message_composer'
 require 'twterm/event/direct_message/fetched'
 require 'twterm/image_builder/user_name_image_builder'
 require 'twterm/subscriber'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/loadable'
 require 'twterm/tab/direct_message/conversation'
 
 module Twterm
   module Tab
     module DirectMessage
-      class ConversationList < Base
+      class ConversationList < AbstractTab
         include Loadable
         include Searchable
         include Subscriber

data/lib/twterm/tab/key_assignments_cheatsheet.rb

@@ -1,10 +1,10 @@
 require 'twterm/image'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/searchable'
 
 module Twterm
   module Tab
-    class KeyAssignmentsCheatsheet < Base
+    class KeyAssignmentsCheatsheet < AbstractTab
       include Scrollable
 
       def ==(other)

data/lib/twterm/tab/new/{start.rb → index.rb}

@@ -1,4 +1,4 @@
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/direct_message/conversation_list'
 require 'twterm/tab/rate_limit_status'
 require 'twterm/tab/preferences/index'
@@ -6,7 +6,7 @@ require 'twterm/tab/preferences/index'
 module Twterm
   module Tab
     module New
-      class Start < Base
+      class Index < AbstractTab
         include Scrollable
 
         def ==(other)

data/lib/twterm/tab/new/list.rb

@@ -1,11 +1,11 @@
 require 'twterm/event/message/info'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/loadable'
 
 module Twterm
   module Tab
     module New
-      class List < Base
+      class List < AbstractTab
         include Loadable
         include Publisher
         include Searchable

data/lib/twterm/tab/new/search.rb

@@ -1,13 +1,16 @@
 require 'concurrent'
 
-require 'twterm/tab/base'
+require 'twterm/event/screen/refresh'
+require 'twterm/publisher'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/loadable'
 
 module Twterm
   module Tab
     module New
-      class Search < Base
+      class Search < AbstractTab
         include Loadable
+        include Publisher
         include Readline
         include Searchable
 
@@ -31,7 +34,7 @@ module Twterm
           resetter = proc do
             reset_prog_mode
             sleep 0.1
-            app.screen.refresh
+            publish(Event::Screen::Refresh.new)
           end
 
           input_thread = Thread.new do

data/lib/twterm/tab/new/user.rb

@@ -1,11 +1,12 @@
-require 'twterm/publisher'
-require 'twterm/tab/base'
 require 'twterm/event/message/error'
+require 'twterm/event/screen/refresh'
+require 'twterm/publisher'
+require 'twterm/tab/abstract_tab'
 
 module Twterm
   module Tab
     module New
-      class User < Base
+      class User < AbstractTab
         include Publisher
         include Readline
 
@@ -17,7 +18,7 @@ module Twterm
           resetter = proc do
             reset_prog_mode
             sleep 0.1
-            app.screen.refresh
+            publish(Event::Screen::Refresh.new)
           end
 
           app.completion_manager.set_screen_name_mode!
@@ -29,12 +30,12 @@ module Twterm
             resetter.call
 
             if screen_name.nil? || screen_name.empty?
-              app.tab_manager.switch(Tab::New::Start.new(app, client))
+              app.tab_manager.switch(Tab::New::Index.new(app, client))
             else
               client.show_user(screen_name).then do |user|
                 if user.nil?
                   publish(Event::Message::Error.new('User not found'))
-                  tab = Tab::New::Start.new(app, client)
+                  tab = Tab::New::Index.new(app, client)
                 else
                   tab = Tab::UserTab.new(app, client, user.id)
                 end
@@ -46,7 +47,7 @@ module Twterm
           app.register_interruption_handler do
             input_thread.kill
             resetter.call
-            tab = Tab::New::Start.new(app, client)
+            tab = Tab::New::Index.new(app, client)
             app.tab_manager.switch(tab)
           end
 

data/lib/twterm/tab/preferences/index.rb

@@ -1,14 +1,15 @@
 require 'twterm/image'
 require 'twterm/tab/preferences/notification_backend'
+require 'twterm/tab/preferences/photo_viewer_backend'
 require 'twterm/preferences'
 require 'twterm/publisher'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/scrollable'
 
 module Twterm
   module Tab
     module Preferences
-      class Index < Tab::Base
+      class Index < AbstractTab
         include Scrollable
 
         def initialize(app, client)
@@ -27,6 +28,8 @@ module Twterm
               case item
               when :notification_backend
                 'Notification backend preferences'
+              when :photo_viewer_backend
+                'Photo viewer backend preferences'
               end
 
               cursor - Image.whitespace - Image.string(desc).bold(curr)
@@ -37,7 +40,8 @@ module Twterm
 
         def items
           [
-            :notification_backend
+            :notification_backend,
+            :photo_viewer_backend,
           ]
         end
 
@@ -65,6 +69,8 @@ module Twterm
             case scroller.current_item
             when :notification_backend
               Tab::Preferences::NotificationBackend.new(app, client)
+            when :photo_viewer_backend
+              Tab::Preferences::PhotoViewerBackend.new(app, client)
             end
 
           app.tab_manager.add_and_show(tab)

data/lib/twterm/tab/preferences/notification_backend.rb

@@ -1,13 +1,13 @@
 require 'twterm/image'
 require 'twterm/preferences'
 require 'twterm/publisher'
-require 'twterm/tab/base'
+require 'twterm/tab/abstract_tab'
 require 'twterm/tab/scrollable'
 
 module Twterm
   module Tab
     module Preferences
-      class NotificationBackend < Tab::Base
+      class NotificationBackend < AbstractTab
         include Scrollable
         include Publisher
 

data/lib/twterm/tab/preferences/photo_viewer_backend.rb

@@ -0,0 +1,86 @@
+require 'twterm/image'
+require 'twterm/preferences'
+require 'twterm/publisher'
+require 'twterm/tab/abstract_tab'
+require 'twterm/tab/scrollable'
+
+module Twterm
+  module Tab
+    module Preferences
+      class PhotoViewerBackend < AbstractTab
+        include Scrollable
+        include Publisher
+
+        def drawable_item_count
+          (window.maxy - 1) / 2
+        end
+
+        def image
+          drawable_items.map.with_index do |item, i|
+            curr = scroller.current_index?(i)
+            cursor = Image.cursor(1, curr)
+            checkbox = Image.checkbox(app.preferences[:photo_viewer_backend, item])
+            desc =
+              case item
+              when :browser
+                'Web browser backend'
+              when :imgcat
+                'imgcat backend'
+              when :quick_look
+                'Quick Look backend'
+              end
+
+              cursor - Image.whitespace - checkbox - Image.whitespace - Image.string(desc).bold(curr)
+          end
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty) { |acc, x| acc | x }
+        end
+
+        def items
+          env = app.environment
+
+          [
+            :browser,
+            (:imgcat if env.with_imgcat?),
+            (:quick_look if env.with_qlmanage?),
+          ].compact
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10
+            perform_selected_action
+          end
+
+          false
+        end
+
+        def title
+          'Photo viewer backend preferences'
+        end
+
+        private
+
+        def perform_selected_action
+          item = scroller.current_item
+
+          case item
+          when :browser
+            app.preferences[:photo_viewer_backend, :browser] =
+              !app.preferences[:photo_viewer_backend, :browser]
+          when :imgcat
+            app.preferences[:photo_viewer_backend, :imgcat] =
+              !app.preferences[:photo_viewer_backend, :imgcat]
+          when :quick_look
+            app.preferences[:photo_viewer_backend, :quick_look] =
+              !app.preferences[:photo_viewer_backend, :quick_look]
+          end
+
+          render
+        end
+      end
+    end
+  end
+end