twterm 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edeb8383924ffcd0cd837dad84d60637bfdae3de7a4edf00a0a9bb9aeaf6a7e
-  data.tar.gz: f707dc76ada2cdf2082e6d7aeec9d8a890056fdde114fa90b3b69aaa28ea257f
+  metadata.gz: 0e671a532f1618d8104f52f972a733eacc9b417328475f32efe887d382bc7608
+  data.tar.gz: 7bccdd9bdbb33042b367983c7250f3fb1521c1726a81e9c80b34f90fd1cae071
 SHA512:
-  metadata.gz: d92d30135cd6793a117ecb2b1f4a8648ade22e5759c2dadf7c7b39afea0ac72e3622da83d0577a3acb2f96b63d1976928a228e756544a9c694e7eddfd2eb79a2
-  data.tar.gz: f488de8b0fed4655ed95ff767910b136bcd7deeded6258fbffa561f9699b55a3404315ecaf19144a1eed096348559753f1ef78d176976a77109cf946c2590527
+  metadata.gz: 49e31ffb5cdcab3e2a59e62c59f4f25ee495fd7209f4fc6df876dadd7f9dfd38b7760a6e8686518e2f886c5a4e353aad0b2c9d22436205a244e47a45264c0eba
+  data.tar.gz: 1ee336d6a643c75b6958a559397828914f6d83afa0069881708860bdea8ea28bc622dc92d3dd94f51ca0b2931ce3bed2d40d2b0d28da5e73f3fbd0d377c8eaa2

data/lib/twterm/app.rb

@@ -1,7 +1,6 @@
 require 'curses'
 
 require 'twterm/completion_manager'
-require 'twterm/direct_message_composer'
 require 'twterm/environment'
 require 'twterm/event/screen/refresh'
 require 'twterm/event/screen/resize'
@@ -10,7 +9,6 @@ require 'twterm/notification_dispatcher'
 require 'twterm/persistable_configuration_proxy'
 require 'twterm/preferences'
 require 'twterm/photo_viewer'
-require 'twterm/repository/direct_message_repository'
 require 'twterm/repository/friendship_repository'
 require 'twterm/repository/hashtag_repository'
 require 'twterm/repository/list_repository'
@@ -42,14 +40,6 @@ module Twterm
       @completion_manager ||= CompletionManager.new(self)
     end
 
-    def direct_message_composer
-      @direct_message_composer ||= DirectMessageComposer.new(self, client)
-    end
-
-    def direct_message_repository
-      @direct_messages_repository ||= Repository::DirectMessageRepository.new
-    end
-
     def friendship_repository
       @friendship_repository ||= Repository::FriendshipRepository.new
     end
@@ -103,11 +93,6 @@ module Twterm
         user_repository.expire(3600)
       end
 
-      direct_message_repository.before_create do |dm|
-        user_repository.create(dm.recipient)
-        user_repository.create(dm.sender)
-      end
-
       user_repository.before_create do |user|
         client_id = client.user_id
 
@@ -179,7 +164,6 @@ module Twterm
         config[:access_token_secret],
         {
           friendship: friendship_repository,
-          direct_message: direct_message_repository,
           hashtag: hashtag_repository,
           list: list_repository,
           status: status_repository,

data/lib/twterm/client.rb

@@ -11,7 +11,6 @@ module Twterm
       @access_token, @access_token_secret = access_token, access_token_secret
 
       @friendship_repository = repositories[:friendship]
-      @direct_message_repository = repositories[:direct_message]
       @hashtag_repository = repositories[:hashtag]
       @list_repository = repositories[:list]
       @status_repository = repositories[:status]
@@ -27,12 +26,10 @@ module Twterm
             muted_user_ids.include?(status.retweeted_status.user.id))
         end
       end
-
-      direct_message_manager
     end
 
     private
 
-    attr_reader :friendship_repository, :direct_message_repository, :hashtag_repository, :list_repository, :status_repository, :user_repository
+    attr_reader :friendship_repository, :hashtag_repository, :list_repository, :status_repository, :user_repository
   end
 end

data/lib/twterm/rest_client.rb

@@ -1,6 +1,4 @@
 require 'concurrent'
-require 'twterm/direct_message'
-require 'twterm/direct_message_manager'
 require 'twterm/publisher'
 require 'twterm/event/message/success'
 
@@ -25,33 +23,6 @@ module Twterm
       end
     end
 
