twterm 1.1.3 → 1.2.0

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

@@ -0,0 +1,103 @@
+require 'twterm/direct_message_composer'
+require 'twterm/event/direct_message/fetched'
+require 'twterm/subscriber'
+require 'twterm/tab/base'
+
+module Twterm
+  module Tab
+    module DirectMessage
+      class Conversation < Base
+        include FilterableList
+        include Scrollable
+        include Subscriber
+
+        def drawable_item_count
+          messages.drop(scroller.offset).lazy
+            .map { |m| m.text.split_by_width(window.maxx - 4).count + 2 }
+            .scan(0, :+)
+            .select { |l| l < window.maxy }
+            .count
+        end
+
+        def initialize(conversation)
+          super()
+
+          @conversation = conversation
+
+          subscribe(Event::DirectMessage::Fetched) { refresh }
+        end
+
+        def items
+          if filter_query.empty?
+            messages
+          else
+            messages.select { |m| m.matches?(filter_query) }
+          end
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when ?/
+            filter
+          when ?n, ?r
+            DirectMessageComposer.instance.compose(conversation.collocutor)
+          when ?q
+            reset_filter
+          else
+            return false
+          end
+
+          true
+        end
+
+        def update
+          line = 0
+
+          scroller.drawable_items.each.with_index(0) do |message, i|
+            formatted_lines = message.text.split_by_width(window.maxx - 4).count
+
+            window.with_color(:black, :magenta) do
+              formatted_lines.+(1).times do |j|
+                window.setpos(line + j, 0)
+                window.addch(' ')
+              end
+            end if scroller.current_item?(i)
+
+            window.setpos(line, 2)
+
+            window.bold do
+              window.with_color(message.sender.color) do
+                window.addstr(message.sender.name)
+              end
+            end
+
+            window.addstr(' (@%s)' % message.sender.screen_name)
+            window.addstr(' [%s]' % message.date)
+
+            message.text.split_by_width(window.maxx - 4).each do |str|
+              line += 1
+              window.setpos(line, 2)
+              window.addstr(str)
+            end
+
+            line += 2
+          end
+        end
+
+        def title
+          '@%s messages' % conversation.collocutor.screen_name
+        end
+
+        private
+
+        attr_reader :conversation
+
+        def messages
+          @conversation.messages
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,99 @@
+require 'twterm/direct_message_composer'
+require 'twterm/event/direct_message/fetched'
+require 'twterm/subscriber'
+require 'twterm/tab/base'
+require 'twterm/tab/direct_message/conversation'
+
+module Twterm
+  module Tab
+    module DirectMessage
+      class ConversationList < Base
+        include FilterableList
+        include Scrollable
+        include Subscriber
+
+        def drawable_item_count
+          window.maxy.-(2).div(3)
+        end
+
+        def initialize
+          super
+
+          subscribe(Event::DirectMessage::Fetched) { refresh }
+        end
+
+        def ==(other)
+          other.is_a?(self.class)
+        end
+
+        def items
+          if filter_query.empty?
+            Client.current.direct_message_conversations
+          else
+            Client.current.direct_message_conversations.select { |c| c.matches?(filter_query) }
+          end
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10
+            open_conversation
+          when ?n, ?r
+            conversation = current_item
+            DirectMessageComposer.instance.compose(conversation.collocutor)
+          when ?/
+            filter
+          when ?q
+            reset_filter
+          else
+            return false
+          end
+
+          true
+        end
+
+        def update
+          scroller.drawable_items.each.with_index(0) do |conversation, i|
+            line = 3 * i
+
+            window.with_color(:black, :magenta) do
+              2.times do |j|
+                window.setpos(line + j, 0)
+                window.addch(' ')
+              end
+            end if scroller.current_item?(i)
+
+            window.setpos(line, 2)
+
+            window.bold do
+              window.with_color(conversation.collocutor.color) do
+                window.addstr(conversation.collocutor.name)
+              end
+            end
+
+            window.addstr(' (@%s)' % conversation.collocutor.screen_name)
+            window.addstr(' [%s]' % conversation.updated_at)
+
+            window.setpos(line + 1, 2)
+            window.addstr(conversation.preview.split_by_width(window.maxx - 4).first)
+          end
+        end
+
+        def title
+          'Direct Messages'
+        end
+
+        private
+
+        def open_conversation
+          conversation = scroller.current_item
+
+          tab = Tab::DirectMessage::Conversation.new(conversation)
+          TabManager.instance.add_and_show(tab)
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab/key_assignments_cheatsheet.rb

