Changeset 9eb9479 for lib/BarnOwl/Module/Twitter.pm

Timestamp:

Oct 7, 2009, 10:53:37 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

176434d

Parents:

443eea1

git-author:

Nelson Elhage <nelhage@mit.edu> (10/06/09 00:18:00)

git-committer:

Nelson Elhage <nelhage@mit.edu> (10/07/09 22:53:37)

Message:

Don't rely on zephyr_getsender() at startup.

With krb5 Zephyr, zephyr_getsender() is not guaranteed to work until
Zephyr has been initialized. If we're seeing zephyrs, it's probably a
safe bet to try calling it, but don't assume that it returns anything
meaningful at startup.

File:

• lib/BarnOwl/Module/Twitter.pm (modified) (3 diffs)

lib/BarnOwl/Module/Twitter.pm

@@ -26 +26 @@
 our @twitter_handles = ();
 our $default_handle = undef;
-my $user     = BarnOwl::zephyr_getsender();
-my ($class)  = ($user =~ /(^[^@]+)/);
+my $class    = $ENV{USER};
 my $instance = "status";
 my $opcode   = "twitter";
@@ -133 +132 @@
 
 for my $cfg (@$raw_cfg) {
-    my $twitter_args = { username   => $cfg->{user} || $user,
+    my $twitter_args = { username   => $cfg->{user},
                         password   => $cfg->{password},
                         source     => 'barnowl', 
@@ -176 +175 @@
     my $m = shift;
     ($class, $instance, $opcode) = map{BarnOwl::getvar("twitter:$_")} qw(class instance opcode);
-    if($m->sender eq $user
+    if($m->sender eq BarnOwl::zephyr_getsender()
        && match($m->class, $class)
        && match($m->instance, $instance)