Changeset 53d6269

Timestamp:

Dec 1, 2015, 6:50:07 PM (8 years ago)

Author:

Karl Ramm <xyzzy-github@1ts.org>

Branches:

master, release-1.10

Children:

02514d9, 3d20ce1

Parents:

ff58239 (diff), 8fcd3e7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #165 from JasonGross/smartnarrow-view

Add some see-alsos to smartnarrow and smartfilter

Files:

• commands.c (modified) (6 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (2 diffs)
• zephyr.c (modified) (1 diff)

commands.c

@@ -548 +548 @@
               "optional color arguments are used they specifies the colors that\n"
               "messages matching this filter should be displayed in.\n\n"
-              "SEE ALSO: view, viewclass, viewuser\n"),
+              "SEE ALSO: smartfilter, smartnarrow, view, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("colorview", owl_command_colorview, OWL_CTX_INTERACTIVE,
@@ -585 +585 @@
               "filter expression that will be dynamically created by BarnOwl and then\n"
               "applied as the view's filter\n"
-              "SEE ALSO: filter, viewclass, viewuser\n"),
+              "SEE ALSO: filter, smartfilter, smartnarrow, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("smartnarrow", owl_command_smartnarrow, OWL_CTX_INTERACTIVE,
@@ -599 +599 @@
               "    then narrow to the class and instance.\n"
               "If '-r' or '--related' is specified, behave as though the\n"
-              "    'narrow-related' variable was inverted."),
+              "    'narrow-related' variable was inverted.\n\n"
+              "SEE ALSO: filter, smartfilter, view, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("smartfilter", owl_command_smartfilter, OWL_CTX_INTERACTIVE,
@@ -610 +611 @@
               "If the curmsg is a class message, the filter is that class.\n"
               "If the curmsg is a class message and '-i' is specified\n"
-              "    the filter is to that class and instance.\n"),
+              "    the filter is to that class and instance.\n\n"
+              "SEE ALSO: filter, smartnarrow, view, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("viewclass", owl_command_viewclass, OWL_CTX_INTERACTIVE,
@@ -618 +620 @@
               "matching the specified class and switch the current view\n"
               "to it.\n\n"
-              "SEE ALSO: filter, view, viewuser\n"),
+              "SEE ALSO: filter, smartfilter, smartnarrow, view, viewuser\n"),
   OWLCMD_ALIAS("vc", "viewclass"),
 
@@ -627 +629 @@
               "matching the specified user and switch the current\n"
               "view to it.\n\n"
-              "SEE ALSO: filter, view, viewclass\n"),
+              "SEE ALSO: filter, smartfilter, smartnarrow, view, viewclass\n"),
   OWLCMD_ALIAS("vu", "viewuser"),
   OWLCMD_ALIAS("viewperson", "viewuser"),

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

@@ -562 +562 @@
                                "[" . $conn->alias . "] Reconnect cancelled");
         $conn->cancel_reconnect;
+        delete $ircnets{$conn->alias};
+    } elsif (exists $ircnets{$conn->alias}) { # inconsistent state; no socket, but not yet deleted
+        BarnOwl::admin_message('IRC',
+                               "[" . $conn->alias . "] Attempt to disconnect from a socketless connection; deleting it");
         delete $ircnets{$conn->alias};
     }

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -437 +437 @@
 }
 
+sub rejoin_channels {
+    my $self = shift;
+    my @channels = @_;
+    # As reported in https://barnowl.mit.edu/ticket/274, if we reconnect to
+    # too many at once, the server rejects us.  Empirically, this is about
+    # 20-26, so we set the cap at 15, then delay further joins for 5 seconds.
+    my $MAX_RECONNECT_CHANNELS = 15;
+    my $DELAY = 5;
+    foreach my $c (@channels[ 0 .. $MAX_RECONNECT_CHANNELS ]) {
+        $self->conn->send_msg(join => $c);
+    }
+    if ($MAX_RECONNECT_CHANNELS < $#channels) {
+        my $remaining = $#channels - $MAX_RECONNECT_CHANNELS;
+        my $cur_alias = $self->alias;
+        BarnOwl::admin_message('IRC', "[$cur_alias] Delaying $remaining autorejoins for $DELAY seconds");
+        # if we don't assign the timer to anything, then it gets garbage
+        # collected, and never runs
+        $self->{autoconnect_channels_delay_timer} = BarnOwl::Timer->new({
+            name  => "IRC rejoin overflow timer ($remaining remaining)",
+            after => $DELAY,
+            cb    => sub {
+                rejoin_channels($self, @channels[ $MAX_RECONNECT_CHANNELS .. $#channels ]);
+            }
+        });
+    }
+}
+
+
 sub connected {
     my $self = shift;
@@ -443 +471 @@
     $self->cancel_reconnect;
     if ($self->autoconnect_channels) {
-        for my $c (@{$self->autoconnect_channels}) {
-            $self->conn->send_msg(join => $c);
-        }
+        rejoin_channels($self, @{$self->autoconnect_channels});
     }
     $self->conn->enable_ping(60, sub {

zephyr.c

@@ -1311 +1311 @@
 {
   int n = strcspn(in, "./");
-  char *realm = strchrnul(in, '@');
+  const char *realm = strchr(in, '@');
+  if (realm == NULL)
+    realm = in + strlen(in);
 
   if (in + n >= realm ||