feat(term): support feed annotations

ymgyt · Apr 10, 2024 · 937b561 · 937b561
1 parent 9c9c89a
commit 937b561
Show file tree

Hide file tree

Showing 18 changed files with 334 additions and 212 deletions.
diff --git a/.helix/languages.toml b/.helix/languages.toml
@@ -25,7 +25,7 @@ diagnostics.disabled = ["inactive-code"]
 hover.actions.enable = false
 
 [language-server.rust-analyzer.config.cargo]
-features = ["introspection", "integration", "opentelemetry-stdout"]
+features = ["introspection", "integration", "opentelemetry-stdout", "graphql"]
 
 [language-server.rust-analyzer.config.check]
 command  = "clippy"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,7 @@ repository  = "https://github.com/ymgyt/syndicationd"
 
 [workspace.dependencies]
 anyhow             = { version = "1", default-features = false, features = ["std"] }
+async-graphql      = { version = "7.0" }
 async-trait        = { version = "0.1.79", default-features = false }
 axum               = { version = "0.7.5", default-features = false }
 axum-server        = { version = "0.6.0", features = ["tls-rustls"] }
@@ -29,7 +30,6 @@ http               = { version = "0.2" }
 itertools          = { version = "0.12", default-features = false, features = ["use_std"] }
 kvsd               = { version = "0.1.3", default-features = false }
 moka               = { version = "0.12.4", features = ["future"] }
-nutype             = { version = "0.4.0", default-features = false }
 parse_duration     = { version = "2.1.1" }
 rand               = { version = "0.8.5" }
 reqwest            = { version = "0.11.24", default-features = false, features = ["rustls-tls", "json"] }

diff --git a/crates/synd_term/Cargo.toml b/crates/synd_term/Cargo.toml
@@ -33,7 +33,6 @@ graphql_client       = { workspace = true }
 html2text            = { version = "0.12" }
 itertools            = { workspace = true }
 nom                  = { version = "7.1.3", default-features = false, features = ["std"] }
-nutype               = { workspace = true }
 open                 = "5.1.0"
 parse_duration       = { workspace = true }
 ratatui              = { version = "0.26.0" }

diff --git a/crates/synd_term/gql/mutation.gql b/crates/synd_term/gql/mutation.gql
@@ -1,5 +1,5 @@
-mutation SubscribeFeed($input: SubscribeFeedInput!) {
-  subscribeFeed(input: $input) {
+mutation SubscribeFeed($subscribeInput: SubscribeFeedInput!) {
+  subscribeFeed(input: $subscribeInput) {
     __typename
     ... on SubscribeFeedSuccess {
       feed {
@@ -18,8 +18,8 @@ mutation SubscribeFeed($input: SubscribeFeedInput!) {
   }
 }
 
-mutation UnsubscribeFeed($input: UnsubscribeFeedInput!) {
-  unsubscribeFeed(input: $input) {
+mutation UnsubscribeFeed($unsubscribeInput: UnsubscribeFeedInput!) {
+  unsubscribeFeed(input: $unsubscribeInput) {
     __typename
     ... on UnsubscribeFeedSuccess {
       status {
@@ -43,6 +43,8 @@ fragment Feed on Feed {
   websiteUrl
   description
   generator
+  requirement
+  category
   entries(first: 20) {
     nodes {
       ...EntryMeta

diff --git a/crates/synd_term/gql/query.gql b/crates/synd_term/gql/query.gql
@@ -20,6 +20,8 @@ fragment Feed on Feed {
   websiteUrl
   description
   generator
+  requirement
+  category
   entries(first: 20) {
     nodes {
       ...EntryMeta

diff --git a/crates/synd_term/gql/schema.json b/crates/synd_term/gql/schema.json
@@ -71,6 +71,16 @@
           "name": "Boolean",
           "possibleTypes": null
         },
+        {
+          "description": null,
+          "enumValues": null,
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "kind": "SCALAR",
+          "name": "Category",
+          "possibleTypes": null
+        },
         {
           "description": null,
           "enumValues": null,
@@ -130,7 +140,7 @@
             {
               "args": [],
               "deprecationReason": null,
-              "description": "Entry summary",
+              "description": "Entry summary. If there is no summary of the entry, return the content(is this bad api?)",
               "isDeprecated": false,
               "name": "summary",
               "type": {
@@ -446,6 +456,30 @@
                 "name": "String",
                 "ofType": null
               }
+            },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": "Requirement level for feed",
+              "isDeprecated": false,
+              "name": "requirement",
+              "type": {
+                "kind": "ENUM",
+                "name": "Requirement",
+                "ofType": null
+              }
+            },
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": "Feed category",
+              "isDeprecated": false,
+              "name": "category",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Category",
+                "ofType": null
+              }
             }
           ],
           "inputFields": null,
@@ -1160,6 +1194,35 @@
           "name": "Query",
           "possibleTypes": null
         },
+        {
+          "description": "`Requirement` expresses how important the feed is\nusing an analogy to [RFC2119](https://datatracker.ietf.org/doc/html/rfc2119)",
+          "enumValues": [
+            {
+              "deprecationReason": null,
+              "description": "`Must` indicates it must be read",
+              "isDeprecated": false,
+              "name": "MUST"
+            },
+            {
+              "deprecationReason": null,
+              "description": "`Should` suggests it should be read unless there is a special reason not to",
+              "isDeprecated": false,
+              "name": "SHOULD"
+            },
+            {
+              "deprecationReason": null,
+              "description": "`May` implies it is probably worth reading",
+              "isDeprecated": false,
+              "name": "MAY"
+            }
+          ],
+          "fields": null,
+          "inputFields": null,
+          "interfaces": null,
+          "kind": "ENUM",
+          "name": "Requirement",
+          "possibleTypes": null
+        },
         {
           "description": null,
           "enumValues": [
@@ -1421,6 +1484,26 @@
                   "ofType": null
                 }
               }
+            },
+            {
+              "defaultValue": null,
+              "description": "Requirement level for feed",
+              "name": "requirement",
+              "type": {
+                "kind": "ENUM",
+                "name": "Requirement",
+                "ofType": null
+              }
+            },
+            {
+              "defaultValue": null,
+              "description": "Feed category",
+              "name": "category",
+              "type": {
+                "kind": "SCALAR",
+                "name": "Category",
+                "ofType": null
+              }
             }
           ],
           "interfaces": null,
@@ -2166,6 +2249,22 @@
           "description": "A GraphQL Schema defines the capabilities of a GraphQL server. It exposes\nall available types and directives on the server, as well as the entry\npoints for query, mutation, and subscription operations.",
           "enumValues": null,
           "fields": [
+            {
+              "args": [],
+              "deprecationReason": null,
+              "description": "description of __Schema for newer graphiql introspection schema\nrequirements",
+              "isDeprecated": false,
+              "name": "description",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              }
+            },
             {
               "args": [],
               "deprecationReason": null,