GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[COMPONENT][LeftPanel] Add previous title to error message when a duplicate feed is found

Browse Source
This commit is contained in:
Hugo Sales 2021-12-11 16:50:52 +00:00
parent 682f9aa611
commit e8ddca6b06
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/LeftPanel/LeftPanel.php
View File

@ -31,6 +31,7 @@ use App\Core\Router\Router;
use App\Entity\Actor; use App\Entity\Actor;
use App\Entity\Feed; use App\Entity\Feed;
use App\Util\Exception\ClientException; use App\Util\Exception\ClientException;
use App\Util\Exception\NotFoundException;
use Component\LeftPanel\Controller as C; use Component\LeftPanel\Controller as C;
class LeftPanel extends Component class LeftPanel extends Component
@ -47,7 +48,13 @@ class LeftPanel extends Component
$feeds = Feed::getFeeds($actor); $feeds = Feed::getFeeds($actor);
$ordering = end($feeds)->getOrdering(); $ordering = end($feeds)->getOrdering();
$url = Router::url($route, $route_params); $url = Router::url($route, $route_params);
if (DB::count('feed', ['actor_id' => $actor->getId(), 'url' => $url]) === 0) { try {
$feed = DB::findOneBy('feed', ['actor_id' => $actor->getId(), 'url' => $url]);
throw new ClientException(_m(
'Cannot add feed with url "{url}" because it already exists with title "{title}"',
['{url}' => $url, '{title}' => $feed->getTitle()],
));
} catch (NotFoundException) {
DB::persist(Feed::create([ DB::persist(Feed::create([
'actor_id' => $actor->getId(), 'actor_id' => $actor->getId(),
'url' => $url, 'url' => $url,
@ -59,7 +66,6 @@ class LeftPanel extends Component
Cache::delete($cache_key); Cache::delete($cache_key);
return Event::stop; return Event::stop;
} }
throw new ClientException(_m('Cannot add feed with url "{url}" because it already exists', ['{url}' => $url]));
} }
/** /**