fixed bug in tags with multiple citations appearing as several tags i…

…n the results
HerrKnarz · Sep 28, 2024 · 7ceec67 · 7ceec67
1 parent d20e240
commit 7ceec67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Metadata/WikipediaMetadata/Resources.cs b/Metadata/WikipediaMetadata/Resources.cs
@@ -117,7 +117,7 @@ public static class Resources
         /// <summary>
         /// Templates that will be removed from the results.
         /// </summary>
-        public static readonly string[] UnwantedTemplateNames = { "efn", "cite web" };
+        public static readonly string[] UnwantedTemplateNames = { "efn", "cite web", "cite tweet", "cite video game" };
 
         /// <summary>
         /// Possible names for video game release templates. Is needed to remove the country value from the list of platforms.

diff --git a/Metadata/WikipediaMetadata/WikitextParser.cs b/Metadata/WikipediaMetadata/WikitextParser.cs
@@ -477,21 +477,19 @@ internal List<MetadataProperty> GetValues(Template infoBox, string field, bool r
         internal TemplateArgument StripUnwantedElements(TemplateArgument argument)
         {
             // First we remove every template we don't want.
-            foreach (var x in argument.EnumDescendants().OfType<Template>()
-                .Where(t => Resources.UnwantedTemplateNames.Contains(CleanTemplateName(MwParserUtility.NormalizeTemplateArgumentName(t.Name)))))
+            foreach (var item in argument.EnumDescendants().OfType<Template>().Where(t =>
+                         Resources.UnwantedTemplateNames.Contains(
+                             CleanTemplateName(MwParserUtility.NormalizeTemplateArgumentName(t.Name)))).ToList())
             {
-                x.Remove();
+                item.Remove();
             }
 
             // Now we also remove <ref> tags, because those contain footnotes etc., we don't need.
             foreach (var line in argument.Value.Lines)
             {
-                foreach (var inline in line.EnumDescendants())
+                foreach (var item in line.EnumDescendants().Where(t => t.ToString().StartsWith("<ref")).ToList())
                 {
-                    if (inline.ToString().StartsWith("<ref"))
-                    {
-                        inline.Remove();
-                    }
+                    item.Remove();
                 }
             }