twterm 2.6.0 → 2.10.1

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

@@ -1,5 +1,4 @@
 require 'twterm/tab/abstract_tab'
-require 'twterm/tab/direct_message/conversation_list'
 require 'twterm/tab/rate_limit_status'
 require 'twterm/tab/preferences/index'
 
@@ -19,7 +18,6 @@ module Twterm
 
         def items
           %i(
-            direct_messages
             list_tab
             search_tab
             user_tab
@@ -60,8 +58,6 @@ module Twterm
 
               desc =
                 case item
-                when :direct_messages
-                  'Direct messages'
                 when :list_tab
                   'List tab'
                 when :search_tab
@@ -82,10 +78,6 @@ module Twterm
             .reduce(Image.empty, :|)
         end
 
-        def open_direct_messages
-          switch(Tab::DirectMessage::ConversationList.new(app, client))
-        end
-
         def open_list_tab
           switch(Tab::New::List.new(app, client))
         end
@@ -114,8 +106,6 @@ module Twterm
 
         def perform_selected_action
           case current_item
-          when :direct_messages
-            open_direct_messages
           when :list_tab
             open_list_tab
           when :search_tab

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

@@ -32,13 +32,13 @@ module Twterm
 
         def invoke_input
           resetter = proc do
-            reset_prog_mode
+            Curses.reset_prog_mode
             sleep 0.1
             publish(Event::Screen::Refresh.new)
           end
 
           input_thread = Thread.new do
-            close_screen
+            Curses.close_screen
             app.completion_manager.set_search_mode!
             puts "\ninput search query"
             query = (readline('> ', true) || '').strip

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

@@ -16,7 +16,7 @@ module Twterm
 
         def invoke_input
           resetter = proc do
-            reset_prog_mode
+            Curses.reset_prog_mode
             sleep 0.1
             publish(Event::Screen::Refresh.new)
           end
@@ -24,7 +24,7 @@ module Twterm
           app.completion_manager.set_screen_name_mode!
 
           input_thread = Thread.new do
-            close_screen
+            Curses.close_screen
             puts "\nSearch user"
             screen_name = (readline('> @', true) || '').strip
             resetter.call

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

@@ -0,0 +1,77 @@
+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 Control < AbstractTab
+        include Scrollable
+        include Publisher
+
+        def drawable_item_count
+          1
+        end
+
+        def image
+          drawable_items.map.with_index do |item, i|
+            curr = scroller.current_index?(i)
+            cursor = Image.cursor(2, curr)
+            options = Image.toggle_switch(['traditional', 'natural'], app.preferences[:control, item])
+            desc =
+              case item
+              when :scroll_direction
+                header = Image.string('Scroll direction')
+                body = Image.string('  ') - options
+                cursor - Image.whitespace - (header | body)
+              end
+          end
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty) { |acc, x| acc | x }
+        end
+
+        def items
+          [
+            :scroll_direction,
+          ]
+        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
+          'Control preferences'
+        end
+
+        private
+
+        def perform_selected_action
+          item = scroller.current_item
+
+          case item
+          when :scroll_direction
+            app.preferences[:control, :scroll_direction] =
+              case app.preferences[:control, :scroll_direction]
+              when 'natural'
+                'traditional'
+              when 'traditional'
+                'natural'
+              end
+          end
+
+          render
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'twterm/image'
+require 'twterm/tab/preferences/control'
 require 'twterm/tab/preferences/notification_backend'
 require 'twterm/tab/preferences/photo_viewer_backend'
 require 'twterm/preferences'
@@ -26,6 +27,8 @@ module Twterm
             cursor = Image.cursor(1, curr)
             desc =
               case item
+              when :control
+                'Control preferences'
               when :notification_backend
                 'Notification backend preferences'
               when :photo_viewer_backend
@@ -40,6 +43,7 @@ module Twterm
 
         def items
           [
+            :control,
             :notification_backend,
             :photo_viewer_backend,
           ]
@@ -67,6 +71,8 @@ module Twterm
         def open
           tab =
             case scroller.current_item
+            when :control
+              Tab::Preferences::Control.new(app, client)
             when :notification_backend
               Tab::Preferences::NotificationBackend.new(app, client)
             when :photo_viewer_backend

data/lib/twterm/tab/scrollable.rb

