messages.getHistory, newsfeed.getBanned, ContentId, stuff

kasthack-labs · Nov 3, 2015 · 8a90ff8 · 8a90ff8
1 parent 2b8c407
commit 8a90ff8
Show file tree

Hide file tree

Showing 29 changed files with 468 additions and 104 deletions.
diff --git a/Sources/kasthack.vksharp/DataTypes/ContentId.cs b/Sources/kasthack.vksharp/DataTypes/ContentId.cs
diff --git a/Sources/kasthack.vksharp/DataTypes/Date.cs b/Sources/kasthack.vksharp/DataTypes/Date.cs
@@ -29,7 +29,7 @@ public static Date Parse(string innerText) {
             };
         }
         public override string ToString() {
-            return String.Format(
+            return string.Format(
                 Year != null ? "{0:D2}.{1:D2}.{2:D4}" : "{0:D2}.{1:D2}",
                 Day,
                 Month,
@@ -38,7 +38,7 @@ public override string ToString() {
         }
 
         public string ToString( string format, IFormatProvider formatProvider ) {
-            return String.Format(
+            return string.Format(
                 formatProvider,
                 Year != null ? "{0:D2}.{1:D2}.{2:D4}" : "{0:D2}.{1:D2}",
                 Day,

diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Attachment.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Attachment.cs
@@ -2,7 +2,7 @@
 
 namespace kasthack.vksharp.DataTypes.Entities {
     public class Attachment  {
-        public AttachmentType? Type { get; set; }
+        public ContentType? Type { get; set; }
         public Photo Photo { get; set; }
         public PostedPhoto PostedPhoto { get; set; }
         public Video Video { get; set; }
@@ -11,46 +11,46 @@ public class Attachment  {
         public Document Doc { get; set; }
         public Link Link { get; set; }
         public Note Note { get; set; }
-
+        public Comment WallReply { get; set; }
         public Poll Poll { get; set; }
         public Page Page { get; set; }
         public PhotoAlbum Album { get; set; }
-
+        public Post Wall { get; set; }
 
         public override string ToString() {
             switch ( Type ) {
-                case AttachmentType.Photo:
-                    return $"photo{Photo.OwnerId}_{Photo.Id}";
-                case AttachmentType.PostedPhoto:
-                    return $"photo{PostedPhoto.OwnerId}_{PostedPhoto.Id}";
-                case AttachmentType.Video:
-                    return $"video{Video.OwnerId}_{Video.Id}";
-                case AttachmentType.Audio:
-                    return $"audio{Audio.OwnerId}_{Audio.Id}";
-                case AttachmentType.Doc:
-                    return $"doc{Doc.OwnerId}_{Doc.Id}";
-                case AttachmentType.Link:
-                    return Link.Url;
+                case ContentType.Photo:
+                    return ((ContentId)Photo).ToAttachmentString();
+                case ContentType.PostedPhoto:
+                    return ((ContentId)PostedPhoto).ToAttachmentString();
+                case ContentType.Video:
+                    return ((ContentId)Video).ToAttachmentString();
+                case ContentType.Audio:
+                    return ((ContentId)Audio).ToAttachmentString();
+                case ContentType.Doc:
+                    return ((ContentId)Doc).ToAttachmentString();
+                case ContentType.Link:
+                    return ((ContentId)Link).ToAttachmentString();
                 //case AttachmentType.Graffiti:
-                    //break;
-                case AttachmentType.Note:
-                    return $"note{Note.OwnerId}_{Note.Id}";
+                //break;
+                case ContentType.Note:
+                    return ((ContentId)Note).ToAttachmentString();
                 //case AttachmentType.App:
                 //    break;
-                case AttachmentType.Poll:
-                    return $"poll{Poll.OwnerId}_{Poll.Id}";
-                case AttachmentType.Page:
-                    return $"page{-Page.GroupId}_{Page.Id}";
-                case AttachmentType.Album:
-                    return $"album{Album.OwnerId}_{Album.Id}";
+                case ContentType.Poll:
+                    return ((ContentId)Poll).ToAttachmentString();
+                case ContentType.Page:
+                    return ((ContentId)Page).ToAttachmentString();
+                case ContentType.Album:
+                    return ((ContentId)Album).ToAttachmentString();
                 //case AttachmentType.PhotosList:
-                    //break;
-                //case AttachmentType.Wall:
-                    //return $"wall{Album.OwnerId}_{Album.Id}";
-                //case AttachmentType.WallReply:
-                    //break;
+                //break;
+                case ContentType.Wall:
+                    return ((ContentId)Wall).ToAttachmentString();
+                case ContentType.WallReply:
+                    return ((ContentId) WallReply).ToAttachmentString();
                 //case null:
-                    //break;
+                //break;
                 default:
                     return $"Attached {Type}";
             }

diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Audio.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Audio.cs
@@ -12,5 +12,7 @@ public class Audio : OwnedEntity {
         public int Duration { get; set; }
 
         public override string ToString() => Artist + " - " + Title;
+        public static explicit operator ObjectContentId(Audio audio) => new ObjectContentId( ContentType.Audio, audio.Id, audio.OwnerId );
+        public static implicit operator ContentId(Audio audio) => (ObjectContentId)audio;
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Comment.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Comment.cs
@@ -1,15 +1,19 @@
 using System;
 using kasthack.vksharp.DataTypes.EntityFragments;
+using kasthack.vksharp.DataTypes.Enums;
+using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
-    public class Comment {
-        public long Id{ get; set; }
+    public class Comment : OwnedEntity {
+        public int PostId { get; set; }
         public int FromId{ get; set; }
+
         public DateTimeOffset Date { get; set; }
         public string Text { get; set; }
-        public int ReplyToUser{ get; set; }
-        public long ReplyToComment { get; set; }
         public Attachment[] Attachments { get; set; }
         public CommentLikes Likes { get; set; }
+        public int ReplyToUser { get; set; }
+        public long ReplyToComment { get; set; }
+        public static implicit operator ContentId(Comment comment)=>new ObjectContentId( ContentType.WallReply, comment.Id, comment.OwnerId );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Document.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Document.cs
@@ -1,4 +1,5 @@
-using kasthack.vksharp.DataTypes.Interfaces;
+using kasthack.vksharp.DataTypes.Enums;
+using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
     public class Document : OwnedEntity {
@@ -9,5 +10,6 @@ public class Document : OwnedEntity {
         public string Photo130 { get; set; }
 
         public string Ext { get; set; }
+        public static implicit operator ContentId(Document doc)=> new ObjectContentId( ContentType.Doc, doc.Id, doc.OwnerId );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Link.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Link.cs
@@ -6,6 +6,7 @@ public class Link  {
         public string ImageSrc { get; set; }
         public string PreviewPage { get; set; }
         public string PreviewUrl { get; set; }
+        public static implicit operator ContentId(Link link) => new StringContentId( link.Url );
     }
 }
 
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Message.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Message.cs
@@ -11,6 +11,7 @@ public class Message {
         public MessageType? Type { get; set; }
         public string Title { get; set; }
         public string Body { get; set; }
+        public bool Out { get; set; }
         public Attachment[] Attachments { get; set; }
         public Message[] ForwardedMessages { get; set; }
         public bool ContainsEmojiSmiles { get; set; }

diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Note.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Note.cs
@@ -1,4 +1,5 @@
 using System;
+using kasthack.vksharp.DataTypes.Enums;
 using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
@@ -10,5 +11,7 @@ public class Note : OwnedEntity {
         public int? ReadCommentCount { get; set; }
         public string Text { get; set; }
         public string Title { get; set; }
+
+        public static implicit operator ContentId(Note note) => new ObjectContentId( ContentType.Note, note.Id, note.OwnerId );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Page.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Page.cs
@@ -1,4 +1,5 @@
 using System;
+using kasthack.vksharp.DataTypes.Enums;
 
 namespace kasthack.vksharp.DataTypes.Entities {
 
@@ -17,7 +18,7 @@ public class Page {
         public int? EditorId { get; set; }
         public int CreatorId { get; set; }
         public string ViewUrl { get; set; }
-
+        public static implicit operator ContentId(Page page) => new ObjectContentId( ContentType.Page, page.Id, -page.GroupId );
     }
 
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Photo.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Photo.cs
@@ -24,6 +24,8 @@ public class Photo : OwnedEntity {
         //public Counter Tags { get; set; }
         public Counter Comments { get; set; }
         public PhotoSize[] Sizes { get; set; }
-        public static implicit operator Attachment( Photo photo ) => new Attachment { Photo = photo, Type = AttachmentType.Photo };
+
+        public static implicit operator Attachment( Photo photo ) => new Attachment { Photo = photo, Type = ContentType.Photo };
+        public static implicit operator ObjectContentId(Photo photo) => new ObjectContentId( ContentType.Photo, photo.Id, photo.OwnerId, photo.AccessKey );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/PhotoAlbum.cs b/Sources/kasthack.vksharp/DataTypes/Entities/PhotoAlbum.cs
@@ -1,4 +1,5 @@
-using kasthack.vksharp.DataTypes.Interfaces;
+using kasthack.vksharp.DataTypes.Enums;
+using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
 
@@ -13,5 +14,6 @@ public class PhotoAlbum : OwnedEntity {
         public bool CanUpload { get; set; }
         public Privacy PrivacyView { get; set; }
         public Privacy PrivacyComment { get; set; }
+        public static implicit operator ContentId(PhotoAlbum album)=> new ObjectContentId( ContentType.Album, album.Id, album.OwnerId );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Poll.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Poll.cs
@@ -1,4 +1,5 @@
-using kasthack.vksharp.DataTypes.Interfaces;
+using kasthack.vksharp.DataTypes.Enums;
+using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
     public class Poll : OwnedEntity {
@@ -7,5 +8,7 @@ public class Poll : OwnedEntity {
         public int Created { get; set; }
         public int Votes { get; set; }
         public int AnswerId { get; set; }
+
+        public static implicit operator ContentId(Poll poll) => new ObjectContentId( ContentType.Poll, poll.Id, poll.OwnerId );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Post.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Post.cs
@@ -29,6 +29,8 @@ public class Post : OwnedEntity {
         public Group[] Groups { get; set; }
         public User[] Profiles { get; set; }
 
+        public static implicit operator ContentId(Post post) => new ObjectContentId( ContentType.Wall, post.Id, post.OwnerId );
+
         public override string ToString () {
             return $"Post #{Id}@{OwnerId}by{FromId}";
         }

diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/PostedPhoto.cs b/Sources/kasthack.vksharp/DataTypes/Entities/PostedPhoto.cs
@@ -1,8 +1,10 @@
-using kasthack.vksharp.DataTypes.Interfaces;
+using kasthack.vksharp.DataTypes.Enums;
+using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
     public class PostedPhoto : OwnedEntity {
         public string Photo130 { get; set; }
         public string Photo640 { get; set; }
+        public static implicit operator ObjectContentId(PostedPhoto photo)=>new ObjectContentId( ContentType.PostedPhoto, photo.Id, photo.OwnerId );
     }
 }
diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/User.cs b/Sources/kasthack.vksharp/DataTypes/Entities/User.cs
@@ -152,7 +152,7 @@ private ushort? Graduation {
         public bool? IsFavorite { get; set; }
         public CropPhoto CropPhoto { get; set; }
         [JsonConverter(typeof(OneTwoFUConverter))]
-        public bool? IsFriend { get; set; }//todo:converter
+        public bool? IsFriend { get; set; }
         public FriendshipStatusEnum FriendStatus { get; set; }
         public GroupRole? Role { get; set; }
         private void CreateUniversityIfNotExists() {

diff --git a/Sources/kasthack.vksharp/DataTypes/Entities/Video.cs b/Sources/kasthack.vksharp/DataTypes/Entities/Video.cs
@@ -1,4 +1,5 @@
 using System;
+using kasthack.vksharp.DataTypes.Enums;
 using kasthack.vksharp.DataTypes.Interfaces;
 
 namespace kasthack.vksharp.DataTypes.Entities {
@@ -23,6 +24,7 @@ public class Video : OwnedEntity {
         public bool? UserLikes { get; set; }
         public int? LikesCount { get; set; }
         public bool? PlaybackLooped { get; set; }
+        public static implicit operator ContentId(Video video) => new ObjectContentId( ContentType.Video, video.Id, video.OwnerId, video.AccessKey );
     }
 
     public class TaggedVideo : Video{

diff --git a/...vksharp/DataTypes/Enums/AttachmentType.cs → ...ck.vksharp/DataTypes/Enums/ContentType.cs b/...vksharp/DataTypes/Enums/AttachmentType.cs → ...ck.vksharp/DataTypes/Enums/ContentType.cs
@@ -1,5 +1,5 @@
 namespace kasthack.vksharp.DataTypes.Enums {
-    public enum AttachmentType:byte {
+    public enum ContentType:byte {
         Photo,
         PostedPhoto,
         Video,