New channel and options page functionality

This commit is contained in:
Paul Kirby 2018-10-05 12:22:47 -05:00
parent 8839003fca
commit eebe712f2c
3 changed files with 41 additions and 10 deletions

View file

@ -191,9 +191,14 @@ class LBRY_Admin
$new_channel = $_POST['new_channel'];
$bid_amount = $_POST['bid_amount'];
// TODO: Wrap in a try catch
$result = LBRY()->daemon->channel_new($new_channel, $bid_amount);
LBRY()->notice->set_notice('success', 'Successfully added a new channel!', true);
// Try to add the new channel
try {
$result = LBRY()->daemon->channel_new($new_channel, $bid_amount);
// Tell the user it takes some time to go through
LBRY()->notice->set_notice('success', 'Successfully added a new channel! Please wait a few minutes for the bid to process.', true);
} catch (\Exception $e) {
LBRY()->notice->set_notice('error', $e->getMessage(), false);
}
}
wp_safe_redirect($redirect_url);

View file

@ -24,7 +24,7 @@ class LBRY_Daemon
public function wallet_unused_address()
{
$result = $this->request('wallet_unused_address');
return json_decode($result)->result;
return $result->result;
}
/**
@ -36,7 +36,7 @@ class LBRY_Daemon
public function wallet_balance()
{
$result = $this->request('wallet_balance');
return json_decode($result)->result;
return $result->result;
}
/**
@ -45,7 +45,7 @@ class LBRY_Daemon
*/
public function channel_list()
{
$result = json_decode($this->request('channel_list'))->result;
$result = $this->request('channel_list')->result;
return empty($result) ? null : $result;
}
@ -55,6 +55,20 @@ class LBRY_Daemon
*/
public function channel_new($channel_name, $bid_amount)
{
// TODO: Sanitize channel name and bid
// Make sure no @ sign, as we will add that
if (strpos($channel_name, '@')) {
throw new \Exception('Illegal character "@" in channel name', 1);
}
// No white space allowed
if (strpos($channel_name, ' ')) {
throw new \Exception("No spaces allowed in channel name", 1);
}
$channel_name = '@' . $channel_name;
$result = $this->request(
'channel_new',
array(
@ -62,8 +76,8 @@ class LBRY_Daemon
'amount' => floatval($bid_amount)
)
);
error_log($result);
return json_decode($result)->result;
$this->check_for_errors($result);
return $result->result;
}
/**
@ -94,7 +108,18 @@ class LBRY_Daemon
$result = curl_exec($ch);
curl_close($ch);
return $result;
return json_decode($result);
}
/**
* Checks for erros in decoded daemon response and throws an exception if it finds one
* @param $response
*/
private function check_for_errors($response)
{
if (property_exists($response, 'error')) {
throw new \Exception($response->error->message, $response->error->code);
}
}
/**

View file

@ -38,7 +38,8 @@ $channel_list = $LBRY->daemon->channel_list();
<tr>
<th scope="row">New Channel Name</th>
<td>
<input type="text" name="new_channel" value="" placeholder="Your New Channel" required>
<span>@</span>
<input type="text" name="new_channel" value="" placeholder="your-new-channel" required>
</td>
</tr>
<tr>