Changeset 7c5d060 for perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

Timestamp:

May 19, 2010, 10:33:40 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

5e24227

Parents:

3aa0522

git-author:

Anders Kaseorg <andersk@mit.edu> (05/19/10 18:43:59)

git-committer:

Anders Kaseorg <andersk@mit.edu> (05/19/10 22:33:40)

Message:

Jabber: Set long_sender in a MUC to the full sender JID (from presence).

Currently the long_sender of a MUC message just duplicates the context
and sender.
  sipb@conference.mit.edu / subject / andersk  17:17  (sipb@conference.mit.edu/andersk)

Change it to look up the sender’s JID from the MUC presence, if
possible:
  sipb@conference.mit.edu / subject / andersk  17:17  (andersk@mit.edu/barnowl)

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

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)

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

@@ -1225 +1225 @@
         $completion_jids{$room} = 1;
 
+        my $muc;
+        if ($dir eq 'in') {
+            my $connection = $conn->getConnectionFromSid($props{sid});
+            $muc = $connection->FindMUC(jid => $from);
+        } else {
+            my $connection = $conn->getConnectionFromJID($props{from});
+            $muc = $connection->FindMUC(jid => $to);
+        }
+        $props{from} = $muc->GetFullJID($from) || $nick || $room;
         $props{sender} = $nick || $room;
         $props{recipient} = $room;