mirror of
https://github.com/LBRYFoundation/lbry.com.git
synced 2025-08-23 17:47:26 +00:00
Revert "pull tag data from api.lbry.com (#1097)"
This reverts commit 5e73137d7e.
This commit is contained in:
Jeremy Kauffman
GitHub
parent
d3af4a1729
commit
206763b2f4
3 changed files with 54 additions and 39 deletions
|
|
@ -68,7 +68,6 @@ class MailActions extends Actions
|
|||
$response['error'] = "This email link is invalid. If you clicked this from an older email it may have been expired for security purposes. Please email help@lbry.com for a valid one.";
|
||||
}
|
||||
$responseData = $response['data'] ?? [];
|
||||
|
||||
return ['mail/settings', [
|
||||
'emails' => $responseData['emails'] ?? [],
|
||||
'tags' => $responseData['tags'] ?? [],
|
||||
|
|
@ -79,19 +78,45 @@ class MailActions extends Actions
|
|||
|
||||
public static function prepareSettingsFormPartial(array $vars)
|
||||
{
|
||||
$tags = LBRY::listTags($vars['token']);
|
||||
$tagMetadata = [];
|
||||
$specialDisplayNames = [
|
||||
'ios' => 'iOS'
|
||||
];
|
||||
foreach($tags as $tag) {
|
||||
if ($tag['is_user_addable']) {
|
||||
$tagMetadata[$tag['name']] = [
|
||||
'label' => $specialDisplayNames[$tag['name']] ?? ucwords(str_replace(['-', '_'], ' ', $tag['name'])),
|
||||
'description' => $tag['description']
|
||||
];
|
||||
}
|
||||
}
|
||||
return $vars + ['tagMetadata' => $tagMetadata];
|
||||
return $vars + [
|
||||
'tagMetadata' => [
|
||||
'3d-printing' => [
|
||||
'label' => '3D Printing',
|
||||
'description' => 'Receive updates, tips, and new content suggestions related to 3D Printing.'
|
||||
],
|
||||
'android' => [
|
||||
'label' => 'Android',
|
||||
'description' => 'Be an Android beta tester, earn LBC, and receive notification when the app goes live!'
|
||||
],
|
||||
'college' => [
|
||||
'label' => 'University',
|
||||
'description' => 'LBRY has special programs and opportunities for people in school.'
|
||||
],
|
||||
'creator' => [
|
||||
'label' => 'Creator',
|
||||
'description' => 'Get the most out of the stuff you create with tips and feedback from LBRY.'
|
||||
],
|
||||
'consumer' => [
|
||||
'label' => 'Content Lover',
|
||||
'description' => 'Learn how to get the most out of LBRY as someone who just wants to find cool stuff.'
|
||||
],
|
||||
'developer' => [
|
||||
'label' => 'Developer',
|
||||
'description' => 'Receive technical updates and other news intended for those who are familiar with software engineering.'
|
||||
],
|
||||
'ios' => [
|
||||
'label' => 'iPhone',
|
||||
'description' => 'Be an iOS alpha tester, earn LBC, and receive notification when the app goes live!'
|
||||
],
|
||||
'reward' => [
|
||||
'label' => 'Rewards',
|
||||
'description' => 'Receive emails about the latest rewards that are available to LBRY users.'
|
||||
],
|
||||
'subscription' => [
|
||||
'label' => 'Subscriptions',
|
||||
'description' => 'Stay up to date on the latest content from your favorite creators.'
|
||||
],
|
||||
]
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
7
lib/thirdparty/LBRY.class.php
vendored
7
lib/thirdparty/LBRY.class.php
vendored
|
|
@ -72,13 +72,6 @@ class LBRY
|
|||
return Curl::get(static::getApiUrl('/yt/status'), ['status_token' => $status_token], ['json_response' => true]);
|
||||
}
|
||||
|
||||
public static function listTags($authToken)
|
||||
{
|
||||
$response = Curl::get(static::getApiUrl('/tag/list'), ['auth_token' => $authToken], ['json_response' => true]);
|
||||
return $response['data'] ?? [];
|
||||
}
|
||||
|
||||
|
||||
public static function youtubeReward()
|
||||
{
|
||||
return CurlWithCache::post(static::getApiUrl('/yt/rewards'), [], ['cache' => 3600, 'json_response' => true]);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<?php $emailId = 'email_' . (++$emailIndex) ?>
|
||||
<checkbox-element>
|
||||
<input id="<?php echo $emailId ?>" name="<?php echo $emailId ?>" type="checkbox"<?php echo $enabled ? " checked" : "" ?> value="<?php echo urlencode($email) ?>"/>
|
||||
<label for="<?php echo $emailId ?>"><?php echo count($emails) > 1 ? $email : __('Yes') . ' (' . $email . ')' ?></label>
|
||||
<label for="<?php echo $emailId ?>"><?php echo $email ?></label>
|
||||
<checkbox-toggle/>
|
||||
</checkbox-element>
|
||||
<?php endforeach ?>
|
||||
|
|
@ -39,24 +39,21 @@
|
|||
|
||||
<?php $tagIndex = 0 ?>
|
||||
<?php foreach ($tags as $tag => $enabled): ?>
|
||||
<?php if (!isset($tagMetadata[$tag])) continue; ?>
|
||||
<?php if (!isset($tagMetadata[$tag])) {
|
||||
continue;
|
||||
} //fix/kill this?>
|
||||
<?php $tagId = 'tag_' . (++$tagIndex) ?>
|
||||
<div>
|
||||
<checkbox-element>
|
||||
<input id="<?php echo $tagId ?>" name="<?php echo $tagId ?>" type="checkbox"<?php echo $enabled ? " checked" : "" ?> value="<?php echo urlencode($tag) ?>"/>
|
||||
<label for="<?php echo $tagId ?>">
|
||||
<?php echo isset($tagMetadata[$tag]['label']) ? $tagMetadata[$tag]['label'] : $tag ?>
|
||||
<?php if (isset($tagMetadata[$tag]['description'])): ?>
|
||||
<span class="meta">· <?php echo $tagMetadata[$tag]['description'] ?></small>
|
||||
<?php endif ?>
|
||||
</label>
|
||||
<checkbox-toggle/>
|
||||
</checkbox-element>
|
||||
</div>
|
||||
<checkbox-element>
|
||||
<input id="<?php echo $tagId ?>" name="<?php echo $tagId ?>" type="checkbox"<?php echo $enabled ? " checked" : "" ?> value="<?php echo urlencode($tag) ?>"/>
|
||||
<label for="<?php echo $tagId ?>">
|
||||
<?php echo isset($tagMetadata[$tag]['label']) ? $tagMetadata[$tag]['label'] : $tag ?>
|
||||
<?php if (isset($tagMetadata[$tag]['description'])): ?>
|
||||
<span class="meta">· <?php echo $tagMetadata[$tag]['description'] ?></small>
|
||||
<?php endif ?>
|
||||
</label>
|
||||
<checkbox-toggle/>
|
||||
</checkbox-element>
|
||||
<?php endforeach ?>
|
||||
<?php if ($tagIndex === 0): ?>
|
||||
<div class="notice notice-error"><?php echo __('Something went wrong. Please email help@lbry.com') ?></div>
|
||||
<?php endif ?>
|
||||
</section>
|
||||
</form>
|
||||
<?php endif ?>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue