Skip to content

Commit e887323

Browse files
chrisbobbegnprice
authored andcommitted
internalLinks [nfc]: Rename getMessageIdFromLink to getNearOperandFromLink
1 parent 430be25 commit e887323

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/message/messagesActions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import * as NavigationService from '../nav/NavigationService';
33
import type { Narrow, ThunkAction } from '../types';
44
import { getAuth } from '../selectors';
5-
import { getMessageIdFromLink, getNarrowFromLink } from '../utils/internalLinks';
5+
import { getNearOperandFromLink, getNarrowFromLink } from '../utils/internalLinks';
66
import { openLinkWithUserPreference } from '../utils/openLink';
77
import { navigateToChat } from '../nav/navActions';
88
import { FIRST_UNREAD_ANCHOR } from '../anchor';
@@ -37,8 +37,8 @@ export const messageLinkPress =
3737
// which should be futile.
3838
if (narrow) {
3939
// This call is OK: `narrow` is truthy, so isNarrowLink(…) was true.
40-
const anchor = getMessageIdFromLink(href, auth.realm);
41-
dispatch(doNarrow(narrow, anchor));
40+
const nearOperand = getNearOperandFromLink(href, auth.realm);
41+
dispatch(doNarrow(narrow, nearOperand));
4242
} else if (!isUrlOnRealm(href, auth.realm)) {
4343
openLinkWithUserPreference(href, getGlobalSettings());
4444
} else {

src/utils/__tests__/internalLinks-test.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
isNarrowLink,
77
getLinkType,
88
getNarrowFromLink,
9-
getMessageIdFromLink,
9+
getNearOperandFromLink,
1010
decodeHashComponent,
1111
} from '../internalLinks';
1212
import * as eg from '../../__tests__/lib/exampleData';
@@ -418,25 +418,25 @@ describe('getNarrowFromLink', () => {
418418
});
419419
});
420420

421-
describe('getMessageIdFromLink', () => {
421+
describe('getNearOperandFromLink', () => {
422422
test('not message link', () => {
423-
expect(getMessageIdFromLink('https://example.com/#narrow/is/private', realm)).toBe(0);
424-
expect(getMessageIdFromLink('https://example.com/#narrow/stream/jest', realm)).toBe(0);
423+
expect(getNearOperandFromLink('https://example.com/#narrow/is/private', realm)).toBe(0);
424+
expect(getNearOperandFromLink('https://example.com/#narrow/stream/jest', realm)).toBe(0);
425425
});
426426

427427
test('`near` is the only operator', () => {
428-
expect(getMessageIdFromLink('https://example.com/#narrow/near/1', realm)).toBe(1);
428+
expect(getNearOperandFromLink('https://example.com/#narrow/near/1', realm)).toBe(1);
429429
});
430430

431431
test('when link is a group link, return anchor message id', () => {
432432
expect(
433-
getMessageIdFromLink('https://example.com/#narrow/pm-with/1,3-group/near/1/', realm),
433+
getNearOperandFromLink('https://example.com/#narrow/pm-with/1,3-group/near/1/', realm),
434434
).toBe(1);
435435
});
436436

437437
test('when link is a topic link, return anchor message id', () => {
438438
expect(
439-
getMessageIdFromLink('https://example.com/#narrow/stream/jest/topic/test/near/1', realm),
439+
getNearOperandFromLink('https://example.com/#narrow/stream/jest/topic/test/near/1', realm),
440440
).toBe(1);
441441
});
442442
});

src/utils/internalLinks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ export const getNarrowFromLink = (
233233
* millisecond. Avoid using in a context where it might be called more than
234234
* 10 or 100 times per user action.
235235
*/
236-
export const getMessageIdFromLink = (url: string, realm: URL): number => {
236+
export const getNearOperandFromLink = (url: string, realm: URL): number => {
237237
// isNarrowLink(…) is true, by jsdoc, so this call is OK.
238238
const hashSegments = getHashSegmentsFromNarrowLink(url, realm);
239239

0 commit comments

Comments
 (0)