Skip to content

[stable33] fix(favorite): Limit tagging to favorite #66231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Nov 4, 2026
Merged

[stable33] fix(favorite): Limit tagging to favorite #66231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d711d44
fix(favorite): Limit tagging to favorite
nickvergessen Nov 2, 2026
1d25e33
fix(tag): Fix to respect old types
nickvergessen Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/TagsPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin {
public const NS_OWNCLOUD = 'http://owncloud.org/ns';
public const TAGS_PROPERTYNAME = '{http://owncloud.org/ns}tags';
public const FAVORITE_PROPERTYNAME = '{http://owncloud.org/ns}favorite';
public const TAG_FAVORITE = '_$!<Favorite>!$_';
public const TAG_FAVORITE = ITags::TAG_FAVORITE;

/**
* Reference to main server object
Expand Down
3 changes: 3 additions & 0 deletions apps/files/lib/Service/TagService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public function updateFileTags($path, $tags) {
throw new \RuntimeException('No homeFolder set');
}

// Only handle the favorite tag
$tags = array_filter($tags, static fn (string $tag): bool => $tag === ITags::TAG_FAVORITE);

$fileId = $this->homeFolder->get($path)->getId();

$currentTags = $this->tagger->getTagsForObjects([$fileId]);
Expand Down
12 changes: 2 additions & 10 deletions apps/files/tests/Service/TagServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ protected function tearDown(): void {
}

public function testUpdateFileTags(): void {
$tag1 = 'tag1';
$tag2 = 'tag2';
$tag1 = ITags::TAG_FAVORITE;

$subdir = $this->root->newFolder('subdir');
$testFile = $subdir->newFile('test.txt');
Expand All @@ -89,20 +88,13 @@ public function testUpdateFileTags(): void {
$fileId = $testFile->getId();

// set tags
$this->tagService->updateFileTags('subdir/test.txt', [$tag1, $tag2]);
$this->tagService->updateFileTags('subdir/test.txt', [$tag1]);

$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag1));
$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));

// remove tag
$this->tagService->updateFileTags('subdir/test.txt', [$tag2]);
$this->assertEquals([], $this->tagger->getIdsForTag($tag1));
$this->assertEquals([$fileId], $this->tagger->getIdsForTag($tag2));

// clear tags
$this->tagService->updateFileTags('subdir/test.txt', []);
$this->assertEquals([], $this->tagger->getIdsForTag($tag1));
$this->assertEquals([], $this->tagger->getIdsForTag($tag2));

// non-existing file
$caught = false;
Expand Down
66 changes: 36 additions & 30 deletions lib/private/Tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,12 @@ public function getTagsForObjects(array $objIds) {
* @throws \Exception
*/
public function getIdsForTag($tag) {
$tagId = false;
if (is_numeric($tag)) {
$tagId = $tag;
} elseif (is_string($tag)) {
$tag = trim($tag);
if ($tag === '') {
$this->logger->debug(__METHOD__ . ' Cannot use empty tag names', ['app' => 'core']);
return false;
}
$tagId = $this->getTagId($tag);
$tag = trim((string)$tag);
if ($tag === '') {
$this->logger->debug(__METHOD__ . ' Cannot use empty tag names', ['app' => 'core']);
return false;
}
$tagId = $this->getTagIdByIdOrName($tag);

if ($tagId === false) {
$l10n = \OCP\Util::getL10N('core');
Expand Down Expand Up @@ -499,18 +494,15 @@ public function removeFromFavorites($objid) {
* Creates a tag/object relation.
*/
public function tagAs($objid, $tag, ?string $path = null) {
if (is_string($tag) && !is_numeric($tag)) {
$tag = trim($tag);
if ($tag === '') {
$this->logger->debug(__METHOD__ . ', Cannot add an empty tag');
return false;
}
if (!$this->hasTag($tag)) {
$this->add($tag);
}
$tag = trim((string)$tag);
if ($tag === '') {
$this->logger->debug(__METHOD__ . ', Cannot add an empty tag');
return false;
}
$tagId = $this->getTagIdByIdOrName($tag);
if ($tagId === false) {
$this->add($tag);
$tagId = $this->getTagId($tag);
} else {
$tagId = $tag;
}
$qb = $this->db->getQueryBuilder();
$qb->insert(self::RELATION_TABLE)
Expand Down Expand Up @@ -547,16 +539,12 @@ public function tagAs($objid, $tag, ?string $path = null) {
* Delete single tag/object relation from the db
*/
public function unTag($objid, $tag, ?string $path = null) {
if (is_string($tag) && !is_numeric($tag)) {
$tag = trim($tag);
if ($tag === '') {
$this->logger->debug(__METHOD__ . ', Tag name is empty');
return false;
}
$tagId = $this->getTagId($tag);
} else {
$tagId = $tag;
$tag = trim((string)$tag);
if ($tag === '') {
$this->logger->debug(__METHOD__ . ', Tag name is empty');
return false;
}
$tagId = $this->getTagIdByIdOrName($tag);

try {
$qb = $this->db->getQueryBuilder();
Expand Down Expand Up @@ -664,6 +652,24 @@ private function getTagId($name) {
return false;
}

/**
* Get a tag's ID from either its ID or its name.
*
* A numeric value is only accepted as ID if it is the ID of one of the loaded tags.
*
* @param string $tag The tag ID or name to look for.
* @return string|bool The tag's id or false if no matching tag is found.
*/
private function getTagIdByIdOrName(string $tag) {
if (is_numeric($tag)) {
$key = $this->getTagById($tag);
if ($key !== false) {
return $this->tags[$key]->id ?? false;
}
}
return $this->getTagId($tag);
}

/**
* Get a tag by its name.
*
Expand Down
32 changes: 32 additions & 0 deletions tests/lib/TagsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,38 @@ public function testUnTag(): void {
$this->assertEquals(0, count($tagger->getIdsForTag('Family')));
}

public function testTagById(): void {
$tagger = $this->tagMgr->load($this->objectType);
$tagId = $tagger->add('Family');

$this->assertTrue($tagger->tagAs(1, (string)$tagId));
$this->assertEquals([1], $tagger->getIdsForTag('Family'));
$this->assertEquals([1], $tagger->getIdsForTag($tagId));
$this->assertTrue($tagger->unTag(1, (string)$tagId));
$this->assertEquals([], $tagger->getIdsForTag('Family'));
$this->assertEquals(1, count($tagger->getTags()));
}

public function testTagByNumericValue(): void {
$otherTagger = $this->tagMgr->load($this->objectType, [], false, self::getUniqueID('user_'));
$otherTagId = $otherTagger->add('Family');
$this->assertTrue($otherTagger->tagAs(1, 'Family'));

$tagger = $this->tagMgr->load($this->objectType);

// Treated as the name of an own tag
$this->assertTrue($tagger->tagAs(2, (string)$otherTagId));
$this->assertTrue($tagger->hasTag((string)$otherTagId));
$this->assertEquals([2], $tagger->getIdsForTag((string)$otherTagId));
$this->assertEquals([1], $otherTagger->getIdsForTag('Family'));

$tagger->unTag(1, (string)$otherTagId);
$this->assertEquals([1], $otherTagger->getIdsForTag('Family'));

$tagger->unTag(2, (string)$otherTagId);
$this->assertEquals([], $tagger->getIdsForTag((string)$otherTagId));
}

public function testFavorite(): void {
$tagger = $this->tagMgr->load($this->objectType);
$this->assertTrue($tagger->addToFavorites(1));
Expand Down
Loading