Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[irssi_logger.pl] added a blacklist option, added host and port as new options #853

Merged
merged 3 commits into from
Aug 23, 2023
Merged

[irssi_logger.pl] added a blacklist option, added host and port as new options #853

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d49cd47
added a blacklist option, added host and port as new options
terminaldweller Aug 21, 2023
d32d350
upped the version, blacklist now updates without need for reloading t…
terminaldweller Aug 21, 2023
8d5b2b1
removed the unnecessary else
terminaldweller Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions scripts/irssi_logger.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# - postgresql
# - postgresql-contrib (pg_trgm)

$VERSION = "1.0";
$VERSION = "1.1";
%IRSSI = (
authors => "Aaron Bieber",
contact => "deftly\@gmail.com",
Expand All @@ -23,6 +23,7 @@

my $user = $ENV{LOGNAME} || $ENV{USER} || getpwuid($<);
my $dbh;
my %blacklist = ();


my $sql = qq~
Expand Down Expand Up @@ -63,8 +64,10 @@
~;

sub db_init {
my $dbhost = Irssi::settings_get_str('il_host');
my $dbport = Irssi::settings_get_str('il_port');
my ($dbname, $dbuser, $dbpass) = @_;
my $mdbh = DBI->connect("dbi:Pg:dbname=$dbname", $dbuser, $dbpass) || Irssi::print("Can't connect to postgres! " . DBI::errstr);
my $mdbh = DBI->connect("DBI:Pg:database=$dbname;host=$dbhost;port=$dbport", $dbuser, $dbpass) || Irssi::print("Can't connect to postgres! " . DBI::errstr);

my $sth = $mdbh->prepare($check_db);
$sth->execute();
Expand All @@ -90,29 +93,33 @@ sub connect_db {
my $dbname = Irssi::settings_get_str('il_dbname') || $user;
my $dbuser = Irssi::settings_get_str('il_dbuser') || $user;
my $dbpass = Irssi::settings_get_str('il_dbpass') || "";
my $dbhost = Irssi::settings_get_str('il_host');
my $dbport = Irssi::settings_get_str('il_port');

db_init($dbname, $dbuser, $dbpass);

Irssi::print("Connecting to the database");

return DBI->connect("dbi:Pg:dbname=$dbname", $dbuser, $dbpass) || Irssi::print("Can't connect to db!" . DBI::errstr);
return DBI->connect("DBI:Pg:database=$dbname;host=$dbhost;port=$dbport", $dbuser, $dbpass) || Irssi::print("Can't connect to db!" . DBI::errstr);
}

sub write_db {
my ($nick, $message, $target) = @_;
my @vals;
my $date = strftime("%Y-%m-%d %H:%M:%S", localtime);
if (!exists $blacklist{$target}) {
my @vals;
my $date = strftime("%Y-%m-%d %H:%M:%S", localtime);

$dbh = connect_db() unless $dbh;
$dbh = connect_db() unless $dbh;

push(@vals, $date);
push(@vals, $nick);
push(@vals, $message);
push(@vals, $target);
push(@vals, $date);
push(@vals, $nick);
push(@vals, $message);
push(@vals, $target);

defined or $_ = "" for @vals;
defined or $_ = "" for @vals;

$dbh->do($sql, undef, @vals) || Irssi::print("Can't log to DB! " . DBI::errstr);
$dbh->do($sql, undef, @vals) || Irssi::print("Can't log to DB! " . DBI::errstr);
}
}

sub log_me {
Expand All @@ -125,11 +132,23 @@ sub log {
write_db($nick, $message, $target)
}

sub setup_changed {
%blacklist = map{$_ => undef} split /\s+/, Irssi::settings_get_str('il_blacklist');
}

Irssi::signal_add_last('message public', 'log');
Irssi::signal_add_last('message own_public', 'log_me');

Irssi::settings_add_str('irssi_logger', 'il_dbname', $user);
Irssi::settings_add_str('irssi_logger', 'il_dbuser', $user);
Irssi::settings_add_str('irssi_logger', 'il_dbpass', "");
Irssi::settings_add_str('irssi_logger', 'il_host', "127.0.0.1");
Irssi::settings_add_str('irssi_logger', 'il_port', "5432");
# a space separated list of channel names to exclude from logging
Irssi::settings_add_str('irssi_logger', 'il_blacklist', "");

Irssi::signal_add('setup changed' => 'setup_changed');


%blacklist = map{$_ => undef} split /\s+/, Irssi::settings_get_str('il_blacklist');
Irssi::print("irssi_logger loaded!");
Loading