diff --git a/admin/css/lbry-admin.css b/admin/css/lbry-admin.css index 5fea468..7763519 100644 --- a/admin/css/lbry-admin.css +++ b/admin/css/lbry-admin.css @@ -14,6 +14,12 @@ margin-bottom: -.2em; } +.channel-bid-icon-lbc { + height: 1.1em; + margin-right: .1em; + margin-bottom: -.2em; +} + .lbry-pub-metabox { margin: 0 0 0 -.2em; padding: 0 .2em 0 0 ; @@ -21,14 +27,14 @@ .meta-icon-lbry { height: 1.55em; margin-bottom: -.4em; - padding-left: .1em; + padding: 0 .1em 0 0; } .lbry-meta-checkbox-wrapper { padding: .5em .8em .6em; } .lbry-meta-wrapper-last { - padding: 0em .8em 1.2em; + padding: 0em .8em 1.5em; } .lbry-meta-label { @@ -79,4 +85,39 @@ .lbry-meta-bx-content-last { padding: .2em .8em 1em .1em; +} + +table.lbry-channel-table { + width: 100%; + border-collapse: collapse; + font-family: Georgia; +} + +.lbry-channel-table th, .lbry-channel-table td { + padding: .4em 1.6em; + border: 2px solid #fff; + background: #fbd7b4; + font-size: 1em; +} +.lbry-channel-table thead th { + padding: .5em 2em; + background: #f69546; + text-align: left; + font-weight: normal; + font-size: 1.2em; + color: #fff; +} +.lbry-channel-table tbody tr:nth-child(odd) *:nth-child(even), .lbry-channel-table tbody tr:nth-child(even) *:nth-child(odd) { + background: #f3eddd; +} +.lbry-channel-table tfoot th { + padding: .5em 2em; + background: #f69546; + text-align: left; + font-weight: normal; + font-size: .9em; + color: #fff; +} +.lbry-channel-table tr *:nth-child(3), .lbry-channel-table tr *:nth-child(4) { + /* text-align: right; */ } \ No newline at end of file diff --git a/classes/LBRY_Admin.php b/classes/LBRY_Admin.php index e4a7fcb..3b521e2 100644 --- a/classes/LBRY_Admin.php +++ b/classes/LBRY_Admin.php @@ -19,6 +19,7 @@ class LBRY_Admin add_action('admin_init', array($this, 'page_init')); add_action('admin_init', array($this, 'wallet_balance_warning')); add_action('admin_post_lbry_add_channel', array($this, 'add_channel')); + add_action('admin_post_lbry_supports_add', array($this, 'supports_add')); } /** @@ -33,7 +34,7 @@ class LBRY_Admin 'manage_options', LBRY_ADMIN_PAGE, array( $this, 'options_page_html' ), - plugin_dir_url( LBRY_PLUGIN_FILE ) . '/admin/images/lbry-icon.png' + plugin_dir_url( LBRY_PLUGIN_FILE ) . '/admin/images/lbry-icon.png' ); // Admin stylesheet enqueue @@ -253,19 +254,56 @@ class LBRY_Admin public function available_channels_callback() { $channel_list = LBRY()->daemon->channel_list(); - if ( $channel_list ) { ?> - - -

Looks like you haven't added any channels yet, feel free to do so below:

- + + + Channel + LBRY URL + Posts + Supports + + + + claim_id; + $results = LBRY()->daemon->claim_search( $claim_id ); + $lbry_url = $results->items[0]->canonical_url; + if ( $lbry_url ) { + $open_url = str_replace( 'lbry://', 'open.lbry.com/', $lbry_url ); + } + $support_amount = $results->items[0]->meta->support_amount; + $claims_published = $results->items[0]->meta->claims_in_channel; + if ( ( $support_amount < 0.001 ) ) { + ( $support_amount = '0' ); + } elseif ( ( $support_amount < 0.01 ) && ( $support_amount >= 0.001 ) ) { + ( $support_amount = '<0.01' ); + } elseif ( ( $support_amount <= 0.099 ) && ( $support_amount >= 0.01) ) { + ( $support_amount = number_format( floatval( $support_amount ), 2, '.', '' ) ); + } elseif ( ( $support_amount <= 0.999 ) && ( $support_amount >= 0.1 ) ) { + ( $support_amount = number_format( floatval( $support_amount ), 1, '.', '' ) ); + } else { + ( $support_amount = number_format( intval( $support_amount ) ) ); + } + $init_bid = $results->items[0]->amount; ?> + + name, 'lbrypress' ); ?> + + + + Add + + + + + LBRYPress + + + +

Looks like you haven't added any channels yet, feel free to do so below:

+ 'lbrypress', 'tab' => 'channels' ), 'options.php' ) ); + + // Check that nonce + if ( isset( $_POST['_lbrynonce'] ) && wp_verify_nonce( $_POST['_lbrynonce'], 'add_supports_nonce' ) ) { + if ( empty( $_POST['lbry_supports_add_claim_id'] ) || empty( $_POST['lbry_supports_add_amount'] ) ) { + LBRY()->notice->set_notice( 'error', 'Must supply both channel name and bid amount' ); + } elseif ( isset( $_POST['lbry_supports_add_claim_id'] ) && isset( $_POST['lbry_supports_add_amount'] ) ) { + $claim_id = $_POST['lbry_supports_add_claim_id']; // TODO: sanitize key() only allows for lowercase chars, dashes, and underscores. maybe remove to allow more characters? and use something else for better control? + + $bid = $_POST['lbry_supports_add_amount']; + $support_bid = number_format( floatval( $bid ), 3, '.', '' ); + + // Try to add the new channel + try { + // $result = LBRY()->daemon->channel_new( $claim_id, $supports_bid ); + // Tell the user it takes some time to go through + LBRY()->notice->set_notice( + 'success', 'Successfully added supports for: @' . esc_html( $claim_name ) . '! Please allow a few minutes for the bid to process.', true ); + + } catch ( \Exception $e ) { + LBRY()->notice->set_notice( 'error', $e->getMessage(), false ); + } + } + } else { + LBRY()->notice->set_notice('error', 'Security check failed' ); + die( __( 'Security check failed', 'lbrypress' ) ); + } + + wp_safe_redirect( $redirect_url ); + exit(); + } + /** * Checks at most once an hour to see if the wallet balance is too low */ @@ -474,19 +549,21 @@ class LBRY_Admin public static function wallet_balance_warning() { // See if we've checked in the past two hours - if (!get_transient('lbry_wallet_check')) { - $balance = LBRY()->daemon->wallet_balance(); - if ($balance < get_option(LBRY_SETTINGS)[LBRY_LBC_PUBLISH] * 20) { + if ( ! get_transient( 'lbry_wallet_check' ) ) { + $result = LBRY()->daemon->wallet_balance(); + $balance = $result->result->available; + $site_url = get_site_url(); + if ( $balance < get_option( LBRY_SETTINGS )[LBRY_LBC_PUBLISH] * 20 ) { // If LBRY Balance is low, send email, but only once per day - if (!get_transient('lbry_wallet_warning_email')) { - $email = get_option('admin_email'); + if ( ! get_transient( 'lbry_wallet_warning_email' ) ) { + $email = get_option( 'admin_email' ); $subject = 'Your LBRYPress Wallet Balance is Low!'; - $message = "Your LBRY Wallet for your WordPress installation at " . site_url() . " is running very low.\r\n\r\nYou currently have " . $balance . ' LBC left in your wallet. In order to keep publishing to the LBRY network, please add some LBC to your account.'; - wp_mail($email, $subject, $message); - set_transient('lbry_wallet_warning_email', true, DAY_IN_SECONDS); + $message = 'Your LBRY Wallet for your WordPress installation at ' . esc_html_e( $site_url ) . ' is running very low.\r\n\r\nYou currently have ' . esc_html_e( $balance ) . ' LBC left in your wallet. In order to keep publishing to the LBRY network, please add some LBC to your account.'; + wp_mail( $email, $subject, $message ); + set_transient( 'lbry_wallet_warning_email', true, DAY_IN_SECONDS ); } } - set_transient('lbry_wallet_check', true, 2 * HOUR_IN_SECONDS); + set_transient( 'lbry_wallet_check', true, 2 * HOUR_IN_SECONDS ); } } diff --git a/classes/LBRY_Network.php b/classes/LBRY_Network.php index b64481b..816e9a0 100644 --- a/classes/LBRY_Network.php +++ b/classes/LBRY_Network.php @@ -90,26 +90,38 @@ class LBRY_Network } $channel = $_POST[LBRY_POST_PUB_CHANNEL]; - $cur_channel = ( get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) ? get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) : get_post_meta( $post_id, '_lbry_channel', true ) ); + $cur_channel = ( get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) ? get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) : get_post_meta( $post_id, '_lbry_channel', true ) ); $license = $_POST[LBRY_POST_PUB_LICENSE]; $cur_license = get_post_meta( $post_id, LBRY_POST_PUB_LICENSE, true ); $will_publish = $_POST[LBRY_WILL_PUBLISH]; // Update meta acordingly - if ( $channel !== $cur_channel ) { + if ( ( $channel ) && ( $channel !== $cur_channel ) && ( $channel != null || $channel != '' ) ) { update_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, $channel ); delete_post_meta( $post_id, '_lbry_channel'); // remove the _lbry_channel if already set from the post and replaces with _lbry_post_pub_channel to avoid confusion } elseif ( $channel === $cur_channel && ( $cur_channel === get_post_meta( $post_id, '_lbry_channel', true ) ) ) { update_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, $channel ); - delete_post_meta( $post_id, '_lbry_channel'); // remove the _lbry_channel if already set from the post and replaces with _lbry_post_pub_channel to avoid confusion + delete_post_meta( $post_id, '_lbry_channel' ); // remove the _lbry_channel if already set from the post and replaces with _lbry_post_pub_channel to avoid confusion } - if ( $license !== $cur_license ) { + if ( ( $license ) && ( $license !== $cur_license ) && ( $license != null || $license != '' ) ) { + update_post_meta( $post_id, LBRY_POST_PUB_LICENSE, $license ); + } elseif ( $license === $cur_license && ( $cur_license === get_post_meta( $post_id, 'lbry_license', true ) ) ) { update_post_meta( $post_id, LBRY_POST_PUB_LICENSE, $license ); } - if ( ( $will_publish ) && ( $will_publish == 1 ) && $post->post_status == 'publish') { + $published = get_post_meta( $post_id, '_lbry_is_published', true ); + $will_pub = get_post_meta( $post_id, '_lbry_will_publish', true ); + if ( ( $will_pub == 0 ) && ( ! ( $published ) || ( $published ) == 0 ) ) { + // If not publishing to LBRY we want to not save unused values in database + delete_post_meta( $post_id, '_lbry_post_pub_channel' ); + delete_post_meta( $post_id, '_lbry_post_pub_license' ); + delete_post_meta( $post_id, '_lbry_canonical_url' ); + } + $pub_channel = ( $channel ) ? $channel : $cur_channel; + $pub_license = ( $license ) ? $license : $cur_license; + if ( ( $will_publish ) && ( $will_publish == true ) && ( $post->post_status == 'publish' ) && ( $pub_channel ) && ( $pub_license ) && ( $pub_license != null ) ) { // Publish the post on the LBRY Network - $this->publisher->publish( $post, $channel, $license ); + $this->publisher->publish( $post, $pub_channel, $pub_license ); } } @@ -127,32 +139,34 @@ class LBRY_Network $lbry_claim_id = get_post_meta( $post_id, '_lbry_claim_id', true ); if ( $_GET['action'] === 'edit' ) { if ( get_post_meta( $post_id, '_lbry_canonical_url', true ) == null || empty( get_post_meta( $post_id, '_lbry_canonical_url', true ) ) ) { - $canonical_url = LBRY()->daemon->canonical_url( $lbry_claim_id ); - update_post_meta( $post_id, '_lbry_canonical_url', $canonical_url ); + $canonical_url = LBRY()->daemon->canonical_url( $lbry_claim_id ); + if ( $canonical_url != null ) { + update_post_meta( $post_id, '_lbry_canonical_url', $canonical_url ); + } elseif ( $canonical_url == null ) { + delete_post_meta( $post_id, '_lbry_canonical_url' ); + } } } - if ( ( get_post_meta( $post_id, '_lbry_will_publish', true ) == true ) && (isset( $lbry_claim_id ) ) ) { - update_post_meta( $post_id, '_lbry_is_published', true ); - } - $lbry_published = get_post_meta( $post_id, '_lbry_is_published', true ); - $lbry_url = ( get_post_meta( $post_id, '_lbry_canonical_url', true ) ); + $lbry_url = ( get_post_meta( $post_id, '_lbry_canonical_url', true ) ); if ($lbry_url) { $open_url = str_replace('lbry://', 'open.lbry.com/', $lbry_url ); } - - $default_value = get_option( LBRY_SETTINGS )['lbry_default_publish_setting']; - $new_value = get_post_meta( $post_id, LBRY_WILL_PUBLISH, true ); - if ( ( $new_value ) ? $new_value : $new_value = $default_value ); - $value = $new_value; - if ( ( $value ) ? $value : 0 ); + + $lbry_published = get_post_meta( $post_id, '_lbry_is_published', true ); + $will_publish = get_post_meta( $post_id, '_lbry_will_publish', true ); + $lbry_post_pub_channel = get_post_meta( $post_id, '_lbry_post_pub_channel', true ); + if ( ( $will_publish ) ? $will_publish : $will_publish = get_option( LBRY_SETTINGS )['lbry_default_publish_setting'] ); + if ( ( $_GET['action'] === 'edit' ) ? $value = $lbry_published : $value = $will_publish ); + + $checked = checked( $value, true, false ); // nonce set on page meta-box.php - if ( ( $lbry_published ) && ( ( $lbry_url) || ( $lbry_claim_id ) ) ) { + if ( ( ( $will_publish == true ) && ( $lbry_post_pub_channel ) ) || ( ( ( $lbry_published ) || ( $lbry_claim_id ) ) && ( ( $lbry_url != null ) || ( $lbry_claim_id ) ) ) ) { printf( '
- Published on: LBRY + Published on: LBRY
LBRY URL: ' . esc_html__( '%3$s', 'lbrypress' ) . ' @@ -161,22 +175,22 @@ class LBRY_Network LBRY claim ID:

