Merge remote-tracking branch 'origin/master' into roadmap

README.md

@@ -1,3 +1,16 @@
 # lbry.io
 
-The [lbry.io](https://lbry.io) website
+The [lbry.io](https://lbry.io) website.
+
+## Running lbry.io
+
+It's very easy to have lbry.io running locally:
+
+- Install PHP7
+- Checkout the project
+- Run `./dev.sh` from the project root
+- Access `localhost:8000` in your browser
+
+To run remotely, simply install PHP and configure Apache or your server of choice to serve `web/index.php`.
+
+Note that some pages and interactions rely on API keys that will not be available to you in your install.

controller/action/DownloadActions.class.php

@@ -86,6 +86,11 @@ class DownloadActions extends Actions
           Session::set(Session::KEY_PREFINER_USED_CUSTOM_CODE, true);
         }
       }
+      catch (CurlException $e)
+      {
+        $failure = true;
+        Slack::sendErrorIfProd($e);
+      }
       catch (PrefineryException $e)
       {
         $failure = true;

lib/tools/Debug.class.php

@@ -36,7 +36,7 @@ class Debug
     return $rtn;
   }
 
-  public static function exceptionFrameArgsToString($args)
+  public static function exceptionFrameArgsToString(array $args)
   {
     $ret = [];
     foreach ($args as $arg)
@@ -72,4 +72,4 @@ class Debug
     }
     return join(', ', $ret);
   }
-}
+}

lib/tools/Slack.class.php

@@ -0,0 +1,19 @@
+<?php
+
+class Slack
+{
+
+  public static function sendErrorIfProd($e)
+  {
+    if ($e instanceof Throwable)
+    {
+      4e = Debug::exceptionToString($e);
+    }
+
+    $slackErrorNotificationUrl = Config::get('slack_error_notification_url');
+    if ($slackErrorNotificationUrl)
+    {
+      Curl::post($slackErrorNotificationUrl, ['text' => '<!everyone> ' . $_SERVER['REQUEST_URI'] . "\n" . $e], ['json_data' => true]);
+    }
+  }
+}

lib/vendor/MCAPI.class.php

