feat: Add shield popup

Author: FlafyDev

.github/workflows/multi-platform.yml

@@ -38,7 +38,6 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
-          sdk: '3.0.0-beta.5'
           combine: true
           target: ${{ matrix.config.target }}
 

mod.json

@@ -1,5 +1,5 @@
 {
-  "geode": "3.0.0-beta.5",
+  "geode": "3.1.1",
   "gd": {
     "win": "2.206",
     "android": "2.206"
@@ -9,6 +9,10 @@
   "name": "Auto Nong",
   "developer": "Flafy",
   "description": "Automatically download NONG songs for levels",
+  "links": {
+    "community": "https://discord.gg/twuZ3X35yM",
+    "source": "https://github.com/flafydev/auto-nong"
+  },
   "repository": "https://github.com/flafydev/auto-nong",
   "tags": [
     "music",
@@ -26,6 +30,7 @@
   "resources": {
     "sprites": [
       "resources/addIcon.png",
+      "resources/mod_btn.png",
       "resources/logo_regular.png",
       "resources/logo_grayscaled.png"
     ]

resources/mod_btn.png

@@ -506,8 +506,8 @@ std::optional<std::string> AutoNongManager::generatePublishUrl(const ANSong &son
 
     return fmt::format("https://github.com/FlafyDev/auto-nong-indexes/issues/"
                        "new?template=add-nong-song.yml&title={}&song-name={}&artist-name={}&"
-                       "youtube-link={}&song-id={}&extra={}",
-                       title, song.m_name, song.m_artist, ytSong->m_ytId, songId, extraEncoded);
+                       "youtube-link={}&start-offset={}&song-id={}&extra={}",
+                       title, song.m_name, song.m_artist, ytSong->m_ytId, ytSong->m_startOffsetMS, songId, extraEncoded);
   }
   return std::nullopt;
 }

src/managers/auto_nong_manager.cpp

@@ -1,6 +1,7 @@
 #include "an_dropdown_layer.hpp"
 #include "../managers/auto_nong_manager.hpp"
 #include "an_add_local_popup.hpp"
+#include "an_shield_popup.hpp"
 #include "an_song_cell.hpp"
 
 bool ANDropdownLayer::setup(int songId, CustomSongWidget *parent, int popupNumber, int totalPopups,
@@ -32,11 +33,19 @@ bool ANDropdownLayer::setup(int songId, CustomSongWidget *parent, int popupNumbe
   addNongBtn->setPosition(contentSize.width - 26.f, 28.f);
   addNongBtn->setID("add-nong-btn");
 
+  auto modBtnSpr = CCSprite::create("mod_btn.png"_spr);
+  modBtnSpr->setScale(.8f);
+  auto modBtn =
+      CCMenuItemSpriteExtra::create(modBtnSpr, this, menu_selector(ANDropdownLayer::onShield));
+  modBtn->setPosition(contentSize.width - 26.f, 70.f);
+  modBtn->setID("mod-btn");
+
   menu = CCMenu::create();
   menu->setAnchorPoint(ccp(0, 0));
   menu->setPosition(ccp(0, 0));
   menu->setID("button-menu2");
   menu->addChild(addNongBtn);
+  menu->addChild(modBtn);
   menu->setZOrder(2);
   m_mainLayer->addChild(menu);
 
@@ -148,3 +157,7 @@ void ANDropdownLayer::updateCellsButtonsState() {
     cell->setButtonsState();
   }
 }
+
+void ANDropdownLayer::onShield(CCObject*) {
+  ANShieldPopup::create()->show(); 
+}

src/ui/an_dropdown_layer.cpp

@@ -41,4 +41,5 @@ class ANDropdownLayer : public Popup<int, CustomSongWidget *, int, int, bool> {
   void updateCells();
   void onOpenOptions(CCObject *);
   void updateCellsButtonsState();
+  void onShield(CCObject *);
 };

src/ui/an_dropdown_layer.hpp

@@ -0,0 +1,67 @@
+#include "an_shield_popup.hpp"
+#include "../managers/auto_nong_manager.hpp"
+#include "Geode/utils/web.hpp"
+
+std::optional<int> ANShieldPopup::m_cachedCount;
+
+bool ANShieldPopup::setup() {
+  this->setTitle("Help Required");
+
+  auto inputParent = CCNode::create();
+  m_inputParent = inputParent;
+  inputParent->setContentSize({250.f, 100.f});
+  inputParent->setAnchorPoint({0.5f, 1.0f});
+  inputParent->setPosition(m_mainLayer->getContentSize().width / 2,
+                           m_mainLayer->getContentSize().height - 40.f);
+
+  setString("many");
+
+  auto discordSpr = CCSprite::createWithSpriteFrameName("gj_discordIcon_001.png");
+  auto discordBtn = CCMenuItemSpriteExtra::create(
+      discordSpr, this, menu_selector(ANShieldPopup::onDiscord)); 
+  auto discordMenu = CCMenu::create();
+  discordMenu->setID("discord-menu");
+  discordMenu->setPosition(250.f/2.f, 0.f);
+  discordMenu->addChild(discordBtn);
+  inputParent->addChild(discordMenu);
+
+  m_mainLayer->addChild(inputParent);
+  
+  if (m_cachedCount.has_value()) {
+    setString(std::to_string(m_cachedCount.value()));
+  } else {
+    auto req = web::WebRequest().header("User-Agent", "Auto-Nong").get("https://api.github.com/search/issues?q=repo:flafydev/auto-nong-indexes+is:issue+is:open");
+    m_countListener.bind([this](web::WebTask::Event *event) {
+      auto res = event->getValue();
+      if (res && res->ok()) {
+        auto json = res->json();
+        auto count = json->as_object()["total_count"].as_int();
+        m_cachedCount = count;
+        setString(std::to_string(count));
+      }
+    });
+    m_countListener.setFilter(req);
+  }
+
+  return true;
+}
+
+void ANShieldPopup::onDiscord(CCObject *) {
+  web::openLinkInBrowser("https://discord.gg/twuZ3X35yM");
+}
+
+void ANShieldPopup::setString(std::string count) {
+  if (m_label) {
+    m_label->removeFromParent();
+  }
+
+  // Recreating because setString behaves weirdly (didn't test with TextArea tho)
+  auto text = TextArea::create(("Auto Nong currently has <cr>" + count + "</c> NONG songs submitted by players for review.\nWe are looking for volunteers to assist with approving/rejecting the submissions.").c_str(),
+                                    "chatFont.fnt", 1.f, 250.f, {0.5f, 0.5f}, 20.f, false);
+  
+  // text->setAnchorPoint({0.0f, 1.0f});
+  text->setPosition({250.f/2.f, 100.f/2.f+10.f});
+  // text->setContentWidth(250.f);
+  m_label = text;
+  m_inputParent->addChild(text);
+}

src/ui/an_shield_popup.cpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "../includes/geode.hpp"
+
+class ANShieldPopup : public Popup<> {
+protected:
+  static std::optional<int> m_cachedCount;
+
+  EventListener<web::WebTask> m_countListener;
+  TextArea *m_label = nullptr;
+  CCNode* m_inputParent = nullptr;
+
+  bool setup() override;
+  void onDiscord(CCObject *);
+  void setString(std::string count);
+public:
+  static ANShieldPopup *create() {
+    auto ret = new ANShieldPopup;
+    if (ret && ret->initAnchored(320.f, 192.f)) {
+      ret->autorelease();
+      return ret;
+    }
+
+    CC_SAFE_DELETE(ret);
+    return nullptr;
+  }
+};
+