1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
|
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This Source Code Form is "Incompatible With Secondary Licenses", as
# defined by the Mozilla Public License, v. 2.0.
package Bugzilla::Extension::BugModal::ActivityStream;
1;
package Bugzilla::Bug;
use strict;
use warnings;
use Bugzilla::Extension::BugModal::Util qw(date_str_to_time);
use Bugzilla::User;
use Bugzilla::Constants;
# returns an arrayref containing all changes to the bug - comments, field
# changes, and duplicates
# [
# {
# time => $unix_timestamp,
# user_id => actor user-id
# comment => optional, comment added
# id => unique identifier for this change-set
# cc_only => boolean
# activty => [
# {
# who => user object
# when => time (string)
# cc_only => boolean
# changes => [
# {
# fieldname => field name :)
# added => string
# removed => string
# }
# ...
# ]
# }
# ...
# ]
# },
# ...
# ]
sub activity_stream {
my ($self) = @_;
if (!$self->{activity_stream}) {
my $stream = [];
_add_comments_to_stream($self, $stream);
_add_activities_to_stream($self, $stream);
_add_duplicates_to_stream($self, $stream);
my $base_time = date_str_to_time($self->creation_ts);
foreach my $change_set (@$stream) {
$change_set->{id} = $change_set->{comment}
? 'c' . $change_set->{comment}->count
: 'a' . ($change_set->{time} - $base_time) . '_' . $change_set->{user_id};
foreach my $activity (@{ $change_set->{activity} }) {
$activity->{changes} = [
sort { $a->{fieldname} cmp $b->{fieldname} }
@{ $activity->{changes} }
];
}
}
my $order = Bugzilla->user->setting('comment_sort_order');
if ($order eq 'oldest_to_newest') {
$self->{activity_stream} = [ sort { $a->{time} <=> $b->{time} } @$stream ];
}
elsif ($order eq 'newest_to_oldest') {
$self->{activity_stream} = [ sort { $b->{time} <=> $a->{time} } @$stream ];
}
elsif ($order eq 'newest_to_oldest_desc_first') {
my $desc = shift @$stream;
$self->{activity_stream} = [ $desc, sort { $b->{time} <=> $a->{time} } @$stream ];
}
}
return $self->{activity_stream};
}
# comments are processed first, so there's no need to merge into existing entries
sub _add_comment_to_stream {
my ($stream, $time, $user_id, $comment) = @_;
push @$stream, {
time => $time,
user_id => $user_id,
comment => $comment,
activity => [],
};
}
sub _add_activity_to_stream {
my ($stream, $time, $user_id, $data) = @_;
foreach my $entry (@$stream) {
next unless $entry->{time} == $time && $entry->{user_id} == $user_id;
$entry->{cc_only} = $entry->{cc_only} && $data->{cc_only};
push @{ $entry->{activity} }, $data;
return;
}
push @$stream, {
time => $time,
user_id => $user_id,
comment => undef,
cc_only => $data->{cc_only},
activity => [ $data ],
};
}
sub _add_comments_to_stream {
my ($bug, $stream) = @_;
my $user = Bugzilla->user;
my $treeherder_id = Bugzilla->treeherder_user->id;
my $raw_comments = $bug->comments();
foreach my $comment (@$raw_comments) {
next if $comment->type == CMT_HAS_DUPE;
my $author_id = $comment->author->id;
next if $comment->is_private && !($user->is_insider || $user->id == $author_id);
next if $comment->body eq '' && ($comment->work_time - 0) != 0 && !$user->is_timetracker;
# treeherder is so spammy we hide its comments by default
if ($author_id == $treeherder_id) {
$comment->{collapsed} = 1;
$comment->{collapsed_reason} = $comment->author->name;
}
_add_comment_to_stream($stream, date_str_to_time($comment->creation_ts), $comment->author->id, $comment);
}
}
sub _add_activities_to_stream {
my ($bug, $stream) = @_;
my $dbh = Bugzilla->dbh;
my $user = Bugzilla->user;
# build bug activity
my ($raw_activity) = $bug->can('get_activity')
? $bug->get_activity()
: Bugzilla::Bug::GetBugActivity($bug->id);
# allow other extensions to alter history
Bugzilla::Hook::process('inline_history_activitiy', { activity => $raw_activity });
my %attachment_cache;
foreach my $attachment (@{$bug->attachments}) {
$attachment_cache{$attachment->id} = $attachment;
}
# build a list of bugs we need to check visibility of, so we can check with a single query
my %visible_bug_ids;
# envelope, augment and tweak
foreach my $operation (@$raw_activity) {
# make operation.who an object
$operation->{who} = Bugzilla::User->new({ name => $operation->{who}, cache => 1 });
# we need to track operations which are just cc changes
$operation->{cc_only} = 1;
for (my $i = 0; $i < scalar(@{$operation->{changes}}); $i++) {
my $change = $operation->{changes}->[$i];
# make an attachment object
if ($change->{attachid}) {
$change->{attach} = $attachment_cache{$change->{attachid}};
}
# empty resolutions are displayed as --- by default
# make it explicit here to enable correct display of the change
if ($change->{fieldname} eq 'resolution') {
$change->{removed} = '---' if $change->{removed} eq '';
$change->{added} = '---' if $change->{added} eq '';
}
# make boolean fields true/false instead of 1/0
my ($table, $field) = ('bugs', $change->{fieldname});
if ($field =~ /^([^\.]+)\.(.+)$/) {
($table, $field) = ($1, $2);
}
my $column = $dbh->bz_column_info($table, $field);
if ($column && $column->{TYPE} eq 'BOOLEAN') {
$change->{removed} = '';
$change->{added} = $change->{added} ? 'true' : 'false';
}
# load field object (only required for custom fields), and set the
# field type for custom fields
my $field_obj;
if ($change->{fieldname} =~ /^cf_/) {
$field_obj = Bugzilla::Field->new({ name => $change->{fieldname}, cache => 1 });
$change->{fieldtype} = $field_obj->type;
}
# identify buglist changes
if ($change->{fieldname} eq 'blocked' ||
$change->{fieldname} eq 'dependson' ||
$change->{fieldname} eq 'dupe' ||
($field_obj && $field_obj->type == FIELD_TYPE_BUG_ID)
) {
$change->{buglist} = 1;
foreach my $what (qw(removed added)) {
my @buglist = split(/[\s,]+/, $change->{$what});
foreach my $id (@buglist) {
if ($id && $id =~ /^\d+$/) {
$visible_bug_ids{$id} = 1;
}
}
}
}
# split see-also
if ($change->{fieldname} eq 'see_also') {
my $url_base = correct_urlbase();
foreach my $f (qw( added removed )) {
my @values;
foreach my $value (split(/, /, $change->{$f})) {
my ($bug_id) = substr($value, 0, length($url_base)) eq $url_base
? $value =~ /id=(\d+)$/
: undef;
push @values, {
url => $value,
bug_id => $bug_id,
};
}
$change->{$f} = \@values;
}
}
# split multiple flag changes (must be processed last)
if ($change->{fieldname} eq 'flagtypes.name') {
my @added = split(/, /, $change->{added});
my @removed = split(/, /, $change->{removed});
next if scalar(@added) <= 1 && scalar(@removed) <= 1;
# remove current change
splice(@{$operation->{changes}}, $i, 1);
# restructure into added/removed for each flag
my %flags;
foreach my $added (@added) {
my ($value, $name) = $added =~ /^((.+).)$/;
$flags{$name}{added} = $value;
$flags{$name}{removed} |= '';
}
foreach my $removed (@removed) {
my ($value, $name) = $removed =~ /^((.+).)$/;
$flags{$name}{added} |= '';
$flags{$name}{removed} = $value;
}
# clone current change, modify and insert
foreach my $flag (sort keys %flags) {
my $flag_change = {};
foreach my $key (keys %$change) {
$flag_change->{$key} = $change->{$key};
}
$flag_change->{removed} = $flags{$flag}{removed};
$flag_change->{added} = $flags{$flag}{added};
splice(@{$operation->{changes}}, $i, 0, $flag_change);
}
$i--;
}
# track cc-only
if ($change->{fieldname} ne 'cc') {
$operation->{cc_only} = 0;
}
}
_add_activity_to_stream($stream, date_str_to_time($operation->{when}), $operation->{who}->id, $operation);
}
# prime the visible-bugs cache
$user->visible_bugs([keys %visible_bug_ids]);
}
# display 'duplicate of this bug' as an activity entry, not a comment
sub _add_duplicates_to_stream {
my ($bug, $stream) = @_;
my $dbh = Bugzilla->dbh;
my $sth = $dbh->prepare("
SELECT longdescs.who,
UNIX_TIMESTAMP(bug_when), " .
$dbh->sql_date_format('bug_when') . ",
extra_data
FROM longdescs
INNER JOIN profiles ON profiles.userid = longdescs.who
WHERE bug_id = ? AND type = ?
ORDER BY bug_when
");
$sth->execute($bug->id, CMT_HAS_DUPE);
while (my($who, $time, $when, $dupe_id) = $sth->fetchrow_array) {
_add_activity_to_stream($stream, $time, $who, {
who => Bugzilla::User->new({ id => $who, cache => 1 }),
when => $when,
changes => [{
fieldname => 'duplicate',
added => $dupe_id,
buglist => 1,
}],
});
}
}
1;
|