@@ -1,7 +1,8 @@
+require 'twterm/tab/base'
+
 module Twterm
   module Tab
-    class KeyAssignmentsCheatsheet
-      include Base
+    class KeyAssignmentsCheatsheet < Base
       include Scrollable
 
       def ==(other)

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

@@ -1,8 +1,10 @@
+require 'twterm/event/notification'
+require 'twterm/tab/base'
+
 module Twterm
   module Tab
     module New
-      class List
-        include Base
+      class List < Base
         include FilterableList
         include Scrollable
 
@@ -84,7 +86,7 @@ module Twterm
           window.bold { window.addstr('Open list tab') }
 
           Thread.new do
-            Notifier.instance.show_message('Loading lists ...')
+            publish(Event::Notification.new(:message, 'Loading lists ...'))
             Client.current.lists.then do |lists|
               @@lists = lists.sort_by(&:full_name)
               show_lists

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

@@ -1,8 +1,9 @@
+require 'twterm/tab/base'
+
 module Twterm
   module Tab
     module New
-      class Search
-        include Base
+      class Search < Base
         include Readline
         include FilterableList
         include Scrollable

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

@@ -1,8 +1,10 @@
+require 'twterm/tab/base'
+require 'twterm/tab/direct_message/conversation_list'
+
 module Twterm
   module Tab
     module New
-      class Start
-        include Base
+      class Start < Base
         include Scrollable
 
         def ==(other)
