From c7bf32450881d7be285e45bfb5e034b212278795 Mon Sep 17 00:00:00 2001 From: varazir Date: Fri, 20 Jan 2017 10:15:48 +0100 Subject: [PATCH 01/18] Added custom_msg() --- Irssi/irssinotifier.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index e717cf2..86f9686 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -465,6 +465,14 @@ sub event_key_pressed { $screen_socket_path = $1; } } +sub custom_msg { + my ($data, $server, $witem) = @_; + use Text::ParseWords;    my ($nick, @message_words) = shellwords($data); + $lastMsg = "@message_words"; + $lastNick = "$nick"; + $lastTarget = "!PRIVATE"; + send_to_api(); +} Irssi::settings_add_str('irssinotifier', 'irssinotifier_encryption_password', 'password'); Irssi::settings_add_str('irssinotifier', 'irssinotifier_api_token', ''); @@ -494,3 +502,4 @@ sub event_key_pressed { Irssi::signal_add('print text', 'print_text'); Irssi::signal_add('setup changed', 'are_settings_valid'); Irssi::signal_add('window changed', 'check_window_activity'); +Irssi::command_bind custom_msg => \&custom_msg; From 4e1909eb61a5ca3ac2cbe4895bdf7ee3866af90a Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 10:03:47 +0100 Subject: [PATCH 02/18] Added custom_msg Command used to manually push messages to the phone Added option for showing the network tag after the nick irssinotifier_tag --- Irssi/irssinotifier.pl | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 86f9686..c96ff1d 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -35,6 +35,7 @@ my $lastDcc = 0; my $notifications_sent = 0; my @delayQueue = (); +my $lastTag; my $screen_socket_path; @@ -46,6 +47,7 @@ sub private { $lastTarget = "!PRIVATE"; $lastWindow = $nick; $lastDcc = 0; + $lastTag = $server->{tag}; } sub joined { @@ -66,6 +68,7 @@ sub public { $lastTarget = $target; $lastWindow = $target; $lastDcc = 0; + $lastTag = $server->{tag}; } sub dcc { @@ -263,6 +266,11 @@ sub send_to_api { my $wget_cmd = "wget --tries=2 --timeout=10 --no-check-certificate -qO- /dev/null"; my $api_url; my $data; + my $tag = Irssi::settings_get_str('irssinotifier_tag'); + + if ($tag eq 'True') { + $lastNick = "$lastNick on $lastTag" + } if ($type eq 'notification') { $lastMsg = Irssi::strip_codes($lastMsg); @@ -465,13 +473,18 @@ sub event_key_pressed { $screen_socket_path = $1; } } + sub custom_msg { my ($data, $server, $witem) = @_; - use Text::ParseWords;    my ($nick, @message_words) = shellwords($data); - $lastMsg = "@message_words"; - $lastNick = "$nick"; - $lastTarget = "!PRIVATE"; - send_to_api(); + use Text::ParseWords; + my ($nick, @message_words) = shellwords($data); + + $lastMsg = "@message_words"; + $lastNick = "$nick"; + $lastTarget = "!PRIVATE"; + $lastTag = $server->{tag}; + + send_to_api(); } Irssi::settings_add_str('irssinotifier', 'irssinotifier_encryption_password', 'password'); @@ -488,6 +501,7 @@ sub custom_msg { Irssi::settings_add_bool('irssinotifier', 'irssinotifier_clear_notifications_when_viewed', 0); Irssi::settings_add_int('irssinotifier', 'irssinotifier_require_idle_seconds', 0); Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_dcc', 1); +Irssi::settings_add_str('irssinotifier', 'irssinotifier_tag', 'False'); # these commands are renamed Irssi::settings_remove('irssinotifier_ignore_server'); @@ -502,4 +516,4 @@ sub custom_msg { Irssi::signal_add('print text', 'print_text'); Irssi::signal_add('setup changed', 'are_settings_valid'); Irssi::signal_add('window changed', 'check_window_activity'); -Irssi::command_bind custom_msg => \&custom_msg; +Irssi::command_bind('custom_msg', 'custom_msg'); From 29e766f39c7406a9a209ef652cd48ea2e478217d Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 10:09:33 +0100 Subject: [PATCH 03/18] Changed the setting for the network tag to irssinotifier_enable_network_tag --- Irssi/irssinotifier.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index c96ff1d..d4a1a0f 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -266,7 +266,7 @@ sub send_to_api { my $wget_cmd = "wget --tries=2 --timeout=10 --no-check-certificate -qO- /dev/null"; my $api_url; my $data; - my $tag = Irssi::settings_get_str('irssinotifier_tag'); + my $tag = Irssi::settings_get_str('irssinotifier_enable_network_tag'); if ($tag eq 'True') { $lastNick = "$lastNick on $lastTag" @@ -501,7 +501,7 @@ sub custom_msg { Irssi::settings_add_bool('irssinotifier', 'irssinotifier_clear_notifications_when_viewed', 0); Irssi::settings_add_int('irssinotifier', 'irssinotifier_require_idle_seconds', 0); Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_dcc', 1); -Irssi::settings_add_str('irssinotifier', 'irssinotifier_tag', 'False'); +Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_network_tag', '1'); # these commands are renamed Irssi::settings_remove('irssinotifier_ignore_server'); From beb41232fe84ad10e4cc4d621016482805e3c073 Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 10:18:41 +0100 Subject: [PATCH 04/18] Updated README.md with a space --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f83baba..169ff3f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ #IrssiNotifier -Get notifications from IRC hilights and private messages from Irssi to Android. +Get notifications from IRC hilights and private messages from Irssi to Android. Check it out on [Google Play](https://play.google.com/store/apps/details?id=fi.iki.murgo.irssinotifier)! From b86be15f9f25b9018664f402b0df9d5d59861067 Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 11:48:51 +0100 Subject: [PATCH 05/18] Change the IF statement for adding network tag --- Irssi/irssinotifier.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index d4a1a0f..0bbecd7 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -266,9 +266,8 @@ sub send_to_api { my $wget_cmd = "wget --tries=2 --timeout=10 --no-check-certificate -qO- /dev/null"; my $api_url; my $data; - my $tag = Irssi::settings_get_str('irssinotifier_enable_network_tag'); - - if ($tag eq 'True') { + + if (Irssi::settings_get_str('irssinotifier_enable_network_tag')) { $lastNick = "$lastNick on $lastTag" } From 576bddd59dfb530e55dc2cff8517fb92db3c851a Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 11:54:54 +0100 Subject: [PATCH 06/18] Change the default setting for network tags --- Irssi/irssinotifier.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 0bbecd7..57b41e9 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -500,7 +500,7 @@ sub custom_msg { Irssi::settings_add_bool('irssinotifier', 'irssinotifier_clear_notifications_when_viewed', 0); Irssi::settings_add_int('irssinotifier', 'irssinotifier_require_idle_seconds', 0); Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_dcc', 1); -Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_network_tag', '1'); +Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_network_tag', '0'); # these commands are renamed Irssi::settings_remove('irssinotifier_ignore_server'); From 374239442c95c85ef175453f54e380901b2af84d Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 13:04:11 +0100 Subject: [PATCH 07/18] Corrected the irssinotifier_enable_network_tag default value --- Irssi/irssinotifier.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 57b41e9..ab3dd4c 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -500,7 +500,7 @@ sub custom_msg { Irssi::settings_add_bool('irssinotifier', 'irssinotifier_clear_notifications_when_viewed', 0); Irssi::settings_add_int('irssinotifier', 'irssinotifier_require_idle_seconds', 0); Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_dcc', 1); -Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_network_tag', '0'); +Irssi::settings_add_bool('irssinotifier', 'irssinotifier_enable_network_tag', 0); # these commands are renamed Irssi::settings_remove('irssinotifier_ignore_server'); From e2ac717a4443cb1d311f5ef3c3dee72db0dce3c0 Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 13:15:18 +0100 Subject: [PATCH 08/18] Corrected the dcc sub change to ->{tag} --- Irssi/irssinotifier.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index ab3dd4c..efd112a 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -77,7 +77,7 @@ sub dcc { $lastMsg = $msg; $lastNick = $dcc->{nick}; $lastTarget = "!PRIVATE"; - $lastWindow = $dcc->{target}; + $lastWindow = $dcc->{tag}; $lastDcc = 1; } From 2846c37bb497c0ef133e27d24436658692d62e70 Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 14:57:49 +0100 Subject: [PATCH 09/18] Updated the version number and changed date --- Irssi/irssinotifier.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index efd112a..e41ca77 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -9,7 +9,7 @@ use Encode; use vars qw($VERSION %IRSSI); -$VERSION = "21"; +$VERSION = "21.1"; %IRSSI = ( authors => "Lauri \'murgo\' Härsilä", contact => "murgo\@iki.fi", @@ -17,7 +17,7 @@ description => "Send notifications about irssi highlights to server", license => "Apache License, version 2.0", url => "https://irssinotifier.appspot.com", - changed => "2016-03-26" + changed => "2017-01-23" ); # Sometimes, for some unknown reason, perl emits warnings like the following: From f58e46d492801553ac630f6cb47f3ec25b209fee Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 15:02:07 +0100 Subject: [PATCH 10/18] Update irssinotifier.pl --- Irssi/irssinotifier.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index e41ca77..b6aef9a 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -515,4 +515,4 @@ sub custom_msg { Irssi::signal_add('print text', 'print_text'); Irssi::signal_add('setup changed', 'are_settings_valid'); Irssi::signal_add('window changed', 'check_window_activity'); -Irssi::command_bind('custom_msg', 'custom_msg'); +Irssi::command_bind('custom_msg', 'custom_msg'); # Can be used to send test messages to your phone or if you like to use a trigger to push From 72deb8b561358608401e39e20c3323fd258246ba Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 23 Jan 2017 19:00:16 +0100 Subject: [PATCH 11/18] Changed back the version number to 21 --- Irssi/irssinotifier.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index b6aef9a..d52853b 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -9,7 +9,7 @@ use Encode; use vars qw($VERSION %IRSSI); -$VERSION = "21.1"; +$VERSION = "21"; %IRSSI = ( authors => "Lauri \'murgo\' Härsilä", contact => "murgo\@iki.fi", From e28da57212bcedb2d8183a059c459fa4e948ceca Mon Sep 17 00:00:00 2001 From: varazir Date: Tue, 24 Jan 2017 14:07:37 +0100 Subject: [PATCH 12/18] Changed the way nick and message are set in custom_msg --- Irssi/irssinotifier.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index d52853b..0a66fb7 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -475,8 +475,9 @@ sub event_key_pressed { sub custom_msg { my ($data, $server, $witem) = @_; - use Text::ParseWords; - my ($nick, @message_words) = shellwords($data); + #use Text::ParseWords; + #my ($nick, @message_words) = shellwords($data); + my ($nick, @message_words) = split " ", $data, 2; $lastMsg = "@message_words"; $lastNick = "$nick"; From 9c93ec795794afb867114e99274e1c33c36301fb Mon Sep 17 00:00:00 2001 From: varazir Date: Sun, 12 Feb 2017 20:17:58 +0100 Subject: [PATCH 13/18] cleaning up --- Irssi/irssinotifier.pl | 51 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 0a66fb7..350ef55 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -7,8 +7,17 @@ use Fcntl; use POSIX; use Encode; -use vars qw($VERSION %IRSSI); +use MIME::Base64; +use Data::Random qw(rand_chars); +use Crypt::Mode::CBC; +use Crypt::PBKDF2; +use Crypt::Misc qw(encode_b64); +use URI::Escape qw(uri_escape); +use Mojo::Util qw(url_escape); +use LWP::Simple; + +use vars qw($VERSION %IRSSI); $VERSION = "21"; %IRSSI = ( authors => "Lauri \'murgo\' Härsilä", @@ -484,9 +493,43 @@ sub custom_msg { $lastTarget = "!PRIVATE"; $lastTag = $server->{tag}; - send_to_api(); + if ("$lastNick" && "$lastMsg") { + send_to_api(); + } + else { + print "You need both a nick and a message to use this command, read more /help custom_msg" + } } +sub cmd_help { + my ($args) = @_; + if ($args =~ /^irssinotifier *$/i) { + print CLIENTCRAP < + You will find the token at https://irssinotifier.appspot.com/#profile + + Second if you have set a password in the android app you need to set the same here. + /set irssinotifier_encryption_password +HELP +; +Irssi::signal_stop; + } + if ($args =~ /^custom_msg *$/i) { + print CLIENTCRAP < 'cmd_help'); # So you can use the /help command. +Irssi::command_bind('irssinotifier', 'cmd_help'); # To make it easier to to get the help info From 31de1bbec4ea8218d522c78e21a6968fab10b3a5 Mon Sep 17 00:00:00 2001 From: varazir Date: Mon, 13 Feb 2017 09:38:01 +0100 Subject: [PATCH 14/18] Removed the custom_msg and moduels for encrypting --- Irssi/irssinotifier.pl | 60 ------------------------------------------ 1 file changed, 60 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 350ef55..75838d8 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -8,15 +8,6 @@ use POSIX; use Encode; -use MIME::Base64; -use Data::Random qw(rand_chars); -use Crypt::Mode::CBC; -use Crypt::PBKDF2; -use Crypt::Misc qw(encode_b64); -use URI::Escape qw(uri_escape); -use Mojo::Util qw(url_escape); -use LWP::Simple; - use vars qw($VERSION %IRSSI); $VERSION = "21"; %IRSSI = ( @@ -481,54 +472,6 @@ sub event_key_pressed { $screen_socket_path = $1; } } - -sub custom_msg { - my ($data, $server, $witem) = @_; - #use Text::ParseWords; - #my ($nick, @message_words) = shellwords($data); - my ($nick, @message_words) = split " ", $data, 2; - - $lastMsg = "@message_words"; - $lastNick = "$nick"; - $lastTarget = "!PRIVATE"; - $lastTag = $server->{tag}; - - if ("$lastNick" && "$lastMsg") { - send_to_api(); - } - else { - print "You need both a nick and a message to use this command, read more /help custom_msg" - } -} - -sub cmd_help { - my ($args) = @_; - if ($args =~ /^irssinotifier *$/i) { - print CLIENTCRAP < - You will find the token at https://irssinotifier.appspot.com/#profile - - Second if you have set a password in the android app you need to set the same here. - /set irssinotifier_encryption_password -HELP -; -Irssi::signal_stop; - } - if ($args =~ /^custom_msg *$/i) { - print CLIENTCRAP < 'cmd_help'); # So you can use the /help command. -Irssi::command_bind('irssinotifier', 'cmd_help'); # To make it easier to to get the help info From 3ad1b79799aa056cbfb61cc0a5b71456595212f1 Mon Sep 17 00:00:00 2001 From: varazir Date: Thu, 16 Feb 2017 10:23:10 +0100 Subject: [PATCH 15/18] Added command irssinotifier and help for that command --- Irssi/irssinotifier.pl | 71 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 75838d8..3945467 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -472,6 +472,55 @@ sub event_key_pressed { $screen_socket_path = $1; } } + +sub irssinotifier { + my ($data, $server, $witem) = @_; + my ($args, $rest) = Irssi::command_parse_options('irssinotifier', $data); + ref $args or return 0; + + $lastNick = $args->{nick}; + $lastMsg = $rest; + if ($args->{channel}){ + $lastTarget = "$args->{channel}"; + } else { + $lastTarget = "!PRIVATE"; + } + send_to_api(); +} + +sub irssinotifier_help { + my ($args) = @_; + if ($args =~ /^irssinotifier *$/i) { + print CLIENTCRAP <] [-channel #] + +%U%_Description:%_%U + + The command is used to manually send messages using the irssinotifier API + +%U%_Parameters:%_%U + + -nick The nick name that should be presented in the android application. + + -channel The channel name that should be presented in the android application. + # is mandator in the name. + + The message you like to send + +%U%_Example:%_%U + + Send a message as Foo to your phone + /irssinotifier -nick foo I hope you got my message now + Send a message as Foo in #channel + /irssinotifier -nick foo -channel #channel I hope you got this message too +HELP + ; + Irssi::signal_stop; + } +} Irssi::settings_add_str('irssinotifier', 'irssinotifier_encryption_password', 'password'); Irssi::settings_add_str('irssinotifier', 'irssinotifier_api_token', ''); @@ -493,12 +542,16 @@ sub event_key_pressed { Irssi::settings_remove('irssinotifier_ignore_server'); Irssi::settings_remove('irssinotifier_ignore_channel'); -Irssi::signal_add('message irc action', 'public'); -Irssi::signal_add('message public', 'public'); -Irssi::signal_add('message private', 'private'); -Irssi::signal_add('message join', 'joined'); -Irssi::signal_add('message dcc', 'dcc'); -Irssi::signal_add('message dcc action', 'dcc'); -Irssi::signal_add('print text', 'print_text'); -Irssi::signal_add('setup changed', 'are_settings_valid'); -Irssi::signal_add('window changed', 'check_window_activity'); +Irssi::signal_add('message irc action', 'public'); +Irssi::signal_add('message public', 'public'); +Irssi::signal_add('message private', 'private'); +Irssi::signal_add('message join', 'joined'); +Irssi::signal_add('message dcc', 'dcc'); +Irssi::signal_add('message dcc action', 'dcc'); +Irssi::signal_add('print text', 'print_text'); +Irssi::signal_add('setup changed', 'are_settings_valid'); +Irssi::signal_add('window changed', 'check_window_activity'); +Irssi::command_bind('irssinotifier', 'irssinotifier'); +Irssi::command_bind_first('help', 'irssinotifier_help'); +Irssi::command_set_options('irssinotifier', '+nick +channel'); + From 442d6dab3e3f77ed76c143cdb74ee144af2fe626 Mon Sep 17 00:00:00 2001 From: varazir Date: Thu, 16 Feb 2017 10:43:48 +0100 Subject: [PATCH 16/18] Added a check that the parameters are set --- Irssi/irssinotifier.pl | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 3945467..6b36431 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -7,7 +7,6 @@ use Fcntl; use POSIX; use Encode; - use vars qw($VERSION %IRSSI); $VERSION = "21"; %IRSSI = ( @@ -477,6 +476,19 @@ sub irssinotifier { my ($data, $server, $witem) = @_; my ($args, $rest) = Irssi::command_parse_options('irssinotifier', $data); ref $args or return 0; + + if (!exists $args->{nick}) { + Irssi::print("You need to use -nick and nickname after it"); + return 0; + } elsif ( !length $args->{nick}) { + Irssi::print("you need to specify a nickname after -nick"); + return 0; + } + + if ($args->{nick} and !length $rest ) { + Irssi::print("You need to specify a message"); + return 0; + } $lastNick = $args->{nick}; $lastMsg = $rest; From 3e46154edc76facdcdca5ccde80d4f4e4e5bcc93 Mon Sep 17 00:00:00 2001 From: varazir Date: Thu, 23 Feb 2017 11:37:34 +0100 Subject: [PATCH 17/18] Support for OpneSSL 1.1.0 as it was updated in the master --- Irssi/irssinotifier.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 6b36431..8a11bca 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -8,7 +8,7 @@ use POSIX; use Encode; use vars qw($VERSION %IRSSI); -$VERSION = "21"; +$VERSION = "22"; %IRSSI = ( authors => "Lauri \'murgo\' Härsilä", contact => "murgo\@iki.fi", @@ -16,7 +16,7 @@ description => "Send notifications about irssi highlights to server", license => "Apache License, version 2.0", url => "https://irssinotifier.appspot.com", - changed => "2017-01-23" + changed => "2017-02-22" ); # Sometimes, for some unknown reason, perl emits warnings like the following: @@ -359,7 +359,7 @@ sub encrypt { fcntl($r, F_SETFD, $flags & ~FD_CLOEXEC) or die "fcntl F_SETFD: $!"; my $rfn = fileno($r); - my $pid = open2(my $out, my $in, qw(openssl enc -aes-128-cbc -salt -base64 -A -pass), "fd:$rfn"); + my $pid = open2(my $out, my $in, qw(openssl enc -aes-128-cbc -salt -base64 -md md5 -A -pass), "fd:$rfn"); print $w "$password"; close $w; From f210ba5026ec50a9dca67d63a6a6fb28beca2662 Mon Sep 17 00:00:00 2001 From: varazir Date: Thu, 9 Mar 2017 10:52:42 +0100 Subject: [PATCH 18/18] Added 'tag' => , to the delayQueue --- Irssi/irssinotifier.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/Irssi/irssinotifier.pl b/Irssi/irssinotifier.pl index 8a11bca..a6689f0 100644 --- a/Irssi/irssinotifier.pl +++ b/Irssi/irssinotifier.pl @@ -213,6 +213,7 @@ sub send_notification { 'nick' => $lastNick, 'target' => $lastTarget, 'added' => time, + 'tag' => $lastTag, }; } else { Irssi::print("IrssiNotifier: previous send is still in progress and queue is full, skipping notification");