Merge pull request #1722 from KanCraft/develop

RELEASE: 3.2.81

Author: github-actions[bot]

manifest.json

@@ -1,8 +1,8 @@
 {
   "manifest_version": 2,
   "name": "艦これウィジェット",
-  "version": "3.2.80",
-  "version_name": "3.2.80",
+  "version": "3.2.81",
+  "version_name": "3.2.81",
   "description": "「艦これ」をほどよく快適にたのしく遊べるようにするやつです",
   "permissions": [
     "tabs",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "kan-colle-widget",
-  "version": "3.2.80",
+  "version": "3.2.81",
   "description": "『艦これ』をちょっとだけ快適にするやつ",
   "engines": {
     "node": "18.12.1",
@@ -57,8 +57,8 @@
     "ts-loader": "^9.2.8",
     "ts-node": "^10.4.0",
     "twitter": "^1.7.1",
-    "typescript": "^4.5.4",
-    "webpack": "^5.75.0",
+    "typescript": "^4.9.5",
+    "webpack": "^5.76.0",
     "webpack-cli": "^4.9.1"
   },
   "jest": {
@@ -96,7 +96,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/react-fontawesome": "^0.1.16",
+    "@fortawesome/react-fontawesome": "^0.2.0",
     "chomex": "^2.2.0",
     "classnames": "^2.3.2",
     "firebase": "^9.15.0",

package.json

@@ -26,7 +26,15 @@ const __main__ = async (intervalHours: number) => {
   const q = `艦これウィジェット OR #艦これウィジェット OR #編成キャプチャ -from:KanColleWidget -RT since:${since}`;
   console.log("[INFO]", q);
   const params = { q };
-  const { statuses } = await client.get("search/tweets", params);
+  let statuses = [];
+  try {
+    const res = await client.get("search/tweets", params);
+    statuses = res.statuses;
+  } catch (err) {
+    console.log("[ERROR]", err);
+    // FIXME: process.exit(1); // ひとまずTwitterAPI対応できるまでエラーは無視
+    return;
+  }
   console.log("[INFO]", "FOUND", statuses.length);
   for (let i = 0; i < statuses.length; i++) {
     const status = statuses[i];

scripts/egosearch.ts

@@ -15,7 +15,8 @@ if (require.main == module) {
     console.log(`Tweet:\thttps://twitter.com/${tweet.user.screen_name}/statuses/${tweet.id_str}\nStatus:\t${status}`);
     process.exit(0);
   }).catch(err => {
-    console.error("Error:", err);
-    process.exit(1);
+    console.log("[ERROR]", err);
+    console.log("[DEBUG]", "ツイート内容:\t", status);
+    // FIXME: process.exit(1); // ひとまずTwitterAPI対応できるまでエラーは無視
   });
 }

scripts/tweet.ts

@@ -47,26 +47,31 @@ export default class TwitterAPI {
   ) {}
 
   async getOfficialTweets(count = 5): Promise<Status[]> {
-    const oauth = OAuthSimple(this.consumer.key, this.consumer.secret);
-    const request = oauth.sign({
-      action: "GET",
-      path: "https://api.twitter.com/1.1/statuses/user_timeline.json",
-      parameters: {
-        screen_name: "KanColle_STAFF",
-        count,
-      },
-      signatures: {
-        oauth_token: this.credential.accessToken,
-        oauth_secret : this.credential.tokenSecret,
-      }
-    });
-    const res = await fetch(request.signed_url);
-    const data = await res.json();
-    if (data.errors) {
-      console.log(data.errors);
-      return [];
-    }
-    return data;
+    return [];
+    /**
+     * Chrome拡張からTwitterAPIを叩かないようにする.
+     * TODO: 独自のDatabaseをGitHub上に用意するので、そこをGETするようにする.
+     */
+    // const oauth = OAuthSimple(this.consumer.key, this.consumer.secret);
+    // const request = oauth.sign({
+    //   action: "GET",
+    //   path: "https://api.twitter.com/1.1/statuses/user_timeline.json",
+    //   parameters: {
+    //     screen_name: "KanColle_STAFF",
+    //     count,
+    //   },
+    //   signatures: {
+    //     oauth_token: this.credential.accessToken,
+    //     oauth_secret : this.credential.tokenSecret,
+    //   }
+    // });
+    // const res = await fetch(request.signed_url);
+    // const data = await res.json();
+    // if (data.errors) {
+    //   console.log(data.errors);
+    //   return [];
+    // }
+    // return data;
   }
 
   async uploadSingleImage(img: Blob): Promise<Media> {

src/js/Services/API/Twitter.ts

@@ -6,10 +6,11 @@ describe("TwitterAPI", () => {
   global.TWITTER_CONFIG = { key: "xxx", secret: "xxx" };
   describe("getOfficialTweets", () => {
     it("なんかとってくる", async () => {
-      Fetch.replies([{text: "hello"}]);
+      // Fetch.replies([{text: "hello"}]);
+      // TODO: GitHub上に独自のDatabaseを用意するので、そこをGETするようにする.
       const api = new TwitterAPI();
       const statuses = await api.getOfficialTweets();
-      expect(statuses.length).toBe(1);
+      expect(statuses.length).toBe(0);
     });
   });
   describe("uploadSingleImage", () => {