twterm 2.1.0 → 2.2.0

data/lib/twterm/preferences.rb

@@ -0,0 +1,66 @@
+require 'toml'
+
+require 'twterm/abstract_persistable_configuration'
+
+module Twterm
+  class Preferences < AbstractPersistableConfiguration
+    def initialize(preferences)
+      super(preferences)
+    end
+
+    # @param [Symbol] cat
+    # @param [Symbol] key
+    def [](cat, key)
+      validate_key!(cat, key)
+
+      configuration[cat][key]
+    end
+
+    def []=(cat, key, value)
+      validate_key!(cat, key)
+
+      configuration[cat][key] = value
+    end
+
+    # Returns an instance having the default value
+    #
+    # @return [Twterm::Preferences] an instance having the default value
+    def self.default
+      new({
+        notification_backend: {
+          inline: true,
+          terminal_notifier: false,
+          tmux: false,
+        },
+      })
+    end
+
+    # @return [Hash]
+    def to_h
+      configuration
+    end
+
+    # @return [Hash]
+    def self.structure
+      bool = -> x { x == true || x == false }
+
+      {
+        notification_backend: {
+          inline: bool,
+          terminal_notifier: bool,
+          tmux: bool,
+        },
+      }
+    end
+
+    private
+
+    alias_method :preferences, :configuration
+
+    # @raise [ArgumentError]
+    def validate_key!(cat, key)
+      raise ArgumentError, "no such category: #{cat}" unless configuration.has_key?(cat)
+      raise ArgumentError, "no such key: #{cat}.#{key}" unless configuration[cat].has_key?(key)
+    end
+  end
+end

data/lib/twterm/repository/abstract_expirable_entity_repository.rb

@@ -40,7 +40,7 @@ module Twterm
         raise NotImplementedError, '`garbage_collection_event_class` must be implemented'
       end
 
-      def should_keep?(instance)
+      def should_keep?(_instance)
         raise NotImplementedError, '`should_keep?` method must be implemented'
       end
 

data/lib/twterm/rest_client.rb

@@ -2,7 +2,7 @@ require 'concurrent'
 require 'twterm/direct_message'
 require 'twterm/direct_message_manager'
 require 'twterm/publisher'
-require 'twterm/event/notification/success'
+require 'twterm/event/message/success'
 
 module Twterm
   module RESTClient
@@ -32,7 +32,7 @@ module Twterm
         msg = direct_message_repository.create(message)
         direct_message_manager.add(recipient.id, msg)
         publish(Event::DirectMessage::Fetched.new)
-        publish(Event::Notification::Success.new('Your message to @%s has been sent' % recipient.screen_name))
+        publish(Event::Message::Success.new('Your message to @%s has been sent' % recipient.screen_name))
       end
     end
 
@@ -56,11 +56,11 @@ module Twterm
       send_request_without_catch do
         rest_client.destroy_status(status.id)
         publish(Event::Status::Delete.new(status.id))
-        publish(Event::Notification::Success.new('Your tweet has been deleted'))
+        publish(Event::Message::Success.new('Your tweet has been deleted'))
       end.catch do |reason|
         case reason
         when Twitter::Error::NotFound, Twitter::Error::Forbidden
-          publish(Event::Notification::Error.new('You cannot destroy that status'))
+          publish(Event::Message::Error.new('You cannot destroy that status'))
         else
           raise reason
         end
@@ -75,7 +75,7 @@ module Twterm
       end.then do |tweet, *_|
         status_repository.create(tweet)
 
