Merge pull request #485 from ddirty830/fix/missing-rawtext

fix: parse rawTax from text is missing
sim0n00ps · Jul 24, 2024 · 852198c · 852198c
2 parents c532851 + b0174c6
commit 852198c
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 5 deletions.
diff --git a/OF DL/Entities/Archived/Archived.cs b/OF DL/Entities/Archived/Archived.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using OF_DL.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -82,7 +83,23 @@ public class LinkedPost
             public object expiredAt { get; set; }
             public Author author { get; set; }
             public string text { get; set; }
-            public string rawText { get; set; }
+            private string _rawText;
+            public string rawText
+            {
+                get
+                {
+                    if (string.IsNullOrEmpty(_rawText))
+                    {
+                        _rawText = XmlUtils.EvaluateInnerText(text);
+                    }
+
+                    return _rawText;
+                }
+                set
+                {
+                    _rawText = value;
+                }
+            }
             public bool? lockedText { get; set; }
             public bool? isFavorite { get; set; }
             public bool? canReport { get; set; }
@@ -124,7 +141,23 @@ public class List
             public object expiredAt { get; set; }
             public Author author { get; set; }
             public string text { get; set; }
-            public string rawText { get; set; }
+            private string _rawText;
+            public string rawText
+            {
+                get
+                {
+                    if (string.IsNullOrEmpty(_rawText))
+                    {
+                        _rawText = XmlUtils.EvaluateInnerText(text);
+                    }
+
+                    return _rawText;
+                }
+                set
+                {
+                    _rawText = value;
+                }
+            }
             public bool? lockedText { get; set; }
             public bool? isFavorite { get; set; }
             public bool? canReport { get; set; }

diff --git a/OF DL/Entities/Post/Post.cs b/OF DL/Entities/Post/Post.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using OF_DL.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -74,7 +75,24 @@ public class List
         public object expiredAt { get; set; }
         public Author author { get; set; }
         public string text { get; set; }
-        public string rawText { get; set; }
+
+        private string _rawText;
+        public string rawText
+        {
+            get
+            {
+                if(string.IsNullOrEmpty(_rawText))
+                {
+                    _rawText = XmlUtils.EvaluateInnerText(text);
+                }
+
+                return _rawText;
+            }
+            set
+            {
+                _rawText = value;
+            }
+        }
         public bool? lockedText { get; set; }
         public bool? isFavorite { get; set; }
         public bool? canReport { get; set; }

diff --git a/OF DL/Entities/Post/SinglePost.cs b/OF DL/Entities/Post/SinglePost.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using OF_DL.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +17,23 @@ public class SinglePost
         public object expiredAt { get; set; }
         public Author author { get; set; }
         public string text { get; set; }
-        public string rawText { get; set; }
+        private string _rawText;
+        public string rawText
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_rawText))
+                {
+                    _rawText = XmlUtils.EvaluateInnerText(text);
+                }
+
+                return _rawText;
+            }
+            set
+            {
+                _rawText = value;
+            }
+        }
         public bool lockedText { get; set; }
         public bool isFavorite { get; set; }
         public bool canReport { get; set; }

diff --git a/OF DL/Entities/Streams/Streams.cs b/OF DL/Entities/Streams/Streams.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using OF_DL.Utils;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -52,7 +53,23 @@ public class List
             public object expiredAt { get; set; }
             public Author author { get; set; }
             public string text { get; set; }
-            public string rawText { get; set; }
+            private string _rawText;
+            public string rawText
+            {
+                get
+                {
+                    if (string.IsNullOrEmpty(_rawText))
+                    {
+                        _rawText = XmlUtils.EvaluateInnerText(text);
+                    }
+
+                    return _rawText;
+                }
+                set
+                {
+                    _rawText = value;
+                }
+            }
             public bool lockedText { get; set; }
             public bool isFavorite { get; set; }
             public bool canReport { get; set; }

diff --git a/OF DL/Utils/XmlUtils.cs b/OF DL/Utils/XmlUtils.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace OF_DL.Utils
+{
+    internal static class XmlUtils
+    {
+        public static string EvaluateInnerText(string xmlValue)
+        {
+            try
+            {
+                var parsedText = XElement.Parse($"<root>{xmlValue}</root>");
+                return parsedText.Value;
+            }
+            catch
+            { }
+
+            return string.Empty;
+        }
+    }
+}