Changeset d5dcd7c for perl/modules/Jabber/lib/BarnOwl

Timestamp:

Aug 21, 2008, 6:20:01 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

5b75e8b

Parents:

57cf4f9

Message:

Use replycmd/replysendercmd subs rather than properties for Jabber.

Location:

perl/modules/Jabber/lib/BarnOwl

Files:

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

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

@@ -91 +91 @@
 }
 
+sub replycmd {
+    my $self = shift;
+    my ($recip, $account, $subject);
+    if ($self->is_loginout) {
+        $recip   = $self->sender;
+        $account = $self->recipient;
+    } elsif ($self->jtype eq 'chat') {
+        return $self->replysendercmd;
+    } elsif ($self->jtype eq 'groupchat') {
+        $recip = $self->room;
+        if ($self->is_incoming) {
+            $account = $self->to;
+        } else {
+            $account = $self->from;
+        }
+        $subject = $self->subject;
+    }
+    return jwrite_cmd($recip, $account, $subject);
+}
+
+sub replysendercmd {
+    my $self = shift;
+    if($self->jtype eq 'groupchat'
+       || $self->jtype eq 'chat') {
+        my ($recip, $account);
+        if ($self->is_incoming) {
+            $recip   = $self->from;
+            $account = $self->to;
+        } else {
+            $recip   = $self->to;
+            $account = $self->from;
+        }
+        return jwrite_cmd($recip, $account);
+    }
+    return $self->replycmd;
+}
+
+sub jwrite_cmd {
+    my ($recip, $account, $subject) = @_;
+    if (defined $recip) {
+        my $cmd = "jwrite $recip -a $account";
+        if (defined $subject) {
+            $cmd .= " -s $subject";
+        }
+        return $cmd;
+    } else {
+        return undef;
+    }
+}
 
 =head1 SEE ALSO

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

@@ -1047 +1047 @@
         $props{loginout} = 'logout';
     }
-    $props{replysendercmd} = $props{replycmd} = "jwrite $from -a $to";
     BarnOwl::queue_message(BarnOwl::Message->new(%props));
 }
@@ -1154 +1153 @@
 
     if ( $jtype eq 'chat' ) {
-        $props{replycmd} =
-          "jwrite " . ( ( $dir eq 'in' ) ? $props{from} : $props{to} );
-        $props{replycmd} .=
-          " -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
         $props{private} = 1;
 
@@ -1180 +1175 @@
         my $nick = $props{nick} = $from->GetResource();
         my $room = $props{room} = $from->GetJID('base');
-        $props{replycmd} = "jwrite $room";
-        $props{replycmd} .=
-          " -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
-        if ($props{subject}) {
-            $props{replycmd} .= " -s " . $props{subject}
-        }
-
-        if ($dir eq 'out') {
-            $props{replysendercmd} = "jwrite ".$props{to}." -a ".$props{from};
-        }
-        else {
-            $props{replysendercmd} = "jwrite ".$props{from}." -a ".$props{to};
-        }
 
         $props{sender} = $nick || $room;
@@ -1203 +1185 @@
     }
     elsif ( $jtype eq 'normal' ) {
-        $props{replycmd}  = "";
         $props{private} = 1;
     }
     elsif ( $jtype eq 'headline' ) {
-        $props{replycmd} = "";
     }
     elsif ( $jtype eq 'error' ) {
-        $props{replycmd} = "";
         $props{body}     = "Error "
           . $props{error_code}
@@ -1218 +1197 @@
     }
 
-    $props{replysendercmd} = $props{replycmd} unless $props{replysendercmd};
     return %props;
 }