Merge pull request #46 from hmlendea/templates

Templates

Author: hmlendea

Service/Models/PersonalLogTemplate.cs

@@ -51,6 +51,8 @@ public enum PersonalLogTemplate
         AccountVisibilityMadePrivate,
         AccountVisibilityMadePublic,
         AlkalinePhosphataseMeasurement,
+        ApplicationInstallation,
+        ApplicationUninstallation,
         BedLinenChanging,
         BedMaking,
         BloodDonation,
@@ -137,7 +139,9 @@ public enum PersonalLogTemplate
         MicronationExternalRelationsRequestRejection,
         MicronationExternalRelationsRequestSending,
         MicronationExternalRelationsEstablishment,
+        MicronationFounding,
         MicronationLegalActIssuance,
+        MicronationNameChange,
         MicronationSettlementFounding,
         MicronationSettlementRankDowngrade,
         MicronationSettlementRankUpgrade,

Service/TextBuilding/IPersonalLogTextBuilder.cs

@@ -52,6 +52,8 @@ public interface IPersonalLogTextBuilder
         string BuildAccountVisibilityMadePrivateLogText(PersonalLog log);
         string BuildAccountVisibilityMadePublicLogText(PersonalLog log);
         string BuildAlkalinePhosphataseMeasurementLogText(PersonalLog log);
+        string BuildApplicationInstallationLogText(PersonalLog log);
+        string BuildApplicationUninstallationLogText(PersonalLog log);
         string BuildBedLinenChangingLogText(PersonalLog log);
         string BuildBedMakingLogText(PersonalLog log);
         string BuildBloodDonationLogText(PersonalLog log);
@@ -138,7 +140,9 @@ public interface IPersonalLogTextBuilder
         string BuildMicronationExternalRelationsRequestRejectionLogText(PersonalLog log);
         string BuildMicronationExternalRelationsRequestSendingLogText(PersonalLog log);
         string BuildMicronationExternalRelationsEstablishmentLogText(PersonalLog log);
+        string BuildMicronationFoundingLogText(PersonalLog log);
         string BuildMicronationLegalActIssuanceLogText(PersonalLog log);
+        string BuildMicronationNameChangeLogText(PersonalLog log);
         string BuildMicronationSettlementFoundingLogText(PersonalLog log);
         string BuildMicronationSettlementRankDowngradeLogText(PersonalLog log);
         string BuildMicronationSettlementRankUpgradeLogText(PersonalLog log);

Service/TextBuilding/Localisation/EnglishTextBuilder.cs

@@ -8,7 +8,7 @@ public class EnglishTextBuilder() : PersonalLogTextBuilderBase, IPersonalLogText
         protected override string LanguageCode => "en";
 
         public string BuildAccessoryCleaningLogText(PersonalLog log)
-            => $"I have cleaned {GetAccessoryType(log.Data)} by {GetCleaningMethod(log.Data)}" +
+            => $"I have cleaned {GetAccessoryType(log.Data, useDefinitiveForm: true)} by {GetCleaningMethod(log.Data)}" +
                 GetLocation(log.Data);
 
         public string BuildAccountActivationLogText(PersonalLog log)
@@ -767,6 +767,12 @@ public string BuildAlkalinePhosphataseMeasurementLogText(PersonalLog log)
             => $"My alkaline phosphatase level measured {GetDecimalValue(log.Data, "alkaline_phosphatase_level")} {GetDataValue(log.Data, "unit", "U/L")}" +
                 GetLocation(log.Data);
 
+        public string BuildApplicationInstallationLogText(PersonalLog log)
+            => $"I have installed the application {GetDataValue(log.Data, "application_name")} on {GetDevice(log.Data)}";
+
+        public string BuildApplicationUninstallationLogText(PersonalLog log)
+            => $"I have uninstalled the application {GetDataValue(log.Data, "application_name")} from {GetDevice(log.Data)}";
+
         public string BuildBedLinenChangingLogText(PersonalLog log)
             => "I have changed the bed linen" + GetLocation(log.Data);
 
@@ -2000,6 +2006,9 @@ public string BuildMicronationExternalRelationsEstablishmentLogText(PersonalLog
             return text;
         }
 
