diff --git a/.config/example.yml b/.config/example.yml index a4f3c0036e..ce092a08f3 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -123,6 +123,7 @@ drive: # google_maps_api_key: example-google-maps-api-key # Twitter integration +# You need to set the oauth callback url as : https:///api/tw/cb # twitter: # consumer_key: example-twitter-consumer-key # consumer_secret: example-twitter-consumer-secret-key diff --git a/docs/setup.en.md b/docs/setup.en.md index 56632cc361..73ea636390 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -62,6 +62,13 @@ npm install web-push -g web-push generate-vapid-keys ``` +*(optional)* Create a twitter application +---------------------------------------------------------------- +If you want to enable the twitter integration, you need to create a twitter app at [apps.twitter.com](https://apps.twitter.com/). + +In the app you need to set the oauth callback url as : https://misskey-instance/api/tw/cb + + *5.* Make configuration file ---------------------------------------------------------------- 1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`. diff --git a/package.json b/package.json index 80c0bc53c2..61820c76f0 100644 --- a/package.json +++ b/package.json @@ -58,9 +58,9 @@ "@types/minio": "6.0.2", "@types/mkdirp": "0.5.2", "@types/mocha": "5.2.3", - "@types/mongodb": "3.1.3", + "@types/mongodb": "3.1.4", "@types/ms": "0.7.30", - "@types/node": "10.5.8", + "@types/node": "10.7.0", "@types/portscanner": "2.1.0", "@types/pug": "2.0.4", "@types/qrcode": "1.2.0", @@ -80,7 +80,7 @@ "@types/webpack": "4.4.9", "@types/webpack-stream": "3.2.10", "@types/websocket": "0.0.39", - "@types/ws": "5.1.2", + "@types/ws": "6.0.0", "animejs": "2.2.0", "autosize": "4.0.2", "autwh": "0.1.0", @@ -153,7 +153,7 @@ "mkdirp": "0.5.1", "mocha": "5.2.0", "moji": "0.5.1", - "mongodb": "3.1.2", + "mongodb": "3.1.3", "monk": "6.0.6", "ms": "2.1.1", "nan": "2.10.0", @@ -210,7 +210,7 @@ "vue-json-tree-view": "2.1.4", "vue-loader": "15.3.0", "vue-router": "3.0.1", - "vue-style-loader": "4.1.1", + "vue-style-loader": "4.1.2", "vue-template-compiler": "2.5.17", "vuedraggable": "2.16.0", "vuex": "3.0.1",