pull tag data from api.lbry.com (#1097)

controller/action/MailActions.class.php

@@ -68,6 +68,7 @@ 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'] ?? [],
@@ -78,45 +79,19 @@ class MailActions extends Actions
 
     public static function prepareSettingsFormPartial(array $vars)
     {
-        return $vars + [
+        $tags = LBRY::listTags($vars['token']);
-        'tagMetadata' => [
+        $tagMetadata = [];
-           '3d-printing' => [
+        $specialDisplayNames = [
-              'label' => '3D Printing',
+            'ios' => 'iOS'
-              'description' => 'Receive updates, tips, and new content suggestions related to 3D Printing.'
+        ];
-           ],
+        foreach($tags as $tag) {
-          'android' => [
+            if ($tag['is_user_addable']) {
-            'label' => 'Android',
+                $tagMetadata[$tag['name']] = [
-            'description' => 'Be an Android beta tester, earn LBC, and receive notification when the app goes live!'
+                    'label' => $specialDisplayNames[$tag['name']] ?? ucwords(str_replace(['-', '_'], ' ', $tag['name'])),
-          ],
+                    'description' => $tag['description']
-          'college' => [
+                ];
-            'label' => 'University',
+            }
-            'description' => 'LBRY has special programs and opportunities for people in school.'
+        }
-          ],
+        return $vars + ['tagMetadata' => $tagMetadata];
-          '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.'
-          ],
-         ]
-      ];
     }
 }

lib/thirdparty/LBRY.class.php

@@ -72,6 +72,13 @@ 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]);

view/template/mail/_settingsForm.php

@@ -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 $email ?></label>
+          <label for="<?php echo $emailId ?>"><?php echo count($emails) > 1 ? $email : __('Yes') . ' (' . $email . ')' ?></label>
           <checkbox-toggle/>
         </checkbox-element>
       <?php endforeach ?>
@@ -39,21 +39,24 @@
 
       <?php $tagIndex = 0 ?>
       <?php foreach ($tags as $tag => $enabled): ?>
-        <?php if (!isset($tagMetadata[$tag])) {
+        <?php if (!isset($tagMetadata[$tag])) continue; ?>
-    continue;
-}  //fix/kill this?>
         <?php $tagId = 'tag_' . (++$tagIndex) ?>
-        <checkbox-element>
+        <div>
-          <input id="<?php echo $tagId ?>" name="<?php echo $tagId ?>" type="checkbox"<?php echo $enabled ? " checked" : "" ?> value="<?php echo urlencode($tag) ?>"/>
+            <checkbox-element>
-          <label for="<?php echo $tagId ?>">
+              <input id="<?php echo $tagId ?>" name="<?php echo $tagId ?>" type="checkbox"<?php echo $enabled ? " checked" : "" ?> value="<?php echo urlencode($tag) ?>"/>
-            <?php echo isset($tagMetadata[$tag]['label']) ? $tagMetadata[$tag]['label'] : $tag ?>
+              <label for="<?php echo $tagId ?>">
-            <?php if (isset($tagMetadata[$tag]['description'])): ?>
+                <?php echo isset($tagMetadata[$tag]['label']) ? $tagMetadata[$tag]['label'] : $tag ?>
-              <span class="meta">&middot; <?php echo $tagMetadata[$tag]['description'] ?></small>
+                <?php if (isset($tagMetadata[$tag]['description'])): ?>
-            <?php endif ?>
+                  <span class="meta">&middot; <?php echo $tagMetadata[$tag]['description'] ?></small>
-          </label>
+                <?php endif ?>
-          <checkbox-toggle/>
+              </label>
-        </checkbox-element>
+              <checkbox-toggle/>
+            </checkbox-element>
+        </div>
       <?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 ?>