-    def create_direct_message(recipient, text)
-      send_request do
-        rest_client.create_direct_message(recipient.id, text)
-      end.then do |message|
-        msg = direct_message_repository.create(message)
-        direct_message_manager.add(recipient.id, msg)
-        publish(Event::DirectMessage::Fetched.new)
-        publish(Event::Message::Success.new('Your message to @%s has been sent' % recipient.screen_name))
-      end
-    end
-
-    def direct_message_conversations
-      direct_message_manager.conversations
-    end
-
-    def direct_messages_received
-      send_request do
-        rest_client.direct_messages(count: 200).map { |dm| direct_message_repository.create(dm) }
-      end
-    end
-
-    def direct_messages_sent
-      send_request do
-        rest_client.direct_messages_sent(count: 200).map { |dm| direct_message_repository.create(dm) }
-      end
-    end
-
     def destroy_status(status)
       send_request_without_catch do
         rest_client.destroy_status(status.id)
@@ -424,10 +395,6 @@ module Twterm
 
     private
 
-    def direct_message_manager
-      @direct_message_manager ||= DirectMessageManager.new(self)
-    end
-
     def show_error
       proc do |e|
         case e

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/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/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -234,19 +234,14 @@ files:
 - lib/twterm/completer/search_query_completer.rb
 - lib/twterm/completion_manager.rb
 - lib/twterm/config.rb
-- lib/twterm/direct_message.rb
-- lib/twterm/direct_message_composer.rb
-- lib/twterm/direct_message_manager.rb
 - lib/twterm/environment.rb
 - lib/twterm/event/abstract_event.rb
-- lib/twterm/event/direct_message/fetched.rb
 - lib/twterm/event/message/abstract_message.rb
 - lib/twterm/event/message/error.rb
 - lib/twterm/event/message/info.rb
 - lib/twterm/event/message/success.rb
 - lib/twterm/event/message/warning.rb
 - lib/twterm/event/notification/abstract_notification.rb
-- lib/twterm/event/notification/direct_message.rb
 - lib/twterm/event/notification/favorite.rb
 - lib/twterm/event/notification/follow.rb
 - lib/twterm/event/notification/list_member_added.rb
@@ -308,7 +303,6 @@ files:
 - lib/twterm/repository/abstract_entity_repository.rb
 - lib/twterm/repository/abstract_expirable_entity_repository.rb
 - lib/twterm/repository/abstract_repository.rb
-- lib/twterm/repository/direct_message_repository.rb
 - lib/twterm/repository/friendship_repository.rb
 - lib/twterm/repository/hashtag_repository.rb
 - lib/twterm/repository/list_repository.rb
@@ -321,8 +315,6 @@ files:
 - lib/twterm/status.rb
 - lib/twterm/subscriber.rb
 - lib/twterm/tab/abstract_tab.rb
-- lib/twterm/tab/direct_message/conversation.rb
-- lib/twterm/tab/direct_message/conversation_list.rb
 - lib/twterm/tab/dumpable.rb
 - lib/twterm/tab/exceptions.rb
 - lib/twterm/tab/key_assignments_cheatsheet.rb
@@ -409,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A full-featured TUI Twitter client

data/lib/twterm/direct_message.rb

@@ -1,60 +0,0 @@
-require 'twterm/user'
-require 'twterm/utils'
-
-module Twterm
-  class DirectMessage
-    attr_reader :id, :created_at, :recipient_id, :sender_id, :text
-
-    def initialize(message)
-      @id = message.id
-      update!(message)
-    end
-
-    def ==(other)
-      other.is_a?(self.class) && id == other.id
-    end
-
-    def date
-      format = Time.now - @created_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
-      @created_at.strftime(format)
-    end
-
-    def update!(message)
-      @created_at = message.created_at.dup.localtime
-      @recipient_id = message.recipient.id
-      @sender_id = message.sender.id
-      @text = message.text
-
-      self
-    end
-
-    class Conversation
-      include Utils
-
-      attr_reader :collocutor_id, :messages
-
-      def initialize(collocutor_id)
-        @collocutor_id = collocutor_id
-        @messages = []
-      end
-
-      def <<(message)
-        @messages << message if messages.find { |m| m == message }.nil?
-        @messages.sort_by!(&:created_at).reverse!
-
-        self
-      end
-
-      def preview
-        messages.sort_by(&:created_at).last.text.gsub("\n", ' ')
-      end
-
-      def updated_at
-        updated_at = @messages.map(&:created_at).max
-
-        format = Time.now - updated_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
-        updated_at.strftime(format)
-      end
-    end
-  end
-end

data/lib/twterm/direct_message_composer.rb

