From b999ecb5dd88516deb89d977f7f75004e83145d8 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Mon, 25 Sep 2023 19:05:00 +0300 Subject: [PATCH] fixed warnings --- .../ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs | 1 - products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs | 7 ++++--- products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs b/common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs index 5f09048602..ec3472d384 100644 --- a/common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs +++ b/common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs @@ -30,7 +30,6 @@ class TelegramSenderSink : Sink { private readonly string _senderName = Configuration.Constants.NotifyTelegramSenderSysName; private readonly INotifySender _sender; - private readonly IServiceProvider _serviceProvider; public TelegramSenderSink(INotifySender sender) { diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs index 48736d048c..31f72c2300 100644 --- a/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs +++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs @@ -112,11 +112,12 @@ public interface IFileDao /// /// /// + /// /// list of files /// /// Return only the latest versions of files of a folder /// - IAsyncEnumerable> GetFilesAsync(T parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, + IAsyncEnumerable> GetFilesAsync(T parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool searchInContent, bool withSubfolders = false, bool exludeSubject = false, int offset = 0, int count = -1, T roomId = default); /// @@ -305,8 +306,8 @@ public interface IFileDao Task GetProperties(T fileId); Task SaveProperties(T fileId, EntryProperties entryProperties); - - Task GetFilesCountAsync(T parentId, FilterType filterType, bool subjectGroup, Guid subjectId, string searchText, bool searchInContent, bool withSubfolders = false, + + Task GetFilesCountAsync(T parentId, FilterType filterType, bool subjectGroup, Guid subjectId, string searchText, bool searchInContent, bool withSubfolders = false, bool excludeSubject = false, T roomId = default); #endregion diff --git a/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs b/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs index 00f3a07e8f..6631fc9411 100644 --- a/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs +++ b/products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs @@ -65,7 +65,7 @@ public interface IFolderDao IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, FilterType filterType, IEnumerable tags, Guid subjectId, string searchText, bool withSubfolders, bool withoutTags, bool excludeSubject, ProviderFilter provider, SubjectFilter subjectFilter, IEnumerable subjectEntriesIds); - + IAsyncEnumerable> GetFakeRoomsAsync(IEnumerable parentsIds, IEnumerable roomsIds, FilterType filterType, IEnumerable tags, Guid subjectId, string searchText, bool withSubfolders, bool withoutTags, bool excludeSubject, ProviderFilter provider, SubjectFilter subjectFilter, IEnumerable subjectEntriesIds); @@ -89,8 +89,9 @@ public interface IFolderDao /// /// /// + /// /// - IAsyncEnumerable> GetFoldersAsync(T parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, + IAsyncEnumerable> GetFoldersAsync(T parentId, OrderBy orderBy, FilterType filterType, bool subjectGroup, Guid subjectID, string searchText, bool withSubfolders = false, bool exludeSubject = false, int offset = 0, int count = -1, T roomId = default); /// @@ -218,7 +219,7 @@ public interface IFolderDao T folderId, CommonChunkedUploadSession chunkedUploadSession, CommonChunkedUploadSessionHolder sessionHolder); - + Task GetBackupExtensionAsync(T folderId);