binmode STDERR, ':utf8';
use utf8;
-# TODO:
-# - detect moves between groups
-
require '../include/config.pm';
my $dbh;
sub format_cell_names_for_seen {
my $seen = shift;
- my @cells = map { chr(ord('A') + $_->[2]) . $_->[1] } @$seen;
+ my @cells = map { chr(ord('A') + $_->[2]) . ($_->[1] + 1) } @$seen;
return join(', ', @cells);
}
die $response->decoded_content if !$response->is_success;
}
+sub get_group_assignments {
+ my $json = shift;
+
+ my %assignments = ();
+ my $rows = $json->{'sheets'}[0]{'data'}[0]{'rowData'};
+ my @curr_groups = ();
+ for my $row (@$rows) {
+ my $col = 0;
+ for my $val (@{$row->{'values'}}) {
+ ++$col;
+ my $contents = $val->{'userEnteredValue'}{'stringValue'};
+ next if !defined($contents);
+ if ($contents =~ /Gruppe /) {
+ @curr_groups = ();
+ last;
+ }
+ next if $contents =~ /^VL:/;
+ next if $contents =~ /^LT\b/;
+ next if $contents =~ /^400m/;
+ next if $contents =~ /^546m/;
+ if ($contents =~ /^(G\d\.\d)/ || $contents =~ /^(Nye løpere.*)/) {
+ $curr_groups[$col] = $1;
+ } else {
+ my $name = get_spreadsheet_name($val);
+ next if (!defined($name));
+ my $group = $curr_groups[$col] // $curr_groups[$col - 1];
+ # print $group, " ", $name, "\n";
+ if (exists($assignments{$name})) {
+ $assignments{$name} = "(flere grupper)";
+ } else {
+ $assignments{$name} = $group;
+ }
+ }
+ }
+ }
+ return %assignments;
+}
+
+sub update_assignment_db {
+ my ($dbh, $channel, $ts, $assignments) = @_;
+
+ local $dbh->{AutoCommit} = 0;
+ my %db_assignments = ();
+ my $q = $dbh->prepare('SELECT name,group_name FROM current_group_membership_history WHERE channel=? AND ts=?');
+ $q->execute($channel, $ts);
+ while (my $ref = $q->fetchrow_hashref) {
+ if (defined($ref->{'group_name'})) {
+ $db_assignments{$ref->{'name'}} = $ref->{'group_name'};
+ }
+ }
+
+ $q = $dbh->prepare('INSERT INTO group_membership_history (channel, ts, name, change_seen, group_name) VALUES (?, ?, ?, CURRENT_TIMESTAMP, ?)');
+ for my $name (keys %$assignments) {
+ if (!exists($db_assignments{$name}) || $db_assignments{$name} ne $assignments->{$name}) {
+ $q->execute($channel, $ts, $name, $assignments->{$name});
+ }
+ }
+ for my $name (keys %db_assignments) {
+ if (!exists($assignments->{$name})) {
+ $q->execute($channel, $ts, $name, undef);
+ }
+ }
+ $dbh->commit;
+}
+
sub get_spreadsheet_with_title {
my ($ua, $token, $wanted_sheet_title) = @_;
return @recent_changes;
}
+sub create_move_log {
+ my ($dbh, $invitation_ts, $prev_invitation_ts) = @_;
+ my $q = $dbh->prepare(<<"EOF");
+SELECT
+ name, g_old.group_name as old_group, g_new.group_name as new_group, TO_CHAR(g_new.change_seen, \'YYYY-mm-dd HH24:MI\') AS change_seen
+FROM ( SELECT * FROM current_group_membership_history WHERE ts=? ) g_old
+ FULL OUTER JOIN ( SELECT * FROM current_group_membership_history WHERE ts=? ) g_new USING (name)
+WHERE
+ g_new.group_name IS DISTINCT FROM g_old.group_name
+ AND g_new.group_name IS NOT NULL
+ORDER BY g_new.change_seen DESC, name
+LIMIT 50
+EOF
+ $q->execute($prev_invitation_ts, $invitation_ts);
+ my @recent_moves = ();
+ while (my $ref = $q->fetchrow_hashref) {
+ my $name = $ref->{'name'};
+ my $old_group = $ref->{'old_group'};
+ my $new_group = $ref->{'new_group'};
+
+ my $msg = $ref->{'change_seen'} . " ";
+ if (!defined($old_group)) {
+ $msg .= "$name, (ny løper) → $new_group";
+ } else {
+ $msg .= "$name, $old_group → $new_group";
+ }
+ push @recent_moves, { values => [{ userEnteredValue => { stringValue => $msg } }] };
+ }
+ while (scalar @recent_moves < 50) {
+ push @recent_moves, { values => [{ userEnteredValue => { stringValue => '' } }] };
+ }
+ return @recent_moves;
+}
+
# Also applies the diff to the database (a bit ugly).
sub find_diff {
my ($dbh, $invitation_ts, $want_colors, $have_colors, $seen_names) = @_;
if (!exists($seen_names->{lc $real_name})) {
# TODO: This can somehow come if we try to add someone who's not in the sheet, too?
skv_log("Ønsket å fjerne at $real_name skulle på trening, men de var ikke i regnearket lenger.");
+ } elsif (scalar @{$seen_names->{lc $real_name}} > 1) {
+ # Don't touch them.
} else {
skv_log("Fjerner at $real_name skal på trening.");
push @diffs, [
return;
}
+ my $msg = "Hei! Du meldte deg akkurat på trening, men vi klarer ikke å finne deg i en gruppe i regnearket. For at det skal være enklere for trenerne, ønsker vi gjerne at du går inn på https://regneark.skvidar.run/ og skriver deg inn der med samme navn som du bruker på Slack. Om du er usikker på hvilken gruppe som passer for deg, ta gjerne kontakt med en trener. Velkommen på trening og til klubben!";
+
skv_log("Sender melding til $userid for å spørre om gruppe.");
+ my $content = {
+ channel => $config::invitation_channel,
+ user => $userid,
+ text => $msg
+ };
my $response = $ua->post(
- 'https://slack.com/api/conversations.open',
- Content => JSON::XS::encode_json({ users => [ $userid ] }),
+ 'https://slack.com/api/chat.postEphemeral',
+ Content => JSON::XS::encode_json($content),
Content_type => 'application/json;charset=UTF-8',
Authorization => 'Bearer ' . $config::slack_oauth_token
);
die $response->status_line if !$response->is_success;
-
- my $im_json = JSON::XS::decode_json($response->decoded_content);
- die "Something went wrong: " . $response->decoded_content if (!defined($im_json) || !$im_json->{'ok'});
- my $channel_id = $im_json->{'channel'}{'id'};
-
- my $msg = "Hei! Du meldte deg akkurat på trening, men vi klarer ikke å finne deg i en gruppe i regnearket. For at det skal være enklere for trenerne, ønsker vi gjerne at du går inn på https://regneark.skvidar.run/ og skriver deg inn der med samme navn som du bruker på Slack. Om du er usikker på hvilken gruppe som passer for deg, ta gjerne kontakt med en trener. Velkommen på trening og til klubben!";
-
- $response = $ua->post(
- 'https://slack.com/api/chat.postMessage',
- Content => JSON::XS::encode_json({ channel => $channel_id, text => $msg }),
- Content_type => 'application/json;charset=UTF-8',
- Authorization => 'Bearer ' . $config::slack_oauth_token
- );
my $msg_json = JSON::XS::decode_json($response->decoded_content);
die "Something went wrong: " . $response->decoded_content if (!defined($msg_json) || !$msg_json->{'ok'});
my $ua = LWP::UserAgent->new('SKVidarLang/1.0');
my $token = get_oauth_bearer_token($ua);
- # Find the newest message, and what it is linked to.
+ # Find the newest message, what it is linked to, and what was the one before it (for group diffing).
# TODO: Support more than one, and test better for errors here.
- my $q = $dbh->prepare('select * from message_sheet_link where channel=? order by ts desc limit 1');
+ my $q = $dbh->prepare('select * from message_sheet_link where channel=? order by ts desc limit 2');
$q->execute($config::invitation_channel);
my $linkref = $q->fetchrow_hashref;
my $invitation_ts = $linkref->{'ts'};
my ($tab_name, $tab_id) = get_spreadsheet_with_title($ua, $token, $wanted_sheet_title);
if (!defined($tab_name)) {
- skv_log("Fant ikke noen fane med “$wanted_sheet_title” i navnet; kan ikke synkronisere.\n");
+ skv_log("Fant ikke noen fane med «$wanted_sheet_title» i navnet; kan ikke synkronisere.\n");
sheet_batch_update($ua, $token, [ serialize_skv_log_to_sheet() ]);
die;
}
+ # Store away the second-newest ID.
+ my $prev_invitation_ts = $q->fetchrow_hashref->{'ts'};
+
# Find everyone who are marked as attending on Slack (via reactions).
$q = $dbh->prepare('SELECT DISTINCT userid,reaction FROM current_reactions WHERE channel=? AND ts=? AND reaction IN (\'heart\', \'open_mouth\', \'blue_heart\')');
$q->execute($config::invitation_channel, $invitation_ts);
);
my $main_sheet_json = JSON::XS::decode_json($response->decoded_content);
+ # Update the list of groups we've seen people in.
+ my %assignments = get_group_assignments($main_sheet_json);
+ update_assignment_db($dbh, $config::invitation_channel, $invitation_ts, \%assignments);
+
my %seen_names = find_where_each_name_is($main_sheet_json);
# Find duplicates.
for my $diff (@diffs) {
my $real_name = $diff->[0];
- # See if we can find them in the spreadsheet.
my $seen = $seen_names{lc $real_name};
- die if (!defined($seen) || scalar @$seen > 1);
+
+ # We've already complained about these earlier, so just skip them silently.
+ next if (scalar @$seen > 1);
+
+ # See if we can find them in the spreadsheet.
+ die "Could not find $real_name" if (!defined($seen));
my $rowno = $seen->[0][1];
my $colno = $seen->[0][2];
push @yellow_updates, {
}
};
+ my @recent_moves = create_move_log($dbh, $invitation_ts, $prev_invitation_ts);
+ push @yellow_updates, {
+ updateCells => {
+ rows => \@recent_moves,
+ fields => 'userEnteredValue.stringValue',
+ range => {
+ sheetId => $config::log_tab_id,
+ startRowIndex => 4,
+ endRowIndex => 4 + scalar @recent_moves,
+ startColumnIndex => 1,
+ endColumnIndex => 2
+ }
+ }
+ };
+
# Push the final set of updates (including the log).
skv_log("Ferdig.");
push @yellow_updates, serialize_skv_log_to_sheet();
projects / skvidarsync / blobdiff