Compare commits

..

18 Commits

Author SHA1 Message Date
syuilo
0ce64f8c33 10.58.2 2018-11-29 06:34:07 +09:00
syuilo
2cd6ccb85c Fix test 2018-11-29 06:33:23 +09:00
syuilo
3dcf5374c2 Mark chart apis as stable 2018-11-29 06:06:07 +09:00
dependabot[bot]
1c7d5f3f64 Update ts-loader requirement from 5.3.0 to 5.3.1 (#3426)
Updates the requirements on [ts-loader](https://github.com/TypeStrong/ts-loader) to permit the latest version.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TypeStrong/ts-loader/commits/v5.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-29 05:31:41 +09:00
Ivan
bb0cb0a866 Fix bad style in deck column options and other things (#3412)
* Fix wrong text color in empty timeline (#3268)

* Whoops

* Fix wrong text color in deck options (#3268)

* Some padding to make it look less ugly

* Fix wrong text color in user lists menu (#3268)

* Fix wrong text color of footer on welcome screen (mobile) (#3268)

* Fix misalignment of icons and text in menu (mobile) (#3289)

* Fix wrong text color in empty timeline (mobile) (#3268)
2018-11-29 05:02:35 +09:00
Acid Chicken (硫酸鶏)
362dc29057 Update profile-editor.vue (#3424) 2018-11-29 04:54:36 +09:00
syuilo
8af0218e4c ✌️🤔✌️ 2018-11-28 18:57:22 +09:00
syuilo
09af9968b5 🎨 2018-11-28 16:29:18 +09:00
syuilo
7d0b819c5a Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-28 16:19:09 +09:00
syuilo
4bbb7eded3 Cookieを使わないように 2018-11-28 16:19:02 +09:00
dependabot[bot]
72ea9e5522 Update systeminformation requirement from 3.49.3 to 3.51.3 (#3419)
Updates the requirements on [systeminformation](https://github.com/sebhildebrandt/systeminformation) to permit the latest version.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-28 16:01:16 +09:00
dependabot[bot]
743e5d947d Update autobind-decorator requirement from 2.2.1 to 2.3.1 (#3418)
Updates the requirements on [autobind-decorator](https://github.com/andreypopp/autobind-decorator) to permit the latest version.
- [Release notes](https://github.com/andreypopp/autobind-decorator/releases)
- [Changelog](https://github.com/andreypopp/autobind-decorator/blob/master/CHANGELOG.md)
- [Commits](https://github.com/andreypopp/autobind-decorator/commits/v2.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-28 16:00:58 +09:00
syuilo
f257853906 Update signin.ts 2018-11-28 05:27:34 +09:00
nico
bdef33e88d Add theme_color and 512x512 icon to app manifest (#3417)
As per Chrome Lighthouse PWA suggestions.
2018-11-28 04:38:50 +09:00
dependabot[bot]
ab92762320 Update webfinger.js requirement from 2.6.6 to 2.7.0 (#3414)
Updates the requirements on [webfinger.js](https://github.com/silverbucket/webfinger.js) to permit the latest version.
- [Release notes](https://github.com/silverbucket/webfinger.js/releases)
- [Changelog](https://github.com/silverbucket/webfinger.js/blob/master/RELEASE_CHECKLIST)
- [Commits](https://github.com/silverbucket/webfinger.js/commits/v2.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 15:49:50 +09:00
Acid Chicken (硫酸鶏)
04942c8477 Update README.md [AUTOGEN] (#3415) 2018-11-27 15:49:39 +09:00
Acid Chicken (硫酸鶏)
e62fad7bc6 Update README.md [AUTOGEN] (#3413) 2018-11-27 03:08:08 +09:00
syuilo
2c6bad2501 [MFM] Improve hashtag detection 2018-11-27 02:08:51 +09:00
31 changed files with 143 additions and 65 deletions

View File

@@ -73,46 +73,50 @@ Please see [Contribution guide](./CONTRIBUTING.md).
---------------------------------------------------------------- ----------------------------------------------------------------
<!-- PATREON_START --> <!-- PATREON_START -->
<table><tr> <table><tr>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12190916/fb7fa7983c14425f890369535b1506a4/1?token-time=2145916800&token-hash=Zeh1u6l_Vmgoy8A1eT1Sltea-_SZSq8t8uOWDRZRh94%3D" alt="weep"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13376668/71f3cf87ec6c4393a44b1b9df5ee3d12/1?token-time=2145916800&token-hash=7pSmWqgMfMSJHVIEcNsuuQoKeU3TRluew5p0EGTzWA4%3D" alt="Arctic"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12731202/0995c46cdcb54153ab5f073f5869b70a/1?token-time=2145916800&token-hash=Yd60FK_SWfQO56SeiJpy1tDHOnCV4xdEywQe8gn5_Wo%3D" alt="negao"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12913507/f7181eacafe8469a93033d85f5969c29/2?token-time=2145916800&token-hash=mgPdX9TqZxEg4TTPuc477dxhIgYk9246qafjWZEqZ7g%3D" alt="Melilot"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/3384329/8b713330cb27404ea6e9fac50ff96efe/1?token-time=2145916800&token-hash=0eu4-m1gTWA9PhptVZt6rdKcusqcD7RB87rJT23VVFI%3D" alt="べすれい"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1?token-time=2145916800&token-hash=GgJ_NmUB6_nnRNLVGUWjV-WX91On7BOu59LKncYV9fE%3D" alt="gutfuckllc"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=I8lJVM8LeW6TSo5W6uIIRZ42cw83zp1wK_FsbzY0mcQ%3D" alt="mydarkstar"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1?token-time=2145916800&token-hash=I8lJVM8LeW6TSo5W6uIIRZ42cw83zp1wK_FsbzY0mcQ%3D" alt="mydarkstar"></td>
<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
</tr><tr> </tr><tr>
<td><a href="https://www.patreon.com/weepjp">weep</a></td>
<td><a href="https://www.patreon.com/user?u=13376668">Arctic</a></td>
<td><a href="https://www.patreon.com/negao">negao</a></td> <td><a href="https://www.patreon.com/negao">negao</a></td>
<td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td> <td><a href="https://www.patreon.com/user?u=12913507">Melilot</a></td>
<td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td> <td><a href="https://www.patreon.com/user?u=3384329">べすれい</a></td>
<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td> <td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
<td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td> <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
</tr></table> </tr></table>
<table><tr> <table><tr>
<td><img src="https://c8.patreon.com/2/100/12718187" alt="Peter G."></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1?token-time=2145916800&token-hash=zwSu01tOtn5xTUucDZHuPsCxF2HBEMVs9ROJKTlEV_o%3D" alt="nemu"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=qsdn0-e6yLaLI6hUX9JAkyTR6a5UdnSp7T1foniBvGQ%3D" alt="YUKIMOCHI"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3?token-time=2145916800&token-hash=qsdn0-e6yLaLI6hUX9JAkyTR6a5UdnSp7T1foniBvGQ%3D" alt="YUKIMOCHI"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=iUXOQzRyJDv3PJxwS7Mjwg1459dzh2trOq6NFtXu_OM%3D" alt="Acid Chicken"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/8241184/39e18850e87a449e9c9a71acb3310ebd/2?token-time=2145916800&token-hash=iUXOQzRyJDv3PJxwS7Mjwg1459dzh2trOq6NFtXu_OM%3D" alt="Acid Chicken"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/13034746/c711c7f58e204ecfbc2fd646bc8a4eee/1?token-time=2145916800&token-hash=UERBN4OyP7Nh5XwwdDg0N0IE5cD6_qUQMO81Z5Wizso%3D" alt="Hiratake"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=P4BIzCX2I1CkEP66ottfhsC8Wr6BUSamjA-vq3pLqFI%3D" alt="Naoki Hirayama"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/10789744/97175095d8f04c0f86225ff47cb98d40/1?token-time=2145916800&token-hash=P4BIzCX2I1CkEP66ottfhsC8Wr6BUSamjA-vq3pLqFI%3D" alt="Naoki Hirayama"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/4503830/ccf2cc867ea64de0b524bb2e24b9a1cb/1?token-time=2145916800&token-hash=S1zP0QyLU52Dqq6dtc9qNYyWfW86XrYHiR4NMbeOrnA%3D" alt="dansup"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></td>
</tr><tr> </tr><tr>
<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td> <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
<td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td> <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
<td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td> <td><a href="https://www.patreon.com/acid_chicken">Acid Chicken</a></td>
<td><a href="https://www.patreon.com/hiratake">Hiratake</a></td> <td><a href="https://www.patreon.com/hiratake">Hiratake</a></td>
<td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td> <td><a href="https://www.patreon.com/spinlock">Naoki Hirayama</a></td>
<td><a href="https://www.patreon.com/dansup">dansup</a></td> <td><a href="https://www.patreon.com/dansup">dansup</a></td>
<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
<td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
</tr></table> </tr></table>
<table><tr> <table><tr>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/619786/32cf01444db24e578cd1982c197f6fc6/1?token-time=2145916800&token-hash=tB1e_r8RlZ5sFL0KV_e8dugapxatNBRK1Z3h67TO1g8%3D" alt="Gargron"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/5731881/4b6038e6cda34c04b83a5fcce3806a93/1?token-time=2145916800&token-hash=VZUtwrjQa8Jml4twCjHYQQZ64wHEY4oIlGl7Kc-VYUQ%3D" alt="Nokotaro Takeda"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td> <td><img src="https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/12531784/93a45137841849329ba692da92ac7c60/1?token-time=2145916800&token-hash=tMosUojzUYJCH_3t--tvYA-SMCyrS__hzSndyaRSnbo%3D" alt="Takashi Shibuya"></td>
</tr><tr> </tr><tr>
<td><a href="https://www.patreon.com/mastodon">Gargron</a></td>
<td><a href="https://www.patreon.com/takenoko">Nokotaro Takeda</a></td>
<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td> <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
</tr></table> </tr></table>
**Last updated:** Fri, 23 Nov 2018 14:09:04 UTC **Last updated:** Tue, 27 Nov 2018 06:24:05 UTC
<!-- PATREON_END --> <!-- PATREON_END -->
:four_leaf_clover: Copyright :four_leaf_clover: Copyright

View File

@@ -1,8 +1,8 @@
{ {
"name": "misskey", "name": "misskey",
"author": "syuilo <i@syuilo.com>", "author": "syuilo <i@syuilo.com>",
"version": "10.58.1", "version": "10.58.2",
"clientVersion": "2.0.12110", "clientVersion": "2.0.12127",
"codename": "nighthike", "codename": "nighthike",
"main": "./built/index.js", "main": "./built/index.js",
"private": true, "private": true,
@@ -88,7 +88,7 @@
"@types/ws": "6.0.1", "@types/ws": "6.0.1",
"animejs": "2.2.0", "animejs": "2.2.0",
"apexcharts": "2.2.3", "apexcharts": "2.2.3",
"autobind-decorator": "2.2.1", "autobind-decorator": "2.3.1",
"autosize": "4.0.2", "autosize": "4.0.2",
"autwh": "0.1.0", "autwh": "0.1.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
@@ -201,13 +201,13 @@
"stylus": "0.54.5", "stylus": "0.54.5",
"stylus-loader": "3.0.2", "stylus-loader": "3.0.2",
"summaly": "2.2.0", "summaly": "2.2.0",
"systeminformation": "3.49.3", "systeminformation": "3.51.3",
"syuilo-password-strength": "0.0.1", "syuilo-password-strength": "0.0.1",
"terser-webpack-plugin": "1.1.0", "terser-webpack-plugin": "1.1.0",
"textarea-caret": "3.1.0", "textarea-caret": "3.1.0",
"tinycolor2": "1.4.1", "tinycolor2": "1.4.1",
"tmp": "0.0.33", "tmp": "0.0.33",
"ts-loader": "5.3.0", "ts-loader": "5.3.1",
"ts-node": "7.0.1", "ts-node": "7.0.1",
"tslint": "5.10.0", "tslint": "5.10.0",
"typescript": "3.1.6", "typescript": "3.1.6",
@@ -233,7 +233,7 @@
"vuex": "3.0.1", "vuex": "3.0.1",
"vuex-persistedstate": "2.5.4", "vuex-persistedstate": "2.5.4",
"web-push": "3.3.3", "web-push": "3.3.3",
"webfinger.js": "2.6.6", "webfinger.js": "2.7.0",
"webpack": "4.26.0", "webpack": "4.26.0",
"webpack-cli": "3.1.2", "webpack-cli": "3.1.2",
"websocket": "1.0.28", "websocket": "1.0.28",

View File

@@ -2,7 +2,7 @@ const faces = [
'(=^・・^=)', '(=^・・^=)',
'v(\'ω\')v', 'v(\'ω\')v',
'🐡( \'-\' 🐡 )フグパンチ!!!!', '🐡( \'-\' 🐡 )フグパンチ!!!!',
'🖕(´・_・`)🖕', '✌️(´・_・`)✌️',
'(。><。)', '(。><。)',
'(Δ・x・Δ)' '(Δ・x・Δ)'
]; ];

View File

@@ -180,6 +180,7 @@ export default Vue.extend({
padding 8px 16px padding 8px 16px
width 100% width 100%
color var(--popupFg) color var(--popupFg)
white-space nowrap
&:hover &:hover
color var(--primaryForeground) color var(--primaryForeground)

View File

@@ -179,8 +179,8 @@ export default Vue.extend({
location: this.location || null, location: this.location || null,
description: this.description || null, description: this.description || null,
birthday: this.birthday || null, birthday: this.birthday || null,
avatarId: this.avatarId, avatarId: this.avatarId || undefined,
bannerId: this.bannerId, bannerId: this.bannerId || undefined,
isCat: !!this.isCat, isCat: !!this.isCat,
isBot: !!this.isBot, isBot: !!this.isBot,
isLocked: !!this.isLocked, isLocked: !!this.isLocked,

View File

@@ -67,7 +67,8 @@ export default Vue.extend({
username: this.username, username: this.username,
password: this.password, password: this.password,
token: this.user && this.user.twoFactorEnabled ? this.token : undefined token: this.user && this.user.twoFactorEnabled ? this.token : undefined
}, true).then(() => { }, true).then(res => {
localStorage.setItem('i', res.i);
location.reload(); location.reload();
}).catch(() => { }).catch(() => {
alert(this.$t('login-failed')); alert(this.$t('login-failed'));

View File

@@ -123,7 +123,7 @@ export default Vue.extend({
> span > span
display block display block
line-height 20px line-height 20px
color currentColor color var(--text)
transition inherit transition inherit
> p > p

View File

@@ -54,7 +54,25 @@ export default Vue.extend({
padding 16px padding 16px
> button > button
display block
margin-bottom 16px margin-bottom 16px
color var(--primaryForeground)
background var(--primary)
width 100%
border-radius 38px
user-select none
cursor pointer
padding 0 16px
min-width 100px
line-height 38px
font-size 14px
font-weight 700
&:hover
background var(--primaryLighten10)
&:active
background var(--primaryDarken10)
> a > a
display block display block

View File

@@ -10,7 +10,7 @@
<span>{{ name }}</span> <span>{{ name }}</span>
</span> </span>
<div class="editor" style="padding:0 12px" v-if="edit"> <div class="editor" style="padding:12px" v-if="edit">
<ui-switch v-model="column.isMediaOnly" @change="onChangeSettings">{{ $t('is-media-only') }}</ui-switch> <ui-switch v-model="column.isMediaOnly" @change="onChangeSettings">{{ $t('is-media-only') }}</ui-switch>
<ui-switch v-model="column.isMediaView" @change="onChangeSettings">{{ $t('is-media-view') }}</ui-switch> <ui-switch v-model="column.isMediaView" @change="onChangeSettings">{{ $t('is-media-view') }}</ui-switch>
</div> </div>

View File

@@ -151,18 +151,20 @@ export default Vue.extend({
&:hover &:hover
color var(--desktopTimelineSrcHover) color var(--desktopTimelineSrcHover)
> .empty > .mk-notes
display block
margin 0 auto
padding 32px
max-width 400px
text-align center
color #999
> [data-icon] > .empty
display block display block
margin-bottom 16px margin 0 auto
font-size 3em padding 32px
color #ccc max-width 400px
text-align center
color var(--text)
> [data-icon]
display block
margin-bottom 16px
font-size 3em
color var(--faceHeaderText);
</style> </style>

View File

@@ -371,7 +371,6 @@ export default Vue.extend({
> .main > .main
grid-row 1 grid-row 1
grid-column 1 / 3 grid-column 1 / 3
border-top solid 5px var(--primary)
> div > div
padding 32px padding 32px

View File

@@ -190,8 +190,8 @@ export default class MiOS extends EventEmitter {
this.store.dispatch('mergeMe', freshData); this.store.dispatch('mergeMe', freshData);
}); });
} else { } else {
// Get token from cookie // Get token from cookie or localStorage
const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1]; const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1] || localStorage.getItem('i');
fetchme(i, me => { fetchme(i, me => {
if (me) { if (me) {

View File

@@ -334,6 +334,7 @@ main
max-width 680px max-width 680px
margin 0 auto margin 0 auto
padding 8px padding 8px
color var(--text)
@media (min-width 500px) @media (min-width 500px)
padding 16px padding 16px

View File

@@ -306,6 +306,7 @@ export default Vue.extend({
padding 16px 0 padding 16px 0
border solid 2px rgba(0, 0, 0, 0.1) border solid 2px rgba(0, 0, 0, 0.1)
border-radius 8px border-radius 8px
color var(--text)
> * > *
margin 0 16px margin 0 16px

View File

@@ -11,11 +11,3 @@ if (!('fetch' in window)) {
'Your browser (or your OS) seems outdated. ' + 'Your browser (or your OS) seems outdated. ' +
'To run Misskey, please update your browser to latest version or try other browsers.'); 'To run Misskey, please update your browser to latest version or try other browsers.');
} }
// Check whether cookie enabled
if (!navigator.cookieEnabled) {
alert(
'Misskeyを利用するにはCookieを有効にしてください。' +
'\n\n' +
'To use Misskey, please enable Cookie.');
}

View File

@@ -129,6 +129,7 @@ export default (os: MiOS) => new Vuex.Store({
logout(ctx) { logout(ctx) {
ctx.commit('updateI', null); ctx.commit('updateI', null);
document.cookie = `i=; domain=${hostname}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`; document.cookie = `i=; domain=${hostname}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
localStorage.removeItem('i');
}, },
mergeMe(ctx, me) { mergeMe(ctx, me) {

View File

@@ -4,6 +4,7 @@
"start_url": "/", "start_url": "/",
"display": "standalone", "display": "standalone",
"background_color": "#313a42", "background_color": "#313a42",
"theme_color": "#fb4e4e",
"icons": [ "icons": [
{ {
"src": "/assets/icons/16.png", "src": "/assets/icons/16.png",
@@ -34,6 +35,11 @@
"src": "/assets/icons/256.png", "src": "/assets/icons/256.png",
"sizes": "256x256", "sizes": "256x256",
"type": "image/png" "type": "image/png"
},
{
"src": "/assets/icons/512.png",
"sizes": "512x512",
"type": "image/png"
} }
], ],
"share_target": { "share_target": {

View File

@@ -30,17 +30,23 @@ function makeNodeWithChildren(name: string, children: Node[], props?: any): Node
} }
function getTrailingPosition(x: string): number { function getTrailingPosition(x: string): number {
let pendingBracket = 0; const brackets = [
['(', ')'],
['「', '」'],
];
const pendingBrackets = [] as any;
const end = x.split('').findIndex(char => { const end = x.split('').findIndex(char => {
if (char == ')') { const closeMatch = brackets.map(x => x[1]).indexOf(char);
if (pendingBracket > 0) { const openMatch = brackets.map(x => x[0]).indexOf(char);
pendingBracket--; if (closeMatch != -1) {
if (pendingBrackets[closeMatch] > 0) {
pendingBrackets[closeMatch]--;
return false; return false;
} else { } else {
return true; return true;
} }
} else if (char == '(') { } else if (openMatch != -1) {
pendingBracket++; pendingBrackets[openMatch] = (pendingBrackets[openMatch] || 0) + 1;
return false; return false;
} else { } else {
return false; return false;
@@ -156,7 +162,7 @@ const mfm = P.createLanguage({
let hashtag = match[1]; let hashtag = match[1];
hashtag = hashtag.substr(0, getTrailingPosition(hashtag)); hashtag = hashtag.substr(0, getTrailingPosition(hashtag));
if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag'); if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag');
if (!['\n', ' ', '(', null, undefined].includes(input[i - 1])) return P.makeFailure(i, 'require space before "#"'); if (!['\n', ' ', '(', '「', null, undefined].includes(input[i - 1])) return P.makeFailure(i, 'require space before "#"');
return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag })); return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag }));
}), }),
//#endregion //#endregion

View File

@@ -4,21 +4,24 @@ import config from '../../../config';
import { ILocalUser } from '../../../models/user'; import { ILocalUser } from '../../../models/user';
export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) { export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
const expires = 1000 * 60 * 60 * 24 * 365; // One Year
ctx.cookies.set('i', user.token, {
path: '/',
domain: config.hostname,
// SEE: https://github.com/koajs/koa/issues/974
// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
secure: config.url.startsWith('https'),
httpOnly: false,
expires: new Date(Date.now() + expires),
maxAge: expires
});
if (redirect) { if (redirect) {
//#region Cookie
const expires = 1000 * 60 * 60 * 24 * 365; // One Year
ctx.cookies.set('i', user.token, {
path: '/',
domain: config.hostname,
// SEE: https://github.com/koajs/koa/issues/974
// When using a SSL proxy it should be configured to add the "X-Forwarded-Proto: https" header
secure: config.url.startsWith('https'),
httpOnly: false,
expires: new Date(Date.now() + expires),
maxAge: expires
});
//#endregion
ctx.redirect(config.url); ctx.redirect(config.url);
} else { } else {
ctx.status = 204; ctx.body = { i: user.token };
ctx.status = 200;
} }
} }

View File

@@ -3,6 +3,8 @@ import define from '../../define';
import driveChart from '../../../../chart/drive'; import driveChart from '../../../../chart/drive';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ドライブのチャートを取得します。' 'ja-JP': 'ドライブのチャートを取得します。'
}, },

View File

@@ -3,6 +3,8 @@ import define from '../../define';
import federationChart from '../../../../chart/federation'; import federationChart from '../../../../chart/federation';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'フェデレーションのチャートを取得します。' 'ja-JP': 'フェデレーションのチャートを取得します。'
}, },

View File

@@ -3,6 +3,8 @@ import define from '../../define';
import hashtagChart from '../../../../chart/hashtag'; import hashtagChart from '../../../../chart/hashtag';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ハッシュタグごとのチャートを取得します。' 'ja-JP': 'ハッシュタグごとのチャートを取得します。'
}, },

View File

@@ -3,6 +3,8 @@ import define from '../../define';
import networkChart from '../../../../chart/network'; import networkChart from '../../../../chart/network';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ネットワークのチャートを取得します。' 'ja-JP': 'ネットワークのチャートを取得します。'
}, },

View File

@@ -3,6 +3,8 @@ import define from '../../define';
import notesChart from '../../../../chart/notes'; import notesChart from '../../../../chart/notes';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': '投稿のチャートを取得します。' 'ja-JP': '投稿のチャートを取得します。'
}, },

View File

@@ -4,6 +4,8 @@ import perUserDriveChart from '../../../../../chart/per-user-drive';
import ID, { transform } from '../../../../../misc/cafy-id'; import ID, { transform } from '../../../../../misc/cafy-id';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ユーザーごとのドライブのチャートを取得します。' 'ja-JP': 'ユーザーごとのドライブのチャートを取得します。'
}, },

View File

@@ -4,6 +4,8 @@ import perUserFollowingChart from '../../../../../chart/per-user-following';
import ID, { transform } from '../../../../../misc/cafy-id'; import ID, { transform } from '../../../../../misc/cafy-id';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ユーザーごとのフォロー/フォロワーのチャートを取得します。' 'ja-JP': 'ユーザーごとのフォロー/フォロワーのチャートを取得します。'
}, },

View File

@@ -4,6 +4,8 @@ import perUserNotesChart from '../../../../../chart/per-user-notes';
import ID, { transform } from '../../../../../misc/cafy-id'; import ID, { transform } from '../../../../../misc/cafy-id';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ユーザーごとの投稿のチャートを取得します。' 'ja-JP': 'ユーザーごとの投稿のチャートを取得します。'
}, },

View File

@@ -4,6 +4,8 @@ import perUserReactionsChart from '../../../../../chart/per-user-reactions';
import ID, { transform } from '../../../../../misc/cafy-id'; import ID, { transform } from '../../../../../misc/cafy-id';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ユーザーごとの被リアクション数のチャートを取得します。' 'ja-JP': 'ユーザーごとの被リアクション数のチャートを取得します。'
}, },

View File

@@ -3,6 +3,8 @@ import define from '../../define';
import usersChart from '../../../../chart/users'; import usersChart from '../../../../chart/users';
export const meta = { export const meta = {
stability: 'stable',
desc: { desc: {
'ja-JP': 'ユーザーのチャートを取得します。' 'ja-JP': 'ユーザーのチャートを取得します。'
}, },

View File

@@ -192,7 +192,7 @@ describe('API', () => {
password: 'foo' password: 'foo'
}); });
expect(res).have.status(204); expect(res).have.status(200);
})); }));
}); });

View File

@@ -213,21 +213,44 @@ describe('Text', () => {
}); });
it('with brackets', () => { it('with brackets', () => {
const tokens = analyze('(#foo)'); const tokens1 = analyze('(#foo)');
assert.deepEqual([ assert.deepEqual([
text('('), text('('),
node('hashtag', { hashtag: 'foo' }), node('hashtag', { hashtag: 'foo' }),
text(')'), text(')'),
], tokens1);
const tokens2 = analyze('「#foo」');
assert.deepEqual([
text('「'),
node('hashtag', { hashtag: 'foo' }),
text('」'),
], tokens2);
});
it('with mixed brackets', () => {
const tokens = analyze('「#foo(bar)」');
assert.deepEqual([
text('「'),
node('hashtag', { hashtag: 'foo(bar)' }),
text('」'),
], tokens); ], tokens);
}); });
it('with brackets (space before)', () => { it('with brackets (space before)', () => {
const tokens = analyze('(bar #foo)'); const tokens1 = analyze('(bar #foo)');
assert.deepEqual([ assert.deepEqual([
text('(bar '), text('(bar '),
node('hashtag', { hashtag: 'foo' }), node('hashtag', { hashtag: 'foo' }),
text(')'), text(')'),
], tokens); ], tokens1);
const tokens2 = analyze('「bar #foo」');
assert.deepEqual([
text('「bar '),
node('hashtag', { hashtag: 'foo' }),
text('」'),
], tokens2);
}); });
it('disallow number only', () => { it('disallow number only', () => {