Changeset fd79497 for perl/modules/Jabber

Timestamp:

Jul 22, 2009, 1:07:41 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

029a8b5

Parents:

0bf6757

Message:

Jabber: Sort roster entries

Entries in a roster group are now sorted alphabetically, case insensitive.
Groups in the roster are also sorted in the same way.
The [unsorted] pseudo-group still appears at the end of the roster.

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (2 diffs)

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -186 +186 @@
 }
 
+# Sort, ignoring markup.
+sub blistSort {
+    return uc(BarnOwl::ztext_stylestrip($a)) cmp uc(BarnOwl::ztext_stylestrip($b));
+}
+
 sub getSingleBuddyList {
     my $jid = shift;
@@ -195 +200 @@
         $blist .= "\n" . BarnOwl::Style::boldify("Jabber Roster for $jid\n");
 
+        my @gTexts = ();
         foreach my $group ( $roster->groups() ) {
-            $blist .= "  Group: $group\n";
             my @buddies = $roster->jids( 'group', $group );
+            my @bTexts = ();
             foreach my $buddy ( @buddies ) {
-                $blist .= blist_listBuddy( $roster, $buddy );
+                push(@bTexts, blist_listBuddy( $roster, $buddy ));
             }
-        }
+            push(@gTexts, "  Group: $group\n".join('',sort blistSort @bTexts));
+        }
+        # Sort groups before adding ungrouped entries.
+        @gTexts = sort blistSort @gTexts;
 
         my @unsorted = $roster->jids('nogroup');
         if (@unsorted) {
-            $blist .= "  [unsorted]\n";
+            my @bTexts = ();
             foreach my $buddy (@unsorted) {
-                $blist .= blist_listBuddy( $roster, $buddy );
+                push(@bTexts, blist_listBuddy( $roster, $buddy ));
             }
-        }
+            push(@gTexts, "  [unsorted]\n".join('',sort blistSort @bTexts));
+        }
+        $blist .= join('', @gTexts);
     }
     return $blist;