twterm 2.5.0 → 2.9.0

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/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
@@ -235,7 +235,7 @@ module Twterm
             ].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/statuses/home.rb

@@ -1,5 +1,4 @@
 require 'twterm/subscriber'
-require 'twterm/event/status/timeline'
 require 'twterm/tab/statuses/abstract_statuses_tab'
 require 'twterm/utils'
 
@@ -21,8 +20,6 @@ module Twterm
         def initialize(app, client)
           super(app, client)
 
-          subscribe(Event::Status::Timeline) { |e| prepend(e.status) }
-
           reload.then do
             initially_loaded!
             scroller.move_to_top

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

@@ -1,4 +1,5 @@
 require 'twterm/tab/statuses/abstract_statuses_tab'
+require 'twterm/event/status/mention'
 
 module Twterm
   module Tab

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

@@ -6,7 +6,6 @@ require 'twterm/view'
 
 module Twterm
   class TabManager
-    include Curses
     include Publisher
     include Subscriber
     include Utils
@@ -69,6 +68,20 @@ module Twterm
       end
     end
 
+    # 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
+
     def initialize(app, client)
       @app, @client = app, client
 
@@ -76,11 +89,50 @@ module Twterm
       @index = 0
       @history = []
 
-      @window = stdscr.subwin(3, stdscr.maxx, 0, 0)
+      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, 0, 0)
 
       subscribe(Event::Screen::Resize, :resize)
     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
+
+      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
       current_user_id = client.user_id
       tab = Tab::UserTab.new(app, client, current_user_id)
@@ -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,8 +247,28 @@ module Twterm
 
     attr_reader :app, :client
 
+    # @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
+
     def resize(_event)
-      @window.resize(3, stdscr.maxx)
+      @window.resize(1, Curses.stdscr.maxx)
       @window.move(0, 0)
     end
   end

data/lib/twterm/tweetbox.rb

@@ -16,7 +16,6 @@ module Twterm
     end
 
     include Readline
-    include Curses
     include Publisher
 
     def initialize(app, client)
@@ -104,7 +103,7 @@ module Twterm
     end
 
     def ask_and_post(leading_text, prompt, postprocessor, options = {})
-      close_screen
+      Curses.close_screen
       puts "\e[H\e[2J#{leading_text}\n\n"
       ask(prompt, postprocessor) { |text| client.post(postprocessor.call(text), options) }
     end
@@ -120,7 +119,7 @@ module Twterm
     end
 
     def reset
-      reset_prog_mode
+      Curses.reset_prog_mode
       sleep 0.1
       publish(Event::Screen::Refresh.new)
     end

data/lib/twterm/user.rb

@@ -1,4 +1,5 @@
 module Twterm
+  # A Twitter user
   class User
     attr_reader :description, :favorites_count, :followers_count,
                 :friends_count, :id, :location, :name, :protected, :profile_image,

data/lib/twterm/version.rb

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

data/nix/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'twterm'

data/nix/Gemfile.lock

@@ -0,0 +1,70 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    buftok (0.2.0)
+    citrus (3.0.2)
+    concurrent-ruby (1.0.5)
+    curses (1.3.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
+    http (3.3.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    http_parser.rb (0.6.0)
+    idn-ruby (0.1.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    multipart-post (2.1.1)
+    naught (1.1.0)
+    oauth (0.5.4)
+    public_suffix (4.0.5)
+    simple_oauth (0.3.1)
+    terminal-notifier (2.0.0)
+    thread_safe (0.3.6)
+    toml-rb (0.3.15)
+      citrus (~> 3.0, > 3.0)
+    twitter (6.2.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      equalizer (~> 0.0.11)
+      http (~> 3.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+      memoizable (~> 0.4.0)
+      multipart-post (~> 2.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
+    twitter-text (2.1.0)
+      idn-ruby
+      unf (~> 0.1.0)
+    twterm (2.8.0)
+      concurrent-ruby (~> 1.0.5)
+      curses (~> 1.3.2)
+      launchy (~> 2.4.3)
+      oauth (~> 0.5.1)
+      terminal-notifier (~> 2.0.0)
+      toml-rb (~> 0.3.14)
+      twitter (~> 6.2.0)
+      twitter-text (~> 2.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  twterm
+
+BUNDLED WITH
+   2.1.4

data/nix/gemset.nix

@@ -0,0 +1,283 @@
+{
+  addressable = {
+    dependencies = ["public_suffix"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  buftok = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  citrus = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  curses = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hic9kq09dhh8jqjx3k1991rnqhlj3glz82w0g7ndcri52m1hgqg";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+      type = "gem";
+    };
+    version = "0.5.20190701";
+  };
+  equalizer = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  http = {
+    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  http-form_data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  "http_parser.rb" = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  idn-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  launchy = {
+    dependencies = ["addressable"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  memoizable = {
+    dependencies = ["thread_safe"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  multipart-post = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  naught = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  oauth = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
+      type = "gem";
+    };
+    version = "0.5.4";
+  };
+  public_suffix = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+      type = "gem";
+    };
+    version = "4.0.5";
+  };
+  simple_oauth = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
+  terminal-notifier = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  thread_safe = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  toml-rb = {
+    dependencies = ["citrus"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03sr3k193i1r5bh9g4zc7iq9jklapmwj0rndcvhr9q7v5xm7x4rf";
+      type = "gem";
+    };
+    version = "0.3.15";
+  };
+  twitter = {
+    dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fjyz3viabz3xs5d9aad18zgdbhfwm51jsnzigc8kxk77p1x58n5";
+      type = "gem";
+    };
+    version = "6.2.0";
+  };
+  twitter-text = {
+    dependencies = ["idn-ruby" "unf"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1igv713wn6wqhq4nlr81r93v7wmgjqny24jwp3ai5i4ipk2f2k6a";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  twterm = {
+    dependencies = ["concurrent-ruby" "curses" "launchy" "oauth" "terminal-notifier" "toml-rb" "twitter" "twitter-text"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "075rq11axsz41hcrmm6ixjyy0kz3axf0mhkvq3cgryqib2isjbk9";
+      type = "gem";
+    };
+    version = "2.8.0";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
+      type = "gem";
+    };
+    version = "0.0.7.7";
+  };
+}