ttrss/ApiClient.cs

@@ -66,26 +66,25 @@ namespace ttrss_co_client.ttrss
             //???? = 7
             //???? = 8
             //1.14 = 9
-            //1.15 = 10
             assertInitialized();
-            return await getOneValue<int>("getApiLevel", "level");
+            return await oneValueGet<int>("getApiLevel", "level");
         }
 
         public async Task<bool> Logout()
         {
             assertInitialized();
 
-            return (await getOneValue<string>("logout", "status"))?.ToLower() == "ok";
+            return (await oneValueGet<string>("logout", "status"))?.ToLower() == "ok";
         }
         public async Task<bool> IsLoggedIn()
         {
             //assertInitialized();
-            return (await getOneValue<bool>("isLoggedIn", "status"));
+            return (await oneValueGet<bool>("isLoggedIn", "status"));
         }
         public async Task<int> GetUnread()
         {
             assertInitialized();
-            return await getOneValue<int>("getUnread", "unread");
+            return await oneValueGet<int>("getUnread", "unread");
         }
 
         ///<summary>at least in my installation, it doesn't seem to respect the parameters I give it, be it curl or here.</summary>
@@ -429,10 +428,10 @@ namespace ttrss_co_client.ttrss
         //     return apiResult;
         // }
         #endregion
+        public enum UPDATEMODE { SetFalse=0, SetTrue=1, Toggle=2 }
         ///<summary>to update note, see <see cref="UpdateArticleNote"/></summary>
         public enum UPDATEFIELD { starred=0, published=1, unread=2 }
-        public enum UPDATEMODE { SetFalse = 0, SetTrue = 1, Toggle = 2 }
+        public async Task<int> UpdateArticleField(UPDATEMODE mode, UPDATEFIELD field, params int[] ids)
-        public async Task<int> UpdateArticleField(UPDATEFIELD field, UPDATEMODE mode, params int[] ids)
         {
             if(ids == null || ids.Length == 0)
             {
@@ -462,7 +461,7 @@ namespace ttrss_co_client.ttrss
             {
                 throw new System.ArgumentNullException("ids", "need to specify at least one id");
             }
-
+            //documentation: UpdateArticle - for note, we have a separate method UpdateArticleNote
             assertInitialized();
 
             var json = JsonContent.Create(new
@@ -477,251 +476,83 @@ namespace ttrss_co_client.ttrss
             var apiResult = JsonConvert.DeserializeObject<ApiResponse<ArticleUpdateFieldResponse>>(response);
             return apiResult.Content.updated;
         }
-        public async Task<IEnumerable<Article>> GetArticles(params int[] article_id)
+        public async Task<IEnumerable<object>> GetArticle(params int[] article_id)
         {
             if (!article_id.Any())
             {
                 throw new ArgumentException("need at least one article_id");
             }
             assertInitialized();
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "getArticle",
-                sid = this.SessionId,
-                article_id = string.Join(',', article_id)
-            });
-            return await get<IEnumerable<Article>>(json);
         }
-        public async Task<datastructures.Configuration> GetConfig()
+        public async Task<Configuration> GetConfig()
         {
             assertInitialized();
-            var json = JsonContent.Create(new
+            throw new NotImplementedException();
-            {
-                op = "getConfig",
-                sid = this.SessionId
-            });
-            return await get<datastructures.Configuration>(json);
         }
         ///<summary>
         ///tell the feed to update. As opposed to updating our configuration of the feed.
         ///</summary>
-        public async Task<bool> UpdateFeed(int feed_id)
+        public async Task UpdateFeed(int feed_id)
         {
             assertInitialized();
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "updateFeed",
-                sid = this.SessionId,
-                feed_id = feed_id
-            });
-            var apiResponse = await get<Dictionary<string, string>>(json);
-
-            return apiResponse.ContainsKey("status") && apiResponse["status"]?.ToLower() == "ok";
         }