@@ -27,7 +27,7 @@ module Twterm
         attr_reader :index, :offset
 
         attr_accessor :delegate
-        def_delegators :delegate, :items, :total_item_count, :drawable_item_count
+        def_delegators :delegate, :items, :total_item_count, :drawable_item_count, :search_query_window
 
         def after_move(&block)
           add_hook(:after_move, &block)

data/lib/twterm/tab/searchable.rb

@@ -14,6 +14,12 @@ module Twterm
         raise NotImplementedError, '`matches?` method must be implemented'
       end
 
+      # @abstract
+      # @return [Twterm::SearchQueryWindow]
+      def search_query_window
+        raise NotImplementedError, '`search_query_window` method must be implemented'
+      end
+
       class Scroller < Scrollable::Scroller
         extend Forwardable
         include Publisher
@@ -122,10 +128,6 @@ module Twterm
           end
         end
 
-        def search_query_window
-          SearchQueryWindow.instance
-        end
-
         alias_method :count, :total_item_count
       end
     end

data/lib/twterm/tab/status_tab.rb

@@ -67,6 +67,7 @@ module Twterm
 
       def items
         [
+          :show_conversation,
           :reply,
           :favorite,
           :retweet,
@@ -135,6 +136,8 @@ module Twterm
           Image.string('Quote this tweet')
         when :destroy
           Image.string('Delete this tweet')
+        when :show_conversation
+          Image.string("Show conversation")
         when :show_user
           Image.string("Show user (@#{user.screen_name})")
         when :open_in_browser
@@ -172,6 +175,8 @@ module Twterm
           quote!
         when :destroy
           destroy!
+        when :show_conversation
+          show_conversation!
         when :show_user
           show_user!
         when :open_in_browser
@@ -209,6 +214,11 @@ module Twterm
           .then { render }
       end
 
+      def show_conversation!
+        tab = Tab::Statuses::Conversation.new(app, client, status_id)
+        app.tab_manager.add_and_show(tab)
+      end
+
       def show_user!
         user_id = status.user_id
         user_tab = Tab::UserTab.new(app, client, user_id)

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

@@ -27,7 +27,7 @@ module Twterm
           return if @status_ids.include?(status.id)
 
           @status_ids.push(status.id)
-          status.split(window.maxx - 4)
+          status.split(window.maxx - 2)
           scroller.item_appended!
           render
         end
@@ -46,7 +46,7 @@ module Twterm
 
         def drawable_item_count
           statuses.drop(scroller.offset).lazy
-          .map { |s| s.split(window.maxx - 4).count + 2 }
+          .map { |s| s.split(window.maxx - 2).count + 2 }
           .scan(0, :+)
           .each_cons(2)
           .select { |_, l| l < window.maxy }
@@ -113,7 +113,7 @@ module Twterm
           return if @status_ids.include?(status.id)
 
           @status_ids.unshift(status.id)
-          status.split(window.maxx - 4)
+          status.split(window.maxx - 2)
           scroller.item_prepended!
           render
         end
@@ -177,6 +177,11 @@ module Twterm
             .then { render }
         end
 
+        # for the sake of Twterm::Tab::Searchable
+        def search_query_window
+          app.search_query_window
+        end
+
         def show_conversation
           status = highlighted_original_status
 
@@ -226,16 +231,16 @@ module Twterm
 
             header = [
               ImageBuilder::UserNameImageBuilder.new(user).build,
-              Image.string(original.date.to_s).brackets,
+              Image.string(original.date.to_s).brackets.dim,
               (Image.whitespace.color(:black, :red) if original.favorited?),
               (Image.whitespace.color(:black, :green) if original.retweeted?),
-              ((Image.string('retweeted by ') - !Image.string("@#{retweeted_by.screen_name}")).parens if status.retweet?),
+              ((Image.string('retweeted by ') - !Image.string("@#{retweeted_by.screen_name}")).parens.dim if status.retweet?),
               ((Image.number(original.favorite_count) - Image.plural(original.favorite_count, 'like')).color(:red) if original.favorite_count.positive?),
               ((Image.number(original.retweet_count) - Image.plural(original.retweet_count, 'RT')).color(:green) if original.retweet_count.positive?),
             ].compact.intersperse(Image.whitespace).reduce(Image.empty, :-)
 
             body = original
-              .split(window.maxx - 4)
+              .split(window.maxx - 2)
               .map(&Image.method(:string))
               .reduce(Image.empty, :|)
 

data/lib/twterm/tab/user_tab.rb

@@ -53,7 +53,6 @@ module Twterm
           :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?),
