mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Remove a remote config flag

Browse source
This commit is contained in:
Fedor Indutny 2024-06-20 14:39:40 -04:00 • committed by GitHub
parent 8c555a9b28
commit 5d3de4ed5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/util/getTitle.ts
View file

@ -9,7 +9,6 @@ import { combineNames } from './combineNames';
import { getRegionCodeForNumber } from './libphonenumberUtil';
import { isDirectConversation } from './whatTypeOfConversation';
import { getE164 } from './getE164';
import { areNicknamesEnabled } from './nicknames';
type TitleOptions = {
isShort?: boolean;
@ -42,7 +41,7 @@ export function getTitleNoDefault(
const { username } = attributes;
let nicknameValue: string | undefined;
if (areNicknamesEnabled() && !ignoreNickname) {
if (!ignoreNickname) {
nicknameValue =
(isShort ? attributes.nicknameGivenName : undefined) ||
getNicknameName(attributes);
@ -114,10 +113,6 @@ export function getNicknameName(
'nicknameGivenName' | 'nicknameFamilyName' | 'type'
>
): string | undefined {
if (!areNicknamesEnabled()) {
return undefined;
}
if (isDirectConversation(attributes)) {
return combineNames(
attributes.nicknameGivenName ?? undefined,