-        public async Task<T> GetPref<T>(string pref)
+        public async Task<string> GetPref(string key)
         {
             assertInitialized();
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "getPref",
-                sid = this.SessionId,
-                pref_name = pref
-            });
-            var apiResponse = await get<Dictionary<string, string>>(json);
-            try
-            {
-                var converter = TypeDescriptor.GetConverter(typeof(T));
-                if (converter != null)
-                {
-                    return (T)converter.ConvertFromString(apiResponse["value"]);
-                }
-                return default(T);
-            }
-            catch (NotSupportedException)
-            {
-                return default(T);
-            }
         }
         public enum CATCHUPMODE { All, OneDay, OneWeek, TwoWeeks }
-        ///<summary>Tries to catchup (e.g. mark as read) specified feed.</summary>
+        public async Task CatchupFeed(int feed_id, bool is_cat, CATCHUPMODE mode = CATCHUPMODE.All)
-        public async Task<bool> CatchupFeed(int feed_id, bool is_cat, CATCHUPMODE mode = CATCHUPMODE.All)
         {
             assertInitialized();
-
+            throw new NotImplementedException();
-            var modestring = "all";
-            if (mode != CATCHUPMODE.All)
-            {
-                assertApiLevel(15);
-                switch (mode)
-                {
-                    case CATCHUPMODE.OneDay:
-                        modestring = "1day";
-                        break;
-                    case CATCHUPMODE.OneWeek:
-                        modestring = "1week";
-                        break;
-                    case CATCHUPMODE.TwoWeeks:
-                        modestring = "2week";
-                        break;
         }
-            }
+        public async Task GetLabels(int? article_id)
-
-            var json = JsonContent.Create(new
-            {
-                op = "catchupFeed",
-                sid = this.SessionId,
-                feed_id = feed_id,
-                is_cat = is_cat,
-                mode = modestring
-            });
-            var apiResponse = await get<Dictionary<string, string>>(json);
-
-            return apiResponse.ContainsKey("status") && apiResponse["status"]?.ToLower() == "ok";
-        }
-        public async Task<IEnumerable<Label>> GetLabels(int? article_id = null)
         {
             assertInitialized();
-
+            if (article_id != null)
-            var json = JsonContent.Create(new
             {
-                op = "getLabels",
+                assertApiLevel(5);
-                sid = this.SessionId,
-                article_id = article_id
-            });
-            var labels = await get<IEnumerable<Label>>(json);
-            if (this.api_level < 5)
-            {
-                foreach (var l in labels)
-                {
-                    l.id = -11 - l.id;
             }
+            throw new NotImplementedException();
         }
-            return labels;
+        public async Task SetArticleLabel(int label_id, bool assign, params int[] article_ids)
-        }
-        public async Task<int> SetArticleLabel(int label_id, bool assign, params int[] article_ids)
         {
-            if (article_ids == null || article_ids.Length == 0)
+            //there's a label "cache", i guess?
-            {
-                throw new System.ArgumentNullException("ids", "need to specify at least one id");
-            }
             assertInitialized();
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "setArticleLabel",
-                sid = this.SessionId,
-                article_ids = string.Join(',', article_ids),
-                label_id = label_id,
-                assign = assign
-            });
-
-            var apiResponse = await get<Dictionary<string, string>>(json);
-
-            if (!apiResponse.ContainsKey("status") && apiResponse["status"]?.ToLower() == "ok")
-            {
-                return 0;
         }
-
+        public async Task ShareToPublished(string title, Uri url, string content, bool sanitize = true)
-            if (this.api_level <= 10)
         {
-                //update label cache
-                var tasks = new List<Task>();
-                foreach (var id in article_ids)
-                {
-                    tasks.Add(GetLabels(id));
-                }
-                Task.WaitAll(tasks.ToArray());
-            }
-            int toReturn;
-            if (int.TryParse(apiResponse["updated"], out toReturn))
-            {
-                return toReturn;
-            }
-            else
-            {
-                throw new Exception("update ostensibly ok, but couldn't parse");
-            }
-        }
-        public async Task<bool> ShareToPublished(string title, Uri url, string content, bool sanitize = true)
-        {
-            if (url == null)
-            {
-                throw new ArgumentNullException("url");
-            }
             assertInitialized();
             assertApiLevel(4);
             if (!sanitize)
                 assertApiLevel(20);
-
+            throw new NotImplementedException();
-
-            var json = JsonContent.Create(new
-            {
-                op = "shareToPublished",
-                sid = this.SessionId,
-                title = title,
-                url = url.ToString(),
-                content = content,
-                sanitize = sanitize
-            });
-
-            var apiResponse = await get<Dictionary<string, string>>(json);
-
-            return apiResponse.ContainsKey("status") && apiResponse["status"]?.ToLower() == "ok";
         }
