Permalink
Browse files

Merge branch 'autosearch'

Conflicts:
	README
  • Loading branch information...
mmitch committed Feb 8, 2012
2 parents 6c66684 + 43055e4 commit 8c1b9e9e1e5d75fb3b2ca1c65e00d77421efbeeb
Showing with 26 additions and 19 deletions.
  1. +1 −0 README
  2. +17 −13 html/history.html
  3. +1 −1 html/using.html
  4. +7 −5 twirssi.pl
View
1 README
@@ -4,6 +4,7 @@ You may need to use CPAN or another method to install these modules.
* Net::Twitter
* DateTime
* DateTime::Format::Strptime
+ * JSON::Any
### Installation ###
Installation is two part. First
View
@@ -1,20 +1,24 @@
<ul>
-<li><strong>v2.2.5BETA - currently under development</strong><br />
- <ul>
- <li>BETA versions are always available at <a
+<li><strong>v2.5.1BETA - currently under development</strong><br />
+ <ul>
+ <li><em>BETA versions are always available at <a
href="http://github.com/zigdon/twirssi/tree/master">github</a>. You
can also upgrade a running twirssi install by setting
- twirssi_upgrade_beta to true, and using /twirssi_upgrade.</li></li>
- <li><em>2011-10-15</em> /twitter_listinfo - new command</li>
- <li><em>2011-10-15</em> twitter_autosearch_results - new setting</li>
- <li><em>2011-10-15</em> twitter_autosearch_results - new setting</li>
- <li><em>2011-10-11</em> /twirssi_reload - new command, settings: twirssi_poll_store, twirssi_id_store</li>
+ <code>twirssi_upgrade_beta</code> to true, and using <code>/twirssi_upgrade</code>.</em></li>
+ <li><em>2012-02-07</em> Fix: avoid re-reading temporary files (left by debugging)</li>
+ <li><em>2012-01-30</em> <code>twirssi_unshorten_color</code> - new setting</li>
+ <li><em>2012-01-30</em> <code>twirssi_hilight_color</code> - new setting</li>
+ <li><em>2011-10-15</em> <code>/twitter_listinfo</code> - new command</li>
+ <li><em>2011-10-15</em> <code>twitter_autosearch_results</code> - new setting</li>
+ <li><em>2011-10-15</em> <code>twitter_autosearch_results</code> - new setting</li>
+ <li><em>2011-10-11</em> <code>/twirssi_reload</code> - new command, settings: <code>twirssi_poll_store</code>, <code>twirssi_id_store</code></li>
<li><em>2011-10-11</em> completion - code improved</li>
- <li><em>2011-09-22</em> short_url_domains - new setting, short URL expanding</li>
- <li><em>2011-06-22</em> Improved completion for /retweet_to</li>
- <li><em>2011-06-18</em> Improved /twirssi_wipe (new default action; -A is previous default action)</li>
- <li><em>2011-06-09</em> Add URL shortening to DMs (/dm)</li>
- <li><em>2011-06-06</em> Add /twitter_dms and /twitter_dms_as (list recent DMs)</li></ul></li>
+ <li><em>2011-09-22</em> <code>short_url_domains</code> - new setting, short URL expanding</li>
+ <li><em>2011-06-22</em> Improved completion for <code>/retweet_to</code></li>
+ <li><em>2011-06-18</em> Improved <code>/twirssi_wipe</code> (new default action; <code>-A</code> is previous default action)</li>
+ <li><em>2011-06-09</em> Add URL shortening to DMs (<code>/dm</code>)</li>
+ <li><em>2011-06-06</em> Add <code>/twitter_dms</code> and <code>/twitter_dms_as</code> (list recent DMs)</li>
+ </ul></li>
<li><strong>v2.2.5 - 20:00 30-Aug-2009</strong><br />
<ul>
<li>New setting, twitter_timeout, should help avoid irssi pinging out of
View
@@ -151,7 +151,7 @@ <h3>Look-and-feel Settings</h3>
well.</li>
<li><code>twirssi_hilight_color</code> - Color that hilights should be for
the twirssi window. (default %M)</li>
- <li><code>twirssi_unshorten_color</code> - Color for unshortned URL links
+ <li><code>twirssi_unshorten_color</code> - Color that unshortened URL links
will display as, when enabled. (default %b)</li>
<li><code>twirssi_replies_autonick</code> - On by default. If on, /reply
will make sure the reply begins with @nick. If off, you can reply to
View
@@ -17,7 +17,7 @@
use vars qw($VERSION %IRSSI);
-$VERSION = sprintf '%s', q$Version: v2.5.1beta136$ =~ /^\w+:\s+v(\S+)/;
+$VERSION = sprintf '%s', q$Version: v2.5.1beta140$ =~ /^\w+:\s+v(\S+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
@@ -26,7 +26,7 @@
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2011-10-21 13:55:11 +0000$',
+ changed => '$Date: 2012-02-07 22:34:25 +0000$',
);
my $twit; # $twit is current logged-in Net::Twitter object (usually one of %twits)
@@ -1016,7 +1016,7 @@ sub verify_twitter_object {
if ( my $timeout = $settings{timeout} and $twit->can('ua') ) {
$twit->ua->timeout($timeout);
&notice( ["tweet", "$user\@$service"],
- "Twitter timeout set to $timeout" );
+ "Twitter timeout for $user\@$service set to $timeout" );
}
unless ( $twit->verify_credentials() ) {
@@ -1784,12 +1784,14 @@ sub background_setup {
return unless &logged_in($twit);
my ( $fh, $filename ) = File::Temp::tempfile('tw_'.$$.'_XXXX', TMPDIR => 1);
+ my $done_filename = "$filename.done";
+ unlink($done_filename) if -f $done_filename;
binmode( $fh, ":" . &get_charset() );
$child_pid = fork();
if ($child_pid) { # parent
Irssi::timeout_add_once( $pause_monitor, 'monitor_child',
- [ "$filename.done", $max_pauses, $pause_monitor, $is_update ] );
+ [ $done_filename, $max_pauses, $pause_monitor, $is_update ] );
Irssi::pidwait_add($child_pid);
} elsif ( defined $child_pid ) { # child
my $pid_filename = $filename . '.' . $$;
@@ -1804,7 +1806,7 @@ sub background_setup {
}
close $fh;
- rename $pid_filename, "$filename.done";
+ rename $pid_filename, $done_filename;
exit;
} else {
&notice([ 'error' ], "Failed to fork for background call: $!");

0 comments on commit 8c1b9e9

Please sign in to comment.