@@ -15,6 +17,7 @@ module Twterm
 
         def items
           %i(
+            direct_messages
             list_tab
             search_tab
             user_tab
@@ -31,6 +34,8 @@ module Twterm
           return true if scroller.respond_to_key(key)
 
           case key
+          when 'D'
+            open_direct_messages
           when 10
             perform_selected_action
           when 'L'
@@ -51,6 +56,10 @@ module Twterm
 
         private
 
+        def open_direct_messages
+          switch(Tab::DirectMessage::ConversationList.new)
+        end
+
         def open_list_tab
           switch(Tab::New::List.new)
         end
@@ -71,6 +80,8 @@ module Twterm
 
         def perform_selected_action
           case current_item
+          when :direct_messages
+            open_direct_messages
           when :list_tab
             open_list_tab
           when :search_tab
@@ -95,6 +106,10 @@ module Twterm
             window.setpos(line, 5)
 
             case item
+            when :direct_messages
+              window.addstr('[D] Direct messages')
+              window.setpos(line, 6)
+              window.bold { window.addch(?D) }
             when :list_tab
               window.addstr('[L] List tab')
               window.setpos(line, 6)

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

@@ -1,8 +1,11 @@
+require 'twterm/publisher'
+require 'twterm/tab/base'
+
 module Twterm
   module Tab
     module New
-      class User
-        include Base
+      class User < Base
+        include Publisher
         include Readline
 
         def ==(other)
@@ -29,7 +32,7 @@ module Twterm
             else
               Client.current.show_user(screen_name).then do |user|
                 if user.nil?
-                  Notifier.instance.show_error 'User not found'
+                  publish(Event::Notification.new(:error, 'User not found'))
                   tab = Tab::New::Start.new
                 else
                   tab = Tab::UserTab.new(user.id)

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

@@ -1,14 +1,22 @@
+require 'twterm/event/open_uri'
+require 'twterm/event/status/delete'
+require 'twterm/publisher'
+require 'twterm/subscriber'
+require 'twterm/tab/base'
+require 'twterm/utils'
+
 module Twterm
   module Tab
     module Statuses
-      module Base
-        include Tab::Base
+      class Base < Tab::Base
         include FilterableList
+        include Publisher
         include Scrollable
+        include Subscriber
+        include Utils
 
         def append(status)
-          fail ArgumentError,
-            'argument must be an instance of Status class' unless status.is_a? Status
+          check_type Status, status
 
           return if @status_ids.include?(status.id)
 
@@ -27,10 +35,7 @@ module Twterm
         def destroy_status
           status = highlighted_status
 
-          Client.current.destroy_status(status).then do
-            delete(status.id)
-            refresh
-          end
+          Client.current.destroy_status(status)
         end
 
         def drawable_item_count
@@ -57,6 +62,8 @@ module Twterm
           super
 
           @status_ids = []
+
+          subscribe(Event::Status::Delete) { |e| delete(e.status_id) }
         end
 
         def items
@@ -68,9 +75,9 @@ module Twterm
 
           status = highlighted_status
           urls = status.urls.map(&:expanded_url) + status.media.map(&:expanded_url)
-          urls.each(&Launchy.method(:open))
-        rescue Launchy::CommandNotFoundError
-          Notifier.instance.show_error 'Cannot find web browser'
+          urls
+            .map { |url| Event::OpenURI.new(url) }
+            .each { |e| publish(e) }
         end
 
         def prepend(status)

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

@@ -1,8 +1,9 @@
+require 'twterm/tab/statuses/base'
+
 module Twterm
   module Tab
     module Statuses
-      class Conversation
-        include Base
+      class Conversation < Base
         include Dumpable
 
         attr_reader :status

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

@@ -1,8 +1,9 @@
+require 'twterm/tab/statuses/base'
+
 module Twterm
   module Tab
     module Statuses
-      class Favorites
-        include Base
+      class Favorites < Base
         include Dumpable
 
         attr_reader :user, :user_id

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

@@ -1,8 +1,14 @@
+require 'twterm/subscriber'
+require 'twterm/event/status/timeline'
+require 'twterm/tab/statuses/base'
+require 'twterm/utils'
+
 module Twterm
   module Tab
     module Statuses
-      class Home
-        include Base
+      class Home < Base
+        include Subscriber
+        include Utils
 
         def close
           fail NotClosableError
@@ -17,11 +23,11 @@ module Twterm
         end
 
         def initialize(client)
-          fail ArgumentError, 'argument must be an instance of Client class' unless client.is_a? Client
+          check_type Client, client
 
           super()
           @client = client
-          @client.on_timeline_status(&method(:prepend))
+          subscribe(Event::Status::Timeline) { |e| prepend e.status }
 
           fetch { scroller.move_to_top }
           @auto_reloader = Scheduler.new(180) { fetch }

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

@@ -1,8 +1,9 @@
+require 'twterm/tab/statuses/base'
+
 module Twterm
   module Tab
     module Statuses
-      class ListTimeline
-        include Base
+      class ListTimeline < Base
         include Dumpable
 
         attr_reader :list

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

@@ -1,8 +1,10 @@
+require 'twterm/tab/statuses/base'
+
 module Twterm
   module Tab
     module Statuses
-      class Mentions
-        include Base
+      class Mentions < Base
+        include Subscriber
 
         def close
           fail NotClosableError
@@ -22,10 +24,8 @@ module Twterm
           super()
 
           @client = client
-          @client.on_mention do |status|
-            prepend(status)
-            Notifier.instance.show_message "Mentioned by @#{status.user.screen_name}: #{status.text}"
-          end
+
+          subscribe(Event::Status::Mention) { |e| prepend(e.status) }
 
           fetch { scroller.move_to_top }
           @auto_reloader = Scheduler.new(300) { fetch }

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

@@ -1,8 +1,9 @@
+require 'twterm/tab/statuses/base'
+
 module Twterm
   module Tab
     module Statuses
-      class Search
-        include Base
+      class Search < Base
         include Dumpable
 
         attr_reader :query
@@ -22,7 +23,7 @@ module Twterm
 
         def fetch
           Client.current.search(@query).then do |statuses|
-            statuses.reverse.each(&method(:prepend))
+            statuses.each(&method(:append))
             yield if block_given?
           end
         end

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

@@ -1,8 +1,9 @@
+require 'twterm/tab/statuses/base'
+
 module Twterm
   module Tab
     module Statuses
-      class UserTimeline
-        include Base
+      class UserTimeline < Base
         include Dumpable
 
         attr_reader :user, :user_id

data/lib/twterm/tab/user_tab.rb

@@ -1,8 +1,12 @@
+require 'twterm/event/open_uri'
+require 'twterm/publisher'
+require 'twterm/tab/base'
+
 module Twterm
   module Tab
-    class UserTab
-      include Base
+    class UserTab < Base
       include Dumpable
+      include Publisher
       include Scrollable
 
       attr_reader :user_id
@@ -44,6 +48,7 @@ module Twterm
           show_followers
           show_likes
         )
