From 2d3552da2a2e634a32484d6a1a458373af165ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 19 Jun 2024 23:26:46 +0200 Subject: [PATCH 1/2] Change back shape names to Twitter for backwards compatibility. User-facing content should continue to say "X". --- .../OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs | 2 +- .../Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs | 2 +- ...sign.cshtml => UpdateTwitterStatusTask.Fields.Design.cshtml} | 0 ...s.Edit.cshtml => UpdateTwitterStatusTask.Fields.Edit.cshtml} | 0 ...l.cshtml => UpdateTwitterStatusTask.Fields.Thumbnail.cshtml} | 0 .../{XSettings.Edit.cshtml => TwitterSettings.Edit.cshtml} | 0 ...inSettings.Edit.cshtml => TwitterSigninSettings.Edit.cshtml} | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateXStatusTask.Fields.Design.cshtml => UpdateTwitterStatusTask.Fields.Design.cshtml} (100%) rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateXStatusTask.Fields.Edit.cshtml => UpdateTwitterStatusTask.Fields.Edit.cshtml} (100%) rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/{UpdateXStatusTask.Fields.Thumbnail.cshtml => UpdateTwitterStatusTask.Fields.Thumbnail.cshtml} (100%) rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/{XSettings.Edit.cshtml => TwitterSettings.Edit.cshtml} (100%) rename src/OrchardCore.Modules/OrchardCore.Twitter/Views/{XSigninSettings.Edit.cshtml => TwitterSigninSettings.Edit.cshtml} (100%) diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs index 5754a343734..d0c827eb731 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs @@ -45,7 +45,7 @@ public override async Task EditAsync(TwitterSettings settings, B return null; } - return Initialize("XSettings_Edit", model => + return Initialize("TwitterSettings_Edit", model => { model.APIKey = settings.ConsumerKey; if (!string.IsNullOrWhiteSpace(settings.ConsumerSecret)) diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs index e3331541314..38f287a9ac6 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs @@ -35,7 +35,7 @@ public override async Task EditAsync(TwitterSigninSettings setti return null; } - return Initialize("XSigninSettings_Edit", model => + return Initialize("TwitterSigninSettings_Edit", model => { if (settings.CallbackPath.HasValue) { diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml similarity index 100% rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml similarity index 100% rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Edit.cshtml rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Thumbnail.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml similarity index 100% rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Thumbnail.cshtml rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml similarity index 100% rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSettings.Edit.cshtml rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSigninSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml similarity index 100% rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSigninSettings.Edit.cshtml rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml From 0afd9e3bfee807a59576b0ace6f8a9823c124291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ra=20El-Saig?= Date: Wed, 19 Jun 2024 23:38:41 +0200 Subject: [PATCH 2/2] Improve module searchability. --- src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs index 9cd4f012eab..4b6859ee54d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs +++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs @@ -11,14 +11,14 @@ [assembly: Feature( Id = TwitterConstants.Features.Twitter, - Name = "X Integration", + Name = "X (Twitter) Integration", Category = "X", Description = "Provides a TwitterClient and Workflow Activities to integrate with X" )] [assembly: Feature( Id = TwitterConstants.Features.Signin, - Name = "Sign in with X", + Name = "Sign in with X (Twitter)", Category = "X", Description = "Authenticates users with their X Account.", Dependencies = [TwitterConstants.Features.Twitter]