GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve linking of accounts

This commit is contained in:
Pragmatic Software 2016-08-25 01:41:32 -07:00
parent 6d0a548c26
commit ba6fb2c2d7
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PBot/AntiFlood.pm
View File

@ -299,8 +299,7 @@ sub check_flood {
if (defined $id) { if (defined $id) {
if ($id != $account) { if ($id != $account) {
$self->{pbot}->{logger}->log("Linking $mask [$id] to account $account\n"); $self->{pbot}->{logger}->log("Linking $mask [$id] to account $account\n");
$self->{pbot}->{messagehistory}->{database}->unlink_alias($account, $id); $self->{pbot}->{messagehistory}->{database}->link_alias($account, $id, $self->{pbot}->{messagehistory}->{database}->{alias_type}->{STRONG}, 1);
$self->{pbot}->{messagehistory}->{database}->link_alias($account, $id, $self->{pbot}->{messagehistory}->{database}->{alias_type}->{STRONG});
} else { } else {
$self->{pbot}->{logger}->log("New hostmask already belongs to original account.\n"); $self->{pbot}->{logger}->log("New hostmask already belongs to original account.\n");
} }

64
PBot/MessageHistory_SQLite.pm
View File

@ -1067,57 +1067,51 @@ sub link_aliases {
} }
} }
#my $sth = $self->{dbh}->prepare('REPLACE INTO Aliases (id, alias, type) VALUES (?, ?, ?)');
foreach my $id (sort keys %ids) { foreach my $id (sort keys %ids) {
next if $account == $id; next if $account == $id;
$self->link_alias($account, $id, $ids{$id}->{type}, $ids{$id}->{force});
if (exists $ids{$id}->{force}) {
$self->{pbot}->{logger}->log("Forcing link of $account and $id!\n");
$self->unlink_alias($account, $id);
}
$self->link_alias($account, $id, $ids{$id}->{type});
=cut
$sth->bind_param(1, $account);
$sth->bind_param(2, $id);
$sth->bind_param(3, $ids{$id}->{type});
$sth->execute();
if ($sth->rows) {
$self->{pbot}->{logger}->log("Linked $account to $id [$ids{$id}->{type}]\n") if $debug_link;
$self->{new_entries}++;
}
$sth->bind_param(1, $id);
$sth->bind_param(2, $account);
$sth->bind_param(3, $ids{$id}->{type});
$sth->execute();
if ($sth->rows) {
$self->{pbot}->{logger}->log("Linked $id to $account [$ids{$id}->{type}]\n") if $debug_link;
$self->{new_entries}++;
}
=cut
} }
}; };
$self->{pbot}->{logger}->log($@) if $@; $self->{pbot}->{logger}->log($@) if $@;
} }
sub link_alias { sub link_alias {
my ($self, $id, $alias, $type) = @_; my ($self, $id, $alias, $type, $force) = @_;
$self->{pbot}->{logger}->log("Attempting to " . ($type == $self->{alias_type}->{STRONG} ? "strongly" : "weakly") . " link $id to $alias\n"); $self->{pbot}->{logger}->log("Attempting to " . ($force ? "forcefully " : "") . ($type == $self->{alias_type}->{STRONG} ? "strongly" : "weakly") . " link $id to $alias\n");
my $ret = eval { my $ret = eval {
my $sth = $self->{dbh}->prepare('SELECT * FROM Aliases WHERE id = ? AND alias = ? LIMIT 1'); my $sth = $self->{dbh}->prepare('SELECT type FROM Aliases WHERE id = ? AND alias = ? LIMIT 1');
$sth->bind_param(1, $alias); $sth->bind_param(1, $alias);
$sth->bind_param(2, $id); $sth->bind_param(2, $id);
$sth->execute(); $sth->execute();
my $row = $sth->fetchrow_hashref(); my $row = $sth->fetchrow_hashref();
if (defined $row) { if (defined $row) {
$self->{pbot}->{logger}->log("$id already " . ($row->{'type'} == $self->{alias_type}->{STRONG} ? "strongly" : "weakly") . " linked to $alias, ignoring\n"); if ($force) {
return 0; if ($row->{'type'} != $type) {
$self->{pbot}->{logger}->log("$id already " . ($row->{'type'} == $self->{alias_type}->{STRONG} ? "strongly" : "weakly") . " linked to $alias, forcing override\n");
$sth = $self->{dbh}->prepare('UPDATE Aliases SET type = ? WHERE alias = ? AND id = ?');
$sth->bind_param(1, $type);
$sth->bind_param(2, $id);
$sth->bind_param(3, $alias);
$sth->execute();
$sth->bind_param(2, $alias);
$sth->bind_param(3, $id);
$sth->execute();
return 1;
} else {
$self->{pbot}->{logger}->log("$id already " . ($row->{'type'} == $self->{alias_type}->{STRONG} ? "strongly" : "weakly") . " linked to $alias, ignoring\n");
return 0;
}
} else {
$self->{pbot}->{logger}->log("$id already " . ($row->{'type'} == $self->{alias_type}->{STRONG} ? "strongly" : "weakly") . " linked to $alias, ignoring\n");
return 0;
}
} }
$sth = $self->{dbh}->prepare('INSERT INTO Aliases VALUES (?, ?, ?)'); $sth = $self->{dbh}->prepare('INSERT INTO Aliases VALUES (?, ?, ?)');
@ -1130,10 +1124,10 @@ sub link_alias {
$sth->bind_param(2, $alias); $sth->bind_param(2, $alias);
$sth->execute(); $sth->execute();
$self->{pbot}->{logger}->log("Linked.\n");
return 1; return 1;
}; };
$self->{pbot}->{logger}->log($@) if $@; $self->{pbot}->{logger}->log($@) if $@;
$self->{pbot}->{logger}->log("Linked.\n") if $ret;
return $ret; return $ret;
} }