@@ -1,80 +0,0 @@
-require 'twterm/event/screen/refresh'
-require 'twterm/publisher'
-require 'twterm/user'
-require 'twterm/utils'
-
-module Twterm
-  class DirectMessageComposer
-    include Readline
-    include Curses
-    include Publisher
-    include Utils
-
-    def initialize(app, client)
-      @app, @client = app, client
-    end
-
-    def compose(recipient)
-      check_type User, recipient
-
-      clear
-
-      resetter = proc do
-        reset_prog_mode
-        sleep 0.1
-        publish(Event::Screen::Refresh.new)
-      end
-
-      thread = Thread.new do
-        close_screen
-
-        puts "\nCompose new message to @%s:" % recipient.screen_name
-
-        app.completion_manager.set_default_mode!
-
-        loop do
-          line = (readline('> ', true) || '').strip
-          break if line.empty?
-
-          if line.end_with?('\\')
-            @text << line.chop.rstrip + "\n"
-          else
-            @text << line
-            break
-          end
-        end
-
-        puts "\n"
-
-        resetter.call
-        send(recipient) unless text.empty?
-      end
-
-      app.register_interruption_handler do
-        thread.kill
-        clear
-        puts "\nCanceled"
-        resetter.call
-      end
-
-      thread.join
-    end
-
-    private
-
-    attr_reader :app, :client
-
-    def clear
-      @text = ''
-    end
-
-    def send(recipient)
-      client.create_direct_message(recipient, text)
-      clear
-    end
-
-    def text
-      @text || ''
-    end
-  end
-end

data/lib/twterm/direct_message_manager.rb

@@ -1,51 +0,0 @@
-require 'twterm/client'
-require 'twterm/direct_message'
-require 'twterm/event/direct_message/fetched'
-require 'twterm/publisher'
-require 'twterm/scheduler'
-require 'twterm/user'
-require 'twterm/utils'
-
-module Twterm
-  class DirectMessageManager
-    include Publisher, Utils
-
-    def initialize(client)
-      check_type Client, client
-
-      @client = client
-      @conversations = {}
-
-      fetch
-
-      Scheduler.new(300) { fetch }
-    end
-
-    def add(collocutor_id, message)
-      check_type DirectMessage, message
-
-      @conversations[collocutor_id] ||= DirectMessage::Conversation.new(collocutor_id)
-      @conversations[collocutor_id] << message
-    end
-
-    def fetch
-      client.direct_messages_received.then do |messages|
-        messages.each { |m| add(m.sender_id, m) }
-        publish(Event::DirectMessage::Fetched.new)
-      end
-
-      client.direct_messages_sent.then do |messages|
-        messages.each { |m| add(m.recipient_id, m) }
-        publish(Event::DirectMessage::Fetched.new)
-      end
-    end
-
-    def conversations
-      @conversations.values
-    end
-
-    private
-
-    attr_reader :client
-  end
-end

data/lib/twterm/event/direct_message/fetched.rb

@@ -1,10 +0,0 @@
-require 'twterm/event/abstract_event'
-
-module Twterm
-  module Event
-    module DirectMessage
-      class Fetched < AbstractEvent
-      end
-    end
-  end
-end

data/lib/twterm/event/notification/direct_message.rb

@@ -1,30 +0,0 @@
-require 'twterm/event/notification/abstract_notification'
-
-module Twterm
-  module Event
-    module Notification
-      class DirectMessage < AbstractNotification
-        # @param [Twterm::DirectMessage] message
-        # @param [Twterm::User] user
-        def initialize(message, user)
-          @message = message
-          @user = user
-        end
-
-        # @return [String] notification body
-        def body
-          message.text
-        end
-
-        # @return [String] notification title
-        def title
-          "@#{user.screen_name} has sent you a message"
-        end
-
-        private
-
-        attr_reader :message, :user
-      end
-    end
-  end
-end

data/lib/twterm/repository/direct_message_repository.rb

@@ -1,14 +0,0 @@
-require 'twterm/direct_message'
-require 'twterm/repository/abstract_entity_repository'
-
-module Twterm
-  module Repository
-    class DirectMessageRepository < AbstractEntityRepository
-      private
-
-      def type
-        DirectMessage
-      end
-    end
-  end
-end

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

