Compare commits

..
Author SHA1 Message Date
Jeremy Kauffman 76bc068b29 hacky app image support 2020-01-21 18:18:52 -05:00
Jeremy Kauffman 57f16b454c add faq image 2020-01-21 15:00:26 -05:00
Thomas Zarebczan eed77ff351 appimage redirects 2020-01-21 12:50:22 -05:00
Thomas Zarebczan 1f3ff568f4 invites FAQ (#1207) 2020-01-20 15:47:06 -05:00
Julie Sigwart ec189f0b7e Create 249-stossel.md 2020-01-15 15:25:03 -08:00
Julie Sigwart e8a30c69ad blog cover for stossel 2020-01-15 15:23:59 -08:00
Thomas Zarebczan f5952805dd Monthly wording on status page 2020-01-15 16:19:39 -05:00
Thomas Zarebczan 0a71da18b6 Update view rewards 2020-01-13 18:41:38 -05:00
Thomas Zarebczan 1b605334dd Update rewards amounts 2020-01-13 18:09:39 -05:00
Thomas Zarebczan 3674f6e515 Update dmca.php 2020-01-12 20:10:03 -05:00
joebass85 3d3ea1a2b5 Fixed typo in Where is my content stored and shared from (#1204) 2020-01-09 21:39:56 -05:00
Julie Sigwart adede340bc Create 248-naomiwu.md 2020-01-09 13:42:35 -08:00
Julie Sigwart c0918a65f2 NaomiWu LBRYcast blog cover 2020-01-09 09:15:15 -08:00
Thomas Zarebczan f883e44973 update trending link 2020-01-09 00:22:35 -05:00
Thomas Zarebczan 3d1e6938b3 mention red flag 2020-01-08 21:24:56 -05:00
Julie Sigwart 61a07db01e Create 247-fireworks.md (#1203)
* Create 247-fireworks.md
2020-01-08 12:24:02 -05:00
23 changed files with 214 additions and 98 deletions

No files matched your search

+2 -2
View File
@@ -17,13 +17,13 @@ Open the LBRY and navigate to the content you wish to report. Underneath the con
## How does LBRY handle and respond to a DMCA request or takedown notice?
Upon receipt of a DMCA request from the content owner or legal representative, LBRY Inc. will use its best judgment to determine validity. We will block access to content deemed infringing in any LBRY Inc. owned applications. LBRY Inc. will also remove any data related to the infringing content from servers within its control.
Upon receipt of a DMCA request from the content owner or legal representative, LBRY Inc. will use its best judgment to determine validity. We will block access to content deemed infringing in any LBRY Inc. owned applications. LBRY Inc. will also remove any data related to the infringing content from servers within its control. LBRY also must abide by the [red flag rule](https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Red_flags) also.
Due to the immutable nature of the LBRY blockchain, a record and metadata of the infringing content may continue to exist on network hosts if the original publisher does not remove it. The data may still exist on the original publisher's computer (and anyone who may have downloaded it prior to it being blocked) but will not be accessible through any LBRY Inc. controlled applications.
## Where are DMCA requests recorded?
You can view all of the DMCA requests LBRY receives on our [DMCA GitHub Repository](https://github.com/lbryio/dmca), categorized by year and dated by filename.
You can view all of the DMCA requests LBRY receives on our [DMCA GitHub Repository](https://github.com/lbryio/dmca), categorized by year and dated by filename. [Red flag DMCAs](https://en.wikipedia.org/wiki/Online_Copyright_Infringement_Liability_Limitation_Act#Red_flags) are currently not recorded.
## Can I dispute a DMCA complaint?
+1 -1
View File
@@ -104,7 +104,7 @@ Click `Remove`. If you abandoned your claim, you should see the deposit back in
## Where is my content stored and shared from? {#blobs}
Content uploaded is chunked up into 2MB files called blobs, and stored in your [lbrynet/blob files folder](https://lbry.com/faq/lbry-directories). These can be deleted if the fully is fully streamable on [https://lbry.tv](https://lbry.tv) or [spee.ch](https://spee.ch).
Content uploaded is chunked up into 2MB files called blobs, and stored in your [lbrynet/blob files folder](https://lbry.com/faq/lbry-directories). These can be deleted if the video is fully streamable on [https://lbry.tv](https://lbry.tv) or [spee.ch](https://spee.ch).
## Can someone tip me for my content?
Yes, check out how tipping in LBRY works by going [here](/faq/tipping).
+54
View File
@@ -0,0 +1,54 @@
---
title: How does the invite program work?
category: getstarted
---
You can earn LBRY Credits (LBC) for inviting others to use LBRY as well as letting us know who invited you. Invite new users to LBRY via email or a customized link on the [Invites page of LBRY Desktop or lbry.tv](http://open.lbry.com/?invite). This page will also show the status of existing invites.
*Note: Referral redemptions are typically limited to 20, but increases as your channel grows in popularity on LBRY. See the [limits section below](#limits)*
## Finding your invite link and status
To get to the [Invites area](http://open.lbry.com/?invite), click the Account menu in the top right and select **Invites**. You can now customize your invite link by selecting one of your channels from the drop down. Any of them will work, but the email we send out will include your largest subbed channel. You can also invite a user directly via email.
You will also see all of your invites, along with their status(es) - whether the user has accepted it (signed in) and if it is claimable or not (if the user is reward approved).
![invite](https://spee.ch/7/invites6.jpg)
## How does the invite link work?
When a user clicks your invite link, they are greeted with a welcome message and option to create an account. They will also automatically subscribe to your channel.
![url](https://spee.ch/6/invites-4.jpeg)
## When do I get my rewards?
If you have claimable invites, you will see a claim button with the total reward amount on the page. You will not receive rewards for each referral until those users join and use LBRY themselves (see below section regarding claimable invites). This is to combat invite fraud and abuse.
## Claiming your bonus for being invited and setting the inviter
For a limited time, you can claim a reward for being invited and letting us know which channel did so (so they can earn also). You must set the inviter before claiming your reward.
![invitee](https://spee.ch/b/invite-5.jpg)
## How many LBRY Credits do I earn?
New invites are eligible for a 20 LBC reward (subject to change based on our discretion).
## Is there a limit to the credits I can earn? {#limits}
The default limit for claimable invites is 20. Your limit increases as you use LBRY more and your channel grows in popularity. If you want us to review your account and allow for more redemptions, please first make sure you've claimed your maximum and then [email us](mailto:help@lbry.com) with details about yourself and users you are inviting.
## What is the difference between accepted and claimable?
Accepted means the user has signed into LBRY. Claimable means they have verified their account.
## What are the criteria for a claimable invite?
A claimable invite has the same definition as a Rewards eligible or Verified LBRY user. This means the referred user must have logged into LBRY and verified their account.
LBRY users who abuse either the Invite or Rewards system will not be eligible for invite redemption. If you have specific questions about individual invites which are not claimable, please reach out to the [helpdesk](mailto:help@lbry.com) with details.
## I have a clever idea to cheat the invite system
If you want to waste your time to receive no reward, be our guest. We will monitor the system closely and go to significant lengths to only allow legitimate users to join.
Rather than spending the time attempting to cheat and failing, we suggest you do productive work to earn LBRY credits. Join our [Discord chat](http://chat.lbry.com) and message or email [Tom](mailto:tom@lbry.com) (@jiggytom) or [Julie](mailto:julie@lbry.com) (@jsigwart) for opportunities.
-49
View File
@@ -1,49 +0,0 @@
---
title: How does the referral program work?
category: getstarted
---
You can earn LBRY Credits (LBC) for referring others to use LBRY. You can now view the status of your referrals and invite new users to LBRY via email or referral link on the Account overview page of LBRY Desktop or lbry.tv.
## Getting your referral link
To get to the Account Overview area, click the Account menu at the top right, and select `Overview`.
You will see all of your referrals, along with their status(es) - whether the user has accepted it (signed in) and if it is claimable or not (if the user is reward approved).
![invite]("https://spee.ch/f/invites.jpg)
*Note: Referral redemptions are currently limited to 10, but you can invite as many as you want*
## How many LBRY Credits do I earn and how do I see how many credits I've earned?
New invites are eligible for a 20 LBC reward (subject to change based on our discretion).
## When do I get my rewards?
If you have claimable rewards, you will see a claim button with the total reward amount on the page. You will not receive rewards for each referral until those users join and use LBRY themselves (see below section regarding claimable referrals). This is to combat referral fraud and abuse.
## How does the referral link work?
After a user clicks, installs and registers their email with LBRY, it may take up to an hour for the invite to appear on your Invites page.
## What are the criteria for a claimable referral?
A claimable referral has the same definition as a Rewards eligible or Verified LBRY user. This means the referred user must have logged into LBRY and verified their account.
LBRY users who abuse either the Referral or Rewards system will not be eligible for referral redemption. If you have specific questions about individual referrals which are not claimable, please reach out to the [helpdesk](mailto:help@lbry.com) with details.
## What is the difference between accepted and claimable?
Accepted means the user has signed into LBRY. Claimable means they have verified their account.
## Is there a limit to the credits I can earn?
If you expect to refer more than 50-100 people, please discuss it with us on [Discord chat](http://chat.lbry.com) or email [us](mailto:tom@lbry.com).
Currently, there is a limit of 10 redemptions per account.
## I have a clever idea to cheat the referral system.
If you want to waste your time to receive no reward, be our guest. We will be monitoring the system closely and will be going to significant lengths to only allow legitimate users to join.
Rather than spending the time attempting to cheat and failing, we suggest you do productive work to earn LBRY credits. Join our [Discord chat](http://chat.lbry.com) and message or email [Tom](mailto:tom@lbry.com) (@jiggytom) or [Julie](mailto:julie@lbry.com) (@jsigwart) for opportunities.
+20 -16
View File
@@ -5,6 +5,8 @@ category: getstarted
Rewards allow LBRY users to earn LBC, the token that powers the LBRY network. You can earn rewards for watching content, creating an identity, and generally learning about and using LBRY.
**Please note:** Reward amounts are subject to change at any time by LBRY Inc.
![rewardslist](https://spee.ch/@clem:0/rewardslist.png)
_The rewards screen in the LBRY app_
@@ -16,7 +18,7 @@ To be eligible for LBRY Rewards, you must:
- Verify your email
- Potentially complete an [additional verification step](#additional-verification) (common if using from VPN or a fraud-prone network)
Rewards are intended to be earnable on a per-person basis. LBRY reserves the right to revoke rewards privileges on any account if abuse is suspected, including on the basis of VPN or shared connections.
Rewards are intended to be earnable on a per-person basis (typically limited to 1 rewards account per household / location). LBRY reserves the right to revoke rewards privileges on any account if abuse is suspected, including on the basis of VPN or shared connections. Users on shared connections will typically not be eligible for rewards.
## Do I need to be eligible for rewards?
@@ -33,18 +35,18 @@ Rewards that you have earned be marked your [wallet](/faq/transaction-types).
## What rewards exist?
| Reward | Amount | Description |
--- | --- | ---
| **Your First Nickel** | 6 LBC | A one-time welcome gift for learning the basics of the application & wallet. Including the purchase of paid content.
| **Go for a Stream** | 4 LBC | Rewarded for streaming your very first video on LBRY.
| **Channel Surfing** | 6 LBC | A one-time reward for creating a channel on LBRY via the Publish screen.
| **First Publish** | 10 LBC | A one-time reward for publishing your first piece of content to LBRY.
| **Your First Nickel** | 3 LBC | A one-time welcome gift for learning the basics of the application & wallet. Including the purchase of paid content.
| **Go for a Stream** | 2 LBC | Rewarded for streaming your very first video on LBRY.
| **Channel Surfing** | 3 LBC | A one-time reward for creating a channel on LBRY via the Publish screen.
| **First Publish** | 5 LBC | A one-time reward for publishing your first piece of content to LBRY.
| **Daily View** | 1- 100 LBC | A random daily reward from 1 to 100 LBC, resets every 24 hours!
| **Many Views** | 2- ???? LBC | A multi-level reward for watching videos on LBRY. See descriptions in-app for levels/details!
| **Faithful Follower** | 1 - 20 LBC | A multi-level reward for following channels.
| [**Coveted Creator**](#followers) | 1 - 20K LBC | A multi-level reward for gaining followers on your channel.
| [**Content View Tips**](#contentview) | 2 - 10 LBC | A per view reward from verified lbry.tv users
| **Welcome Back** | 6 LBC | Return to the LBRY 24-48 hours following your first use of the app. This reward will self-destruct after that time span.
| **Android in Beta** | 20 LBC | Limited time reward for early Android Beta testers.
| **Upgrade** | 10 LBC | Rewarded each time the LBRY Desktop app updates versions (i.e. 0.27 to 0.28).
| **Faithful Follower** | 1 - 10 LBC | A multi-level reward for following channels.
| [**Coveted Creator**](#followers) | 1 - 10K LBC | A multi-level reward for gaining followers on your channel.
| [**Content View Tips**](#contentview) | 1 - 5 LBC | A per view reward from verified lbry.tv users
| **Welcome Back** | 3 LBC | Return to the LBRY 24-48 hours following your first use of the app. This reward will self-destruct after that time span.
| **Android in Beta** | 10 LBC | Limited time reward for early Android Beta testers.
| **Upgrade** | 5 LBC | Rewarded each time the LBRY Desktop app updates versions (i.e. 0.27 to 0.28).
| **YouTube** | ?? LBC | Rewarded as part of the [YouTube Sync program](/youtube).
| **Reward Code** | ?? LBC | [Custom reward codes](#reward-code) given out to users - be on the look out on social media/Discord/Reddit!
| **Referral** | 20 LBC | LBRY users can refer their friends via an email invitation and get rewarded when those users are verified. For more information on referrals, click [here](/faq/referrals).
@@ -60,11 +62,11 @@ You receive additional rewards as you build a following on LBRY. Only verified L
| 1 | 2 LBC
| 5 | 10 LBC
| 20 | 50 LBC
| 100 | 200 LBC
| 500 | 500 LBC
| 1,000 | 2,000 LBC
| 5,000 | 10,000 LBC
| 10,000 | 20,000 LBC
| 100 | 100 LBC
| 500 | 300 LBC
| 1,000 | 1,000 LBC
| 5,000 | 5,000 LBC
| 10,000 | 10,000 LBC
_Not seeing this reward despite being eligible? If you created your channel while not signed in to lbry.tv, we might not know about it. Publishing something new while signed in to lbry.tv will restore eligibility._
@@ -76,6 +78,8 @@ You receive additional rewards for views from verified lbry.tv accounts. You wil
Custom reward codes can be claimed via the [Rewards](https://open.lbry.com/?rewards) page on LBRY. You may have been given a reward code via email, social media or you stumbled upon it somewhere - whichever way, you can claim it for LBC today! It's simple, just hit `Enter Code`, type it in and press `Redeem`.
**Please note:** Reward code sharing is strictly prohibited and rewards privileges will be revoked.
![rewards](https://spee.ch/@clem:0/custom-code.png)
## What is the additional verification step? {#additional-verification}
+1 -1
View File
@@ -59,4 +59,4 @@ Top content is based on calculations around the total LBC value of content, whic
YouTube uses obscured, secret algorithms that are designed to be biased in favor of the mainstream media and other creators they prefer, rather than being neutral to all content ([See Veritasium's take on this](https://lbry.tv/@veritasium:f/my-video-went-viral-here-s-why:e)).
LBRY creates open-source code that allows all of the world to see precisely how our features work. We can then write articles like this one that try to spell it out in plain language. The source code for the Trending/Top/New functionality is viewable [here](https://github.com/lbryio/lbry-sdk/blob/master/lbry/lbry/wallet/server/db/trending.py).
LBRY creates open-source code that allows all of the world to see precisely how our features work. We can then write articles like this one that try to spell it out in plain language. The source code for the Trending/Top/New functionality is viewable [here](https://github.com/lbryio/lbry-sdk/blob/master/lbry/wallet/server/db/trending.py).
+29
View File
@@ -0,0 +1,29 @@
---
author: samuel-lbryian
title: 'Sexy Genius Killer Robots (in Space with Lasers?)'
date: '2020-01-09 13:00:00'
cover: 'naomiwu.jpg'
category: featured-content
---
## [Naomi “Sexy Cyborg” Wu](https://open.lbry.com/@Naomi-SexyCyborg-Wu:b) combines big brains with other things that are big to create even bigger excitement.
We’ve all been there. You’re watching an informative, detailed technical breakdown of the latest model of killer robot cyborg arms. This is great, you think to yourself, but wouldn’t it be better if the creator looked like a supermodel instead of [Duke Nukem?](https://twitter.com/eevblog/status/1211226840481685504)
![Naomi Wu](https://api.lbry.tv/content/claims/naomiwu/021b0c1f3e3b05e0147a3d2b770007fcdb0fd72c/stream.jpg)
Today’s LBRYcast makes sure that will never happen again. Naomi Wu is an incredibly talented maker, creator, and entertainer that teaches you a lot about making and the scene behind it.
These recent videos are a great place to start:
- [Innfos Gluon: Amazing 6-Axis REAL Robot Arm!](https://lbry.tv/@Naomi-SexyCyborg-Wu:b/innfos-gluon-amazing-6-axis-real-robot:3)
- [Train Your Punch To Do More Brain Damage- With Science and JLCPCB!](https://lbry.tv/@Naomi-SexyCyborg-Wu:b/train-your-punch-to-do-more-brain-damage:4)
Naomi has also experienced first-hand exactly why technologies like LBRY are so vital. Last year, Naomi was deplatformed from Patreon and faced potential consequences from her home country of China. For more on this, you can check out these:
- [No more videos (for a while? longer? no idea)](https://lbry.tv/@Naomi-SexyCyborg-Wu:b/no-more-videos-for-a-while-longer-no:5)
- [I'm Back! (For now? I think?🤞🏼)](https://lbry.tv/@Naomi-SexyCyborg-Wu:b/i-m-back-for-now-i-think:c)
- [They defunded me on Patreon, now they want SubscribeStar 😔](https://lbry.tv/@Naomi-SexyCyborg-Wu:b/they-defunded-me-on-patreon-now-they:f)
Help ensure Naomi can never face this kind of threat again and [follow her on LBRY.](https://open.lbry.com/@Naomi-SexyCyborg-Wu:b)
+28
View File
@@ -0,0 +1,28 @@
---
author: samuel-lbryian
title: 'Broadcaster Saves World from Fake News'
date: '2020-01-15 13:00:00'
cover: 'stossel.jpg'
category: featured-content
---
## [John Stossel](https://open.lbry.com/@johnstossel:7) produces an unusual, artisanal, almost extinct product: real news.
![John Stossel](https://spee.ch/@lbrynews:0/stossel.jpg)
Sure, you’ll find the fake stuff. Or the real stuff, but cut with baking soda and Beyoncé facts. But raw, uncut, actual real-reporting? It’s nearly been eliminated.
John Stossel has been producing it for decades. First with CBS, later ABC’s 20/20 and Fox Business, and currently Reason magazine (plus other stuff, the dude has made a lot of news).
With so many news manufactures moving on to ersatz alternatives, it’s been left to a small number of craftsmen like John Stossel to continue the production of this nearly extinct product.
LBRY first met John Stossel more than 2 years ago when [he covered an effort by the LBRY community](https://lbry.tv/@johnstossel:7/entrepreneur-saves-free-college-courses:2) to save more than 20,000 college lectures. A few weeks ago, [he announced](https://twitter.com/JohnStossel/status/1205208053148241931) he’d publishing all of his content to the network directly.
### If you’ve never watched John before, some great videos to start with are:
- [Entrepreneur Saves Free College Courses from Government Ban](https://open.lbry.com/@johnstossel:7/entrepreneur-saves-free-college-courses:2) (about LBRY)
- [Bad Laws Cause Homelessness Crisis](https://open.lbry.com/@johnstossel:7/bad-laws-cause-homeless-crisis:4)
- [Bitcoin: Better Money?](https://open.lbry.com/@johnstossel:7/bitcoin-better-money:7)
- [Are we Doomed?](https://open.lbry.com/@johnstossel:7/are-we-doomed:b)
Make sure to [follow @Stossel](https://open.lbry.com/@johnstossel:7) on LBRY for your regular dose.
+20 -4
View File
@@ -12,7 +12,7 @@ class DownloadActions extends Actions
public static function executeDownloadReleaseAsset(string $repo, string $ext, bool $allowPrerelease = false)
{
return Controller::redirect(GitHub::getRepoReleaseUrl($repo, OS::getOsForExtension($ext), $allowPrerelease) ?: '/get', 302);
return Controller::redirect(GitHub::getRepoReleaseUrl($repo, $ext, $allowPrerelease) ?: '/get', 302);
}
public static function executeDownloadSnapshot(string $type)
@@ -40,6 +40,7 @@ class DownloadActions extends Actions
$osChoices = OS::getAll();
list($uri, $osTitle, $osIcon) = $osChoices[$os];
$params = [
'preferredExt' => $os === Os::OS_LINUX ? 'AppImage' : '',
'osTitle' => $osTitle,
'osIcon' => $osIcon,
'osScreenshotSrc' => 'https://spee.ch/b/desktop-035-og.jpeg',
@@ -53,7 +54,7 @@ class DownloadActions extends Actions
}
else
{
$asset = Github::getRepoAsset(GitHub::REPO_LBRY_DESKTOP, $os);
$asset = Github::getRepoAsset(GitHub::REPO_LBRY_DESKTOP, $os, $params['preferredExt']);
$params['downloadUrl'] = $asset ? $asset['browser_download_url'] : null;
}
@@ -132,21 +133,36 @@ class DownloadActions extends Actions
$os = static::guessOS();
if ($os && isset($osChoices[$os])) {
list($uri, $osTitle, $osIcon, $buttonLabel, $analyticsLabel) = $osChoices[$os];
list($uri, $osTitle, $osIcon, $oldButtonLabel, $analyticsLabel) = $osChoices[$os];
if ($os !== OS::OS_ANDROID) {
$asset = Github::getRepoAsset(GitHub::REPO_LBRY_DESKTOP, $os);
$asset = Github::getRepoAsset(GitHub::REPO_LBRY_DESKTOP, $os, $vars['preferredExt'] ?? '');
} else {
$asset = ['browser_download_url' => static::ANDROID_STORE_URL];
}
$buttonLabel = __('download.for-os2', ['%os%' => OS::OS_DETAIL($os)[1]]);
if (isset($vars['preferredExt']) && $vars['preferredExt']) {
$buttonLabel = __('Download .%ext%', ['%ext%' => $vars['preferredExt']]);
}
$vars += [
'analyticsLabel' => $analyticsLabel,
'buttonLabel' => $buttonLabel,
'isDownload' => true,
'downloadUrl' => $asset ? $asset['browser_download_url'] : null,
'os' => $os,
'skipRender' => isset($vars['preferredExt']) && $vars['preferredExt'] &&
substr_compare($asset['browser_download_url'], $vars['preferredExt'], -strlen($vars['preferredExt'])) !== 0,
'isAuto' => Request::getParam('auto'),
];
if ($os === OS::OS_LINUX && !isset($vars['preferredExt'])) {
$vars['isDownload'] = false;
$vars['downloadUrl'] = '/linux';
}
}
return $vars;
+4 -1
View File
@@ -17,7 +17,7 @@
/faq/claimtrie-implementation: https://lbry.tech/resources/lbry-claimtrie
/faq/proof-algorithm: https://lbry.tech/resources/pow
/faq/regtest-setup-guide: https://lbry.tech/resources/regtest-setup
/faq/bounty https://lbry.com/faq/how-to-get-lbry-command-line
/faq/bounty: https://lbry.tech/contribute
# FAQ
/faq/tips: /faq/appreciation
@@ -29,6 +29,7 @@
/faq/how-to-report-bugs: /faq/support
/what-is-lbry: /faq/what-is-lbry
/youtube/sync: /faq/youtube
/faq/referrals: /faq/invites
# Get
/dl/lbry_setup.sh: /get
@@ -72,11 +73,13 @@
/get/lbrynet.macos.zip: /releases/lbry.pkg
/get/lbrynet.osx.zip: /releases/lbry.pkg
/get/lbry.deb: /releases/lbry-desktop.deb
/get/lbry.AppImage: /releases/lbry-desktop.AppImage
/get/lbry.dmg: /releases/lbry-desktop.dmg
/get/lbry.pkg: /releases/lbry-desktop.dmg
/get/lbry.exe: /releases/lbry-desktop.exe
/get/lbry.msi: /releases/lbry-desktop.exe
/get/lbry.pre.deb: /releases/pre/lbry-desktop.deb
/get/lbry.pre.AppImage: /releases/pre/lbry-desktop.AppImage
/get/lbry.pre.dmg: /releases/pre/lbry-desktop.dmg
/get/lbry.pre.pkg: /releases/pre/lbry-desktop.dmg
/get/lbry.pre.exe: /releases/pre/lbry-desktop.exe
+18 -7
View File
@@ -10,7 +10,7 @@ class Github
switch ($os) {
case OS::OS_LINUX:
return
in_array($ext, ['deb']) ||
in_array($ext, ['deb', 'AppImage']) ||
in_array($asset['content_type'], ['application/x-debian-package', 'application/x-deb']) ||
stripos($asset['name'], 'linux') !== false;
case OS::OS_OSX:
@@ -30,7 +30,7 @@ class Github
}
}
protected static function findReleaseAssetForOs(array $release, string $os)
protected static function findReleaseAsset(array $release, string $os, string $preferredExt = '')
{
if (!in_array($os, array_keys(OS::getAll()))) {
throw new DomainException('Unknown OS');
@@ -40,11 +40,21 @@ class Github
throw new Exception('Release array missing assets - possible GitHub auth failure, auth limit, and/or inspect releases array');
}
$bestAsset = null;
foreach ($release['assets'] as $asset) {
if (static::isAssetForOs($asset, $os)) {
return $asset;
if (!$bestAsset) {
$bestAsset = $asset;
} else if ($os === Os::OS_LINUX) {
$ext = pathinfo($asset['name'], PATHINFO_EXTENSION);
if ($ext === $preferredExt || (!$preferredExt && $ext === 'AppImage')) {
$bestAsset = $asset;
}
}
}
}
return $bestAsset;
}
public static function getRepoRelease($repo, $prerelease = false, $cache = true)
@@ -63,16 +73,17 @@ class Github
return null;
}
public static function getRepoAsset($repo, $os, $prerelease = false, $cache = true)
public static function getRepoAsset($repo, $os, $preferredExt = '', $prerelease = false, $cache = true)
{
$release = static::getRepoRelease($repo, $prerelease, $cache);
return $release ? static::findReleaseAssetForOs($release, $os) : null;
return $release ? static::findReleaseAsset($release, $os, $preferredExt) : null;
}
public static function getRepoReleaseUrl($repo, $os, bool $prerelease = false, $cache = true)
public static function getRepoReleaseUrl($repo, $ext, bool $prerelease = false, $cache = true)
{
$asset = static::getRepoAsset($repo, $os, $prerelease, $cache);
$os = OS::getOsForExtension($ext);
$asset = static::getRepoAsset($repo, $os, $ext, $prerelease, $cache);
return $asset ? $asset['browser_download_url'] : null;
}
+1
View File
@@ -83,6 +83,7 @@ class OS
{
switch ($ext) {
case 'deb':
case 'AppImage':
return OS::OS_LINUX;
case 'dmg':
+3 -1
View File
@@ -172,7 +172,9 @@
<h4>
Views on LBRY
</h4>
<p>Receive 2-10 LBC (<span class="lbc-to-usd" data-lbc-amount="2"></span> - <span class="lbc-to-usd" data-lbc-amount="10"></span>) per view from verified lbry.tv accounts. </p>
<p>Receive 1-5 LBC (<span class="lbc-to-usd" data-lbc-amount="1"></span> - <span class="lbc-to-usd" data-lbc-amount="5"></span>) per view from verified lbry.tv accounts.
<small> <em>These reward amounts may change at LBRY Inc's discretion.</em></small>
</p>
<h4>
Follows on LBRY
+1 -1
View File
@@ -72,7 +72,7 @@
<th>Your Sync Status</th>
<th>Subscribers</th>
<th>Videos</th>
<th>Expected Rewards</th>
<th>Expected Monthly Rewards</th>
</tr>
</thead>
+1 -1
View File
@@ -1,4 +1,4 @@
<?php Response::addMetaImages($post->getImageUrls()) ?>
<?php Response::addMetaImages($post->getImageUrls() ?: [Request::getHostAndProto() . '/img/og-faq.png?_cache=' . date('Y-m-d')]) ?>
<?php Response::setMetaDescription(htmlspecialchars($post->getContentText(20, true))) ?>
<?php NavActions::setNavUri('/learn') ?>
+1
View File
@@ -1,3 +1,4 @@
<?php Response::addMetaImage(Request::getHostAndProto() . '/img/og-faq.png?_cache=' . date('Y-m-d')) ?>
<?php Response::setMetaDescription(__('description.faq')) ?>
<main class="ancillary">
+20 -11
View File
@@ -1,15 +1,24 @@
<?php if ($downloadUrl): ?>
<?php if ($skipRender): ?>
<?php elseif ($downloadUrl): ?>
<?php if ($os !== OS::OS_ANDROID): ?>
<a class="button button--<?php echo $buttonStyle?>"
download
href="<?php echo $downloadUrl ?>"
id="get-download-btn"
data-facebook-track="1"
data-analytics-category="Sign Up"
data-analytics-action="Download"
data-analytics-label="<?php echo $analyticsLabel ?>"
title="Download our app"
><?php echo __('download.for-os2', ['%os%' => OS::OS_DETAIL($os)[1]]) ?></a>
<?php if ($isDownload): ?>
<a class="button button--<?php echo $buttonStyle?>"
download
href="<?php echo $downloadUrl ?>"
id="get-download-btn"
data-facebook-track="1"
data-analytics-category="Sign Up"
data-analytics-action="Download"
data-analytics-label="<?php echo $analyticsLabel ?>"
title="Download LBRY App"
><?php echo $buttonLabel ?></a>
<?php else: ?>
<a class="button button--<?php echo $buttonStyle?>"
href="<?php echo $downloadUrl ?>"
id="get-download-btn"
title="Download LBRY App"
><?php echo $buttonLabel ?></a>
<?php endif ?>
<?php else: ?>
<a
class="button button--google-play"
+1 -1
View File
@@ -4,7 +4,7 @@
<br/>
<?php if ($os === OS::OS_LINUX): ?>
Works with Ubuntu, Debian, or any distro with <code>apt</code> or <code>dpkg</code>. For other Linux flavors including Arch and Flatpak support or compiling from source, <a href="https://github.com/lbryio/lbry-desktop#install">see our GitHub install page</a>.
We provide app builds as AppImage and .deb. For other Linux flavors including Arch and Flatpak support or compiling from source, <a href="https://github.com/lbryio/lbry-desktop#install">see our GitHub install page</a>.
<?php elseif ($os === OS::OS_OSX): ?>
Works with with macOS version 10.12.4 (Sierra), and higher.
<?php elseif ($sourceLink): ?>
+8 -1
View File
@@ -19,8 +19,15 @@
<p>Securely download the LBRY app here, and see what all the fuss is about!</p>
<?php $metaHtml = $os !== OS::OS_ANDROID ? View::Render('download/_meta') : false ?>
<?php echo View::Render('download/_downloadButton', [
'buttonStyle' => 'primary'
'buttonStyle' => 'primary',
'preferredExt' => $preferredExt
])?>
<?php if ($os === OS::OS_LINUX && $preferredExt === 'AppImage'): ?>
<?php echo View::Render('download/_downloadButton', [
'buttonStyle' => 'primary',
'preferredExt' => 'deb'
])?>
<?php endif ?>
<?php if ($os === OS::OS_ANDROID): ?>
<p style="font-size: 0.8rem;">You can also <a href="http://lbry.com/releases/lbry-android.apk" title="Download our Android app directly">download</a> our Android app directly</p>
+1 -1
View File
@@ -52,7 +52,7 @@
<input type="submit" value="{{dmca.form_submit}}"/>
</form>
<small class="meta">You may also submit content that you want to flag for being illegal. To learn more about reporting infringing or illegal content and DMCA procedures, please see our <a href="/faq/dmca">DMCA article</a>.</small>
<small class="meta">You may also submit content that you want to flag for being illegal, not marked Mature, or abusing the tag system. To learn more about reporting infringing or illegal content and DMCA procedures, please see our <a href="/faq/dmca">DMCA article</a>.</small>
</div>
</section>
</main>
Binary file not shown.

After

Width:  |  Height:  |  Size: 189 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB