Merge branch 'master' of https://github.com/NatsukiDev/Natsuki

merge conflict

.gitignore

@@ -2,6 +2,7 @@ node_modules/
 config.json
 auth.json
 test.js
+gauth.json
 /.idea/
 
 api/**/*

.idea/workspace.xml

@@ -5,8 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="826c705b-a7fa-4ece-b82a-e278fca7d494" name="Changes" comment="more avatar bugs">
-      <change afterPath="$PROJECT_DIR$/slash/fun/nowplaying.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/util/lht.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/events/ready.js" beforeDir="false" afterPath="$PROJECT_DIR$/events/ready.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
@@ -47,23 +49,18 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
+  <component name="PropertiesComponent"><![CDATA[{
-    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
+  "keyToString": {
-    <property name="NEW_TOOLWINDOW_STRIPE_DEFAULTS" value="true" />
+    "WebServerToolWindowFactoryState": "false",
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    "node.js.detected.package.eslint": "true",
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    "node.js.detected.package.tslint": "true",
-    <property name="WebServerToolWindowFactoryState" value="false" />
+    "node.js.selected.package.eslint": "(autodetect)",
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    "node.js.selected.package.tslint": "(autodetect)",
-    <property name="node.js.detected.package.eslint" value="true" />
+    "nodejs_package_manager_path": "npm",
-    <property name="node.js.detected.package.tslint" value="true" />
+    "settings.editor.selected.configurable": "terminal",
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    "vue.rearranger.settings.migration": "true"
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+  }
-    <property name="nodejs_package_manager_path" value="npm" />
+}]]></component>
-    <property name="settings.editor.selected.configurable" value="MTConfigurable" />
-    <property name="ts.external.directory.path" value="C:\Program Files\JetBrains\WebStorm 2021.2\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
-    <property name="ts.rename.search.for.dynamic.occurrences" value="true" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\clarkjr1836\Desktop\bot\Natsuki\util\ts" />
@@ -177,6 +174,7 @@
       <workItem from="1652646106603" duration="1287000" />
       <workItem from="1655452467524" duration="126000" />
       <workItem from="1660254007752" duration="1643000" />
+      <workItem from="1738896915425" duration="15805000" />
     </task>
     <task id="LOCAL-00001" summary="not even gonna explain">
       <created>1640148826800</created>
@@ -334,7 +332,6 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />

events/ready.js

@@ -110,6 +110,8 @@ module.exports = async client => {
 		await botData.save();
 	}
 
+	await require('../util/lht')(client);
+
 	console.log(`${chalk.gray('\n[INFO]')} >> ${chalk.white(`This is restart #${botData.restarts}.`)}`);
 
 	let cms = new Date().getTime();

package.json

@@ -8,14 +8,19 @@
         "@discordjs/builders": "^0.12.0",
         "@discordjs/rest": "^0.1.0-canary.0",
         "@discordjs/voice": "^0.6.0",
+        "axios": "^1.7.9",
         "canvas": "^2.9.0",
         "chalk": "^4.1.0",
+        "cheerio": "^1.0.0",
         "cron": "^1.8.2",
         "dblapi.js": "^2.4.1",
         "discord-api-types": "^0.22.0",
         "discord.js": "^13.5.0",
         "dreidels": "^0.5.2",
         "fuzzysort": "^1.1.4",
+        "google-auth-library": "^9.15.1",
+        "google-spreadsheet": "^4.1.4",
+        "googleapis": "^144.0.0",
         "gradient-string": "^2.0.0",
         "lastfm": "^0.9.0",
         "manyitems": "^1.0.2",

util/lht.js

@@ -0,0 +1,60 @@
+const path = require('path');
+const Discord = require('discord.js');
+const axios = require("axios");
+const cheerio = require('cheerio');
+const {GoogleSpreadsheet} = require('google-spreadsheet');
+const {google} = require('googleapis');
+const {JWT} = require("google-auth-library");
+
+const auth = require('../gauth.json');
+
+module.exports = async client => { try {
+
+    const LH = await client.guilds.fetch('359107239056769044');
+    const UPDATES = await LH.channels.fetch('1337297601208516699');
+
+    let doc = new GoogleSpreadsheet('1JRQ3B4v56Hz1oi8NkGPH0ImAWrrMZXifetb24LMCN1s', new JWT({email: auth.client_email, key: auth.private_key, scopes: ['https://www.googleapis.com/auth/spreadsheets', 'https://www.googleapis.com/auth/drive.file']}));
+    await doc.loadInfo();
+
+    let sheet = doc.sheetsByIndex[0];
+    let rows = await sheet.getRows({limit: 500});
+
+    let raws = {};
+    rows.forEach(row => raws[row.get("NAME")] = {link: row.get("LINK RAW"), released: row.get("RELEASED"), raw: row.get("RAW")});
+    const compareRaws = async () => {
+        rows = await sheet.getRows({limit: 500});
+        for (let row of rows) {
+            if (row.get("RAW") !== raws[row.get("NAME")].raw) {
+                const {data} = await axios.get(row.get("LINK RAW"));
+                const $ = cheerio.load(data);
+                let img = '';
+                try {img = $('div.col-md-4 > div.text-center > img.thumbnail').attr('src');} catch {} //deviously easy web scrape
+
+                let embed = new Discord.MessageEmbed()
+                    .setAuthor({name: "New Raw Posted"})
+                    .setTitle(row.get("NAME")) //TODO IMAGES
+                    .setDescription(`A new raw has been released for *${row.get("NAME")}*.\n\n*time to get to work~*`)
+                    .addField("Old", `**${raws[row.get("NAME")].raw}**`, true)
+                    .addField("New", `**${row.get("RAW")}**`, true)
+                    .addField("Last LH Release", `**${row.get("RELEASED")}**`)
+                    .setURL(row.get("LINK RAW"))
+                    .setFooter({text: "Natsuki", iconURL: client.user.avatarURL()})
+                    .setTimestamp()
+
+                if (img && typeof img === 'string' && img.startsWith('https')) {
+                    /*const colors = await prominent(img, {amount: 3, format: 'hex'});*/
+                    embed.setImage(img)
+                        /*.setColor(colors[Math.floor(Math.random() * colors.length)])*/;
+                } /*else {*/embed.setColor('dc134c');/*}*/
+
+                UPDATES.send({
+                    content: (row.get("ROLE") && row.get("ROLE").match(/\d+/g)) ? `<@&${row.get("ROLE")}>` : "I don't know what role to ping for this series!",
+                    embeds: [embed]
+                }).catch(() => {});
+            }
+            raws[row.get("NAME")] = {link: row.get("LINK RAW"), released: row.get("RELEASED"), raw: row.get("RAW")};
+        }
+    };
+
+    setInterval(compareRaws, 60000);
+} catch {}};