diff --git a/src/BSLManager/App.cs b/src/BSLManager/App.cs deleted file mode 100644 index 37697cc..0000000 --- a/src/BSLManager/App.cs +++ /dev/null @@ -1,252 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Threading.Tasks; -using BirdsiteLive.DAL.Contracts; -using BirdsiteLive.DAL.Models; -using BirdsiteLive.Moderation.Actions; -using BSLManager.Domain; -using BSLManager.Tools; -using Terminal.Gui; - -namespace BSLManager -{ - public class App - { - private readonly IFollowersDal _followersDal; - private readonly IRemoveFollowerAction _removeFollowerAction; - - private readonly FollowersListState _state = new FollowersListState(); - - #region Ctor - public App(IFollowersDal followersDal, IRemoveFollowerAction removeFollowerAction) - { - _followersDal = followersDal; - _removeFollowerAction = removeFollowerAction; - } - #endregion - - public void Run() - { - Application.Init(); - var top = Application.Top; - - // Creates the top-level window to show - var win = new Window("BSL Manager") - { - X = 0, - Y = 1, // Leave one row for the toplevel menu - - // By using Dim.Fill(), it will automatically resize without manual intervention - Width = Dim.Fill(), - Height = Dim.Fill() - }; - - top.Add(win); - - // Creates a menubar, the item "New" has a help menu. - var menu = new MenuBar(new MenuBarItem[] - { - new MenuBarItem("_File", new MenuItem[] - { - new MenuItem("_Quit", "", () => - { - if (Quit()) top.Running = false; - }) - }), - //new MenuBarItem ("_Edit", new MenuItem [] { - // new MenuItem ("_Copy", "", null), - // new MenuItem ("C_ut", "", null), - // new MenuItem ("_Paste", "", null) - //}) - }); - top.Add(menu); - - static bool Quit() - { - var n = MessageBox.Query(50, 7, "Quit BSL Manager", "Are you sure you want to quit?", "Yes", "No"); - return n == 0; - } - - RetrieveUserList(); - - var list = new ListView(_state.GetDisplayableList()) - { - X = 1, - Y = 3, - Width = Dim.Fill(), - Height = Dim.Fill() - }; - - list.KeyDown += _ => - { - if (_.KeyEvent.Key == Key.Enter) - { - OpenFollowerDialog(list.SelectedItem); - } - else if (_.KeyEvent.Key == Key.Delete - || _.KeyEvent.Key == Key.DeleteChar - || _.KeyEvent.Key == Key.Backspace - || _.KeyEvent.Key == Key.D) - { - OpenDeleteDialog(list.SelectedItem); - } - }; - - var listingFollowersLabel = new Label(1, 0, "Listing followers"); - var filterLabel = new Label("Filter: ") { X = 1, Y = 1 }; - var filterText = new TextField("") - { - X = Pos.Right(filterLabel), - Y = 1, - Width = 40 - }; - - filterText.KeyDown += _ => - { - var text = filterText.Text.ToString(); - if (_.KeyEvent.Key == Key.Enter && !string.IsNullOrWhiteSpace(text)) - { - _state.FilterBy(text); - ConsoleGui.RefreshUI(); - } - }; - - win.Add( - listingFollowersLabel, - filterLabel, - filterText, - list - ); - - Application.Run(); - } - - private void OpenFollowerDialog(int selectedIndex) - { - var close = new Button(3, 14, "Close"); - close.Clicked += () => Application.RequestStop(); - - var dialog = new Dialog("Info", 60, 18, close); - - var follower = _state.GetElementAt(selectedIndex); - - var name = new Label($"User: @{follower.Acct}@{follower.Host}") - { - X = 1, - Y = 1, - Width = Dim.Fill(), - Height = 1 - }; - var following = new Label($"Following Count: {follower.Followings.Count}") - { - X = 1, - Y = 3, - Width = Dim.Fill(), - Height = 1 - }; - var errors = new Label($"Posting Errors: {follower.PostingErrorCount}") - { - X = 1, - Y = 4, - Width = Dim.Fill(), - Height = 1 - }; - var inbox = new Label($"Inbox: {follower.InboxRoute}") - { - X = 1, - Y = 5, - Width = Dim.Fill(), - Height = 1 - }; - var sharedInbox = new Label($"Shared Inbox: {follower.SharedInboxRoute}") - { - X = 1, - Y = 6, - Width = Dim.Fill(), - Height = 1 - }; - - dialog.Add(name); - dialog.Add(following); - dialog.Add(errors); - dialog.Add(inbox); - dialog.Add(sharedInbox); - dialog.Add(close); - Application.Run(dialog); - } - - private void OpenDeleteDialog(int selectedIndex) - { - bool okpressed = false; - var ok = new Button(10, 14, "Yes"); - ok.Clicked += () => - { - Application.RequestStop(); - okpressed = true; - }; - - var cancel = new Button(3, 14, "No"); - cancel.Clicked += () => Application.RequestStop(); - - var dialog = new Dialog("Delete", 60, 18, cancel, ok); - - var follower = _state.GetElementAt(selectedIndex); - var name = new Label($"User: @{follower.Acct}@{follower.Host}") - { - X = 1, - Y = 1, - Width = Dim.Fill(), - Height = 1 - }; - var entry = new Label("Delete user and remove all their followings?") - { - X = 1, - Y = 3, - Width = Dim.Fill(), - Height = 1 - }; - dialog.Add(name); - dialog.Add(entry); - Application.Run(dialog); - - if (okpressed) - { - DeleteAndRemoveUser(selectedIndex); - } - } - - private void DeleteAndRemoveUser(int el) - { - Application.MainLoop.Invoke(async () => - { - try - { - var userToDelete = _state.GetElementAt(el); - - BasicLogger.Log($"Delete {userToDelete.Acct}@{userToDelete.Host}"); - await _removeFollowerAction.ProcessAsync(userToDelete); - BasicLogger.Log($"Remove user from list"); - _state.RemoveAt(el); - } - catch (Exception e) - { - BasicLogger.Log(e.Message); - } - - ConsoleGui.RefreshUI(); - }); - } - - private void RetrieveUserList() - { - Application.MainLoop.Invoke(async () => - { - var followers = await _followersDal.GetAllFollowersAsync(); - _state.Load(followers.ToList()); - ConsoleGui.RefreshUI(); - }); - } - } -} \ No newline at end of file diff --git a/src/BSLManager/BSLManager.csproj b/src/BSLManager/BSLManager.csproj deleted file mode 100644 index 885decf..0000000 --- a/src/BSLManager/BSLManager.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - Exe - net6 - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - diff --git a/src/BSLManager/Bootstrapper.cs b/src/BSLManager/Bootstrapper.cs deleted file mode 100644 index 7375cd6..0000000 --- a/src/BSLManager/Bootstrapper.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Net.Http; -using BirdsiteLive.Common.Settings; -using BirdsiteLive.Common.Structs; -using BirdsiteLive.DAL.Contracts; -using BirdsiteLive.DAL.Postgres.DataAccessLayers; -using BirdsiteLive.DAL.Postgres.Settings; -using Lamar; -using Lamar.Scanning.Conventions; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace BSLManager -{ - public class Bootstrapper - { - private readonly DbSettings _dbSettings; - private readonly InstanceSettings _instanceSettings; - - #region Ctor - public Bootstrapper(DbSettings dbSettings, InstanceSettings instanceSettings) - { - _dbSettings = dbSettings; - _instanceSettings = instanceSettings; - } - #endregion - - public Container Init() - { - var container = new Container(x => - { - x.For().Use(x => _dbSettings); - - x.For().Use(x => _instanceSettings); - - if (string.Equals(_dbSettings.Type, DbTypes.Postgres, StringComparison.OrdinalIgnoreCase)) - { - var connString = $"Host={_dbSettings.Host};Username={_dbSettings.User};Password={_dbSettings.Password};Database={_dbSettings.Name}"; - var postgresSettings = new PostgresSettings - { - ConnString = connString - }; - x.For().Use(x => postgresSettings); - - x.For().Use().Singleton(); - x.For().Use().Singleton(); - x.For().Use().Singleton(); - } - else - { - throw new NotImplementedException($"{_dbSettings.Type} is not supported"); - } - - var serviceProvider = new ServiceCollection().AddHttpClient().BuildServiceProvider(); - x.For().Use(_ => serviceProvider.GetService()); - - x.For(typeof(ILogger<>)).Use(typeof(DummyLogger<>)); - - x.Scan(_ => - { - _.Assembly("BirdsiteLive.Twitter"); - _.Assembly("BirdsiteLive.Domain"); - _.Assembly("BirdsiteLive.DAL"); - _.Assembly("BirdsiteLive.DAL.Postgres"); - _.Assembly("BirdsiteLive.Moderation"); - - _.TheCallingAssembly(); - - _.WithDefaultConventions(); - - _.LookForRegistries(); - }); - }); - return container; - } - - public class DummyLogger : ILogger - { - public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) - { - } - - public bool IsEnabled(LogLevel logLevel) - { - return false; - } - - public IDisposable BeginScope(TState state) - { - return null; - } - } - } -} \ No newline at end of file diff --git a/src/BSLManager/Domain/FollowersListState.cs b/src/BSLManager/Domain/FollowersListState.cs deleted file mode 100644 index 02c2151..0000000 --- a/src/BSLManager/Domain/FollowersListState.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using BirdsiteLive.DAL.Models; - -namespace BSLManager.Domain -{ - public class FollowersListState - { - private readonly List _filteredDisplayableUserList = new List(); - - private List _sourceUserList = new List(); - private List _filteredSourceUserList = new List(); - - public void Load(List followers) - { - _sourceUserList = followers.OrderByDescending(x => x.Followings.Count).ToList(); - - ResetLists(); - } - - private void ResetLists() - { - _filteredSourceUserList = _sourceUserList.ToList(); - - _filteredDisplayableUserList.Clear(); - - foreach (var follower in _sourceUserList) - { - var displayedUser = $"{GetFullHandle(follower)} ({follower.Followings.Count}) (err:{follower.PostingErrorCount})"; - _filteredDisplayableUserList.Add(displayedUser); - } - } - - public List GetDisplayableList() - { - return _filteredDisplayableUserList; - } - - public void FilterBy(string pattern) - { - ResetLists(); - - if (!string.IsNullOrWhiteSpace(pattern)) - { - var elToRemove = _filteredSourceUserList - .Where(x => !GetFullHandle(x).Contains(pattern)) - .Select(x => x) - .ToList(); - - foreach (var el in elToRemove) - { - _filteredSourceUserList.Remove(el); - - var dElToRemove = _filteredDisplayableUserList.First(x => x.Contains(GetFullHandle(el))); - _filteredDisplayableUserList.Remove(dElToRemove); - } - } - } - - private string GetFullHandle(Follower follower) - { - return $"@{follower.Acct}@{follower.Host}"; - } - - public void RemoveAt(int index) - { - var displayableUser = _filteredDisplayableUserList[index]; - var sourceUser = _filteredSourceUserList[index]; - - _filteredDisplayableUserList.Remove(displayableUser); - - _filteredSourceUserList.Remove(sourceUser); - _sourceUserList.Remove(sourceUser); - } - - public Follower GetElementAt(int index) - { - return _filteredSourceUserList[index]; - } - } -} \ No newline at end of file diff --git a/src/BSLManager/Program.cs b/src/BSLManager/Program.cs deleted file mode 100644 index 629ff25..0000000 --- a/src/BSLManager/Program.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using BirdsiteLive.Common.Settings; -using BirdsiteLive.DAL.Contracts; -using BSLManager.Tools; -using Microsoft.Extensions.Configuration; -using NStack; -using Terminal.Gui; - -namespace BSLManager -{ - class Program - { - static async Task Main(string[] args) - { - Console.OutputEncoding = Encoding.Default; - - var settingsManager = new SettingsManager(); - var settings = settingsManager.GetSettings(); - - //var builder = new ConfigurationBuilder() - // .AddEnvironmentVariables(); - //var configuration = builder.Build(); - - //var dbSettings = configuration.GetSection("Db").Get(); - //var instanceSettings = configuration.GetSection("Instance").Get(); - - var bootstrapper = new Bootstrapper(settings.dbSettings, settings.instanceSettings); - var container = bootstrapper.Init(); - - var app = container.GetInstance(); - app.Run(); - } - } -} diff --git a/src/BSLManager/Tools/BasicLogger.cs b/src/BSLManager/Tools/BasicLogger.cs deleted file mode 100644 index dbb9265..0000000 --- a/src/BSLManager/Tools/BasicLogger.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.IO; - -namespace BSLManager.Tools -{ - public static class BasicLogger - { - public static void Log(string log) - { - File.AppendAllLines($"Log-{Guid.NewGuid()}.txt", new []{ log }); - } - } -} \ No newline at end of file diff --git a/src/BSLManager/Tools/ConsoleGui.cs b/src/BSLManager/Tools/ConsoleGui.cs deleted file mode 100644 index b6f7b6e..0000000 --- a/src/BSLManager/Tools/ConsoleGui.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using Terminal.Gui; - -namespace BSLManager.Tools -{ - public static class ConsoleGui - { - public static void RefreshUI() - { - typeof(Application) - .GetMethod("TerminalResized", BindingFlags.Static | BindingFlags.NonPublic) - .Invoke(null, null); - } - } -} \ No newline at end of file diff --git a/src/BSLManager/Tools/SettingsManager.cs b/src/BSLManager/Tools/SettingsManager.cs deleted file mode 100644 index 87daeba..0000000 --- a/src/BSLManager/Tools/SettingsManager.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System; -using System.IO; -using System.Text.Json; -using System.Runtime.CompilerServices; -using BirdsiteLive.Common.Settings; - -namespace BSLManager.Tools -{ - public class SettingsManager - { - private const string LocalFileName = "ManagerSettings.json"; - - public (DbSettings dbSettings, InstanceSettings instanceSettings) GetSettings() - { - var localSettingsData = GetLocalSettingsFile(); - if (localSettingsData != null) return Convert(localSettingsData); - - Console.WriteLine("We need to set up the manager"); - Console.WriteLine("Please provide the following information as provided in the docker-compose file"); - - LocalSettingsData data; - do - { - data = GetDataFromUser(); - Console.WriteLine(); - Console.WriteLine("Please check if all is ok:"); - Console.WriteLine(); - Console.WriteLine($"Db Host: {data.DbHost}"); - Console.WriteLine($"Db Name: {data.DbName}"); - Console.WriteLine($"Db User: {data.DbUser}"); - Console.WriteLine($"Db Password: {data.DbPassword}"); - Console.WriteLine($"Instance Domain: {data.InstanceDomain}"); - Console.WriteLine(); - - string resp; - do - { - Console.WriteLine("Is it valid? (yes, no)"); - resp = Console.ReadLine()?.Trim().ToLowerInvariant(); - - if (resp == "n" || resp == "no") data = null; - - } while (resp != "y" && resp != "yes" && resp != "n" && resp != "no"); - - } while (data == null); - - SaveLocalSettings(data); - return Convert(data); - } - - private LocalSettingsData GetDataFromUser() - { - var data = new LocalSettingsData(); - - Console.WriteLine("Db Host:"); - data.DbHost = Console.ReadLine(); - - Console.WriteLine("Db Name:"); - data.DbName = Console.ReadLine(); - - Console.WriteLine("Db User:"); - data.DbUser = Console.ReadLine(); - - Console.WriteLine("Db Password:"); - data.DbPassword = Console.ReadLine(); - - Console.WriteLine("Instance Domain:"); - data.InstanceDomain = Console.ReadLine(); - - return data; - } - - private (DbSettings dbSettings, InstanceSettings instanceSettings) Convert(LocalSettingsData data) - { - var dbSettings = new DbSettings - { - Type = data.DbType, - Host = data.DbHost, - Name = data.DbName, - User = data.DbUser, - Password = data.DbPassword - }; - var instancesSettings = new InstanceSettings - { - Domain = data.InstanceDomain - }; - return (dbSettings, instancesSettings); - } - - private LocalSettingsData GetLocalSettingsFile() - { - try - { - if (!File.Exists(LocalFileName)) return null; - - var jsonContent = File.ReadAllText(LocalFileName); - var content = JsonSerializer.Deserialize(jsonContent); - return content; - } - catch (Exception) - { - return null; - } - } - - private void SaveLocalSettings(LocalSettingsData data) - { - var jsonContent = JsonSerializer.Serialize(data); - File.WriteAllText(LocalFileName, jsonContent); - } - } - - internal class LocalSettingsData - { - public string DbType { get; set; } = "postgres"; - public string DbHost { get; set; } - public string DbName { get; set; } - public string DbUser { get; set; } - public string DbPassword { get; set; } - - public string InstanceDomain { get; set; } - } -} \ No newline at end of file diff --git a/src/BirdsiteLive.ActivityPub/BirdsiteLive.ActivityPub.csproj b/src/BirdsiteLive.ActivityPub/BirdsiteLive.ActivityPub.csproj index ec55c83..c69dfd9 100644 --- a/src/BirdsiteLive.ActivityPub/BirdsiteLive.ActivityPub.csproj +++ b/src/BirdsiteLive.ActivityPub/BirdsiteLive.ActivityPub.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 diff --git a/src/BirdsiteLive.Common/BirdsiteLive.Common.csproj b/src/BirdsiteLive.Common/BirdsiteLive.Common.csproj index a546d7a..8268829 100644 --- a/src/BirdsiteLive.Common/BirdsiteLive.Common.csproj +++ b/src/BirdsiteLive.Common/BirdsiteLive.Common.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 diff --git a/src/BirdsiteLive.Cryptography/BirdsiteLive.Cryptography.csproj b/src/BirdsiteLive.Cryptography/BirdsiteLive.Cryptography.csproj index 43b50a5..b17ba22 100644 --- a/src/BirdsiteLive.Cryptography/BirdsiteLive.Cryptography.csproj +++ b/src/BirdsiteLive.Cryptography/BirdsiteLive.Cryptography.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 diff --git a/src/BirdsiteLive.Domain/BirdsiteLive.Domain.csproj b/src/BirdsiteLive.Domain/BirdsiteLive.Domain.csproj index f401973..a914f94 100644 --- a/src/BirdsiteLive.Domain/BirdsiteLive.Domain.csproj +++ b/src/BirdsiteLive.Domain/BirdsiteLive.Domain.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 diff --git a/src/BirdsiteLive.Moderation/BirdsiteLive.Moderation.csproj b/src/BirdsiteLive.Moderation/BirdsiteLive.Moderation.csproj index 0c6da67..a585597 100644 --- a/src/BirdsiteLive.Moderation/BirdsiteLive.Moderation.csproj +++ b/src/BirdsiteLive.Moderation/BirdsiteLive.Moderation.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 diff --git a/src/BirdsiteLive.Pipeline/BirdsiteLive.Pipeline.csproj b/src/BirdsiteLive.Pipeline/BirdsiteLive.Pipeline.csproj index b189b1b..fe3f487 100644 --- a/src/BirdsiteLive.Pipeline/BirdsiteLive.Pipeline.csproj +++ b/src/BirdsiteLive.Pipeline/BirdsiteLive.Pipeline.csproj @@ -1,7 +1,7 @@  - net6 + net7.0 latest diff --git a/src/BirdsiteLive.Twitter/BirdsiteLive.Twitter.csproj b/src/BirdsiteLive.Twitter/BirdsiteLive.Twitter.csproj index 6d1746d..000fc37 100644 --- a/src/BirdsiteLive.Twitter/BirdsiteLive.Twitter.csproj +++ b/src/BirdsiteLive.Twitter/BirdsiteLive.Twitter.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 diff --git a/src/BirdsiteLive.sln b/src/BirdsiteLive.sln index afd49a7..77a6067 100644 --- a/src/BirdsiteLive.sln +++ b/src/BirdsiteLive.sln @@ -47,10 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BirdsiteLive.Moderation.Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BirdsiteLive.Common.Tests", "Tests\BirdsiteLive.Common.Tests\BirdsiteLive.Common.Tests.csproj", "{C69F7582-6050-44DC-BAAB-7C8F0BDA525C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BSLManager", "BSLManager\BSLManager.csproj", "{4A84D351-E91B-4E58-8E20-211F0F4991D7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSLManager.Tests", "Tests\BSLManager.Tests\BSLManager.Tests.csproj", "{D4457271-620E-465A-B08E-7FC63C99A2F6}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BirdsiteLive.Twitter.Tests", "Tests\BirdsiteLive.Twitter.Tests\BirdsiteLive.Twitter.Tests.csproj", "{2DFA0BFD-88F5-4434-A6E3-C93B5750E88C}" EndProject Global @@ -131,14 +127,6 @@ Global {C69F7582-6050-44DC-BAAB-7C8F0BDA525C}.Debug|Any CPU.Build.0 = Debug|Any CPU {C69F7582-6050-44DC-BAAB-7C8F0BDA525C}.Release|Any CPU.ActiveCfg = Release|Any CPU {C69F7582-6050-44DC-BAAB-7C8F0BDA525C}.Release|Any CPU.Build.0 = Release|Any CPU - {4A84D351-E91B-4E58-8E20-211F0F4991D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4A84D351-E91B-4E58-8E20-211F0F4991D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4A84D351-E91B-4E58-8E20-211F0F4991D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4A84D351-E91B-4E58-8E20-211F0F4991D7}.Release|Any CPU.Build.0 = Release|Any CPU - {D4457271-620E-465A-B08E-7FC63C99A2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4457271-620E-465A-B08E-7FC63C99A2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4457271-620E-465A-B08E-7FC63C99A2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4457271-620E-465A-B08E-7FC63C99A2F6}.Release|Any CPU.Build.0 = Release|Any CPU {2DFA0BFD-88F5-4434-A6E3-C93B5750E88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2DFA0BFD-88F5-4434-A6E3-C93B5750E88C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DFA0BFD-88F5-4434-A6E3-C93B5750E88C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -165,7 +153,6 @@ Global {4BE541AC-8A93-4FA3-98AC-956CC2D5B748} = {DA3C160C-4811-4E26-A5AD-42B81FAF2D7C} {0A311BF3-4FD9-4303-940A-A3778890561C} = {A32D3458-09D0-4E0A-BA4B-8C411B816B94} {C69F7582-6050-44DC-BAAB-7C8F0BDA525C} = {A32D3458-09D0-4E0A-BA4B-8C411B816B94} - {D4457271-620E-465A-B08E-7FC63C99A2F6} = {A32D3458-09D0-4E0A-BA4B-8C411B816B94} {2DFA0BFD-88F5-4434-A6E3-C93B5750E88C} = {A32D3458-09D0-4E0A-BA4B-8C411B816B94} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/BirdsiteLive/BirdsiteLive.csproj b/src/BirdsiteLive/BirdsiteLive.csproj index b5a2998..15207ad 100644 --- a/src/BirdsiteLive/BirdsiteLive.csproj +++ b/src/BirdsiteLive/BirdsiteLive.csproj @@ -1,7 +1,7 @@  - net6 + net7.0 d21486de-a812-47eb-a419-05682bb68856 Linux 1.0 diff --git a/src/DataAccessLayers/BirdsiteLive.DAL.Postgres/BirdsiteLive.DAL.Postgres.csproj b/src/DataAccessLayers/BirdsiteLive.DAL.Postgres/BirdsiteLive.DAL.Postgres.csproj index c4c49db..dd319cf 100644 --- a/src/DataAccessLayers/BirdsiteLive.DAL.Postgres/BirdsiteLive.DAL.Postgres.csproj +++ b/src/DataAccessLayers/BirdsiteLive.DAL.Postgres/BirdsiteLive.DAL.Postgres.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/src/Tests/BSLManager.Tests/BSLManager.Tests.csproj b/src/Tests/BSLManager.Tests/BSLManager.Tests.csproj deleted file mode 100644 index 1c5177e..0000000 --- a/src/Tests/BSLManager.Tests/BSLManager.Tests.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - net6 - - false - - - - - - - - - - - - - - diff --git a/src/Tests/BSLManager.Tests/Domain/FollowersListStateTests.cs b/src/Tests/BSLManager.Tests/Domain/FollowersListStateTests.cs deleted file mode 100644 index a0171a4..0000000 --- a/src/Tests/BSLManager.Tests/Domain/FollowersListStateTests.cs +++ /dev/null @@ -1,307 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using BirdsiteLive.DAL.Models; -using BSLManager.Domain; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace BSLManager.Tests -{ - [TestClass] - public class FollowersListStateTests - { - [TestMethod] - public void FilterBy() - { - #region Stub - var followers = new List - { - new Follower - { - Id = 0, - Acct = "test", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 1, - Acct = "test", - Host = "host2", - Followings = new List() - }, - new Follower - { - Id = 2, - Acct = "user1", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 3, - Acct = "user2", - Host = "host1", - Followings = new List() - } - }; - #endregion - - var state = new FollowersListState(); - state.Load(followers); - - state.FilterBy("test"); - - #region Validate - Assert.AreEqual(2, state.GetDisplayableList().Count); - #endregion - } - - [TestMethod] - public void FilterBy_GetElement() - { - #region Stub - var followers = new List - { - new Follower - { - Id = 0, - Acct = "test", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 1, - Acct = "test", - Host = "host2", - Followings = new List() - }, - new Follower - { - Id = 2, - Acct = "user1", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 3, - Acct = "user2", - Host = "host1", - Followings = new List() - } - }; - #endregion - - var state = new FollowersListState(); - state.Load(followers); - - state.FilterBy("test"); - var el = state.GetElementAt(1); - - #region Validate - Assert.AreEqual(followers[1].Id, el.Id); - #endregion - } - - [TestMethod] - public void GetElement() - { - #region Stub - var followers = new List - { - new Follower - { - Id = 0, - Acct = "test", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 1, - Acct = "test", - Host = "host2", - Followings = new List() - }, - new Follower - { - Id = 2, - Acct = "user1", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 3, - Acct = "user2", - Host = "host1", - Followings = new List() - } - }; - #endregion - - var state = new FollowersListState(); - state.Load(followers); - - var el = state.GetElementAt(2); - - #region Validate - Assert.AreEqual(followers[2].Id, el.Id); - #endregion - } - - [TestMethod] - public void FilterBy_RemoveAt() - { - #region Stub - var followers = new List - { - new Follower - { - Id = 0, - Acct = "test", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 1, - Acct = "test", - Host = "host2", - Followings = new List() - }, - new Follower - { - Id = 2, - Acct = "user1", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 3, - Acct = "user2", - Host = "host1", - Followings = new List() - } - }; - #endregion - - var state = new FollowersListState(); - state.Load(followers.ToList()); - - state.FilterBy("test"); - state.RemoveAt(1); - - var list = state.GetDisplayableList(); - - #region Validate - Assert.AreEqual(1, list.Count); - Assert.IsTrue(list[0].Contains("@test@host1")); - #endregion - } - - [TestMethod] - public void RemoveAt() - { - #region Stub - var followers = new List - { - new Follower - { - Id = 0, - Acct = "test", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 1, - Acct = "test", - Host = "host2", - Followings = new List() - }, - new Follower - { - Id = 2, - Acct = "user1", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 3, - Acct = "user2", - Host = "host1", - Followings = new List() - } - }; - #endregion - - var state = new FollowersListState(); - state.Load(followers.ToList()); - - state.RemoveAt(1); - - var list = state.GetDisplayableList(); - - #region Validate - Assert.AreEqual(3, list.Count); - Assert.IsTrue(list[0].Contains("@test@host1")); - Assert.IsFalse(list[1].Contains("@test@host2")); - #endregion - } - - [TestMethod] - public void FilterBy_ResetFilter() - { - #region Stub - var followers = new List - { - new Follower - { - Id = 0, - Acct = "test", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 1, - Acct = "test", - Host = "host2", - Followings = new List() - }, - new Follower - { - Id = 2, - Acct = "user1", - Host = "host1", - Followings = new List() - }, - new Follower - { - Id = 3, - Acct = "user2", - Host = "host1", - Followings = new List() - } - }; - #endregion - - var state = new FollowersListState(); - state.Load(followers.ToList()); - - #region Validate - state.FilterBy("data"); - var list = state.GetDisplayableList(); - Assert.AreEqual(0, list.Count); - - state.FilterBy(string.Empty); - list = state.GetDisplayableList(); - Assert.AreEqual(4, list.Count); - #endregion - } - } -} diff --git a/src/Tests/BirdsiteLive.ActivityPub.Tests/BirdsiteLive.ActivityPub.Tests.csproj b/src/Tests/BirdsiteLive.ActivityPub.Tests/BirdsiteLive.ActivityPub.Tests.csproj index bf7140a..2b4a949 100644 --- a/src/Tests/BirdsiteLive.ActivityPub.Tests/BirdsiteLive.ActivityPub.Tests.csproj +++ b/src/Tests/BirdsiteLive.ActivityPub.Tests/BirdsiteLive.ActivityPub.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.Common.Tests/BirdsiteLive.Common.Tests.csproj b/src/Tests/BirdsiteLive.Common.Tests/BirdsiteLive.Common.Tests.csproj index cee9667..04c3fa7 100644 --- a/src/Tests/BirdsiteLive.Common.Tests/BirdsiteLive.Common.Tests.csproj +++ b/src/Tests/BirdsiteLive.Common.Tests/BirdsiteLive.Common.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.Cryptography.Tests/BirdsiteLive.Cryptography.Tests.csproj b/src/Tests/BirdsiteLive.Cryptography.Tests/BirdsiteLive.Cryptography.Tests.csproj index 4d81b7d..1640a76 100644 --- a/src/Tests/BirdsiteLive.Cryptography.Tests/BirdsiteLive.Cryptography.Tests.csproj +++ b/src/Tests/BirdsiteLive.Cryptography.Tests/BirdsiteLive.Cryptography.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.DAL.Postgres.Tests/BirdsiteLive.DAL.Postgres.Tests.csproj b/src/Tests/BirdsiteLive.DAL.Postgres.Tests/BirdsiteLive.DAL.Postgres.Tests.csproj index 910e256..71e3383 100644 --- a/src/Tests/BirdsiteLive.DAL.Postgres.Tests/BirdsiteLive.DAL.Postgres.Tests.csproj +++ b/src/Tests/BirdsiteLive.DAL.Postgres.Tests/BirdsiteLive.DAL.Postgres.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.DAL.Tests/BirdsiteLive.DAL.Tests.csproj b/src/Tests/BirdsiteLive.DAL.Tests/BirdsiteLive.DAL.Tests.csproj index b7427d6..d1139d9 100644 --- a/src/Tests/BirdsiteLive.DAL.Tests/BirdsiteLive.DAL.Tests.csproj +++ b/src/Tests/BirdsiteLive.DAL.Tests/BirdsiteLive.DAL.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.Domain.Tests/BirdsiteLive.Domain.Tests.csproj b/src/Tests/BirdsiteLive.Domain.Tests/BirdsiteLive.Domain.Tests.csproj index fd8c60d..d32c5fa 100644 --- a/src/Tests/BirdsiteLive.Domain.Tests/BirdsiteLive.Domain.Tests.csproj +++ b/src/Tests/BirdsiteLive.Domain.Tests/BirdsiteLive.Domain.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 11 false diff --git a/src/Tests/BirdsiteLive.Moderation.Tests/BirdsiteLive.Moderation.Tests.csproj b/src/Tests/BirdsiteLive.Moderation.Tests/BirdsiteLive.Moderation.Tests.csproj index be5c246..7227ddc 100644 --- a/src/Tests/BirdsiteLive.Moderation.Tests/BirdsiteLive.Moderation.Tests.csproj +++ b/src/Tests/BirdsiteLive.Moderation.Tests/BirdsiteLive.Moderation.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.Pipeline.Tests/BirdsiteLive.Pipeline.Tests.csproj b/src/Tests/BirdsiteLive.Pipeline.Tests/BirdsiteLive.Pipeline.Tests.csproj index 5c398bb..c6b988f 100644 --- a/src/Tests/BirdsiteLive.Pipeline.Tests/BirdsiteLive.Pipeline.Tests.csproj +++ b/src/Tests/BirdsiteLive.Pipeline.Tests/BirdsiteLive.Pipeline.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false diff --git a/src/Tests/BirdsiteLive.Twitter.Tests/BirdsiteLive.Twitter.Tests.csproj b/src/Tests/BirdsiteLive.Twitter.Tests/BirdsiteLive.Twitter.Tests.csproj index 3185e3d..54fb623 100644 --- a/src/Tests/BirdsiteLive.Twitter.Tests/BirdsiteLive.Twitter.Tests.csproj +++ b/src/Tests/BirdsiteLive.Twitter.Tests/BirdsiteLive.Twitter.Tests.csproj @@ -1,7 +1,7 @@ - net6 + net7.0 false