+        public string BuildMicronationFoundingLogText(PersonalLog log)
+            => $"I have founded the micronation of {GetDataValue(log.Data, "name")}";
+
         public string BuildMicronationLegalActIssuanceLogText(PersonalLog log)
         {
             string legalActTypeWord = GetMappedDataValue(
@@ -2043,6 +2052,9 @@ public string BuildMicronationLegalActIssuanceLogText(PersonalLog log)
             return text;
         }
 
+        public string BuildMicronationNameChangeLogText(PersonalLog log)
+            => $"I have changed the name of the micronation of {GetDataValue(log.Data, "old_name")} to {GetDataValue(log.Data, "new_name")}";
+
         public string BuildMicronationSettlementFoundingLogText(PersonalLog log)
         {
             string settlementType = GetMappedDataValue(
@@ -2797,7 +2809,12 @@ public string BuildVideoWatchingLogText(PersonalLog log)
         {
             string text = $"I have watched the video '{log.Data["video_title"]}'";
 
-            if (log.Data.TryGetValue("channel_name", out string channelName))
+            if (TryGetDataValue(log.Data, "video_id", out string videoId))
+            {
+                text += $" ({videoId})";
+            }
+
+            if (TryGetDataValue(log.Data, "channel_name", out string channelName))
             {
                 text += $" from the '{channelName}' channel";
             }

Service/TextBuilding/Localisation/RomanianTextBuilder.cs

@@ -8,7 +8,7 @@ public class RomanianTextBuilder() : PersonalLogTextBuilderBase, IPersonalLogTex
         protected override string LanguageCode => "ro";
 
         public string BuildAccessoryCleaningLogText(PersonalLog log)
-            => $"Mi-am curățat {GetAccessoryType(log.Data)} prin {GetCleaningMethod(log.Data)}" +
+            => $"Mi-am curățat {GetAccessoryType(log.Data, useDefinitiveForm: true)} prin {GetCleaningMethod(log.Data)}" +
                 GetLocation(log.Data);
 
         public string BuildAccountActivationLogText(PersonalLog log)
@@ -778,6 +778,12 @@ public string BuildAlkalinePhosphataseMeasurementLogText(PersonalLog log)
             => $"Nivelul de fosfatază alcalină a fost măsurat la {GetDecimalValue(log.Data, "alkaline_phosphatase_level")} {GetDataValue(log.Data, "unit", "U/L")}" +
                 GetLocation(log.Data);
 
+        public string BuildApplicationInstallationLogText(PersonalLog log)
+            => $"Am instalat aplicația {GetDataValue(log.Data, "application_name")} pe {GetDevice(log.Data)}";
+
+        public string BuildApplicationUninstallationLogText(PersonalLog log)
+            => $"Am dezinstalat aplicația {GetDataValue(log.Data, "application_name")} de pe {GetDevice(log.Data)}";
+
         public string BuildBedLinenChangingLogText(PersonalLog log)
             => "Am schimbat lenjeria de pat" + GetLocation(log.Data);
 
@@ -2029,6 +2035,9 @@ public string BuildMicronationExternalRelationsEstablishmentLogText(PersonalLog
             return text;
         }
 
+        public string BuildMicronationFoundingLogText(PersonalLog log)
+            => $"Am fondat micronațiunea {GetDataValue(log.Data, "name")}";
+
         public string BuildMicronationLegalActIssuanceLogText(PersonalLog log)
         {
             string legalActTypeWord = GetMappedDataValue(
@@ -2076,6 +2085,9 @@ public string BuildMicronationLegalActIssuanceLogText(PersonalLog log)
             return text;
         }
 
+        public string BuildMicronationNameChangeLogText(PersonalLog log)
+            => $"Am schimbat numele micronațiunii {GetDataValue(log.Data, "old_name")} în {GetDataValue(log.Data, "new_name")}";
+
         public string BuildMicronationSettlementFoundingLogText(PersonalLog log)
         {
             string settlementType = GetMappedDataValue(
@@ -2921,7 +2933,12 @@ public string BuildVideoWatchingLogText(PersonalLog log)
         {
             string text = $"Am vizionat video-ul '{log.Data["video_title"]}'";
 
-            if (log.Data.TryGetValue("channel_name", out string channelName))
+            if (TryGetDataValue(log.Data, "video_id", out string videoId))
+            {
+                text += $" ({videoId})";
+            }
+
+            if (TryGetDataValue(log.Data, "channel_name", out string channelName))
             {
                 text += $" de pe canalul '{channelName}'";
             }

Service/TextBuilding/PersonalLogTextBuilderBase.cs

@@ -309,6 +309,13 @@ protected bool TryGetByPerson(Dictionary<string, string> data, out string byPers
             return !MissingValue.Equals(byPerson);
         }
 
+        public bool TryGetDataValue(Dictionary<string, string> data, string key, out string value)
+        {
+            value = GetDataValue(data, key, null);
+
+            return !string.IsNullOrWhiteSpace(value);
+        }
+
         protected bool TryGetPlatform(Dictionary<string, string> data, out string platform)
         {
             platform = GetPlatform(data);