Показ стикеров

Author: Opiumtm

DvachBrowser3.Engines.Makaba/Engines/Makaba/Html/MakabaJsonResponseParseService.cs

@@ -218,20 +218,39 @@ private PostTree Parse(BoardPost2 data, ThreadLink link, bool isPreview)
             {
                 foreach (var f in data.Files)
                 {
-                    var mediaLink = new BoardMediaLink()
+                    BoardLinkBase mediaLink, tnLink;
+                    if (IsBoardLink(f.Path, link.Board))
+                    {
+                        mediaLink = new BoardMediaLink()
                         {
                             Engine = CoreConstants.Engine.Makaba,
                             Board = link.Board,
                             RelativeUri = RemoveBoardFromLink(f.Path),
                             KnownMediaType = f.Type == MakabaMediaTypes.Webm ? KnownMediaType.Webm : KnownMediaType.Default
                         };
-                    var tnLink = new BoardMediaLink()
+                        tnLink = new BoardMediaLink()
+                        {
+                            Engine = CoreConstants.Engine.Makaba,
+                            Board = link.Board,
+                            RelativeUri = RemoveBoardFromLink(f.Thumbnail),
+                            KnownMediaType = KnownMediaType.Default
+                        };
+                    }
+                    else
                     {
-                        Engine = CoreConstants.Engine.Makaba,
-                        Board = link.Board,
-                        RelativeUri = RemoveBoardFromLink(f.Thumbnail),
-                        KnownMediaType = KnownMediaType.Default
-                    };
+                        mediaLink = new MediaLink()
+                        {
+                            Engine = CoreConstants.Engine.Makaba,
+                            RelativeUri = f.Path,
+                            IsAbsolute = false,
+                        };
+                        tnLink = new MediaLink()
+                        {
+                            Engine = CoreConstants.Engine.Makaba,
+                            RelativeUri = f.Thumbnail,
+                            IsAbsolute = false
+                        };
+                    }
                     var media = new PostImageWithThumbnail()
                     {
                         Link = mediaLink,
@@ -256,6 +275,16 @@ private PostTree Parse(BoardPost2 data, ThreadLink link, bool isPreview)
             return result;
         }
 
+        private bool IsBoardLink(string uri, string board)
+        {
+            if (uri == null)
+            {
+                return false;
+            }
+            return uri.StartsWith($"/{board}/", StringComparison.OrdinalIgnoreCase) ||
+                   uri.StartsWith($"{board}/", StringComparison.OrdinalIgnoreCase);
+        }
+
         private string RemoveBoardFromLink(string uri)
         {
             var parts = uri?.Split('/');

DvachBrowser3.Engines.Makaba/Engines/Makaba/Json/BoardPostFile2.cs

@@ -7,6 +7,18 @@ namespace DvachBrowser3.Engines.Makaba.Json
     /// </summary>
     public class BoardPostFile2
     {
+        /// <summary>
+        /// Отображаемое имя.
+        /// </summary>
+        [JsonProperty("displayname")]
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// Полное имя.
+        /// </summary>
+        [JsonProperty("fullname")]
+        public string FullName { get; set; }
+
         /// <summary>
         /// Высота.
         /// </summary>
@@ -25,6 +37,12 @@ public class BoardPostFile2
         [JsonProperty("name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Не для работы.
+        /// </summary>
+        [JsonProperty("nsfw")]
+        public int NotSafeForWork { get; set; }
+
         /// <summary>
         /// Путь.
         /// </summary>
@@ -37,6 +55,12 @@ public class BoardPostFile2
         [JsonProperty("size")]
         public int Size { get; set; }
 
+        /// <summary>
+        /// Идентификатор стикера.
+        /// </summary>
+        [JsonProperty("sticker")]
+        public string Sticker { get; set; }
+
         /// <summary>
         /// Уменьшенное изображение.
         /// </summary>