数種の変更

* privacy -> visibility
* インスタンスの種類によって自動でvisibilityが変わるように
* Misskeyのvisibility付き投稿に対応

Author: GenbuHase

Diff for: _locales/en/messages.json

@@ -4,12 +4,20 @@
 
 	"setting_instance": { "message": "Your instance" },
 	"setting_token": { "message": "Your token(Required permission to write)" },
-	"setting_privacy": { "message": "Privacy" },
-	"setting_privacy_public": { "message": "Public" },
-	"setting_privacy_unlisted": { "message": "Unlisted" },
-	"setting_privacy_private": { "message": "Private" },
-	"setting_privacy_limited": { "message": "Limited(Only for implemented instances)" },
-	"setting_privacy_direct": { "message": "Direct" },
+	"setting_visibility": { "message": "Privacy" },
+
+	"setting_visibility_Mastodon_public": { "message": "Public" },
+	"setting_visibility_Mastodon_unlisted": { "message": "Unlisted" },
+	"setting_visibility_Mastodon_private": { "message": "Private" },
+	"setting_visibility_Mastodon_limited": { "message": "Limited(Only for implemented instances)" },
+	"setting_visibility_Mastodon_direct": { "message": "Direct" },
+
+	"setting_visibility_Misskey_public": { "message": "Public" },
+	"setting_visibility_Misskey_home": { "message": "Home" },
+	"setting_visibility_Misskey_followers": { "message": "Followers" },
+	"setting_visibility_Misskey_specified": { "message": "Direct" },
+	"setting_visibility_Misskey_private": { "message": "Private" },
+
 	"setting_save": { "message": "Save the changes" },
 	"setting_close": { "message": "Discard the changes" },
 

Diff for: _locales/ja/messages.json

@@ -4,12 +4,20 @@
 
 	"setting_instance": { "message": "所属インスタンス" },
 	"setting_token": { "message": "トークン(書き込み権限必須)" },
-	"setting_privacy": { "message": "公開範囲" },
-	"setting_privacy_public": { "message": "公開" },
-	"setting_privacy_unlisted": { "message": "未収載" },
-	"setting_privacy_private": { "message": "非公開" },
-	"setting_privacy_limited": { "message": "限定公開(※一部のインスタンスのみ)" },
-	"setting_privacy_direct": { "message": "ダイレクト" },
+	"setting_visibility": { "message": "公開範囲" },
+
+	"setting_visibility_Mastodon_public": { "message": "公開" },
+	"setting_visibility_Mastodon_unlisted": { "message": "未収載" },
+	"setting_visibility_Mastodon_private": { "message": "非公開" },
+	"setting_visibility_Mastodon_limited": { "message": "限定公開(※一部のインスタンスのみ)" },
+	"setting_visibility_Mastodon_direct": { "message": "ダイレクト" },
+
+	"setting_visibility_Misskey_public": { "message": "公開" },
+	"setting_visibility_Misskey_home": { "message": "ホーム" },
+	"setting_visibility_Misskey_followers": { "message": "フォロワー" },
+	"setting_visibility_Misskey_specified": { "message": "ダイレクト" },
+	"setting_visibility_Misskey_private": { "message": "非公開" },
+	
 	"setting_save": { "message": "変更を保存" },
 	"setting_close": { "message": "変更を破棄" },
 

Diff for: background.js

