Skip to content
This repository was archived by the owner on Oct 11, 2022. It is now read-only.

Commit c5b74c6

Browse files
brianlovinbrianlovin
authored
Merge pull request #4271 from withspectrum/2.4.71
2.4.71
2 parents 932ee95 + b8e917c commit c5b74c6

29 files changed

+212
-114
lines changed

‎cypress/integration/thread_spec.js‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,7 @@ describe('Thread View', () => {
170170
expect($p).to.have.length(3);
171171
});
172172
// the url should contain the message query param
173-
cy.url().should(
174-
'eq',
175-
`http://localhost:3000/thread/${thread.id}?m=MTQ4MzIyNTE5OTk5OQ==`
176-
);
173+
cy.url().should('contain', `${thread.id}?m=MTQ4MzIyNTE5OTk5OQ==`);
177174
});
178175
});
179176

@@ -204,10 +201,7 @@ describe('Thread View', () => {
204201
expect($p).to.have.length(3);
205202
});
206203
// the url should contain the message query param
207-
cy.url().should(
208-
'eq',
209-
`http://localhost:3000/thread/${thread.id}?m=MTQ4MzIyNTE5OTk5OQ==`
210-
);
204+
cy.url().should('contain', `?m=MTQ4MzIyNTE5OTk5OQ==`);
211205
});
212206
});
213207

@@ -240,7 +234,7 @@ describe('Thread View', () => {
240234
// the message should not be selected
241235
cy.get('[data-cy="message-selected"]').should('not.be.visible');
242236
// the url should not have changed
243-
cy.url().should('eq', `http://localhost:3000/thread/${thread.id}`);
237+
cy.url().should('not.contain', `?m`);
244238

245239
// unlike the message from the message action bar
246240
cy.get('[data-cy="unlike-action"]')
@@ -254,7 +248,7 @@ describe('Thread View', () => {
254248
expect($p).to.have.length(3);
255249
});
256250
// the url should not have changed
257-
cy.url().should('eq', `http://localhost:3000/thread/${thread.id}`);
251+
cy.url().should('not.contain', `?m`);
258252
});
259253

