Skip to content

Commit

Permalink
設定ファイルのプリセットに関するデータをCDNで配信 #48 (#49)
Browse files Browse the repository at this point in the history
  • Loading branch information
Robot-Inventor committed Jul 28, 2021
1 parent e0d3a8d commit b9ca0d2
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 15 deletions.
2 changes: 1 addition & 1 deletion dist/advanced_setting.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function get_setting_name(element) {
throw "設定の名称が指定されていないinput要素が見つかりました";
}
async function load_filter_list(setting) {
const response = await fetch("advanced_filter.json");
const response = await fetch("https://cdn.statically.io/gh/Robot-Inventor/stc-filter/main/dist/advanced_filter.json");
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const json_data = await response.json();
const filter_list_outer = document.getElementById("filter_list_outer");
Expand Down
2 changes: 1 addition & 1 deletion dist/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ void (async () => {
const setting = await (0,_load_setting__WEBPACK_IMPORTED_MODULE_1__.load_setting)();
const filter_list = [];
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const filter_url_data = await get_json(browser.runtime.getURL("dist/advanced_filter.json"));
const filter_url_data = await get_json("https://cdn.statically.io/gh/Robot-Inventor/stc-filter/main/dist/advanced_filter.json");
for (let i = 0; i < setting.advanced_filter.length; i++) {
const key = setting.advanced_filter[i];
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
Expand Down
5 changes: 1 addition & 4 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,5 @@
"gecko": {
"id": "{feb13580-3a7d-4151-923b-2b39c1104fe4}"
}
},
"web_accessible_resources": [
"dist/advanced_filter.json"
]
}
}
2 changes: 1 addition & 1 deletion src/advanced_setting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function get_setting_name(element: HTMLElement) {
}

async function load_filter_list(setting: setting_object): Promise<void> {
const response = await fetch("advanced_filter.json");
const response = await fetch("https://cdn.statically.io/gh/Robot-Inventor/stc-filter/main/dist/advanced_filter.json");
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const json_data: advanced_filter_type = await response.json();
const filter_list_outer = document.getElementById("filter_list_outer");
Expand Down
3 changes: 0 additions & 3 deletions src/browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@ export interface browser_interface {
set: (keys: { [key: string]: setting_object }) => Promise<void>,
get: (keys: string) => Promise<{ setting: setting_object }>
}
},
runtime: {
getURL: (path: string) => string
}
}
6 changes: 1 addition & 5 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ import { load_setting, setting_object } from "./load_setting";
import { selector } from "./selector";
import { TweetAnalyser } from "./tweet_analyser";
import { TweetElement } from "./tweet_element";
import { browser_interface } from "./browser";
import { advanced_filter_type } from "./advanced_filter_type";


declare const browser: browser_interface;


function get_unchecked_tweets() {
const tweets: NodeListOf<TweetElement> = document.querySelectorAll(`${selector.tweet_outer}:not(.${selector.checked_tweet_class_name})`);
const result: Array<TweetElement> = [];
Expand Down Expand Up @@ -70,7 +66,7 @@ void (async () => {
const filter_list: Array<query_type> = [];

// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const filter_url_data: advanced_filter_type = await get_json(browser.runtime.getURL("dist/advanced_filter.json"));
const filter_url_data: advanced_filter_type = await get_json("https://cdn.statically.io/gh/Robot-Inventor/stc-filter/main/dist/advanced_filter.json");
for (let i = 0; i < setting.advanced_filter.length; i++) {
const key = setting.advanced_filter[i];
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
Expand Down

0 comments on commit b9ca0d2

Please sign in to comment.