bugfix and yet more address imrpvoements: always use 'me' when possible

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@445 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/lib/sup/account.rb b/lib/sup/account.rb
index 344572e9c0eef86759f57c10a0b953fefe168799..411060889b30761ff3343d83f4161ee4ccb11682 100644 (file)
--- a/lib/sup/account.rb
+++ b/lib/sup/account.rb
@@ -26,7 +26,7 @@ class AccountManager
   end
 
   def user_accounts; @accounts.keys; end
-  def user_emails; (@email_map.keys + @alternate_map.keys).uniq.select { |e| String === e }; end
+  def user_emails; @email_map.keys.select { |e| String === e }; end
 
   def add_account hash, default=false
     main_email = hash[:email]

diff --git a/lib/sup/modes/thread-index-mode.rb b/lib/sup/modes/thread-index-mode.rb
index b90c21e48f8f9c32453bb642d4212557af3d5223..43339956320c38058aadd0ae3bb0cb431979893b 100644 (file)
--- a/lib/sup/modes/thread-index-mode.rb
+++ b/lib/sup/modes/thread-index-mode.rb
@@ -433,11 +433,15 @@ protected
   end
   
   def author_text_for_thread t
-    if t.authors.size == 1
-      t.authors.first.mediumname
-    else
-      t.authors.map { |p| AccountManager.is_account?(p) ? "me" : p.shortname }.join ", "
-    end
+    t.authors.map do |p|
+      if AccountManager.is_account?(p)
+        "me"
+      elsif t.authors.size == 1
+        p.mediumname
+      else
+        p.shortname
+      end
+    end.join ","
   end
 
   def text_for_thread t