+        items << :compose_direct_message unless myself?
         items << :open_website  unless user.website.nil?
         items << :toggle_follow unless myself?
         items << :toggle_mute   unless myself?
@@ -56,6 +61,8 @@ module Twterm
         return true if scroller.respond_to_key(key)
 
         case key
+        when ?D
+          compose_direct_message unless myself?
         when ?F
           follow unless myself?
         when 10
@@ -82,8 +89,7 @@ module Twterm
           refresh
 
           user = users.first
-          msg = "Blocked @#{user.screen_name}"
-          Notifier.instance.show_message msg
+          publish(Event::Notification.new(:message, 'Blocked @%s' % user.screen_name))
         end
       end
 
@@ -91,6 +97,10 @@ module Twterm
         user.blocked_by?(Client.current.user_id)
       end
 
+      def compose_direct_message
+        DirectMessageComposer.instance.compose(user)
+      end
+
       def follow
         Client.current.follow(user_id).then do |users|
           refresh
@@ -101,7 +111,7 @@ module Twterm
           else
             msg = "Followed @#{user.screen_name}"
           end
-          Notifier.instance.show_message msg
+          publish(Event::Notification.new(:message, msg))
         end
       end
 
@@ -122,8 +132,7 @@ module Twterm
           refresh
 
           user = users.first
-          msg = "Muted @#{user.screen_name}"
-          Notifier.instance.show_message msg
+          publish(Event::Notification.new(:message, 'Muted @%s' % user.screen_name))
         end
       end
 
@@ -143,13 +152,13 @@ module Twterm
       def open_website
         return if user.website.nil?
 
-        Launchy.open(user.website)
-      rescue Launchy::CommandNotFoundError
-        Notifier.instance.show_error 'Browser not found'
+        publish(Event::OpenURI.new(user.website))
       end
 
       def perform_selected_action
         case scroller.current_item
+        when :compose_direct_message
+          compose_direct_message
         when :open_timeline_tab
           open_timeline_tab
         when :open_website
@@ -195,8 +204,7 @@ module Twterm
           refresh
 
           user = users.first
-          msg = "Unblocked @#{user.screen_name}"
-          Notifier.instance.show_message msg
+          publish(Event::Notification.new(:message, 'Unblocked @%s' % user.screen_name))
         end
       end
 
@@ -205,8 +213,7 @@ module Twterm
           refresh
 
           user = users.first
-          msg = "Unfollowed @#{user.screen_name}"
-          Notifier.instance.show_message msg
+          publish(Event::Notification.new(:message, 'Unfollowed @%s' % user.screen_name))
         end
       end
 
@@ -215,8 +222,7 @@ module Twterm
           refresh
 
           user = users.first
-          msg = "Unmuted @#{user.screen_name}"
-          Notifier.instance.show_message msg
+          publish(Event::Notification.new(:message, 'Unmuted @%s' % user.screen_name))
         end
       end
 
@@ -263,6 +269,10 @@ module Twterm
 
           window.setpos(current_line, 5)
           case item
+          when :compose_direct_message
+            window.addstr('[ ] Compose direct message')
+            window.setpos(current_line, 6)
+            window.bold { window.addch(?D) }
           when :toggle_block
             if blocking?
               window.addstr('    Unblock this user')

data/lib/twterm/tab/users/base.rb

@@ -1,8 +1,9 @@
+require 'twterm/tab/base'
+
 module Twterm
   module Tab
     module Users
-      module Base
-        include Tab::Base
+      class Base < Tab::Base
         include FilterableList
         include Scrollable
 

data/lib/twterm/tab/users/followers.rb

@@ -1,8 +1,9 @@
+require 'twterm/tab/users/base'
+
 module Twterm
   module Tab
     module Users
-      class Followers
-        include Base
+      class Followers < Base
         include Dumpable
 
         attr_reader :user_id

data/lib/twterm/tab/users/friends.rb

@@ -1,8 +1,9 @@
+require 'twterm/tab/users/base'
+
 module Twterm
   module Tab
     module Users
-      class Friends
-        include Base
+      class Friends < Base
         include Dumpable
 
         attr_reader :user_id