260254
it('should unlike a message from the inline reaction', () => {
@@ -274,7 +268,7 @@ describe('Thread View', () => {
274268
// no inline like buttons should be visible
275269
cy.get('[data-cy="inline-unlike-action"]').should('not.be.visible');
276270
// the url should not have changed
277-
cy.url().should('eq', `http://localhost:3000/thread/${thread.id}`);
271+
cy.url().should('not.contain', `?m`);
278272
});
279273

280274
it('should not allow user to like their own message from inline reaction', () => {

‎email-templates/mentionInMessage.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ <h3>{{data.thread.content.title}}</h3>
464464
<table cellpadding="0" cellspacing="0" class="reply-body">
465465
<tr width="100%" cellpadding="0" cellspacing="0">
466466
<td valign="middle">
467-
<a href="https://spectrum.chat/thread/{{data.thread.id}}" class="block">
467+
<a data-pm-no-track href="https://spectrum.chat/thread/{{data.thread.id}}" class="block">
468468
<p>{{data.message.content.body}}</p>
469469
</a>
470470
</td>
@@ -478,7 +478,7 @@ <h3>{{data.thread.content.title}}</h3>
478478
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions">
479479
<tr width="100%" cellpadding="0" cellspacing="0">
480480
<td valign="middle">
481-
<a href="https://spectrum.chat/thread/{{data.thread.id}}" class="button">
481+
<a data-pm-no-track href="https://spectrum.chat/thread/{{data.thread.id}}" class="button">
482482
View conversation
483483
</a>
484484
</td>

‎email-templates/mentionInThread.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@
429429
<table width="100%" cellpadding="0" cellspacing="0" class="thread-title">
430430
<tr width="100%" cellpadding="0" cellspacing="0">
431431
<td valign="middle">
432-
<a href="https://spectrum.chat/thread/{{data.thread.id}}" class="block">
432+
<a data-pm-no-track href="https://spectrum.chat/thread/{{data.thread.id}}" class="block">
433433
<h3>{{data.thread.content.title}}</h3>
434434
</a>
435435
</td>
@@ -441,7 +441,7 @@ <h3>{{data.thread.content.title}}</h3>
441441
<table width="100%" cellpadding="0" cellspacing="0" class="thread-body">
442442
<tr width="100%" cellpadding="0" cellspacing="0">
443443
<td valign="middle">
444-
<a href="https://spectrum.chat/thread/{{../id}}" class="block">
444+
<a data-pm-no-track href="https://spectrum.chat/thread/{{../id}}" class="block">
445445
<p>{{.}}</p>
446446
</a>
447447
</td>
@@ -452,7 +452,7 @@ <h3>{{data.thread.content.title}}</h3>
452452
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions">
453453
<tr width="100%" cellpadding="0" cellspacing="0">
454454
<td valign="middle">
455-
<a href="https://spectrum.chat/thread/{{data.thread.id}}" class="button">
455+
<a data-pm-no-track href="https://spectrum.chat/thread/{{data.thread.id}}" class="button">
456456
View conversation
457457
</a>
458458
</td>

‎email-templates/newDirectMessage.html‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
color: #7b16ff;
4040
font-weight: bold;
4141
text-decoration: none;
42-
43-
&:hover {
44-
text-decoration: underline;
45-
}
4642
}
4743

4844
a img {
@@ -245,11 +241,6 @@
245241
word-break: keep-all;
246242
white-space: nowrap;
247243
font-size: 16px;
248-
249-
&:hover {
250-
text-decoration: none;
251-
box-shadow: 0 8px 16px rgba(0, 0, 0, 0.15);
252-
}
253244
}
254245

255246
.button.feed {
@@ -420,7 +411,7 @@
420411
<table class="attributes post" width="100%" cellpadding="0" cellspacing="0">
421412
<tr>
422413
<td>
423-
<a href="https://spectrum.chat/{{thread.path}}"><h2 class="title">{{thread.content.title}}</h2></a>
414+
<a data-pm-no-track href="https://spectrum.chat/{{thread.path}}"><h2 class="title">{{thread.content.title}}</h2></a>
424415
</td>
425416
</tr>
426417

@@ -429,20 +420,20 @@
429420
<table>
430421
<tr>
431422
<td valign="top">
432-
<a href="https://spectrum.chat/{{thread.path}}">
423+
<a data-pm-no-track href="https://spectrum.chat/{{thread.path}}">
433424
<img class="avatar" src="{{user.profilePhoto}}" />
434425
</a>
435426
</td>
436427
<td>
437428
<table>
438429
<tr>
439430
<td>
440-
<a href="https://spectrum.chat/{{thread.path}}"><span class="name">{{user.name}}</span></a>
431+
<a data-pm-no-track href="https://spectrum.chat/{{thread.path}}"><span class="name">{{user.name}}</span></a>
441432
</td>
442433
</tr>
443434
<tr>
444435
<td>
445-
<a href="https://spectrum.chat/{{thread.path}}"><p class="reply">{{{message.content.body}}}</p></a>
436+
<a data-pm-no-track href="https://spectrum.chat/{{thread.path}}"><p class="reply">{{{message.content.body}}}</p></a>
446437
</td>
447438
</tr>
448439
</table>
@@ -454,7 +445,7 @@
454445

455446
<tr>
456447
<td>
457-
<a class="feed button" href="https://spectrum.chat/{{thread.path}}">Go to conversation</a>
448+
<a data-pm-no-track class="feed button" href="https://spectrum.chat/{{thread.path}}">Go to conversation</a>
458449
</td>
459450
</tr>
460451
</table>

‎email-templates/newRepliesInThreads.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@
494494
<table width="100%" cellpadding="0" cellspacing="0" class="thread-title">
495495
<tr width="100%" cellpadding="0" cellspacing="0">
496496
<td valign="middle">
497-
<a href="https://spectrum.chat/thread/{{id}}" class="block">
497+
<a data-pm-no-track href="https://spectrum.chat/thread/{{id}}" class="block">
498498
<h3>{{content.title}}</h3>
499499
</a>
500500
</td>
@@ -525,7 +525,7 @@ <h3>{{content.title}}</h3>
525525
<table cellpadding="0" cellspacing="0" class="reply-body">
526526
<tr width="100%" cellpadding="0" cellspacing="0">
527527
<td valign="middle">
528-
<a href="https://spectrum.chat/thread/{{../id}}" class="block">
528+
<a data-pm-no-track href="https://spectrum.chat/thread/{{../id}}" class="block">
529529
{{{content.body}}}
530530
</a>
531531
</td>
@@ -540,7 +540,7 @@ <h3>{{content.title}}</h3>
540540
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions multi">
541541
<tr width="100%" cellpadding="0" cellspacing="0">
542542
<td valign="middle">
543-
<a href="https://spectrum.chat/thread/{{id}}" class="button">
543+
<a data-pm-no-track href="https://spectrum.chat/thread/{{id}}" class="button">
544544
View conversation
545545
</a>
546546
</td>

‎email-templates/newThreadNotification.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@
429429
<table width="100%" cellpadding="0" cellspacing="0" class="thread-title">
430430
<tr width="100%" cellpadding="0" cellspacing="0">
431431
<td valign="middle">
432-
<a href="https://spectrum.chat/thread/{{data.thread.id}}" class="block">
432+
<a data-pm-no-track href="https://spectrum.chat/thread/{{data.thread.id}}" class="block">
433433
<h3>{{data.thread.content.title}}</h3>
434434
</a>
435435
</td>
@@ -441,7 +441,7 @@ <h3>{{data.thread.content.title}}</h3>
441441
<table width="100%" cellpadding="0" cellspacing="0" class="thread-body">
442442
<tr width="100%" cellpadding="0" cellspacing="0">
443443
<td valign="middle">
444-
<a href="https://spectrum.chat/thread/{{../../id}}" class="block">
444+
<a data-pm-no-track href="https://spectrum.chat/thread/{{../../id}}" class="block">
445445
<p>{{.}}</p>
446446
</a>
447447
</td>
@@ -452,7 +452,7 @@ <h3>{{data.thread.content.title}}</h3>
452452
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions">
453453
<tr width="100%" cellpadding="0" cellspacing="0">
454454
<td valign="middle">
455-
<a href="https://spectrum.chat/thread/{{data.thread.id}}" class="button">
455+
<a data-pm-no-track href="https://spectrum.chat/thread/{{data.thread.id}}" class="button">
456456
{{data.primaryActionLabel}}
457457
</a>
458458
</td>

‎email-templates/privateChannelRequestApproved.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
<!-- Body content -->
357357
<tr>
358358
<td class="content-cell">
359-
<p>Your request to join the <a href="https://spectrum.chat/{{data.community.slug}}/{{data.channel.slug}}">{{data.channel.name}} channel</a> in the <a href="https://spectrum.chat/{{data.community.slug}}">{{data.community.name}} community</a> was approved! You can now join any conversations happening in this channel.</p>
359+
<p>Your request to join the <a data-pm-no-track href="https://spectrum.chat/{{data.community.slug}}/{{data.channel.slug}}">{{data.channel.name}} channel</a> in the <a href="https://spectrum.chat/{{data.community.slug}}">{{data.community.name}} community</a> was approved! You can now join any conversations happening in this channel.</p>
360360
</td>
361361
</tr>
362362

@@ -365,7 +365,7 @@
365365
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions multi">
366366
<tr width="100%" cellpadding="0" cellspacing="0">
367367
<td valign="middle">
368-
<a href="https://spectrum.chat/{{data.community.slug}}/{{data.channel.slug}}" class="button">
368+
<a data-pm-no-track href="https://spectrum.chat/{{data.community.slug}}/{{data.channel.slug}}" class="button">
369369
View Channel
370370
</a>
371371
</td>

‎email-templates/privateChannelRequestSent.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions multi">
366366
<tr width="100%" cellpadding="0" cellspacing="0">
367367
<td valign="middle">
368-
<a href="https://spectrum.chat/{{data.community.slug}}/{{data.channel.slug}}/settings" class="button">
368+
<a data-pm-no-track href="https://spectrum.chat/{{data.community.slug}}/{{data.channel.slug}}/settings" class="button">
369369
Go to channel settings
370370
</a>
371371
</td>

‎email-templates/privateCommunityRequestApproved.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<!-- Body content -->
356356
<tr>
357357
<td class="content-cell">
358-
<p>Your request to join the <a href="https://spectrum.chat/{{data.community.slug}}">{{data.community.name}} community</a> was approved! You can now join any conversations happening in this community.</p>
358+
<p>Your request to join the <a data-pm-no-track href="https://spectrum.chat/{{data.community.slug}}">{{data.community.name}} community</a> was approved! You can now join any conversations happening in this community.</p>
359359
</td>
360360
</tr>
361361

@@ -364,7 +364,7 @@
364364
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions multi">
365365
<tr width="100%" cellpadding="0" cellspacing="0">
366366
<td valign="middle">
367-
<a href="https://spectrum.chat/{{data.community.slug}}" class="button">
367+
<a data-pm-no-track href="https://spectrum.chat/{{data.community.slug}}" class="button">
368368
View Community
369369
</a>
370370
</td>

‎email-templates/privateCommunityRequestSent.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
<!-- Body content -->
357357
<tr>
358358
<td class="content-cell">
359-
<p><a href="https://spectrum.chat/users/{{data.user.username}}">{{data.user.name}}</a> has requested to join the <a href="https://spectrum.chat/{{data.community.slug}}">{{data.community.name}} community</a>. You can approve or block this request in your community settings.</p>
359+
<p><a data-pm-no-track href="https://spectrum.chat/users/{{data.user.username}}">{{data.user.name}}</a> has requested to join the <a href="https://spectrum.chat/{{data.community.slug}}">{{data.community.name}} community</a>. You can approve or block this request in your community settings.</p>
360360
</td>
361361
</tr>
362362

@@ -365,7 +365,7 @@
365365
<table width="100%" cellpadding="0" cellspacing="0" class="thread-actions multi">
366366
<tr width="100%" cellpadding="0" cellspacing="0">
367367
<td valign="middle">
368-
<a href="https://spectrum.chat/{{data.community.slug}}/settings/members?filter=pending" class="button">
368+
<a data-pm-no-track href="https://spectrum.chat/{{data.community.slug}}/settings/members?filter=pending" class="button">
369369
Go to community settings
370370
</a>
371371
</td>

0 commit comments

Comments
 (0)