@@ -36,7 +36,7 @@ class MCAPI {
      * @param string $apikey Your MailChimp apikey
      * @param string $secure Whether or not this should use a secure connection
      */
-    function MCAPI($apikey, $secure=false) {
+    function __construct($apikey, $secure=false) {
         $this->secure = $secure;
         $this->apiUrl = parse_url("http://api.mailchimp.com/" . $this->version . "/?output=php");
         $this->api_key = $apikey;

posts/bounty/modified-block-explorer.md

@@ -14,5 +14,9 @@ Iquidus explorer is great, but does not currently support LBRY specific operatio
 
 The explorer should be modified to:
 
-- Display what LBRY name claims and supports
+- Display name claims in a transaction and link to claim info provided a txid
-- Exploration of name claims in a way similar to transactions
+- Display a support transaction and link to claim info provided a txid
+- Display claim information (name, claim txid, value, total amount, supports, and previous updates) provided a claim id
+- Display information for contesting name claims provided a lbry name
+
+This will likely require polling for changes in the result of `lbrycrd-cli getclaimsintrie` after each block, and subsiquently populating values from `lbrycrd-cli getclaimsforname` and `lbrycrd-cli getclaimsfortx`. 

posts/bounty/social-media-cover-images.md

@@ -6,11 +6,12 @@ status: available
 date: '2016-07-01'
 ---
 
-The current background images on our [Twitter](https://twitter.com/lbryio) and [Facebook](https://facebook.com/lbryio) are the same stock photo
+**Update: we have received new cover images that we like a lot more than our old ones! We're leaving this open because there is always room for improvement, but this won't be an easy one to win.**
-that is on our homepage. We'd like to do something a little more unique.
+
+The current background images on our [Twitter](https://twitter.com/lbryio) and [Facebook](https://facebook.com/lbryio) are the same stock photo that is on our homepage. We'd like to do something a little more unique.
 
 Candidate replacements could be either a photo or a graphic design. Either way, the image should:
 
 - Connote what LBRY is about: openness and fun
 - Be unique to LBRY or otherwise not in significant use
-- Suitable for white or LBRY green (#155B4A) text on top
+- Suitable for white or LBRY green (#155B4A) text on top

posts/bounty/transaction-history.md

@@ -2,11 +2,12 @@
 category: browser
 title: Add Transaction History to LBRY Browser
 award: 2000
-status: available
+status: complete
+pr: https://github.com/lbryio/lbry-web-ui/pull/46
 date: '2016-07-01'
 ---
 
-Add a screen showing transaction history the LBRY Browser [`lbry-web-ui`](https://github.com/lbry/lbry-web-ui).
+Add a screen showing transaction history the LBRY Browser [`lbry-web-ui`](https://github.com/lbryio/lbry-web-ui).
 
 The screen must:
 
@@ -15,4 +16,4 @@ The screen must:
 
 The LBRY daemon already supports an API call, `get_transaction_history` to retrieve transaction history. While running LBRY, type the following in your browser console:
 
-`lbry.call('get_transaction_history', {}, function(response) { console.log(response); });`
+`lbry.call('get_transaction_history', {}, function(response) { console.log(response); });`

posts/bounty/wallet-ui.md

@@ -3,7 +3,7 @@ category: browser
 title: Add Wallet Interface to LBRY Browser
 award: 2000
 status: complete
-pr: https://github.com/lbryio/lbry-web-ui/pull/23/files
+pr: https://github.com/lbryio/lbry-web-ui/pull/23
 date: '2016-07-01'
 ---
 

posts/faq/credit-policy.md

@@ -13,9 +13,9 @@ The initial 400m credits are broken down as follows:
 
 | Name | Amount | Purpose | Wallet (initial) |
 | ---- | ------ | ---------------- | -------- |
-| Community | 200m |  Reward early adopters, new users, and community contributions. | [link](https://explorer.lbry.io/address/rMT5Sg8SyFP3ax2PRaweRCRZoMeYw4znEi) |
+| Community | 200m |  Reward early adopters, new users, and community contributions. | [link](https://explorer.lbry.io/address/rRmURzvpHTysU4xUSp9CXeosBTbYfKs7n5) |
-| Operational | 100m | To allow LBRY, Inc. to function and profit. | [link](https://explorer.lbry.io/address/rEQKyb7nd7UUGyEEn5xRkk1fgXdTCf2ZCg) |
+| Operational | 100m | To allow LBRY, Inc. to function and profit. | [link](https://explorer.lbry.io/address/rTZF9RvfkLJ6hwCwERwFd7dppRMeddKjpe) |
-| Institutional | 100m |  For strategic partnerships or assistance with charities, non-profits, or other institutions. | [link](https://explorer.lbry.io/address/r9DarmxyPjWkF7ocyxMzaNZN3a9gJvNTZJ) |
+| Institutional | 100m |  For strategic partnerships or assistance with charities, non-profits, or other institutions. | [link](https://explorer.lbry.io/address/rVRMmGLZenVXpT1NwYMGcnwFc642kEgWTV) |
 
 ## Quartery Reports
 
@@ -68,4 +68,4 @@ LBRY, Inc. anticipates a dispersion period for these tokens significantly exceed
 
 ## More Details
 
-For specific details of fund utilization, check the most recent quarterly report.
+For specific details of fund utilization, check the most recent quarterly report.

posts/news/57-lbry-bounties.md

@@ -0,0 +1,35 @@
+---
+author: lbry
+title: 'Be Like Boba Fett – Earn Bounties for Helping LBRY Grow'
+date: '2016-08-18 00:06:18'
+cover: 'boba-fett.png'
+---
+The [LBRY Bounty Program](https://lbry.io/bounty) is now open to the public. Anyone in the world can now improve the future of the internet and digital content and *earn money at the same time*!
+
+LBRY has already benefited from significant community contributions, including basic debugging, content testing, publishing improvements... the list goes on and on. It’s now time to formalize our relationship with this awesome community by offering significant LBRY Credit (LBC) rewards for helping LBRY grow.
+
+![LBRY Bounties](/img/news/lbrybounties.png)
+
+On our [official bounty page](https://lbry.io/bounty), you’ll find details for each individual job, the compensation for completion, and the process for claiming a bounty. 
+
+The bounty list will be constantly growing, so bookmark it and check in regularly for updates. You’ll currently find:
+
+- [Adding support for BitTorrent](https://lbry.io/bounty/bittorrent-support) – 4,000 LBC 
+- [Add transaction history to LBRY browser](https://lbry.io/bounty/transaction-history) – 2,000 LBC
+- [Modified block explorer](https://lbry.io/bounty/modified-block-explorer) – 1,500 LBC
+- [PKG installer for OS X](https://lbry.io/bounty/pkg-installer-for-osx) – 1,500 LBC
+- [Create URL handler for Slack](https://lbry.io/bounty/slack-lbry-url-handler) – 1,000 LBC
+- [Internationalization of lbry.io](https://lbry.io/bounty/web-i18n) – 1,000 LBC
+- [LBRY Community Rep](https://lbry.io/bounty/lbry-club) – 500 LBC
+- [Write, broadcast or share LBRY](https://lbry.io/bounty/pr-for-lbry) – 500 LBC
+- [Create social media cover images](https://lbry.io/bounty/social-media-cover-images) - 400 LBC
+- [Publish open content](https://lbry.io/bounty/publish-open-content) – 250-1,000+ LBC
+- [Refer a publisher to LBRY](https://lbry.io/bounty/refer-publisher) – 100 LBC
+
+You can even [pitch us your own custom project](https://lbry.io/bounty/custom-project) and earn as much as *20,000 LBC* (reward determined by LBRY team). 
+
+**Please note:** These bounties are intended for LBRY updates our official team does not plan on addressing in the immediate future. The bounties you see are *not representative of all desired changes to LBRY*.
+
+All bounties are funded through genesis block LBRY Credits – [get the details here](https://lbry.io/news/lbry-blockchain-live-mine-lbc-now). 
+
+If you have questions about the bounty program or want more information about a specific bounty, please join [LBRY’s public Slack](http://slack.lbry.io/). 

posts/news/58-reweighting-wait-list.md

@@ -0,0 +1,26 @@
+---
+author: lbry
+title: 'LBRY Re-Weighting Massive Beta Waiting List'
+date: '2016-08-22 00:06:18'
+---
+The waiting list to download the LBRY beta is *well over 100,000 strong!* If you [join our Slack](http://slack.lbry.io/) (the best place to stay on top of updates and get questions answered), one of the top inquiries is: 
+
+**When will I get my beta invite code?**
+
+![Waiting for LBRY](/img/news/waiting.png)
+
+Now that publishing tools have been added to the beta, we will be steadily expanding the user base. 
+
+To that end, we have changed the way we weight those on the waiting list. Previously, we rewarded potential beta users for spreading the word about LBRY. Those who referred users to our waiting list were moved further towards the front of the line. 
+
+**We now factor in how long you have been on the waiting list.** Your position on LBRY’s waiting list is now determined by:
+
+<p align="center">The number of invited users credited to you **PLUS** the number of weeks you have been on the list.</p>
+
+Many of you have been waiting for a long while. We halted new invites for about a month after closed beta launch to work a key feature: publishing tools.
+
+Since [publishing went live](https://lbry.io/news/publish-tools-live-earn-1000-dollars) in the first week of August, we have added about 2,000 new beta users using this updated waiting list. Going forward, we intend to add approximately 500 beta users a week. 
+
+So if you’re still champing at the bit, then hang tight! 
+
+Remember – you can potentially jump the waiting list (and earn $1,000 in LBC) if you are a content creator interested in uploading quality digital media to LBRY. [Learn more about this opportunity here](https://lbry.io/publish). 

posts/news/59-ui-publishing-tools-upgrades.md

@@ -0,0 +1,20 @@
+---
+author: lbry
+title: 'UI & Publishing Tools Upgrade with Reflector'
+date: '2016-08-25 00:06:18'
+---
+Content publishers can now use a new feature called Reflector to upload files to LBRY, providing an easier, friendlier, and more permanent publishing experience. This coincides with a beautiful update to our user-interface – a big upgrade to the look and functionality of LBRY’s front-end:
+
+**<p style="text-align: center;">LBRY’s New UI</p>**
+![UI Screenshot](/img/news/lbryuiupgrade.png)
+
+LBRY [publishing tools came online](https://lbry.io/news/publish-tools-live-earn-1000-dollars) in the first week of August, but we found a significant number of people were still having trouble publishing. Reflector fixes these problems with a more robust form of publishing.
+
+**<p style="text-align: center;">Reflector Publishing Tools</p>**
+![Reflector screenshot](/img/news/reflector.png)
+
+Basically, Reflector ensures content is copied by other hosts before the data is ever requested by a user. Since this initial data is not paid for by the recipients, we want to be clear – *Reflector is non-mandatory.* 
+
+This feature is intended as a work around for network and firewall issues.
+
+If you have further questions, [please join LBRY’s public Slack](http://slack.lbry.io/). 

posts/news/60-heckbender-charney-on-lbry.md

@@ -0,0 +1,31 @@
+---
+author: lbry
+title: 'Kinda Sketchy, Totally Legit'
+date: '2016-08-26 00:06:18'
+cover: 'heckbendercover.png'
+---
+This week, we’ve added twice as many comedy partners as last week, starting with…
+
+**[Heck Bender](https://www.facebook.com/heckbender/)**, the Los Angeles-based sketch comedy channel with nothing to prove.
+
+![Heck Bender](/img/news/heckbender.png)
+
+Their latest sketch premieres exclusively on LBRY! *[The Colorado Bridge Incident](lbry://coloradobridge)*.
+
+When you’re done laughing, watch some of their greats like:
+
+- *[How to Help Non-Sports Fans Enjoy Sports](lbry://smallpenis)* – A new medication to help with those times when your buddies are really into the big game, but you? You just aren't...
+- *[Eminem - Rap God (Unofficial Pug Edition)](lbry://pugrapgod)* – It’s Eminem. In top Pug form.
+- *[True Christmas](lbry://truechristmas)* – Rust and Marty from HBO’s True Detective are in fact Santa and his top Elf, unraveling the mystery of the half eaten cookie plate.
+
+**[Charney Comedy](https://www.facebook.com/charneycomedy/)**
+
+![Charney Comedy](/img/news/charney.png)
+
+A whole ‘nother brand of Los Angeles comedy, Charney specializes in the art of the parody. Check out the top notes:
+
+- *[Lenders’ Den (Shark Tank)](lbry://LendersDen)* – America's most addicting reality sensation is back and BIGGER THAN EVER!
+- *[Moneyweasel (Moneyball)](lbry://moneyweasel)* – The Los Angeles Snards have a new backdoorsman in left shield, in this recreation of the scene from Moneyball wherein no one still knows what was said.
+- *[Loose Cannon (Resevoir Dogs)](lbry://LooseCannon)* – One last job, just like old times. Then they're on the next flight to Bora-Bora. ;^)
+
+**Not on LBRY yet?** [Get an invite here](https://lbry.io/get). Just can’t wait? If you’re a creator – filmmaker, musician, artist, writer – you can skip our waiting list line for a chance to earn $1,000 in LBRY Credits at the same time. [Learn more here](https://lbry.io/publish).

view/template/page/canary.php

@@ -0,0 +1,27 @@
+<?php Response::setMetaDescription('LBRY\'s warrant canary page') ?>
+<?php echo View::render('nav/_header', ['isDark' => false ]) ?>
+  <main>
+    <div class="content">
+      <h1>LBRY Warrant Canary</h1>
+      <p>
+        Through September 1st, 2017, LBRY has received:
+      </p>
+      <ul>
+        <li>Zero National Security Letters</li>
+        <li>Zero Foreign Intelligence Surveillance Court orders</li>
+        <li>Zero gag orders that prevent us from stating we have received legal process seeking user or visitor information.</li>
+      </ul>
+      <p>
+        The date on this page will be updated every 3 months.
+      </p>
+      <p>
+        You can view the source code and revision history of this page
+        <a href="https://github.com/lbryio/lbry.io/commits/master/view/template/page/canary.php" class="link-primary">here</a>.
+      </p>
+      <p>
+        To receive an automated update when this file changes, try
+        <a href="http://www.changedetection.com/" class="link-primary">changedetection.com</a>.
+      </p>
+    </div>
+  </main>
+<?php echo View::render('nav/_footer') ?>

web/index.php

@@ -27,14 +27,10 @@ catch(Throwable $e)
 {
   if (IS_PRODUCTION)
   {
-    $slackErrorNotificationUrl = Config::get('slack_error_notification_url');
+    Slack::sendErrorIfProd($e);
-    if ($slackErrorNotificationUrl)
-    {
-      Curl::post($slackErrorNotificationUrl, ['text' => '<!everyone> ' . $e->__toString()], ['json_data' => true]);
-    }
     throw $e;
   }
 
   http_response_code(500);
   echo '<pre>'.Debug::exceptionToString($e).'</pre>';
-}
+}