From ee5eb7f71ca338e134f59cd6b2845568f37c99cc Mon Sep 17 00:00:00 2001 From: AnalogFeelings <51166756+AnalogFeelings@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:57:06 +0100 Subject: [PATCH] [All -> All] Update copyright. --- Bluechirp.sln.DotSettings | 2 +- .../Bluechirp.Library.csproj | 2 +- .../Constants/AppConstants.cs | 2 +- .../Constants/SettingsConstants.cs | 2 +- Source/Bluechirp.Library/Enums/ContentType.cs | 20 +++++- Source/Bluechirp.Library/Enums/PageType.cs | 2 +- .../Bluechirp.Library/Enums/TimelineType.cs | 2 +- .../Bluechirp.Library/Helpers/AsyncHelper.cs | 2 +- Source/Bluechirp.Library/Interop/ShellCore.cs | 2 +- Source/Bluechirp.Library/Interop/User32.cs | 20 +++++- .../Models/MastodonContent.cs | 20 +++++- .../Models/ProfileCredentials.cs | 2 +- .../Models/View/LoginViewModel.cs | 2 +- .../View/Navigation/SettingsViewModel.cs | 20 +++++- .../Models/View/ShellViewModel.cs | 2 +- .../View/Timelines/BaseTimelineViewModel.cs | 2 +- .../View/Timelines/HomeTimelineViewModel.cs | 2 +- .../Environment/IDispatcherService.cs | 2 +- .../Services/Environment/IInfoService.cs | 20 +++++- .../Services/Environment/ISettingsService.cs | 2 +- .../Services/Interface/INavigationService.cs | 2 +- .../Mastodon/IMastodonTextParserService.cs | 20 +++++- .../Services/Security/IAuthService.cs | 2 +- .../Services/Security/ICredentialService.cs | 2 +- .../Services/Security/IEncryptionService.cs | 2 +- .../Utility/IInstanceUtilityService.cs | 2 +- Source/Bluechirp/App.Services.xaml.cs | 2 +- Source/Bluechirp/App.xaml.cs | 2 +- Source/Bluechirp/Bluechirp.csproj | 17 +++--- .../Controls/MastodonTextControl.xaml.cs | 18 ++++++ Source/Bluechirp/Controls/TootControl.xaml.cs | 2 +- Source/Bluechirp/EntryPoint.cs | 2 +- Source/Bluechirp/MainWindow.xaml.cs | 2 +- .../Services/Environment/DispatcherService.cs | 2 +- .../Services/Environment/InfoService.cs | 20 +++++- .../Services/Environment/SettingsService.cs | 2 +- .../Services/Interface/NavigationService.cs | 2 +- .../Mastodon/MastodonTextParserService.cs | 61 ++++++++++++++----- .../Services/Security/AuthService.cs | 2 +- .../Services/Security/CredentialService.cs | 2 +- .../Services/Security/EncryptionService.cs | 2 +- .../Utility/InstanceUtilityService.cs | 2 +- Source/Bluechirp/Views/LoginPage.xaml.cs | 2 +- .../Views/Navigation/SettingsPage.xaml.cs | 18 ++++++ .../Views/Navigation/TimelinePage.xaml.cs | 2 +- Source/Bluechirp/Views/ShellPage.xaml.cs | 2 +- .../Bluechirp/Views/SplashScreenPage.xaml.cs | 2 +- 47 files changed, 260 insertions(+), 66 deletions(-) diff --git a/Bluechirp.sln.DotSettings b/Bluechirp.sln.DotSettings index bd59e4f..c78ce41 100644 --- a/Bluechirp.sln.DotSettings +++ b/Bluechirp.sln.DotSettings @@ -1,7 +1,7 @@  License Information (GPLv3) Bluechirp - A modern, native client for the Mastodon social media. -Copyright (C) 2023-${CurrentDate.Year} Analog Feelings and contributors. +Copyright (C) 2023 Analog Feelings and contributors. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Bluechirp.Library.csproj b/Source/Bluechirp.Library/Bluechirp.Library.csproj index 3da681f..d4c1519 100644 --- a/Source/Bluechirp.Library/Bluechirp.Library.csproj +++ b/Source/Bluechirp.Library/Bluechirp.Library.csproj @@ -1,6 +1,6 @@  - net8.0-windows10.0.22621.0 + net9.0-windows10.0.22621.0 10.0.17763.0 Bluechirp.Library win10-x86;win10-x64;win10-arm64 diff --git a/Source/Bluechirp.Library/Constants/AppConstants.cs b/Source/Bluechirp.Library/Constants/AppConstants.cs index 23c752b..24563ff 100644 --- a/Source/Bluechirp.Library/Constants/AppConstants.cs +++ b/Source/Bluechirp.Library/Constants/AppConstants.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Constants/SettingsConstants.cs b/Source/Bluechirp.Library/Constants/SettingsConstants.cs index e2955bb..cfe4d06 100644 --- a/Source/Bluechirp.Library/Constants/SettingsConstants.cs +++ b/Source/Bluechirp.Library/Constants/SettingsConstants.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Enums/ContentType.cs b/Source/Bluechirp.Library/Enums/ContentType.cs index 8553ccb..1955ba1 100644 --- a/Source/Bluechirp.Library/Enums/ContentType.cs +++ b/Source/Bluechirp.Library/Enums/ContentType.cs @@ -1,4 +1,22 @@ -namespace Bluechirp.Library.Enums; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +namespace Bluechirp.Library.Enums; /// /// The type of element inside a toot. diff --git a/Source/Bluechirp.Library/Enums/PageType.cs b/Source/Bluechirp.Library/Enums/PageType.cs index ef0ffc9..864e437 100644 --- a/Source/Bluechirp.Library/Enums/PageType.cs +++ b/Source/Bluechirp.Library/Enums/PageType.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Enums/TimelineType.cs b/Source/Bluechirp.Library/Enums/TimelineType.cs index 50a0a84..4cf9b4f 100644 --- a/Source/Bluechirp.Library/Enums/TimelineType.cs +++ b/Source/Bluechirp.Library/Enums/TimelineType.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Helpers/AsyncHelper.cs b/Source/Bluechirp.Library/Helpers/AsyncHelper.cs index 218d4b6..0139a6c 100644 --- a/Source/Bluechirp.Library/Helpers/AsyncHelper.cs +++ b/Source/Bluechirp.Library/Helpers/AsyncHelper.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Interop/ShellCore.cs b/Source/Bluechirp.Library/Interop/ShellCore.cs index 8287275..a5fe1f0 100644 --- a/Source/Bluechirp.Library/Interop/ShellCore.cs +++ b/Source/Bluechirp.Library/Interop/ShellCore.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Interop/User32.cs b/Source/Bluechirp.Library/Interop/User32.cs index 9e78b7f..d0b0d7a 100644 --- a/Source/Bluechirp.Library/Interop/User32.cs +++ b/Source/Bluechirp.Library/Interop/User32.cs @@ -1,4 +1,22 @@ -using System; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using System; using System.Runtime.InteropServices; namespace Bluechirp.Library.Interop; diff --git a/Source/Bluechirp.Library/Models/MastodonContent.cs b/Source/Bluechirp.Library/Models/MastodonContent.cs index bc0f2d8..0ec551a 100644 --- a/Source/Bluechirp.Library/Models/MastodonContent.cs +++ b/Source/Bluechirp.Library/Models/MastodonContent.cs @@ -1,4 +1,22 @@ -using Bluechirp.Library.Enums; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using Bluechirp.Library.Enums; using System; namespace Bluechirp.Library.Models; diff --git a/Source/Bluechirp.Library/Models/ProfileCredentials.cs b/Source/Bluechirp.Library/Models/ProfileCredentials.cs index eb27f55..69f0f16 100644 --- a/Source/Bluechirp.Library/Models/ProfileCredentials.cs +++ b/Source/Bluechirp.Library/Models/ProfileCredentials.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Models/View/LoginViewModel.cs b/Source/Bluechirp.Library/Models/View/LoginViewModel.cs index e49713e..2ceb01e 100644 --- a/Source/Bluechirp.Library/Models/View/LoginViewModel.cs +++ b/Source/Bluechirp.Library/Models/View/LoginViewModel.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Models/View/Navigation/SettingsViewModel.cs b/Source/Bluechirp.Library/Models/View/Navigation/SettingsViewModel.cs index 7debec8..dc726a2 100644 --- a/Source/Bluechirp.Library/Models/View/Navigation/SettingsViewModel.cs +++ b/Source/Bluechirp.Library/Models/View/Navigation/SettingsViewModel.cs @@ -1,4 +1,22 @@ -using Bluechirp.Library.Constants; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using Bluechirp.Library.Constants; using Bluechirp.Library.Services.Environment; using CommunityToolkit.Mvvm.Input; using System; diff --git a/Source/Bluechirp.Library/Models/View/ShellViewModel.cs b/Source/Bluechirp.Library/Models/View/ShellViewModel.cs index 35a4409..9d000d3 100644 --- a/Source/Bluechirp.Library/Models/View/ShellViewModel.cs +++ b/Source/Bluechirp.Library/Models/View/ShellViewModel.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Models/View/Timelines/BaseTimelineViewModel.cs b/Source/Bluechirp.Library/Models/View/Timelines/BaseTimelineViewModel.cs index 8f197fc..0cca579 100644 --- a/Source/Bluechirp.Library/Models/View/Timelines/BaseTimelineViewModel.cs +++ b/Source/Bluechirp.Library/Models/View/Timelines/BaseTimelineViewModel.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Models/View/Timelines/HomeTimelineViewModel.cs b/Source/Bluechirp.Library/Models/View/Timelines/HomeTimelineViewModel.cs index 8fca0c5..29005ac 100644 --- a/Source/Bluechirp.Library/Models/View/Timelines/HomeTimelineViewModel.cs +++ b/Source/Bluechirp.Library/Models/View/Timelines/HomeTimelineViewModel.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Environment/IDispatcherService.cs b/Source/Bluechirp.Library/Services/Environment/IDispatcherService.cs index 4584c6a..d2b8999 100644 --- a/Source/Bluechirp.Library/Services/Environment/IDispatcherService.cs +++ b/Source/Bluechirp.Library/Services/Environment/IDispatcherService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Environment/IInfoService.cs b/Source/Bluechirp.Library/Services/Environment/IInfoService.cs index 6fa44af..cb0b580 100644 --- a/Source/Bluechirp.Library/Services/Environment/IInfoService.cs +++ b/Source/Bluechirp.Library/Services/Environment/IInfoService.cs @@ -1,4 +1,22 @@ -using System; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using System; namespace Bluechirp.Library.Services.Environment; diff --git a/Source/Bluechirp.Library/Services/Environment/ISettingsService.cs b/Source/Bluechirp.Library/Services/Environment/ISettingsService.cs index b6dfa51..d4aa54f 100644 --- a/Source/Bluechirp.Library/Services/Environment/ISettingsService.cs +++ b/Source/Bluechirp.Library/Services/Environment/ISettingsService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Interface/INavigationService.cs b/Source/Bluechirp.Library/Services/Interface/INavigationService.cs index ad696c7..476e4ef 100644 --- a/Source/Bluechirp.Library/Services/Interface/INavigationService.cs +++ b/Source/Bluechirp.Library/Services/Interface/INavigationService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Mastodon/IMastodonTextParserService.cs b/Source/Bluechirp.Library/Services/Mastodon/IMastodonTextParserService.cs index 9d36933..d3cc4c5 100644 --- a/Source/Bluechirp.Library/Services/Mastodon/IMastodonTextParserService.cs +++ b/Source/Bluechirp.Library/Services/Mastodon/IMastodonTextParserService.cs @@ -1,4 +1,22 @@ -using Bluechirp.Library.Models; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using Bluechirp.Library.Models; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/Source/Bluechirp.Library/Services/Security/IAuthService.cs b/Source/Bluechirp.Library/Services/Security/IAuthService.cs index f4b9df3..b79fb6f 100644 --- a/Source/Bluechirp.Library/Services/Security/IAuthService.cs +++ b/Source/Bluechirp.Library/Services/Security/IAuthService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Security/ICredentialService.cs b/Source/Bluechirp.Library/Services/Security/ICredentialService.cs index f9b5b76..1514af3 100644 --- a/Source/Bluechirp.Library/Services/Security/ICredentialService.cs +++ b/Source/Bluechirp.Library/Services/Security/ICredentialService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Security/IEncryptionService.cs b/Source/Bluechirp.Library/Services/Security/IEncryptionService.cs index 023eec5..869f845 100644 --- a/Source/Bluechirp.Library/Services/Security/IEncryptionService.cs +++ b/Source/Bluechirp.Library/Services/Security/IEncryptionService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp.Library/Services/Utility/IInstanceUtilityService.cs b/Source/Bluechirp.Library/Services/Utility/IInstanceUtilityService.cs index ff45155..3032762 100644 --- a/Source/Bluechirp.Library/Services/Utility/IInstanceUtilityService.cs +++ b/Source/Bluechirp.Library/Services/Utility/IInstanceUtilityService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/App.Services.xaml.cs b/Source/Bluechirp/App.Services.xaml.cs index 07fe43d..c2ac525 100644 --- a/Source/Bluechirp/App.Services.xaml.cs +++ b/Source/Bluechirp/App.Services.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/App.xaml.cs b/Source/Bluechirp/App.xaml.cs index 734cba3..b47f9b4 100644 --- a/Source/Bluechirp/App.xaml.cs +++ b/Source/Bluechirp/App.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Bluechirp.csproj b/Source/Bluechirp/Bluechirp.csproj index a9b5d8c..b01f43b 100644 --- a/Source/Bluechirp/Bluechirp.csproj +++ b/Source/Bluechirp/Bluechirp.csproj @@ -1,7 +1,7 @@  WinExe - net8.0-windows10.0.22621.0 + net9.0-windows10.0.22621.0 10.0.19041.0 Bluechirp app.manifest @@ -16,6 +16,7 @@ 10.0.22621.38 true enable + True @@ -43,15 +44,15 @@ - - - - + + + + - - + + - + diff --git a/Source/Bluechirp/Controls/MastodonTextControl.xaml.cs b/Source/Bluechirp/Controls/MastodonTextControl.xaml.cs index 7166edf..a66a9a5 100644 --- a/Source/Bluechirp/Controls/MastodonTextControl.xaml.cs +++ b/Source/Bluechirp/Controls/MastodonTextControl.xaml.cs @@ -1,3 +1,21 @@ +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + using Bluechirp.Library.Enums; using Bluechirp.Library.Helpers; using Bluechirp.Library.Models; diff --git a/Source/Bluechirp/Controls/TootControl.xaml.cs b/Source/Bluechirp/Controls/TootControl.xaml.cs index 896ba4b..99afa4d 100644 --- a/Source/Bluechirp/Controls/TootControl.xaml.cs +++ b/Source/Bluechirp/Controls/TootControl.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/EntryPoint.cs b/Source/Bluechirp/EntryPoint.cs index 71c57bb..9f2e7e4 100644 --- a/Source/Bluechirp/EntryPoint.cs +++ b/Source/Bluechirp/EntryPoint.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/MainWindow.xaml.cs b/Source/Bluechirp/MainWindow.xaml.cs index 7910b45..30a9d54 100644 --- a/Source/Bluechirp/MainWindow.xaml.cs +++ b/Source/Bluechirp/MainWindow.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Environment/DispatcherService.cs b/Source/Bluechirp/Services/Environment/DispatcherService.cs index eedbc68..d1fd927 100644 --- a/Source/Bluechirp/Services/Environment/DispatcherService.cs +++ b/Source/Bluechirp/Services/Environment/DispatcherService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Environment/InfoService.cs b/Source/Bluechirp/Services/Environment/InfoService.cs index 5873ae0..b473dbb 100644 --- a/Source/Bluechirp/Services/Environment/InfoService.cs +++ b/Source/Bluechirp/Services/Environment/InfoService.cs @@ -1,4 +1,22 @@ -using Bluechirp.Library.Services.Environment; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using Bluechirp.Library.Services.Environment; using System; using Windows.ApplicationModel; diff --git a/Source/Bluechirp/Services/Environment/SettingsService.cs b/Source/Bluechirp/Services/Environment/SettingsService.cs index ffd0552..e145638 100644 --- a/Source/Bluechirp/Services/Environment/SettingsService.cs +++ b/Source/Bluechirp/Services/Environment/SettingsService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Interface/NavigationService.cs b/Source/Bluechirp/Services/Interface/NavigationService.cs index a57ebf7..27fee31 100644 --- a/Source/Bluechirp/Services/Interface/NavigationService.cs +++ b/Source/Bluechirp/Services/Interface/NavigationService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Mastodon/MastodonTextParserService.cs b/Source/Bluechirp/Services/Mastodon/MastodonTextParserService.cs index 2cd4519..14f975b 100644 --- a/Source/Bluechirp/Services/Mastodon/MastodonTextParserService.cs +++ b/Source/Bluechirp/Services/Mastodon/MastodonTextParserService.cs @@ -1,4 +1,22 @@ -using AngleSharp; +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + +using AngleSharp; using AngleSharp.Dom; using AngleSharp.Html.Dom; using Bluechirp.Library.Enums; @@ -41,21 +59,34 @@ public async Task> ParseHtmlAsync(string htmlContent) foreach (IElement topLevelElement in topLevelElements) { - if(topLevelElement is not IHtmlParagraphElement paragraph) - throw new InvalidDataException("A top level element was not a paragraph tag."); - - HandleParagraphTag(paragraph, ref contentList); - - // HACK: Maybe this is ugly? - if (!paragraph.IsLastChild()) + switch(topLevelElement.NodeName.ToLower()) { - MastodonContent newLineText = new MastodonContent() - { - Content = "\n\n", - ContentType = MastodonContentType.Text - }; - - contentList.Add(newLineText); + case "p": + HandleParagraphTag(topLevelElement as IHtmlParagraphElement, ref contentList); + + if (!topLevelElement.IsLastChild()) + { + MastodonContent newLineText = new MastodonContent() + { + Content = "\n\n", + ContentType = MastodonContentType.Text + }; + + contentList.Add(newLineText); + } + break; + case "#text": + HandleRawText(topLevelElement as IText, ref contentList); + break; + case "a": + HandleAnchorTag(topLevelElement as IHtmlAnchorElement, ref contentList); + break; + case "br": + HandleLineBreak(ref contentList); + break; + case "span": + HandleSpanTag(topLevelElement as IHtmlSpanElement, ref contentList); + break; } } } diff --git a/Source/Bluechirp/Services/Security/AuthService.cs b/Source/Bluechirp/Services/Security/AuthService.cs index d373ecb..c39d413 100644 --- a/Source/Bluechirp/Services/Security/AuthService.cs +++ b/Source/Bluechirp/Services/Security/AuthService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Security/CredentialService.cs b/Source/Bluechirp/Services/Security/CredentialService.cs index 2dd6172..b13b1e8 100644 --- a/Source/Bluechirp/Services/Security/CredentialService.cs +++ b/Source/Bluechirp/Services/Security/CredentialService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Security/EncryptionService.cs b/Source/Bluechirp/Services/Security/EncryptionService.cs index 760e067..a28ba32 100644 --- a/Source/Bluechirp/Services/Security/EncryptionService.cs +++ b/Source/Bluechirp/Services/Security/EncryptionService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Services/Utility/InstanceUtilityService.cs b/Source/Bluechirp/Services/Utility/InstanceUtilityService.cs index 1178588..24355c4 100644 --- a/Source/Bluechirp/Services/Utility/InstanceUtilityService.cs +++ b/Source/Bluechirp/Services/Utility/InstanceUtilityService.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Views/LoginPage.xaml.cs b/Source/Bluechirp/Views/LoginPage.xaml.cs index f2fbb47..6a13c8c 100644 --- a/Source/Bluechirp/Views/LoginPage.xaml.cs +++ b/Source/Bluechirp/Views/LoginPage.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Views/Navigation/SettingsPage.xaml.cs b/Source/Bluechirp/Views/Navigation/SettingsPage.xaml.cs index a808fed..da64d11 100644 --- a/Source/Bluechirp/Views/Navigation/SettingsPage.xaml.cs +++ b/Source/Bluechirp/Views/Navigation/SettingsPage.xaml.cs @@ -1,3 +1,21 @@ +#region License Information (GPLv3) +// Bluechirp - A modern, native client for the Mastodon social media. +// Copyright (C) 2023 Analog Feelings and contributors. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#endregion + using Bluechirp.Library.Models.View.Navigation; using Microsoft.Extensions.DependencyInjection; using Microsoft.UI.Xaml.Controls; diff --git a/Source/Bluechirp/Views/Navigation/TimelinePage.xaml.cs b/Source/Bluechirp/Views/Navigation/TimelinePage.xaml.cs index a24a068..32fa0e5 100644 --- a/Source/Bluechirp/Views/Navigation/TimelinePage.xaml.cs +++ b/Source/Bluechirp/Views/Navigation/TimelinePage.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Views/ShellPage.xaml.cs b/Source/Bluechirp/Views/ShellPage.xaml.cs index 7ebc2de..4ec27dc 100644 --- a/Source/Bluechirp/Views/ShellPage.xaml.cs +++ b/Source/Bluechirp/Views/ShellPage.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Source/Bluechirp/Views/SplashScreenPage.xaml.cs b/Source/Bluechirp/Views/SplashScreenPage.xaml.cs index 52b1647..a858d2f 100644 --- a/Source/Bluechirp/Views/SplashScreenPage.xaml.cs +++ b/Source/Bluechirp/Views/SplashScreenPage.xaml.cs @@ -1,6 +1,6 @@ #region License Information (GPLv3) // Bluechirp - A modern, native client for the Mastodon social media. -// Copyright (C) 2023-2024 Analog Feelings and contributors. +// Copyright (C) 2023 Analog Feelings and contributors. // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by