diff --git a/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.jsx b/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.jsx index 3aa0f50f4..bdc532874 100644 --- a/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.jsx +++ b/packages/ui-default/components/autocomplete/components/UserSelectAutoComplete.jsx @@ -1,11 +1,11 @@ import React, { forwardRef } from 'react'; import PropTypes from 'prop-types'; -import api, { e } from 'vj/utils/api'; +import api, { gql } from 'vj/utils/api'; import AutoComplete from './AutoComplete'; // eslint-disable-next-line prefer-arrow-callback const UserSelectAutoComplete = forwardRef(function UserSelectAutoComplete(props, ref) { - const itemsFn = (query) => api(e` + const itemsFn = (query) => api(gql` users(search: ${query}) { _id uname diff --git a/packages/ui-default/components/monaco/languages/markdown.ts b/packages/ui-default/components/monaco/languages/markdown.ts index 9c5a63ba5..fce52b108 100644 --- a/packages/ui-default/components/monaco/languages/markdown.ts +++ b/packages/ui-default/components/monaco/languages/markdown.ts @@ -1,7 +1,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'; import list from 'emojis-list'; import keyword from 'emojis-keywords'; -import api, { e } from 'vj/utils/api'; +import api, { gql } from 'vj/utils/api'; const qqEmojies = [ 'weixiao', @@ -167,7 +167,7 @@ monaco.languages.registerCompletionItemProvider('markdown', { endColumn: word.endColumn, }; if (prefix === '@') { - const users = await api(e` + const users = await api(gql` users(search: ${word.word}) { _id uname diff --git a/packages/ui-default/pages/home_messages.page.jsx b/packages/ui-default/pages/home_messages.page.jsx index f669c7a16..30f0b7979 100644 --- a/packages/ui-default/pages/home_messages.page.jsx +++ b/packages/ui-default/pages/home_messages.page.jsx @@ -1,5 +1,5 @@ import { NamedPage } from 'vj/misc/Page'; -import api, { e } from 'vj/utils/api'; +import api, { gql } from 'vj/utils/api'; import loadReactRedux from 'vj/utils/loadReactRedux'; import parseQueryString from 'vj/utils/parseQueryString'; @@ -80,7 +80,7 @@ const page = new NamedPage('home_messages', () => { async function loadSendTarget() { const queryString = parseQueryString(); if (!queryString.target) return; - const user = await api(e` + const user = await api(gql` users(search: ${queryString.target}, exact: true) { _id uname diff --git a/packages/ui-default/utils/api.ts b/packages/ui-default/utils/api.ts index e174502a6..0cc8dc67e 100644 --- a/packages/ui-default/utils/api.ts +++ b/packages/ui-default/utils/api.ts @@ -13,7 +13,7 @@ export default async (q: string, path: string[] = []) => { return cursor; }; -export const e = ( +export const gql = ( pieces: TemplateStringsArray, ...templates: (string | number)[] ) => {