-        ///<param name="category_id">0 = uncategorized</param>
+        ///<summary>
-        ///<param name="login">probably if the feed requires basic HTTP auth; the login? (decidedly not self-explanatory, gdi)</param>
+        ///<param name="login"/>if the feed requires basic HTTP auth; the login. (decidedly not self-explanatory, gdi)</param>
-        ///<param name="password">probably if the feed requires basic HTTP auth; the password? (decidedly not self-explanatory, gdi)</param>
+        ///<param name="password"/>if the feed requires basic HTTP auth; the password. (decidedly not self-explanatory, gdi)</param>
-        ///<returns>¯\_(ツ)_/¯ - code 1 = success, I think? - the documentation says "See subscribe_to_feed() in functions.php for details" - that function doesn't exist (as of 2023-04-04).</returns>
+        ///</summary>
-        public async Task<int> SubscribeToFeed(Uri feed_url, int category_id = 0, string login = null, string password = null)
+        public async Task SubscribeToFeed(Uri feed_url, int category_id, string login, string password)
         {
             assertInitialized();
             assertApiLevel(5);
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "subscribeToFeed",
-                sid = this.SessionId,
-                feed_url = feed_url.ToString(),
-                category_id = category_id,
-                login = login,
-                password = password
-            });
-            var apiResponse = await get<Dictionary<string, Dictionary<string, int>>>(json);
-            return apiResponse["status"]["code"];
         }
-        public async Task<bool> UnsubscribeFeed(int feed_id)
+        public async Task UnsubscribeFeed()
         {
             assertInitialized();
             assertApiLevel(5);
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "unsubscribeFeed",
-                sid = this.SessionId,
-                feed_id = feed_id.ToString()
-            });
-
-            var apiResponse = await get<Dictionary<string, string>>(json);
-
-            return apiResponse.ContainsKey("status") && apiResponse["status"]?.ToLower() == "ok";
         }
-        ///<returns>(almost) the whole shebang, for a user</returns>
+        public async Task GetFeedTree()
-        public async Task<Tree> GetFeedTree(bool include_empty = false)
         {
             assertInitialized();
             assertApiLevel(5);
-
+            throw new NotImplementedException();
-            var json = JsonContent.Create(new
-            {
-                op = "getFeedTree",
-                sid = this.SessionId,
-                include_empty = include_empty
-            });
-
-            return await get<Tree>(json);
         }
         private void assertInitialized()
         {
@@ -739,7 +570,7 @@ namespace ttrss_co_client.ttrss
         }
 
 
-        private async Task<T> getOneValue<T>(string op, string key)
+        private async Task<T> oneValueGet<T>(string op, string key)
         {
             //mostly you post {"op": "getAThing", "sid": "sessionId"}
             //and get back something like {"seq": 0, "status": 0, "content": {"the value you asked for": 0}}
@@ -764,11 +595,5 @@ namespace ttrss_co_client.ttrss
                 return default(T);
             }
         }
-        private async Task<T> get<T>(JsonContent json)
-        {
-            var response = await (await httpClient.PostAsync(BaseURI, json)).Content.ReadAsStringAsync();
-            var apiResult = JsonConvert.DeserializeObject<ttrss.messages.ApiResponse<T>>(response);
-            return apiResult.Content;
-        }
     }
 }

ttrss/Configuration.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net.Http.Json;
 
