chore: formatting

This commit is contained in:
ThatOneCalculator 2023-02-11 17:22:05 -08:00
parent 4ca445b587
commit 69da6fa295
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
7 changed files with 21 additions and 9 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "calckey", "name": "calckey",
"version": "13.2.0-dev1", "version": "13.2.0-dev2",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -79,11 +79,11 @@ export async function checkHitAntenna(
getFullApAccount(noteUser.username, noteUser.host).toLowerCase(), getFullApAccount(noteUser.username, noteUser.host).toLowerCase(),
) )
) )
return false; return false;
} else if (antenna.src === "instances") { } else if (antenna.src === "instances") {
const instances = antenna.instances const instances = antenna.instances
.filter(x => x !== "") .filter((x) => x !== "")
.map(host => { .map((host) => {
return host.toLowerCase(); return host.toLowerCase();
}); });
if (!instances.includes(noteUser.host?.toLowerCase() ?? "")) return false; if (!instances.includes(noteUser.host?.toLowerCase() ?? "")) return false;

View File

@ -37,7 +37,10 @@ export const paramDef = {
type: "object", type: "object",
properties: { properties: {
name: { type: "string", minLength: 1, maxLength: 100 }, name: { type: "string", minLength: 1, maxLength: 100 },
src: { type: "string", enum: ["home", "all", "users", "list", "group", "instances"] }, src: {
type: "string",
enum: ["home", "all", "users", "list", "group", "instances"],
},
userListId: { type: "string", format: "misskey:id", nullable: true }, userListId: { type: "string", format: "misskey:id", nullable: true },
userGroupId: { type: "string", format: "misskey:id", nullable: true }, userGroupId: { type: "string", format: "misskey:id", nullable: true },
keywords: { keywords: {

View File

@ -43,7 +43,10 @@ export const paramDef = {
properties: { properties: {
antennaId: { type: "string", format: "misskey:id" }, antennaId: { type: "string", format: "misskey:id" },
name: { type: "string", minLength: 1, maxLength: 100 }, name: { type: "string", minLength: 1, maxLength: 100 },
src: { type: "string", enum: ["home", "all", "users", "list", "group", "instances"] }, src: {
type: "string",
enum: ["home", "all", "users", "list", "group", "instances"],
},
userListId: { type: "string", format: "misskey:id", nullable: true }, userListId: { type: "string", format: "misskey:id", nullable: true },
userGroupId: { type: "string", format: "misskey:id", nullable: true }, userGroupId: { type: "string", format: "misskey:id", nullable: true },
keywords: { keywords: {

View File

@ -1,6 +1,10 @@
import * as mfm from "mfm-js"; import * as mfm from "mfm-js";
import es from "../../db/elasticsearch.js"; import es from "../../db/elasticsearch.js";
import { publishMainStream, publishNotesStream, publishNoteStream } from "@/services/stream.js"; import {
publishMainStream,
publishNotesStream,
publishNoteStream,
} from "@/services/stream.js";
import DeliverManager from "@/remote/activitypub/deliver-manager.js"; import DeliverManager from "@/remote/activitypub/deliver-manager.js";
import renderNote from "@/remote/activitypub/renderer/note.js"; import renderNote from "@/remote/activitypub/renderer/note.js";
import renderCreate from "@/remote/activitypub/renderer/create.js"; import renderCreate from "@/remote/activitypub/renderer/create.js";

View File

@ -548,7 +548,9 @@ export async function selectUser() {
export async function selectInstance(): Promise<Misskey.entities.Instance> { export async function selectInstance(): Promise<Misskey.entities.Instance> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
popup( popup(
defineAsyncComponent(() => import("@/components/MkInstanceSelectDialog.vue")), defineAsyncComponent(
() => import("@/components/MkInstanceSelectDialog.vue"),
),
{}, {},
{ {
ok: (instance) => { ok: (instance) => {

View File

@ -142,7 +142,7 @@ async function deleteAntenna() {
function addUser() { function addUser() {
os.selectUser().then(user => { os.selectUser().then(user => {
users = users.trim(); users = users.trim();
users += '\n@' + Acct.toString(user as any); users += `\n@${Acct.toString(user as any)}`;
users = users.trim(); users = users.trim();
}); });
} }