-        publish(Event::Notification::Success.new('Successfully liked: @%s "%s"' % [
+        publish(Event::Message::Success.new('Successfully liked: @%s "%s"' % [
           tweet.user.screen_name, status.text
         ]))
       end
@@ -201,7 +201,7 @@ module Twterm
         end
       end.catch do |e|
         case e
-        when Twitter::Error::TooManyRequests
+        when Twitter::Error::TooManyRequests # rubocop:disable Lint/EmptyWhen
           # do nothing
         else
           raise e
@@ -250,7 +250,7 @@ module Twterm
         rest_client.update(text, options)
       end
         .then do |status|
-          publish(Event::Notification::Success.new('Your tweet has been posted'))
+          publish(Event::Message::Success.new('Your tweet has been posted'))
 
           status
         end
@@ -273,7 +273,7 @@ module Twterm
       end.then do |tweet, *_|
         status_repository.create(tweet)
 
-        publish(Event::Notification::Success.new('Successfully retweeted: @%s "%s"' % [
+        publish(Event::Message::Success.new('Successfully retweeted: @%s "%s"' % [
           tweet.user.screen_name, status.text
         ]))
       end.catch do |reason|
@@ -288,7 +288,7 @@ module Twterm
           else
             raise e
           end
-        publish(Event::Notification::Error.new("Retweet attempt failed: #{message}"))
+        publish(Event::Message::Error.new("Retweet attempt failed: #{message}"))
       end.catch(&show_error)
     end
 
@@ -350,9 +350,7 @@ module Twterm
       end.then do |tweet, *_|
         status_repository.create(tweet)
 
-        publish(Event::Notification::Success.new('Successfully unliked: @%s "%s"' % [
-          tweet.user.screen_name, status.text
-        ]))
+        publish(Event::Message::Success.new("Successfully unliked @#{tweet.user.screen_name}'s tweet", sutatus.text))
       end
     end
 
@@ -389,7 +387,7 @@ module Twterm
         .then do |tweet|
           status = status_repository.create(tweet)
 
-          publish(Event::Notification::Success.new('Successfully unretweeted: @%s "%s"' % [
+          publish(Event::Message::Success.new('Successfully unretweeted: @%s "%s"' % [
             tweet.user.screen_name, status.text
           ]))
 
@@ -434,7 +432,7 @@ module Twterm
       proc do |e|
         case e
         when Twitter::Error
-          publish(Event::Notification::Error.new("Failed to send request: #{e.message}"))
+          publish(Event::Message::Error.new("Failed to send request: #{e.message}"))
         else
           raise e
         end

data/lib/twterm/scheduler.rb

@@ -25,6 +25,6 @@ class Scheduler
 
   def run
     @block.call unless @paused
-  rescue
+  rescue StandardError # rubocop:disable Lint/HandleExceptions
   end
 end

data/lib/twterm/screen.rb

@@ -24,7 +24,7 @@ module Twterm
     def refresh
       app.tab_manager.refresh_window
       app.tab_manager.current_tab.render
-      Notifier.instance.show
+      MessageWindow.instance.show
     end
 
     def respond_to_key(key)

data/lib/twterm/search_query_window.rb

@@ -45,7 +45,7 @@ module Twterm
 
             @str.chop!
             render_current_string
-          when 0..31
+          when 0..31 # rubocop:disable Lint/EmptyWhen
             # ignore control codes (\x00 - \x1f)
           else
             next if chars.empty?
@@ -116,7 +116,7 @@ module Twterm
 
     attr_reader :window
 
-    def resize(event)
+    def resize(_event)
       window.resize(1, stdscr.maxx)
       window.move(stdscr.maxy - 1, 0)
     end

data/lib/twterm/streaming_client.rb

@@ -1,7 +1,12 @@
-require 'twterm/event/favorite'
-require 'twterm/event/follow'
-require 'twterm/event/notification/error'
-require 'twterm/event/notification/info'
+require 'twterm/event/message/error'
+require 'twterm/event/message/info'
+require 'twterm/event/notification/direct_message'
+require 'twterm/event/notification/favorite'
+require 'twterm/event/notification/follow'
+require 'twterm/event/notification/list_member_added'
+require 'twterm/event/notification/mention'
+require 'twterm/event/notification/quote'
+require 'twterm/event/notification/retweet'
 require 'twterm/event/status/mention'
 require 'twterm/event/status/timeline'
 require 'twterm/publisher'
@@ -18,32 +23,64 @@ module Twterm
 
       @streaming_thread = Thread.new do
         begin
-          publish(Event::Notification::Info.new('Trying to connect to Twitter...'))
+          publish(Event::Message::Info.new('Trying to connect to Twitter...'))
           streaming_client.user do |event|
             keep_alive!
 
             case event
             when Twitter::Tweet
               status = status_repository.create(event)
+              user = user_repository.create(event.user)
+
               publish(Event::Status::Timeline.new(status))
-              publish(Event::Status::Mention.new(status)) if status.text.include?('@%s' % screen_name)
+
+              if !status.retweet? && status.text.include?('@%s' % screen_name)
+                publish(Event::Status::Mention.new(status))
+
+                notification = Event::Notification::Mention.new(status, user)
+                publish(notification)
+              end
+
+              if status.retweet? && event.retweeted_status.user.id == user_id
+                retweeted_status = status_repository.create(event.retweeted_status)
+                notification = Event::Notification::Retweet.new(retweeted_status, user)
+                publish(notification)
+              end
             when Twitter::Streaming::Event
               case event.name
               when :favorite
+                next if event.source.id == user_id
                 user = user_repository.create(event.source)
                 status = status_repository.create(event.target_object)
-
-                event = Event::Favorite.new(user, status, self)
-                publish(event)
+                notification = Event::Notification::Like.new(status, user)
+                publish(notification)
               when :follow
-                source = user_repository.create(event.source)
-                target = user_repository.create(event.target)
+                next if event.source.id == user_id
+
+                user = user_repository.create(event.source)
+                notification = Event::Notification::Follow.new(user)
+                publish(notification)
+              when :list_member_added
+                next if event.source.id == user_id
 
-                event = Event::Follow.new(source, target, self)
+                list = list_repository.create(event.target_object)
+                notification = Event::Notification::ListMemberAdded.new(list)
+                publish(notification)
+              when :quoted_tweet
+                next if event.source.id == user_id
 
-                publish(event)
+                status = status_repository.create(event.target_object)
+                user = user_repository.create(event.source)
+                notification = Event::Notification::Quote.new(status, user)
+                publish(notification)
               end
             when Twitter::DirectMessage
+              next if event.sender.id == user_id
+
+              user = user_repository.create(event.sender)
+              message = DirectMessage.new(event)
+              notification = Event::Notification::DirectMessage.new(message, user)
+              publish(notification)
             when Twitter::Streaming::FriendList
               user_stream_connected!
             when Twitter::Streaming::DeletedTweet
@@ -51,15 +88,15 @@ module Twterm
             end
           end
         rescue Twitter::Error::TooManyRequests
-          publish(Event::Notification::Error.new('Rate limit exceeded'))
+          publish(Event::Message::Error.new('Rate limit exceeded'))
           sleep 120
           retry
         rescue Errno::ENETUNREACH, Errno::ETIMEDOUT, Resolv::ResolvError
-          publish(Event::Notification::Error.new('Network is unavailable'))
+          publish(Event::Message::Error.new('Network is unavailable'))
           sleep 30
           retry
         rescue Twitter::Error => e
-          publish(Event::Notification::Error.new(e.message))
+          publish(Event::Message::Error.new(e.message))
         end
       end
     end
@@ -90,7 +127,7 @@ module Twterm
     end
 
     def user_stream_connected!
-      publish(Event::Notification::Info.new('Connection established')) unless user_stream_connected?
+      publish(Event::Message::Info.new('Connection established')) unless user_stream_connected?
       @user_stream_connected = true
     end
 

data/lib/twterm/tab/base.rb

@@ -10,8 +10,7 @@ module Twterm
       include Curses
       include Subscriber
 
-      attr_reader :window
-      attr_accessor :title
+      attr_reader :window, :title
 
       def ==(other)
         self.equal?(other)
@@ -107,7 +106,7 @@ module Twterm
         )
       end
 
-      def resize(event)
+      def resize(_event)
         window.resize(stdscr.maxy - 5, stdscr.maxx)
         window.move(3, 0)
       end

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

@@ -1,4 +1,4 @@
-require 'twterm/event/notification/info'
+require 'twterm/event/message/info'
 require 'twterm/tab/base'
 require 'twterm/tab/loadable'
 
@@ -33,7 +33,7 @@ module Twterm
           @@lists || []
         end
 
-        def matches?(list, query)
+        def matches?(_list, query)
           [
             other.description,
             other.full_name,
@@ -43,8 +43,6 @@ module Twterm
         def respond_to_key(key)
           return true if scroller.respond_to_key(key)
 
-          k = KeyMapper.instance
-
           case key
           when 10
             return true if current_list.nil?

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

@@ -1,6 +1,7 @@
 require 'twterm/tab/base'
 require 'twterm/tab/direct_message/conversation_list'
 require 'twterm/tab/rate_limit_status'
+require 'twterm/tab/preferences/index'
 
 module Twterm
   module Tab
@@ -24,6 +25,7 @@ module Twterm
             user_tab
             key_assignments_cheatsheet
             rate_limit_status
+            preferences
           ).freeze
         end
 
@@ -69,6 +71,8 @@ module Twterm
                   'Key assignments cheatsheet'
                 when :rate_limit_status
                   'Rate limit status'
+                when :preferences
+                  'Preferences'
                 end
 
               cursor - Image.whitespace - Image.string(desc)
@@ -103,6 +107,10 @@ module Twterm
           switch(Tab::KeyAssignmentsCheatsheet.new(app, client))
         end
 
+        def open_preferences_tab
+          switch(Tab::Preferences::Index.new(app, client))
+        end
+
         def perform_selected_action
           case current_item
           when :direct_messages
@@ -117,6 +125,8 @@ module Twterm
             open_key_assignments_cheatsheet
           when :rate_limit_status
             open_rate_limit_status
+          when :preferences
+            open_preferences_tab
           end
         end
 

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

@@ -1,6 +1,6 @@
 require 'twterm/publisher'
 require 'twterm/tab/base'
-require 'twterm/event/notification/error'
+require 'twterm/event/message/error'
 
 module Twterm
   module Tab
@@ -33,7 +33,7 @@ module Twterm
             else
               client.show_user(screen_name).then do |user|
                 if user.nil?
-                  publish(Event::Notification::Error.new('User not found'))
+                  publish(Event::Message::Error.new('User not found'))
                   tab = Tab::New::Start.new(app, client)
                 else
                   tab = Tab::UserTab.new(app, client, user.id)

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

@@ -0,0 +1,74 @@
+require 'twterm/image'
+require 'twterm/tab/preferences/notification_backend'
+require 'twterm/preferences'
+require 'twterm/publisher'
+require 'twterm/tab/base'
+require 'twterm/tab/scrollable'
+
+module Twterm
+  module Tab
+    module Preferences
+      class Index < Tab::Base
+        include Scrollable
+
+        def initialize(app, client)
+          super(app, client)
+        end
+
+        def drawable_item_count
+          (window.maxy - 1) / 2
+        end
+
+        def image
+          drawable_items.map.with_index do |item, i|
+            cursor = Image.cursor(1, scroller.current_index?(i))
+            desc =
+              case item
+              when :notification_backend
+                'Notification backend preferences'
+              end
+
+              cursor - Image.whitespace - Image.string(desc)
+          end
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty) { |acc, x| acc | x }
+        end
+
+        def items
+          [
+            :notification_backend
+          ]
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10
+            open
+          else
+            return false
+          end
+
+          true
+        end
+
+        def title
+          'Preferences'
+        end
+
+        private
+
+        def open
+          tab =
+            case scroller.current_item
+            when :notification_backend
+              Tab::Preferences::NotificationBackend.new(app, client)
+            end
+
+          app.tab_manager.add_and_show(tab)
+        end
+      end
+    end
+  end
+end