Changeset 2f25537 for perl/modules/Jabber/lib/BarnOwl

Timestamp:

Jun 10, 2010, 2:47:11 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

68e5464

Parents:

5d59c1e

git-author:

Anders Kaseorg <andersk@mit.edu> (06/10/10 02:03:20)

git-committer:

Anders Kaseorg <andersk@mit.edu> (06/10/10 14:47:11)

Message:

Jabber: Don’t break private replies in anonymous MUCs.

In commit 7c5d06020df6dac7defab775ce2d91bdb46805ee we changed the
Jabber message ‘from’ property to show less duplicate information as
the long_sender.  But in anonymous MUCs, we need the old ‘from’ for
private replies, so remove the duplicate information inside sub
long_sender instead in that case.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>

Location:

perl/modules/Jabber/lib/BarnOwl

Files:

• Message/Jabber.pm (modified) (2 diffs)
• Module/Jabber.pm (modified) (1 diff)

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

@@ -20 +20 @@
 sub to { shift->{to} };
 sub room { shift->{room} };
+sub nick { shift->{nick} };
 sub subject { shift->{subject} };
 sub status { shift->{status} }
@@ -41 +42 @@
 sub long_sender {
     my $self = shift;
+    if ($self->jtype eq 'groupchat' && $self->nick) {
+        my $from_jid = Net::Jabber::JID->new($self->from);
+        if ($from_jid->GetJID('base') eq $self->room &&
+            $from_jid->GetResource() eq $self->nick) {
+            return $self->nick;
+        }
+    }
     return $self->from;
 }

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

@@ -1241 +1241 @@
             $muc = $connection->FindMUC(jid => $to);
         }
-        $props{from} = $muc->GetFullJID($from) || $nick || $room;
+        $props{from} = $muc->GetFullJID($from) || $props{from};
         $props{sender} = $nick || $room;
         $props{recipient} = $room;