@@ -1,104 +0,0 @@
-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/abstract_tab'
-require 'twterm/tab/loadable'
-require 'twterm/tab/searchable'
-
-module Twterm
-  module Tab
-    module DirectMessage
-      class Conversation < AbstractTab
-        include Searchable
-        include Subscriber
-        include Loadable
-
-        def drawable_item_count
-          messages.drop(scroller.offset).lazy
-            .map { |m| m.text.split_by_width(window.maxx - 4).count + 2 }
-            .scan(0, :+)
-            .each_cons(2)
-            .select { |_, l| l < window.maxy }
-            .count
-        end
-
-        def image
-          return Image.string(initially_loaded? ? 'No results found' : 'Loading...') if items.empty?
-
-          scroller.drawable_items.map.with_index(0) do |message, i|
-            sender = app.user_repository.find(message.sender_id)
-
-            header = [
-              ImageBuilder::UserNameImageBuilder.new(sender).build,
-              Image.string(message.date.to_s).brackets,
-            ].intersperse(Image.whitespace).reduce(Image.empty, :-)
-
-            body = message.text.split_by_width(window.maxx - 4)
-              .map { |x| Image.string(x) }
-              .reduce(Image.empty, :|)
-
-            m = header | body
-
-            cursor = Image.cursor(m.height, scroller.current_index?(i))
-
-            cursor - Image.whitespace - m
-          end
-            .intersperse(Image.blank_line)
-            .reduce(Image.empty, :|)
-        end
-
-        def initialize(app, client, conversation)
-          super(app, client)
-
-          @conversation = conversation
-
-          subscribe(Event::DirectMessage::Fetched) { initially_loaded! }
-        end
-
-        def items
-          messages
-        end
-
-        def matches?(message, query)
-          sender = app.user_repository.find(message.sender_id)
-
-          [
-            message.text,
-            sender.screen_name,
-            sender.name
-          ].any? { |x| x.downcase.include?(query.downcase) }
-        end
-
-        def respond_to_key(key)
-          return true if scroller.respond_to_key(key)
-
-          k = KeyMapper.instance
-
-          case key
-          when k[:status, :compose], k[:status, :reply]
-            collocutor = app.user_repository.find(conversation.collocutor_id)
-            app.direct_message_composer.compose(collocutor)
-          else
-            return false
-          end
-
-          true
-        end
-
-        def title
-          collocutor = app.user_repository.find(conversation.collocutor_id)
-          '@%s messages' % 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

@@ -1,100 +0,0 @@
-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/abstract_tab'
-require 'twterm/tab/loadable'
-require 'twterm/tab/direct_message/conversation'
-
-module Twterm
-  module Tab
-    module DirectMessage
-      class ConversationList < AbstractTab
-        include Loadable
-        include Searchable
-        include Subscriber
-
-        def drawable_item_count
-          window.maxy.-(2).div(3)
-        end
-
-        def image
-          return Image.string(initially_loaded? ? 'No results found' : 'Loading...') if items.empty?
-
-          scroller.drawable_items.map.with_index(0) do |conversation, i|
-            cursor = Image.cursor(2, scroller.current_index?(i))
-
-            collocutor = app.user_repository.find(conversation.collocutor_id)
-
-            header = [
-              ImageBuilder::UserNameImageBuilder.new(collocutor).build,
-              Image.string(conversation.updated_at.to_s).brackets,
-            ].intersperse(Image.whitespace).reduce(Image.empty, :-)
-
-            body = Image.string(conversation.preview.split_by_width(window.maxx - 4).first)
-
-            cursor - Image.whitespace - (header | body)
-          end
-            .intersperse(Image.blank_line)
-            .reduce(Image.empty, :|)
-        end
-
-        def initialize(app, client)
-          super(app, client)
-
-          subscribe(Event::DirectMessage::Fetched) { initially_loaded! }
-        end
-
-        def ==(other)
-          other.is_a?(self.class)
-        end
-
-        def items
-          client.direct_message_conversations
-        end
-
-        def matches?(conversation, query)
-          collocutor = app.user_repository.find(conversation.collocutor_id)
-
-          [
-            collocutor.name,
-            collocutor.screen_name,
-            conversation.preview
-          ].any? { |x| x.downcase.include?(query.downcase) }
-        end
-
-        def respond_to_key(key)
-          return true if scroller.respond_to_key(key)
-
-          k = KeyMapper.instance
-
-          case key
-          when 10
-            open_conversation
-          when k[:status, :compose], k[:status, :reply]
-            conversation = current_item
-            collocutor = app.user_repository.find(conversation.collocutor_id)
-            app.direct_message_composer.compose(collocutor)
-          else
-            return false
-          end
-
-          true
-        end
-
-        def title
-          'Direct Messages'
-        end
-
-        private
-
-        def open_conversation
-          conversation = scroller.current_item
-
-          tab = Tab::DirectMessage::Conversation.new(app, client, conversation)
-          app.tab_manager.add_and_show(tab)
-        end
-      end
-    end
-  end
-end