-namespace ttrss_co_client.ttrss.datastructures
+namespace ttrss_co_client.ttrss
 {
     public class Configuration
     {

ttrss/datastructures/Article.cs

@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-
-namespace ttrss_co_client.ttrss.datastructures
-{
-    public class Article
-    {
-        public int id { get; set; }
-        //TODO: custom converter for ttrss's guid
-        public string guid { get; set; }
-        public string title;
-        public Uri link;
-        //label-like. seems to be id, caption, fg color, bg color.
-        public IEnumerable<IEnumerable<string>> labels;
-        public bool unread;
-        public bool marked;
-        public bool published;
-        public string comments;
-        public string author;
-        public int updated;
-        public int feed_id;
-        public IEnumerable<Attachment> attachments;
-        public double score;
-        public string feed_title;
-        public string note;
-        public string lang;
-        public string content;
-    }
-}

ttrss/datastructures/Attachment.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace ttrss_co_client.ttrss.datastructures
-{
-    public class Attachment
-    {
-        public int id { get; set; }
-        public Uri content_url { get; set; }
-        public string content_type { get; set; }
-        ///<summary>a.k.a. article id</summary>
-        public int post_id { get; set; }
-        public string title { get; set; }
-        public string duration { get; set; }
-        public int width { get; set; }
-        public int height { get; set; }
-    }
-}

ttrss/datastructures/Feed.cs

@@ -10,7 +10,6 @@ namespace ttrss_co_client.ttrss.datastructures
         public int unread { get; set; }
         public bool has_icon { get; set; }
         public int cat_id { get; set; }
-        //TODO: custom converter for unix timestamps
         ///<summary>unix timestamp, see <see cref="TimeStamp" /></summary>
         public int last_updated { get; set; }
         public DateTime? TimeStamp 

ttrss/datastructures/Headline.cs

@@ -5,8 +5,7 @@ namespace ttrss_co_client.ttrss.datastructures
     public class Headline
     {
         public int id { get; set; }
-        //TODO: custom converter for ttrss's guid
+        public Guid guid { get; set; }
-        public string guid { get; set; }
         public bool unread { get; set; }
         public bool marked { get; set; }
         public bool published { get; set; }

ttrss/datastructures/Label.cs

@@ -4,17 +4,16 @@ namespace ttrss_co_client.ttrss.datastructures
 {
     public class Label
     {
-        public void FromArticle(string[] fromServer)
+        public Label(string[] fromServer)
         {
             int.TryParse(fromServer[0], out id);
-            caption = fromServer[1];
+            Title = fromServer[1];
-            fg_color = System.Drawing.ColorTranslator.FromHtml(fromServer[2]);
+            unknown = fromServer[2];
-            bg_color = System.Drawing.ColorTranslator.FromHtml(fromServer[3]);
+            Color =  System.Drawing.ColorTranslator.FromHtml(fromServer[3]);
         }
         public int id;
-        public string caption { get; set; }
+        public string Title { get; set; }
-        public System.Drawing.Color fg_color { get; set; }
+        public string unknown { get; set; }
-        public System.Drawing.Color bg_color { get; set; }
+        public System.Drawing.Color Color {get; set;}
-        public bool @checked { get; set;}
     }
 }

ttrss/datastructures/Tree.cs

@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-
-namespace ttrss_co_client.ttrss.datastructures
-{
-    public class Tree
-    {
-        public ItemCollection categories { get; set; }
-
-        public class ItemCollection
-        {
-            public string identifier { get; set; }
-            public string label { get; set; }
-            public IEnumerable<Item> items { get; set; }
-            public class Item
-            {
-                public string id { get; set; }
-                public int? bare_id { get; set; }
-                public int? auxcounter { get; set; }
-                public string name { get; set; }
-                public IEnumerable<Item> items { get; set; }
-                public bool? checkbox { get; set; }
-                public string type { get; set; }
-                public int? unread { get; set; }
-                public int? child_unread { get; set; }
-                public string param { get; set; }
-                public string fg_color { get; set; }
-                public string bg_color { get; set; }
-                public int? updates_disabled { get; set; }
-            }
-        }
-    }
-}