From 16856008fedd4d63a4ac2a55012f2c1b9de9cd5d Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 16:42:20 -0600
Subject: [PATCH 1/8] Updated 'address_list' to accomadate pagination

---
 classes/LBRY_Admin.php     |  2 +-
 classes/LBRY_Daemon.php    | 11 ++++++++---
 templates/options_page.php |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/classes/LBRY_Admin.php b/classes/LBRY_Admin.php
index 18cdac2..f9ae10d 100644
--- a/classes/LBRY_Admin.php
+++ b/classes/LBRY_Admin.php
@@ -149,7 +149,7 @@ class LBRY_Admin
     public function wallet_callback()
     {
         // Get first available address from Daemon
-        $address = LBRY()->daemon->address_list();
+        $address = LBRY()->daemon->address_list()->items;
         $address = is_array($address) && !empty($address) ? $address[0] : '';
         printf(
             '<input type="text" id="%1$s" name="%2$s[%1$s]" value="%3$s" readonly />',
diff --git a/classes/LBRY_Daemon.php b/classes/LBRY_Daemon.php
index dde6c21..1d523a8 100644
--- a/classes/LBRY_Daemon.php
+++ b/classes/LBRY_Daemon.php
@@ -45,14 +45,19 @@ class LBRY_Daemon
     }
 
     /**
-     * Returns an array of Address lists
+     * Returns an paginated array of Address lists
      * https://lbry.tech/api/sdk#address_list
      * @return array    Array of address lists linked to this account
      */
-    public function address_list()
+    public function address_list($page = 1)
     {
+        // Get 20 per page
+        $params = array(
+            'page'  => $page,
+            'page_size' => 20
+        );
         try {
-            $result = $this->request('address_list');
+            $result = $this->request('address_list', $params);
             return $result->result;
         } catch (LBRYDaemonException $e) {
             $this->logger->log('address_list error', $e->getMessage() . ' | Code: ' . $e->getCode());
diff --git a/templates/options_page.php b/templates/options_page.php
index 320f2ea..85e9dd2 100644
--- a/templates/options_page.php
+++ b/templates/options_page.php
@@ -17,6 +17,7 @@ $channel_list = $LBRY->daemon->channel_list();
     </form>
     <h2>Your Publishable Channels</h2>
     <?php if ($channel_list): ?>
+        <?php error_log(print_r($channel_list, true)); ?>
         <ul class="lbry-channel-list">
             <?php foreach ($channel_list as $channel): ?>
                 <li><?= $channel->name ?></li>

From 4752915e4d425ef810f5b13b8e572eb6067626d7 Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 16:49:03 -0600
Subject: [PATCH 2/8] Get address from returned items list in Address_List

---
 classes/LBRY_Admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/LBRY_Admin.php b/classes/LBRY_Admin.php
index f9ae10d..8d2f9bb 100644
--- a/classes/LBRY_Admin.php
+++ b/classes/LBRY_Admin.php
@@ -148,9 +148,9 @@ class LBRY_Admin
     */
     public function wallet_callback()
     {
-        // Get first available address from Daemon
+        // Get first available account address from Daemon
         $address = LBRY()->daemon->address_list()->items;
-        $address = is_array($address) && !empty($address) ? $address[0] : '';
+        $address = is_array($address) && !empty($address) ? $address[0]->address : '';
         printf(
             '<input type="text" id="%1$s" name="%2$s[%1$s]" value="%3$s" readonly />',
             LBRY_WALLET,

From 61a8544ece2d8bddea154e474d83e7b2ae338b79 Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 16:53:01 -0600
Subject: [PATCH 3/8] Wallet_Balance call now returns available balance

---
 classes/LBRY_Daemon.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/LBRY_Daemon.php b/classes/LBRY_Daemon.php
index 1d523a8..62972f5 100644
--- a/classes/LBRY_Daemon.php
+++ b/classes/LBRY_Daemon.php
@@ -67,7 +67,7 @@ class LBRY_Daemon
     }
 
     /**
-     * Returns the balance of a current LBRY account
+     * Returns the available balance of a current LBRY account
      * https://lbry.tech/api/sdk#account_balance
      * @param  string   $address    Wallet Address
      * @return float                Wallet Balance
@@ -76,7 +76,7 @@ class LBRY_Daemon
     {
         try {
             $result = $this->request('account_balance');
-            return $result->result;
+            return $result->result->available;
         } catch (LBRYDaemonException $e) {
             $this->logger->log('account_balance error', $e->getMessage() . ' | Code: ' . $e->getCode());
             LBRY()->notice->set_notice('error', 'Issue getting account balance.');

From d39503de10793a294d35efac6fde36c5b53fc79b Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 17:00:13 -0600
Subject: [PATCH 4/8] Channel List set to use new paginated SDK

---
 classes/LBRY_Daemon.php    | 10 ++++++++--
 templates/options_page.php |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/classes/LBRY_Daemon.php b/classes/LBRY_Daemon.php
index 62972f5..3db8337 100644
--- a/classes/LBRY_Daemon.php
+++ b/classes/LBRY_Daemon.php
@@ -87,12 +87,18 @@ class LBRY_Daemon
     /**
      * Returns a list of channels for this account
      * https://lbry.tech/api/sdk#channel_list
+     * @param  int      $page    Pagination page number
      * @return array    claim dictionary or null if empty
      */
-    public function channel_list()
+    public function channel_list($page = 1)
     {
+        $params = array(
+            'page'      => $page,
+            'page_size' => 20
+        );
+
         try {
-            $result = $this->request('channel_list')->result;
+            $result = $this->request('channel_list', $params)->result->items;
             return empty($result) ? null : $result;
         } catch (LBRYDaemonException $e) {
             $this->logger->log('channel_list error', $e->getMessage() . ' | Code: ' . $e->getCode());
diff --git a/templates/options_page.php b/templates/options_page.php
index 85e9dd2..320f2ea 100644
--- a/templates/options_page.php
+++ b/templates/options_page.php
@@ -17,7 +17,6 @@ $channel_list = $LBRY->daemon->channel_list();
     </form>
     <h2>Your Publishable Channels</h2>
     <?php if ($channel_list): ?>
-        <?php error_log(print_r($channel_list, true)); ?>
         <ul class="lbry-channel-list">
             <?php foreach ($channel_list as $channel): ?>
                 <li><?= $channel->name ?></li>

From d29fb3b12bcd57289d5a04e6c245991d27f2eb52 Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 17:04:37 -0600
Subject: [PATCH 5/8] Return Items list from Address_List

---
 classes/LBRY_Admin.php  | 2 +-
 classes/LBRY_Daemon.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/LBRY_Admin.php b/classes/LBRY_Admin.php
index 8d2f9bb..4f7f657 100644
--- a/classes/LBRY_Admin.php
+++ b/classes/LBRY_Admin.php
@@ -149,7 +149,7 @@ class LBRY_Admin
     public function wallet_callback()
     {
         // Get first available account address from Daemon
-        $address = LBRY()->daemon->address_list()->items;
+        $address = LBRY()->daemon->address_list();
         $address = is_array($address) && !empty($address) ? $address[0]->address : '';
         printf(
             '<input type="text" id="%1$s" name="%2$s[%1$s]" value="%3$s" readonly />',
diff --git a/classes/LBRY_Daemon.php b/classes/LBRY_Daemon.php
index 3db8337..36d4ce0 100644
--- a/classes/LBRY_Daemon.php
+++ b/classes/LBRY_Daemon.php
@@ -58,7 +58,7 @@ class LBRY_Daemon
         );
         try {
             $result = $this->request('address_list', $params);
-            return $result->result;
+            return $result->result->items;
         } catch (LBRYDaemonException $e) {
             $this->logger->log('address_list error', $e->getMessage() . ' | Code: ' . $e->getCode());
             LBRY()->notice->set_notice('error', 'Issue getting address list.');

From 4b58edfcd02992bf869a11c23f91f6935aae3fe7 Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 17:07:32 -0600
Subject: [PATCH 6/8] address_list docblock

---
 classes/LBRY_Daemon.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/LBRY_Daemon.php b/classes/LBRY_Daemon.php
index 36d4ce0..9b2b410 100644
--- a/classes/LBRY_Daemon.php
+++ b/classes/LBRY_Daemon.php
@@ -47,6 +47,7 @@ class LBRY_Daemon
     /**
      * Returns an paginated array of Address lists
      * https://lbry.tech/api/sdk#address_list
+     * @param  int      $page   Pagination page number
      * @return array    Array of address lists linked to this account
      */
     public function address_list($page = 1)

From c72c6f8543421d687b566c5b07b1596b0e1d39c8 Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 17:23:43 -0600
Subject: [PATCH 7/8] Updated channel_new sdk (now channel_create

---
 classes/LBRY_Daemon.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/LBRY_Daemon.php b/classes/LBRY_Daemon.php
index 9b2b410..1e1038a 100644
--- a/classes/LBRY_Daemon.php
+++ b/classes/LBRY_Daemon.php
@@ -110,7 +110,7 @@ class LBRY_Daemon
 
     /**
      * Create a claim for a new channel
-     * https://lbry.tech/api/sdk#channel_new
+     * https://lbry.tech/api/sdk#channel_create
      * @return array    dictionary containing result of the request
      */
     public function channel_new($channel_name, $bid_amount)
@@ -130,16 +130,16 @@ class LBRY_Daemon
 
         try {
             $result = $this->request(
-                'channel_new',
+                'channel_create',
                 array(
-                    'channel_name' => $channel_name,
-                    'amount' => number_format(floatval($bid_amount), 2, '.', '')
+                    'name' => $channel_name,
+                    'bid' => number_format(floatval($bid_amount), 2, '.', '')
                 )
             );
             return $result->result;
         } catch (LBRYDaemonException $e) {
             $this->logger->log('channel_new error', $e->getMessage() . ' | Code: ' . $e->getCode());
-            LBRY()->notice->set_notice('error', 'Issue creating new channel.');
+            throw new \Exception('Issue creating new channel.', 1);
             return;
         }
     }

From 5c6a16acddfe310b6150bf3b80d0734878102166 Mon Sep 17 00:00:00 2001
From: Paul Kirby <paulrdkirby@gmail.com>
Date: Mon, 27 Jan 2020 20:45:10 -0600
Subject: [PATCH 8/8] Updated publish Daemon call for sdk 0.54

---
 classes/LBRY_Network_Publisher.php | 74 +++++++++++++++---------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/classes/LBRY_Network_Publisher.php b/classes/LBRY_Network_Publisher.php
index 6f24386..3e52a0d 100644
--- a/classes/LBRY_Network_Publisher.php
+++ b/classes/LBRY_Network_Publisher.php
@@ -21,51 +21,53 @@ class LBRY_Network_Publisher
         $converted = LBRY()->network->parser->convert_to_markdown($post);
         $write_status = $file && fwrite($file, $converted);
         fclose($file);
-        $endtime = microtime(true);
 
         try {
+            if (!$write_status) {
+                throw new \Exception('Write Status failure', 1);
+            }
+
             // If everything went well with the conversion, carry on
-            if ($write_status) {
-                $args = array(
-                    'name' => $post->post_name,
-                    'bid' => number_format(floatval(get_option(LBRY_SETTINGS)[LBRY_LBC_PUBLISH]), 2, '.', ''),
-                    'file_path' => $filepath,
-                    'title' => $post->post_title,
-                    'language' => substr(get_locale(), 0, 2),
-                    'license' => get_option(LBRY_SETTINGS)[LBRY_LICENSE]
-                );
+            $args = array(
+                'name' => $post->post_name,
+                'bid' => number_format(floatval(get_option(LBRY_SETTINGS)[LBRY_LBC_PUBLISH]), 2, '.', ''),
+                'file_path' => $filepath,
+                'title' => $post->post_title,
+                'languages' => array(substr(get_locale(), 0, 2)),
+                'license' => get_option(LBRY_SETTINGS)[LBRY_LICENSE]
+            );
 
-                // Setup channel
-                if ($channel && $channel != 'null') {
-                    $args['channel_id'] = $channel;
-                }
+            // Setup channel
+            if ($channel && $channel != 'null') {
+                $args['channel_id'] = $channel;
+            }
 
-                // Setup featured image
-                $featured_id = get_post_thumbnail_id($post);
-                $featured_image = wp_get_attachment_image_src($featured_id, 'medium');
+            // Setup featured image
+            $featured_id = get_post_thumbnail_id($post);
+            $featured_image = wp_get_attachment_image_src($featured_id, 'medium');
 
-                if ($featured_image[0]) {
-                    $args['thumbnail'] = $featured_image[0];
-                }
+            if ($featured_image[0]) {
+                $args['thumbnail_url'] = $featured_image[0];
+            }
 
-                // Build description using Yoast if installed and its used, excerpt/title otherwise
-                $description = false;
-                if (class_exists('WPSEO_META')) {
-                    $description = WPSEO_META::get_value('opengraph-description', $post->ID);
-                }
-                if (!$description) {
-                    $excerpt = get_the_excerpt($post);
-                    $description = $excerpt ? $excerpt : $post->post_title;
-                }
-                $description .= ' | Originally published at ' . get_permalink($post);
+            // Build description using Yoast if installed and its used, excerpt/title otherwise
+            $description = false;
+            if (class_exists('WPSEO_META')) {
+                $description = WPSEO_META::get_value('opengraph-description', $post->ID);
+            }
+            if (!$description) {
+                $excerpt = get_the_excerpt($post);
+                $description = $excerpt ? $excerpt : $post->post_title;
+            }
+            $description .= ' | Originally published at ' . get_permalink($post);
 
-                $args['description'] = $description;
+            $args['description'] = $description;
 
-                $result = LBRY()->daemon->publish($args);
-                if ($result->success) {
-                    error_log(print_r($result, true));
-                    update_post_meta($post->ID, LBRY_PERM_URL, $result->output->permanent_url);
-                }
+            $result = LBRY()->daemon->publish($args);
+            $outputs = $result->outputs;
+
+            if ($outputs && is_array($outputs)) {
+                update_post_meta($post->ID, LBRY_PERM_URL, $result->outputs[0]->permanent_url);
             }
         } catch (Exception $e) {
             error_log('Issue publishing post ' . $post->ID . ' to LBRY: ' .  $e->getMessage());