cinch-imap 0.0.3 → 0.0.4

data/README.md

@@ -2,12 +2,17 @@ Cinch-Imap
 ==========
 The Cinch Imap Plugin. Poll an IMAP mailbox at a defined interval.
 
-0.0.3 Changes
+Change Log
+----------
+0.0.4 
+	- Added from_rewrites configuration option
+	- Added !monitor showconfig command
+	- Added !monitor version command
+
+0.0.3 
 -------
-
 	- Added configurable prefix based on subject match.
 	- Moved "mark messages read" to a configurable option.
-	- Simplfied from information
 
 Required Configuration
 ----------------------
@@ -52,6 +57,10 @@ Example Configuration
 				:port => 993,
 				:ssl => true,
 				:subject_matches => {'ERROR' => '!!', 'SUCCESS' => '..'},
+				:from_rewrites => {
+					'this@suchalong.silly.address' => 'foo',
+					'another@address.that.bugs.me' => 'bugger',
+				},	
 			}
 		end
 

data/lib/cinch/plugins/imap.rb

@@ -5,27 +5,36 @@ module Cinch
 		class Imap
 			include Cinch::Plugin
 
+			VERSION='0.0.4'
+
 			match /monitor (on|off)/
 			match /monitor status/, method: :status
+			match /monitor showconfig/, method: :showconfig
 			match /monitor clear/, method: :clear
 			match /monitor interval (\d+)/, method: :interval
+			match /monitor version/, method: :about
 			match /monitor$/, method: :usage
 
 			def initialize(*args)
 				super
 				@mail_host = config[:host] 
 				@mail_user = config[:user]
-				@mail_pass = config[:password]
+				@mail_password = config[:password]
 				@mail_folder = config[:folder] || 'INBOX'
 				@mail_port = config[:port] || 143
 				@mail_ssl = config[:ssl] || false
 				@mark_as_read = config[:mark_as_read ] || true
 				@interval = config[:interval] || 300
 				@subject_matches = config[:subject_matches] || {}
+				@from_rewrites = config[:from_rewrites] || {}
 				@messages_seen = 0
 				@started = Time.now
 			end
 
+			def about(m) 
+				m.reply "Looks like I'm on #{VERSION} #{m.user.nick}"
+			end
+
 			def interval (seconds)
 				@interval = seconds
 				@monitor = @interval > 0
@@ -35,6 +44,12 @@ module Cinch
 				@messages_seen = 0
 			end
 
+			def showconfig(m)
+				config.each do |k, v|
+					m.reply "#{k} is #{config[k]}" unless k == :password
+				end
+			end
+
 			def status(m)
 				now = Time.now
 				days = ((now - @started)/(3600 * 24)).to_i
@@ -76,14 +91,16 @@ module Cinch
 
 				background_job do 
 					imap = Net::IMAP.new(@mail_host, @mail_port, @mail_ssl)
-					imap.login(@mail_user, @mail_pass)
+					imap.login(@mail_user, @mail_password)
 					imap.select(@mail_folder)
 					get_messages(imap) do |from, subj| 
-						message = "#{from} #{subj}"
+						@from_rewrites.each do |k, v|
+								from =~ /#{k}/ ? message_from = "#{v}" : message_from = from
+						end
 						@subject_matches.each do |k, v|
-								message = "#{v} #{message}" if subj =~ /#{k}/
+								subj =~ /#{k}/ ? message_prefix = "#{v}" : message_prefix = ''
 						end
-						m.reply message
+						m.reply "#{message_prefix} #{message_from} #{subj}"
 					end
 					imap.disconnect
 				end if @monitor

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - windowsrefund