@@ -96,10 +95,6 @@ module Twterm
         app.friendship_repository.blocking?(client.user_id, user_id)
       end
 
-      def compose_direct_message
-        app.direct_message_composer.compose(user)
-      end
-
       def follow
         client.follow(user_id).then do |users|
           render
@@ -176,8 +171,6 @@ module Twterm
 
       def perform_selected_action
         case scroller.current_item
-        when :compose_direct_message
-          compose_direct_message
         when :manage_lists
           open_list_management_tab
         when :open_in_browser
@@ -294,8 +287,6 @@ module Twterm
           curr = scroller.current_index?(i)
           Image.cursor(1, curr) - Image.whitespace -
             case item
-            when :compose_direct_message
-              Image.string('Compose direct message')
             when :toggle_block
               if blocking?
                 Image.string('Unblock this user')

data/lib/twterm/tab_manager.rb

@@ -1,4 +1,3 @@
-require 'twterm/event/screen/resize'
 require 'twterm/publisher'
 require 'twterm/subscriber'
 require 'twterm/utils'
@@ -6,7 +5,6 @@ require 'twterm/view'
 
 module Twterm
   class TabManager
-    include Curses
     include Publisher
     include Subscriber
     include Utils
@@ -69,16 +67,70 @@ module Twterm
       end
     end
 
-    def initialize(app, client)
+    # Returns if the given coordinate is enclosed by the window
+    #
+    # @param x [Integer]
+    # @param y [Integer]
+    # @return [Boolean]
+    def enclose?(x, y)
+      left = @window.begx
+      top = @window.begy
+      right = left + @window.maxx
+      bottom = top + @window.maxy
+
+      left <= x && x < right && top <= y && y < bottom
+    end
+
+    # @param app [Twterm::App]
+    # @param client [Twterm::Client]
+    # @param window [Curses::Window]
+    def initialize(app, client, window)
       @app, @client = app, client
 
       @tabs = []
       @index = 0
       @history = []
 
-      @window = stdscr.subwin(3, stdscr.maxx, 0, 0)
+      @window = window
+    end
+
+    # Open the clicked tab
+    #
+    # @param x [Integer]
+    # @param _y [Integer]
+    #
+    # @return [nil]
+    def handle_left_click(x, _y)
+      n = find_tab_index_on_x(x)
+      return if n.nil?
+
+      show_nth_tab(n)
+
+      nil
+    end
+
+    # Open next tab
+    #
+    # @param _x [Integer]
+    # @param _y [Integer]
+    #
+    # @return [nil]
+    def handle_scroll_down(_x, _y)
+      show_next
 
-      subscribe(Event::Screen::Resize, :resize)
+      nil
+    end
+
+    # Open previous tab
+    #
+    # @param _x [Integer]
+    # @param _y [Integer]
+    #
+    # @return [nil]
+    def handle_scroll_up(_x, _y)
+      show_previous
+
+      nil
     end
 
     def open_my_profile
@@ -120,10 +172,10 @@ module Twterm
 
       image = @tabs
         .map { |t| [t, Image.string(t.title)] }
-        .map { |t, r| t.equal?(current_tab) ? !r : r }
+        .map { |t, r| t.equal?(current_tab) ? !r._ : r }
         .reduce(pipe) { |acc, x| acc - wss - x - wss - pipe }
 
-      View.new(@window, image).at(1, 1)
+      View.new(@window, image)
     end
 
     def respond_to_key(key)
@@ -195,9 +247,24 @@ module Twterm
 
     attr_reader :app, :client
 
-    def resize(_event)
-      @window.resize(3, stdscr.maxx)
-      @window.move(0, 0)
+    # @param x [Integer]
+    #
+    # @return [Integer, nil]
+    def find_tab_index_on_x(x)
+      pos = 0
+
+      @tabs.each.with_index do |tab, index|
+        title = tab.title
+        len = title.length
+        left = pos + 1
+        right = left + len + 4 # each tab has 2 whitespaces on the both side
+
+        return index if left <= x && x < right
+
+        pos = right
+      end
+
+      nil
     end
   end
 end