' . esc_html__( '%4$s', 'lbrypress' ) . '

- Update Post on: ' . esc_html__('LBRY', 'lbrypress') . ' + Update Post on: LBRY
', plugin_dir_url( LBRY_PLUGIN_FILE ) . 'admin/images/lbry.png', $open_url, $lbry_url, $lbry_claim_id, - checked( $value, true, false ), + $checked, LBRY_WILL_PUBLISH ); } else { printf ( '
- Publish to: ' . esc_html__('LBRY', 'lbrypress') . ' + Publish to: LBRY
', plugin_dir_url( LBRY_PLUGIN_FILE ) . 'admin/images/lbry.png', - checked( $value, true, false ), + $checked, LBRY_WILL_PUBLISH ); } diff --git a/templates/meta-box.php b/templates/meta-box.php index d50abb2..6e92560 100644 --- a/templates/meta-box.php +++ b/templates/meta-box.php @@ -18,60 +18,89 @@ $lbrynonce = wp_create_nonce( 'lbry_publish_post_nonce' ); $lbry_published = get_post_meta( $post_id, '_lbry_is_published', true ); $lbry_claim_id = get_post_meta( $post_id, '_lbry_claim_id', true ); -// $lbry_url = get_post_meta( $post_id, '_lbry_canonical_url', true ); $lbry_published_channel = get_post_meta( $post_id, '_lbry_post_published_channel', true ); -if ( ! ( $lbry_published_channel ) ) { - LBRY()->daemon->claim_search( $lbry_claim_id ); +if ( ( $lbry_published == true ) && ( $lbry_claim_id ) && ( ! ( $lbry_published_channel ) ) ) { + $result = LBRY()->daemon->claim_search( $lbry_claim_id ); + $name = $result->items[0]->signing_channel->name; + update_post_meta( $post_id, '_lbry_post_published_channel', $name ); } $lbry_channel_claim_id = get_post_meta( $post_id, '_lbry_post_pub_channel', true ); -//if ( $lbry_channel_claim_id === null ? 'Anonymously' : $lbry_channel_claim_id); $lbry_published_license = get_post_meta( $post_id, '_lbry_post_pub_license', true ); +if ( ( $lbry_published == true ) && ( ( $lbry_claim_id ) ) && ( ! ( $lbry_published_license ) ) ) { + $result = LBRY()->daemon->claim_search( $lbry_claim_id ); + $license = $result->items[0]->value->license; + update_post_meta( $post_id, '_lbry_post_pub_license', $license ); +} -$channels = LBRY()->daemon->channel_list(); -$channels[] = $unnatributed; $cur_channel = ( get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) ? get_post_meta( $post_id, LBRY_POST_PUB_CHANNEL, true ) : get_post_meta( $post_id, '_lbry_channel', true ) ); $default_channel = get_option( LBRY_SETTINGS )['default_lbry_channel']; $chan_open_url = ( 'open.lbry.com/'. $lbry_published_channel .'#' . $lbry_channel_claim_id . ''); -// Sort the channels in a natural way -usort( $channels, array( 'LBRYPress', 'channel_name_comp' ) ); ?> - daemon->claim_search( $lbry_claim_id ); + $init_bid = $results->items[0]->amount; + $support_amount = $results->items[0]->meta->support_amount; + if ( ( $support_amount < 0.001 ) ) { + ( $support_amount = '0' ); + } elseif ( ( $support_amount < 0.01 ) && ( $support_amount >= 0.001 ) ) { + ( $support_amount = '<0.01' ); + } elseif ( ( $support_amount <= 0.099 ) && ( $support_amount >= 0.01) ) { + ( $support_amount = number_format( floatval( $support_amount ), 2, '.', '' ) ); + } elseif ( ( $support_amount <= 0.999 ) && ( $support_amount >= 0.1 ) ) { + ( $support_amount = number_format( floatval( $support_amount ), 1, '.', '' ) ); + } else { + ( $support_amount = number_format( intval( $support_amount ) ) ); + } printf( - '
' . __( 'LBRY channel published at:', 'lbrypress' ) . '
' . esc_html__( '%1$s', 'lbrypress' ) . '
' . __( 'License published under:', 'lbrypress' ) .'
' . esc_html__( '%3$s', 'lbrypress' ) . '
', + '
' . __( 'Initial bid amount:', 'lbrypress' ) . ' + ' . esc_html__( '%1$s', 'lbrypress' ) . '
+
' . __( 'Supports:', 'lbrypress' ) . ' + ' . esc_html__( '%2$s', 'lbrypress' ) . '' . __( 'Add', 'lbrypress' ) . '
+
' . __( 'LBRY channel published to:', 'lbrypress' ) . '
+
' . esc_html__( '%3$s', 'lbrypress' ) . '
+
' . __( 'License published under:', 'lbrypress' ) .'
+
' . esc_html__( '%5$s', 'lbrypress' ) . '
', + $init_bid, + $support_amount, $lbry_published_channel, $chan_open_url, $lbry_published_license, ); - } else { ?> -
$channel ) { - $options .= ''; - } - printf( - '', - LBRY_POST_PUB_CHANNEL, - $options - ); - } - ?> -
licenses; - $options = ''; - $default_license = get_option(LBRY_SETTINGS)[LBRY_LICENSE]; - $cur_license = get_post_meta( $post_id, LBRY_POST_PUB_LICENSE, true ); + $options = ''; + if ( $channels ) { + foreach ( $channels as $index=>$channel ) { + $options .= ''; + } + printf( + '', + LBRY_POST_PUB_CHANNEL, + $options + ); + } + ?> +
licenses; + $options = ''; + $default_license = get_option(LBRY_SETTINGS)[LBRY_LICENSE]; + $cur_license = get_post_meta( $post_id, LBRY_POST_PUB_LICENSE, true ); // Create options list, select current license if ( $licenses ) { diff --git a/templates/options-page.php b/templates/options-page.php index a4648f1..29b4480 100644 --- a/templates/options-page.php +++ b/templates/options-page.php @@ -19,9 +19,19 @@ $lbry_active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'general'; + ' . esc_html__( 'Supports', 'lbrypress') . '', + $admin_url, + ); + } ?>
@@ -32,7 +42,9 @@ $lbry_active_tab = isset( $_GET['tab'] ) ? $_GET['tab'] : 'general'; do_settings_sections( LBRY_ADMIN_PAGE ); submit_button(); } elseif ( $lbry_active_tab == 'channels' ) { - include_once( 'channels-page.php' ); + //include_once( 'channels-page.php' ); + } elseif ( $lbry_active_tab == 'supports' ) { + // include_once( 'supports-add-form.php' ); } elseif ( $lbry_active_tab == 'speech' ) { settings_fields( LBRY_SPEECH_SETTINGS ); do_settings_sections( 'lbrypress-speech' ); diff --git a/templates/published_on_lbry_banner.php b/templates/published_on_lbry_banner.php index 8873b63..c32933e 100644 --- a/templates/published_on_lbry_banner.php +++ b/templates/published_on_lbry_banner.php @@ -1,23 +1,23 @@ daemon->canonical_url($channel_id); + $lbry_url = LBRY()->daemon->canonical_url( $channel_id ); } - if ($url) { - $url = str_replace('lbry://', 'open.lbry.com/', $url); + if ( $lbry_url ) { + $open_url = str_replace( 'lbry://', 'open.lbry.com/', $lbry_url ); } ?>
Stored Safely on Blockchain

- This post is published to LBRY blockchain - - at . + This post is published to the LBRY blockchain + + at: . . diff --git a/templates/supports-add-form.php b/templates/supports-add-form.php new file mode 100644 index 0000000..5a58a0d --- /dev/null +++ b/templates/supports-add-form.php @@ -0,0 +1,26 @@ + +

+ + + + + + + +