diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Explore/feeds/feeds.en.json | 2 | ||||
| -rwxr-xr-x | lib/Fetcher/FeedFetcher.php | 1 | ||||
| -rw-r--r-- | lib/Plugin/Client/Plugin.php | 2 | ||||
| -rw-r--r-- | lib/Service/FolderServiceV2.php | 2 | ||||
| -rw-r--r-- | lib/Service/ShareService.php | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/lib/Explore/feeds/feeds.en.json b/lib/Explore/feeds/feeds.en.json index d855b243c..9ccd2ac02 100644 --- a/lib/Explore/feeds/feeds.en.json +++ b/lib/Explore/feeds/feeds.en.json @@ -1,7 +1,6 @@ { "Nextcloud": [{ "title": "Nextcloud News", - "favicon": "https://nextcloud.com/wp-content/themes/next/assets/img/common/favicon-touch.png", "url": "https://nextcloud.com/news/", "feed": "https://nextcloud.com/blog/feed", "description": "See what is going on in and around Nextcloud", @@ -9,7 +8,6 @@ }, { "title": "Nextcloud Podcast", - "favicon": "https://nextcloud.com/wp-content/themes/next/assets/img/common/favicon-touch.png", "url": "https://nextcloud.com/podcast/", "feed": "https://nextcloud.com/podcast-feed.rss", "description": "Digital Sovereignty, self hosting, privacy and more", diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index b079f63a9..c0477407c 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -135,7 +135,6 @@ class FeedFetcher implements IFeedFetcher $lastModified = null; } $url = $url2->getNormalizedURL(); - $resource = $this->reader->read($url, null, $lastModified); $location = $resource->getUrl(); diff --git a/lib/Plugin/Client/Plugin.php b/lib/Plugin/Client/Plugin.php index 373968056..ff4cdae05 100644 --- a/lib/Plugin/Client/Plugin.php +++ b/lib/Plugin/Client/Plugin.php @@ -14,6 +14,8 @@ namespace OCA\News\Plugin\Client; /** + * TODO: remove this? it seems old.. there is no global list of plugins and seems plugins register themselves? + * * We actually really want to avoid this global list of plugins. A way would be * for News plugin apps to register themselves in a special database table * and the News app would just pull out the scripts that should be attached diff --git a/lib/Service/FolderServiceV2.php b/lib/Service/FolderServiceV2.php index 1e710a37b..e70e4dee9 100644 --- a/lib/Service/FolderServiceV2.php +++ b/lib/Service/FolderServiceV2.php @@ -155,7 +155,7 @@ class FolderServiceV2 extends Service public function markDelete(string $userId, int $folderId, bool $mark): Entity { $folder = $this->find($userId, $folderId); - $time = $mark ? $this->timeFactory->getTime() : 0; + $time = $mark ? $this->timeFactory->now()->getTimestamp() : 0; $folder->setDeletedAt($time); return $this->mapper->update($folder); diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php index 552e1d9a4..1ba69b612 100644 --- a/lib/Service/ShareService.php +++ b/lib/Service/ShareService.php @@ -114,6 +114,8 @@ class ShareService $sharedItem->setStarred(false); $sharedItem->setSharedBy($userId); + // TODO: should we set the pub date to the date of share? + // Get 'shared with me' dummy feed $feedUrl = $this->urlGenerator->getBaseUrl() . '/news/sharedwithme'; $feed = $this->feedService->findByUrl($shareRecipientId, $feedUrl); |