fix: always use english name for recently contacted category #54736

kesselb · 2025-08-29T11:20:49Z

Resolves: Contacts interactions integration: Translated category leads to weird state when a user changed the language contacts#4663

Summary

Grouping in contacts is done by the categories property and therefore it's not ideal to translate it.
See nextcloud/contacts#4663 for additional context and steps to reproduce.

TODO

Review

Helper script to generate recent contacts

<?php

$pdo = new \PDO('pgsql:host=postgres;port=5432;dbname=server', 'postgres', 'postgres');
$pdo->beginTransaction();

$delete = $pdo->prepare("delete from oc_recent_contact where actor_uid = 'bob' and email ilike '%@example.org';");
$delete->execute();

$insert = $pdo->prepare('INSERT INTO oc_recent_contact (actor_uid, uid, email, federated_cloud_id, card, last_contact) VALUES (?,?,?,?,?,?)');
for ($i = 0; $i < 49000; $i++) {
	if ($i % 2 === 0) {
		$category = 'Zuletzt kontaktiert';
	} else {
		$category = 'Recently contacted';
	}

	$card = sprintf('BEGIN:VCARD
VERSION:4.0
PRODID:-//Blub Blub//EN
UID:recent-contact-%1$s
URI:recent-contact-%1$s
FN:test+%[email protected]
CATEGORIES:%2$s
EMAIL:test+%[email protected]
END:VCARD
', $i, $category);

	$insert->execute(['bob', null, 'test+' . $i . '@example.org', null, $card, time()]);
}

$pdo->commit();

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

apps/contactsinteraction/appinfo/info.xml

github-actions · 2025-09-10T12:45:52Z

Possible performance regression detected

Show Output

An unhandled exception has been thrown:
TypeError: array_map(): Argument #2 ($array) must be of type array, null given in /home/runner/work/server/server/apps/profiler/lib/Command/Compare.php:35
Stack trace:
#0 /home/runner/work/server/server/apps/profiler/lib/Command/Compare.php(35): array_map()
#1 /home/runner/work/server/server/3rdparty/symfony/console/Command/Command.php(326): OCAProfilerCommandCompare->execute()
#2 /home/runner/work/server/server/core/Command/Base.php(218): SymfonyComponentConsoleCommandCommand->run()
#3 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(1078): OCCoreCommandBase->run()
#4 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(324): SymfonyComponentConsoleApplication->doRunCommand()
#5 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(175): SymfonyComponentConsoleApplication->doRun()
#6 /home/runner/work/server/server/lib/private/Console/Application.php(187): SymfonyComponentConsoleApplication->run()
#7 /home/runner/work/server/server/console.php(91): OCConsoleApplication->run()
#8 /home/runner/work/server/server/occ(33): require_once('...')
#9 {main}

github-actions · 2025-09-10T13:44:03Z

Possible performance regression detected

Show Output

An unhandled exception has been thrown:
TypeError: array_map(): Argument #2 ($array) must be of type array, null given in /home/runner/work/server/server/apps/profiler/lib/Command/Compare.php:35
Stack trace:
#0 /home/runner/work/server/server/apps/profiler/lib/Command/Compare.php(35): array_map()
#1 /home/runner/work/server/server/3rdparty/symfony/console/Command/Command.php(326): OCAProfilerCommandCompare->execute()
#2 /home/runner/work/server/server/core/Command/Base.php(218): SymfonyComponentConsoleCommandCommand->run()
#3 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(1078): OCCoreCommandBase->run()
#4 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(324): SymfonyComponentConsoleApplication->doRunCommand()
#5 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(175): SymfonyComponentConsoleApplication->doRun()
#6 /home/runner/work/server/server/lib/private/Console/Application.php(187): SymfonyComponentConsoleApplication->run()
#7 /home/runner/work/server/server/console.php(91): OCConsoleApplication->run()
#8 /home/runner/work/server/server/occ(33): require_once('...')
#9 {main}

github-actions · 2025-09-10T13:46:07Z

Possible performance regression detected

Show Output

An unhandled exception has been thrown:
TypeError: array_map(): Argument #2 ($array) must be of type array, null given in /home/runner/work/server/server/apps/profiler/lib/Command/Compare.php:35
Stack trace:
#0 /home/runner/work/server/server/apps/profiler/lib/Command/Compare.php(35): array_map()
#1 /home/runner/work/server/server/3rdparty/symfony/console/Command/Command.php(326): OCAProfilerCommandCompare->execute()
#2 /home/runner/work/server/server/core/Command/Base.php(218): SymfonyComponentConsoleCommandCommand->run()
#3 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(1078): OCCoreCommandBase->run()
#4 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(324): SymfonyComponentConsoleApplication->doRunCommand()
#5 /home/runner/work/server/server/3rdparty/symfony/console/Application.php(175): SymfonyComponentConsoleApplication->doRun()
#6 /home/runner/work/server/server/lib/private/Console/Application.php(187): SymfonyComponentConsoleApplication->run()
#7 /home/runner/work/server/server/console.php(91): OCConsoleApplication->run()
#8 /home/runner/work/server/server/occ(33): require_once('...')
#9 {main}

github-actions · 2025-09-10T14:09:43Z

Possible performance regression detected

Show Output

An unhandled exception has been thrown:
TypeError: array_map(): Argument #2 ($array) must be of type array, null given in /home/runner/actions-runner/_work/server/server/apps/profiler/lib/Command/Compare.php:35
Stack trace:
#0 /home/runner/actions-runner/_work/server/server/apps/profiler/lib/Command/Compare.php(35): array_map()
#1 /home/runner/actions-runner/_work/server/server/3rdparty/symfony/console/Command/Command.php(326): OCAProfilerCommandCompare->execute()
#2 /home/runner/actions-runner/_work/server/server/core/Command/Base.php(218): SymfonyComponentConsoleCommandCommand->run()
#3 /home/runner/actions-runner/_work/server/server/3rdparty/symfony/console/Application.php(1078): OCCoreCommandBase->run()
#4 /home/runner/actions-runner/_work/server/server/3rdparty/symfony/console/Application.php(324): SymfonyComponentConsoleApplication->doRunCommand()
#5 /home/runner/actions-runner/_work/server/server/3rdparty/symfony/console/Application.php(175): SymfonyComponentConsoleApplication->doRun()
#6 /home/runner/actions-runner/_work/server/server/lib/private/Console/Application.php(187): SymfonyComponentConsoleApplication->run()
#7 /home/runner/actions-runner/_work/server/server/console.php(91): OCConsoleApplication->run()
#8 /home/runner/actions-runner/_work/server/server/occ(33): require_once('...')
#9 {main}

ChristophWurst

👏 for a live migration without downtime
👏 for using a transaction for fast throughput

kesselb · 2025-09-11T13:28:09Z

/backport to stable32

kesselb · 2025-09-11T13:28:12Z

/backport to stable31

provokateurin · 2025-09-12T06:51:01Z

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

 			'URI' => UUIDUtil::getUUID(),
 			'FN' => $this->getDisplayName($contact->getUid()) ?? $contact->getEmail() ?? $contact->getFederatedCloudId(),
-			'CATEGORIES' => $this->l10n->t('Recently contacted'),
+			'CATEGORIES' => 'Recently contacted',


Maybe add a comment here that this should not be translated. Otherwise someone finds it in the future and makes it translated again.

SebastianKrupinski

Tested. Works.

My only comment was going to be that if this is a one time thing, we could just do a regex, string replacement, as the structure is generated by us and is very predicable.

UPDATE vcards
SET vcard_data = REGEXP_REPLACE(
    vcard_data,
    'CATEGORIES:[^\r\n]*',
    'CATEGORIES:Recent Contact'
)
WHERE vcard_data REGEXP 'CATEGORIES:';

But Sqlite does not support regex_replace, so that ideas is out

Signed-off-by: Daniel Kesselberg <[email protected]>

backportbot · 2025-09-16T14:10:00Z

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31

# Create the new backport branch
git checkout -b backport/54736/stable31

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 247861d2

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/54736/stable31

Error: Failed to push branch backport/54736/stable31: remote: Invalid username or token. Password authentication is not supported for Git operations.
fatal: Authentication failed for 'https://github.com/nextcloud/server.git/'

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

kesselb · 2025-09-17T15:53:09Z

/backport to stable31

kesselb self-assigned this Aug 29, 2025

kesselb added bug 2. developing Work in progress labels Aug 29, 2025

kesselb mentioned this pull request Aug 29, 2025

Contacts interactions integration: Translated category leads to weird state when a user changed the language nextcloud/contacts#4663

Closed

kesselb commented Aug 29, 2025

View reviewed changes

apps/contactsinteraction/appinfo/info.xml Outdated Show resolved Hide resolved

kesselb force-pushed the bug/noid/update-vcard-categories branch from e948659 to 9ccae2f Compare September 10, 2025 13:41

kesselb added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 10, 2025

kesselb changed the title ~~Bug/noid/update vcard categories~~ fix: always use english name for recently contacted category Sep 10, 2025

kesselb requested a review from ChristophWurst September 10, 2025 14:13

kesselb marked this pull request as ready for review September 10, 2025 14:13

kesselb requested review from a team and SebastianKrupinski as code owners September 10, 2025 14:13

kesselb requested review from ArtificialOwl, provokateurin and salmart-dev and removed request for a team September 10, 2025 14:13

ChristophWurst approved these changes Sep 10, 2025

View reviewed changes

backportbot bot added the backport-request label Sep 11, 2025

provokateurin reviewed Sep 12, 2025

View reviewed changes

kesselb added this to the Nextcloud 32 milestone Sep 12, 2025

provokateurin approved these changes Sep 12, 2025

View reviewed changes

SebastianKrupinski approved these changes Sep 13, 2025

View reviewed changes

fix: always use english name for recently contacted category

247861d

Signed-off-by: Daniel Kesselberg <[email protected]>

kesselb force-pushed the bug/noid/update-vcard-categories branch from d531867 to 247861d Compare September 15, 2025 14:57

kesselb merged commit 30fcdf2 into master Sep 16, 2025
216 of 225 checks passed

kesselb deleted the bug/noid/update-vcard-categories branch September 16, 2025 14:09

backportbot bot mentioned this pull request Sep 16, 2025

[stable32] fix: always use english name for recently contacted category #55146

Merged

2 tasks

backportbot bot mentioned this pull request Sep 17, 2025

[stable31] fix: always use english name for recently contacted category #55158

Merged

2 tasks

backportbot bot removed the backport-request label Sep 17, 2025

skjnldsv modified the milestones: Nextcloud 32, Nextcloud 33 Sep 28, 2025

nextcloud-bot mentioned this pull request Jan 6, 2026

33.0.0 beta 1 #57361

Merged

Uh oh!

fix: always use english name for recently contacted category #54736

fix: always use english name for recently contacted category #54736

Uh oh!

Conversation

kesselb commented Aug 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

TODO

Helper script to generate recent contacts

Checklist

Uh oh!

Uh oh!

github-actions bot commented Sep 10, 2025

Uh oh!

github-actions bot commented Sep 10, 2025

Uh oh!

github-actions bot commented Sep 10, 2025

Uh oh!

github-actions bot commented Sep 10, 2025

Uh oh!

ChristophWurst left a comment

Choose a reason for hiding this comment

Uh oh!

kesselb commented Sep 11, 2025

Uh oh!

kesselb commented Sep 11, 2025

Uh oh!

provokateurin Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

backportbot bot commented Sep 16, 2025

Uh oh!

kesselb commented Sep 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

kesselb commented Aug 29, 2025 •

edited

Loading