@@ -21,13 +21,13 @@ const URLMatchers = {
  * @param {Number} tabId
  */
 const notifyListeningInfo = (tabId) => {
-	chrome.storage.local.get(["enabled", "instance", "token", "privacy"], items => {
-		const { enabled, instance, token, privacy } = items;
+	chrome.storage.local.get(["enabled", "instance", "token", "visibility"], items => {
+		const { enabled, instance, token, visibility } = items;
 
 		if (!enabled) return;
 		if (!instance) throw new TypeError("A config, 'instance' is invalid.");
 		if (!token) throw new TypeError("A config, 'token' is invalid.");
-		if (!privacy) throw new TypeError("A config, 'privacy' is invalid.");
+		if (!visibility) throw new TypeError("A config, 'visibility' is invalid.");
 
 
 
@@ -70,8 +70,8 @@ const notifyListeningInfo = (tabId) => {
  * @returns {Promise | void}
  */
 const tootListeningInfo = (title, url) => {
-	chrome.storage.local.get(["type", "instance", "token", "privacy"], items => {
-		const { type, instance, token, privacy } = items;
+	chrome.storage.local.get(["type", "instance", "token", "visibility"], items => {
+		const { type, instance, token, visibility } = items;
 
 		const status = [
 			"#WhatYouarePlaying",
@@ -84,10 +84,10 @@ const tootListeningInfo = (title, url) => {
 		].join("\n");
 
 		switch (type) {
-			case "NONE":
+			case "None":
 				throw new URIError("The instance is not acceptable.");
 
-			case "MASTODON":
+			case "Mastodon":
 				return fetch(`${instance}/api/v1/statuses`, {
 					method: "POST",
 
@@ -98,18 +98,20 @@ const tootListeningInfo = (title, url) => {
 
 					body: JSON.stringify({
 						status,
-						visibility: privacy
+						visibility
 					})
 				});
 
-			case "MISSKEY":
+			case "Misskey":
 				return fetch(`${instance}/api/notes/create`, {
 					method: "POST",
 					headers: { "Content-Type": "application/json" },
 
 					body: JSON.stringify({
 						i: token,
-						text: status
+
+						text: status,
+						visibility
 					})
 				});
 		}

Diff for: views/lib/Instance.js

@@ -0,0 +1,80 @@
+class Instance {
+	static get Type () {
+		return {
+			None: "None",
+
+			Mastodon: "Mastodon",
+			Misskey: "Misskey"
+		};
+	}
+
+	static get Visibility () {
+		return {
+			None: [""],
+
+			Mastodon: ["public", "unlisted", "private", "limited", "direct"],
+			Misskey: ["public", "home", "followers", "specified", "private"]
+		};
+	}
+
+	/**
+	 * Detects a type of provided instance's url
+	 * 
+	 * @param {String} instance
+	 * @return {Promise<String>}
+	 */
+	static detectType (instance) {
+		//Misskey's API
+		return fetch(`${instance}/api/stats`, {
+			method: "POST"
+		}).then(res => {
+			if (res.ok) return Instance.Type.Misskey;
+
+			//Mastodon's API
+			return fetch(`${instance}/api/v1/instance`).then(res => {
+				if (res.ok) return Instance.Type.Mastodon;
+
+				throw "";
+			});
+		}).catch(() => Instance.Type.None);
+	}
+
+
+
+	/**
+	 * Setup for handling information of instances
+	 * @param {String} url
+	 */
+	constructor (url) {
+		if (!url) throw new URIError("An argument, 'url' is required.");
+
+		//Throws error if provided url isn't absolutely
+		new URL(url);
+
+		this.url = url;
+		Instance.detectType(url).then(type => this.type = type);
+	}
+
+	/**
+	 * Dispatches provided event when it has been true
+	 * 
+	 * @param {"init"} eventname
+	 * @param {Function} callback
+	 */
+	on (eventname, callback) {
+		switch (eventname) {
+			default:
+				throw new TypeError(`Provided event, "${eventname}" is not defined`);
+
+			case "init":
+				const detector = setInterval(() => {
+					if ([this.type].every(prop => prop)) {
+						clearInterval(detector);
+						callback(this);
+					}
+				});
+				
+				break;
+		}
+	}
+}

Diff for: views/settings/index.html

@@ -10,6 +10,7 @@
 		<Link Rel = "StyleSheet" Href = "../lib/Material Icons/material-icons.css" />
 
 		<Script Src = "../lib/Locale.js"></Script>
+		<Script Src = "../lib/Instance.js"></Script>
 		<Script Src = "settings.js" Defer></Script>
 		<Link Rel = "StyleSheet" Href = "settings.css" />
 	</Head>
@@ -50,15 +51,10 @@
 			</Div>
 
 			<Div Class = "input-field">
-				<Select ID = "privacy">
-					<Option Name = "privacy.public" Value = "public" Locale-Message = "setting_privacy_public">Public</Option>
-					<Option Name = "privacy.unlisted" Value = "unlisted" Locale-Message = "setting_privacy_unlisted">Unlisted</Option>
-					<Option Name = "privacy.private" Value = "private" Locale-Message = "setting_privacy_private">Private</Option>
-					<Option Name = "privacy.limited" Value = "limited" Locale-Message = "setting_privacy_limited">Limited(Only for implemented instances)</Option>
-					<Option Name = "privacy.direct" Value = "direct" Locale-Message = "setting_privacy_direct">Direct</Option>
+				<Select ID = "visibility">
 				</Select>
 
-				<Label Locale-Message = "setting_privacy">Privacy</Label>
+				<Label Locale-Message = "setting_visibility">Privacy</Label>
 			</Div>
 
 			<Div>

Diff for: views/settings/settings.js

@@ -1,6 +1,6 @@
 const instanceInputter = document.getElementById("instance");
 const tokenInputter = document.getElementById("token");
-const pricacySelector = document.getElementById("privacy");
+const visibilitySelector = document.getElementById("visibility");
 const enabledSwitch = document.getElementById("enabled");
 const saveBtn = document.getElementById("btns_save");
 const closeBtn = document.getElementById("btns_close");
@@ -16,93 +16,34 @@ const throwError = errorKey => {
 	throw definedMessages[errorKey].message;
 };
 
-class Instance {
-	static get Type () {
-		return {
-			None: "NONE",
-
-			Mastodon: "MASTODON",
-			Misskey: "MISSKEY"
-		};
-	}
-
-	/**
-	 * Detects a type of provided instance's url
-	 * 
-	 * @param {String} instance
-	 * @return {Promise<String>}
-	 */
-	static detectType (instance) {
-		//Misskey's API
-		return fetch(`${instance}/api/stats`, {
-			method: "POST"
-		}).then(res => {
-			if (res.ok) return Instance.Type.Misskey;
-
-			//Mastodon's API
-			return fetch(`${instance}/api/v1/instance`).then(res => {
-				if (res.ok) return Instance.Type.Mastodon;
-
-				throw "";
-			});
-		}).catch(() => Instance.Type.None);
-	}
-
-
-
-	/**
-	 * Setup for handling information of instances
-	 * @param {String} url
-	 */
-	constructor (url) {
-		if (!url) throw new URIError("An argument, 'url' is required.");
-
-		//Throws error if provided url isn't absolutely
-		new URL(url);
-
-		this.url = url;
-		Instance.detectType(url).then(type => this.type = type);
-	}
-
-	/**
-	 * Dispatches provided event when it has been true
-	 * 
-	 * @param {"init"} eventname
-	 * @param {Function} callback
-	 */
-	on (eventname, callback) {
-		switch (eventname) {
-			default:
-				throw new TypeError(`Provided event, "${eventname}" is not defined`);
-
-			case "init":
-				const detector = setInterval(() => {
-					if ([this.type].every(prop => prop)) {
-						clearInterval(detector);
-						callback(this);
-					}
-				});
-				
-				break;
-		}
-	}
-}
-
 
 
 window.addEventListener("DOMContentLoaded", () => {
 	document.querySelectorAll("Select").forEach(select => M.FormSelect.init(select));
 });
 
 window.addEventListener("DOMContentLoaded", () => {
-	chrome.storage.local.get(["enabled", "type", "instance", "token", "privacy"], items => {
-		if (items.enabled) enabledSwitch.checked = items.enabled;
-		if (items.instance) instanceInputter.value = items.instance;
-		if (items.token) tokenInputter.value = items.token;
-		if (items.privacy) pricacySelector.namedItem(`privacy.${items.privacy}`).selected = true;
+	chrome.storage.local.get(["enabled", "type", "instance", "token", "visibility"], items => {
+		const { enabled, type, instance, token, visibility } = items;
+
+		if (enabled) enabledSwitch.checked = enabled;
+		if (instance) instanceInputter.value = instance;
+		if (token) tokenInputter.value = token;
+
+		if (type && type !== Instance.Type.None) {
+			for (let visibility of Instance.Visibility[type]) {
+				const option = new Option(definedMessages[`setting_visibility_${type}_${visibility}`].message, visibility);
+				option.setAttribute("Name", `visibility.${visibility}`);
+				option.setAttribute("Locale-Message", `setting_visibility_${type}_${visibility}`);
+
+				visibilitySelector.add(option);
+			}
+		}
+		
+		if (visibility && Instance.Visibility[type].includes(visibility)) visibilitySelector.namedItem(`visibility.${visibility}`).selected = true;
 
 		M.updateTextFields();
-		M.FormSelect.init(pricacySelector);
+		M.FormSelect.init(visibilitySelector);
 	});
 
 	enabledSwitch.addEventListener("change", event => {
@@ -124,7 +65,7 @@ window.addEventListener("DOMContentLoaded", () => {
 				type,
 				instance: instance.url,
 				token: tokenInputter.value,
-				privacy: pricacySelector.value
+				visibility: visibilitySelector.value
 			});
 
 			window.close();