usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into sw-notification-action

This commit is contained in:
tamaina 2021-02-11 17:14:48 +09:00
parent f9d26b88a8 cc9bc7703a
commit 538bba080f
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -218,7 +218,7 @@
"rndstr": "1.0.0", "rndstr": "1.0.0",
"s-age": "1.1.2", "s-age": "1.1.2",
"sass": "1.32.6", "sass": "1.32.6",
"sass-loader": "11.0.0", "sass-loader": "11.0.1",
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"sharp": "0.27.1", "sharp": "0.27.1",
"speakeasy": "2.0.0", "speakeasy": "2.0.0",

1
src/client/account.ts
View File

@ -84,6 +84,7 @@ export function updateAccount(data) {
for (const [key, value] of Object.entries(data)) { for (const [key, value] of Object.entries(data)) {
$i[key] = value; $i[key] = value;
} }
localStorage.setItem('account', JSON.stringify($i));
} }
export function refreshAccount() { export function refreshAccount() {

3
src/client/pages/scratchpad.vue
View File

@ -70,7 +70,8 @@ export default defineComponent({
async run() { async run() {
this.logs = []; this.logs = [];
const aiscript = new AiScript(createAiScriptEnv({ const aiscript = new AiScript(createAiScriptEnv({
storageKey: 'scratchpad' storageKey: 'scratchpad',
token: this.$i?.token,
}), { }), {
in: (q) => { in: (q) => {
return new Promise(ok => { return new Promise(ok => {

3
src/client/widgets/aiscript.vue
View File

@ -54,7 +54,8 @@ export default defineComponent({
async run() { async run() {
this.logs = []; this.logs = [];
const aiscript = new AiScript(createAiScriptEnv({ const aiscript = new AiScript(createAiScriptEnv({
storageKey: 'widget' storageKey: 'widget',
token: this.$i?.token,
}), { }), {
in: (q) => { in: (q) => {
return new Promise(ok => { return new Promise(ok => {

3
src/client/widgets/button.vue
View File

@ -45,7 +45,8 @@ export default defineComponent({
methods: { methods: {
async run() { async run() {
const aiscript = new AiScript(createAiScriptEnv({ const aiscript = new AiScript(createAiScriptEnv({
storageKey: 'scratchpad' storageKey: 'widget',
token: this.$i?.token,
}), { }), {
in: (q) => { in: (q) => {
return new Promise(ok => { return new Promise(ok => {

8
yarn.lock
View File

@ -9089,10 +9089,10 @@ safe-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
sass-loader@11.0.0: sass-loader@11.0.1:
version "11.0.0" version "11.0.1"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.0.0.tgz#5263c486afd0a1694bdd47abd533eabee00f9e37" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.0.1.tgz#8672f896593466573b904f47693e0695368e38c9"
integrity sha512-08+bTpDfYK/wTow+LQx2D3VCFQinQij4uyGJl3yRUiOTx7n0FDDiReIIbXIVU0LFX5FhjC7s99lSKT4Qnm5eFg== integrity sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw==
dependencies: dependencies:
klona "^2.0.4" klona "^2.0.4"
neo-async "^2.6.2" neo-async "^2.6.2"